Fix ruby-china#221 Feed 的 Headers Content-Type 描述修正;

Author: huacnlee

app/controllers/topics_controller.rb

@@ -15,7 +15,6 @@ def index
 
   def feed
     @topics = Topic.recent.without_body.limit(20).includes(:node,:user, :last_reply_user)
-    response.headers['Content-Type'] = 'application/rss+xml; charset=utf-8'
     render :layout => false
   end
 
@@ -30,7 +29,6 @@ def node
   def node_feed
     @node = Node.find(params[:id])
     @topics = @node.topics.recent.without_body.limit(20)
-    response.headers["Content-Type"] = "application/rss+xml"
     render :layout => false
   end
 

config/locales/topics.zh-CN.yml

@@ -10,7 +10,7 @@
     reply_this_fllor: "回复此楼"
     tips_for_create_topic: "发帖说明"
     start_a_new_topic_button: "发布新帖"
-    subscribe_with_rss: "订阅%{name}社区新帖"
+    subscribe_with_rss: "订阅 %{name} 社区新帖"
     submit_reply: "提交回复"
     topic_list:
       hot_topic: "活跃帖子"

config/routes.rb

@@ -38,7 +38,7 @@
   resources :nodes
 
   get "topics/node:id" => "topics#node", as: 'node_topics'
-  get "topics/node:id/feed" => "topics#node_feed", as: 'feed_node_topics'
+  get "topics/node:id/feed" => "topics#node_feed", as: 'feed_node_topics', defaults: { format: 'xml' }
   get "topics/last" => "topics#recent", as: 'recent_topics'
   resources :topics do
     member do
@@ -53,7 +53,7 @@
       get :no_reply
       get :popular
       get :excellent
-      get :feed
+      get :feed, defaults: { format: 'xml' }
       post :preview
     end
     resources :replies

spec/controllers/topics_controller_spec.rb

@@ -17,6 +17,7 @@
   describe ":feed" do
     it "should have a feed action" do
       get :feed
+      response.headers['Content-Type'].should == 'application/xml; charset=utf-8'
       response.should be_success
     end
   end