Changeset 8637

Timestamp:

01/13/08 00:11:39 (9 months ago)

Author:

nzkoz

Message:

Allow users to declare other namespaces when using the atom feed helpers. Closes #10304 [david.calavera]

Files:

• trunk/actionpack/CHANGELOG (modified) (1 diff)
• trunk/actionpack/lib/action_view/helpers/atom_feed_helper.rb (modified) (3 diffs)
• trunk/actionpack/test/template/atom_feed_helper_test.rb (modified) (2 diffs)

trunk/actionpack/CHANGELOG

@@ -1 +1 @@
-*SVN*
+
+* Allow users to declare other namespaces when using the atom feed helpers. #10304 [david.calavera]
-
-* Introduce send_file :x_sendfile => true to send an X-Sendfile response header.  [Jeremy Kemper]

trunk/actionpack/lib/action_view/helpers/atom_feed_helper.rb

@@ -43 +43 @@
-      #     end
-      #
-are 
+
-      #
-      # * <tt>:schema_date</tt>: Required. The date at which the tag scheme for the feed was first used. A good default is the year you created the feed. See http://feedvalidator.org/docs/error/InvalidTAG.html for more information.
@@ -49 +49 @@
-      # * <tt>:root_url</tt>: The HTML alternative that this feed is doubling for. Defaults to / on the current host.
-      # * <tt>:url</tt>: The URL for this feed. Defaults to the current URL.
+      #
+      # Other namespaces can be added to the root element:
+      #
+      #   app/views/posts/index.atom.builder:
+      #     atom_feed({'xmlns:app' => 'http://www.w3.org/2007/app',
+      #         'xmlns:openSearch' => 'http://a9.com/-/spec/opensearch/1.1/'}) do |feed|
+      #       feed.title("My great blog!")
+      #       feed.updated((@posts.first.created_at))
+      #       feed.tag!(openSearch:totalResults, 10)
+      #
+      #       for post in @posts
+      #         feed.entry(post) do |entry|
+      #           entry.title(post.title)
+      #           entry.content(post.body, :type => 'html')
+      #           entry.tag!('app:edited', Time.now)
+      #
+      #           entry.author do |author|
+      #             author.name("DHH")
+      #           end
+      #         end
+      #       end
+      #     end
+      #
-      #
-      # atom_feed yields an AtomFeedBuilder instance.
@@ -61 +84 @@
-        xml.instruct!
-
-
+
+
+
+
-          xml.id("tag:#{request.host},#{options[:schema_date]}:#{request.request_uri.split(".")[0]}")      
-          xml.link(:rel => 'alternate', :type => 'text/html', :href => options[:root_url] || (request.protocol + request.host_with_port))

trunk/actionpack/test/template/atom_feed_helper_test.rb

@@ -52 +52 @@
-              entry.title(scroll.title)
-              entry.content(scroll.body, :type => 'html')
+            end
+          end
+        end
+    EOT
+    FEEDS["feed_with_atomPub_namespace"] = <<-EOT
+        atom_feed({'xmlns:app' => 'http://www.w3.org/2007/app',
+                 'xmlns:openSearch' => 'http://a9.com/-/spec/opensearch/1.1/'}) do |feed|
+          feed.title("My great blog!")
+          feed.updated((@scrolls.first.created_at))
+
+          for scroll in @scrolls
+            feed.entry(scroll) do |entry|
+              entry.title(scroll.title)
+              entry.content(scroll.body, :type => 'html')
+              entry.tag!('app:edited', Time.now)
+
+              entry.author do |author|
+                author.name("DHH")
+              end
-            end
-          end
@@ -140 +159 @@
-  end
-
+  def test_feed_should_include_atomPub_namespace
+    with_restful_routing(:scrolls) do
+      get :index, :id => "feed_with_atomPub_namespace"
+      assert_match %r{xml:lang="en-US"}, @response.body
+      assert_match %r{xmlns="http://www.w3.org/2005/Atom"}, @response.body
+      assert_match %r{xmlns:app="http://www.w3.org/2007/app"}, @response.body
+    end
+  end
+
-  private
-    def with_restful_routing(resources)