ratom 0.3.5 → 0.3.6

data/History.txt

@@ -1,3 +1,9 @@
+== 0.3.6 2008-05-15
+
+* Added categories to feeds.
+* Make sure atom:content appears at the end of a atom:entry.
+* Don't use namespace prefixes on content unless we really have to.
+
 == 0.3.5 2008-05-03
 
 * Make sure atom:entries appears last.

data/lib/atom.rb

@@ -188,7 +188,7 @@ module Atom # :nodoc:
       end
       
       def to_xml(nodeonly = true, name = 'content', namespace = nil, namespace_map = Atom::Xml::NamespaceMap.new)
-        node = XML::Node.new("#{namespace_map.get(Atom::NAMESPACE)}:#{name}")
+        node = XML::Node.new("#{namespace_map.prefix(Atom::NAMESPACE, name)}")
         node << self.to_s
         node
       end
@@ -222,7 +222,7 @@ module Atom # :nodoc:
         # to try and recitfy the situation.
         #
         begin
-          node = XML::Node.new("#{namespace_map.get(Atom::NAMESPACE)}:#{name}")
+          node = XML::Node.new("#{namespace_map.prefix(Atom::NAMESPACE, name)}")
           node << Iconv.iconv('utf-8', 'utf-8', self.to_s, namespace_map = nil)
           node['type'] = 'html'
           node['xml:lang'] = self.xml_lang        
@@ -257,7 +257,7 @@ module Atom # :nodoc:
       end
       
       def to_xml(nodeonly = true, name = 'content', namespace = nil, namespace_map = Atom::Xml::NamespaceMap.new)
-        node = XML::Node.new("#{namespace_map.get(Atom::NAMESPACE)}:#{name}")
+        node = XML::Node.new("#{namespace_map.prefix(Atom::NAMESPACE, name)}")
         node['type'] = 'xhtml'
         node['xml:lang'] = self.xml_lang
         
@@ -342,6 +342,7 @@ module Atom # :nodoc:
   # +authors+:: An array of Atom::Person objects that are authors of this feed.
   # +contributors+:: An array of Atom::Person objects that are contributors to this feed.
   # +generator+:: A Atom::Generator.
+  # +categories+:: A list of Atom:Category objects for the feed.
   # +rights+:: A string describing the rights associated with this feed.
   # +entries+:: An array of Atom::Entry objects.
   # +links+:: An array of Atom:Link objects. (This is actually an Atom::Links array which is an Array with some sugar).
@@ -364,6 +365,7 @@ module Atom # :nodoc:
     element :updated, :class => Time, :content_only => true
     elements :links
     elements :authors, :contributors, :class => Person
+    elements :categories
     elements :entries
     
     # Initialize a Feed.
@@ -377,7 +379,7 @@ module Atom # :nodoc:
     # +o+:: An XML Reader or a Hash of attributes.
     #
     def initialize(o = {})
-      @links, @entries, @authors, @contributors = Links.new, [], [], []
+      @links, @entries, @authors, @contributors, @categories = Links.new, [], [], [], []
       
       case o
       when XML::Reader
@@ -498,11 +500,11 @@ module Atom # :nodoc:
     namespace Atom::NAMESPACE
     element :title, :id, :summary
     element :updated, :published, :class => Time, :content_only => true
-    element :content, :class => Content
     element :source, :class => Source
     elements :links
     elements :authors, :contributors, :class => Person
     elements :categories, :class => Category
+    element :content, :class => Content
         
     # Initialize an Entry.
     #

data/lib/atom/version.rb

@@ -2,7 +2,7 @@ module Atom #:nodoc:
   module VERSION #:nodoc:
     MAJOR = 0
     MINOR = 3
-    TINY  = 5
+    TINY  = 6
 
     STRING = [MAJOR, MINOR, TINY].join('.')
   end

data/lib/atom/xml/parser.rb

@@ -32,11 +32,20 @@ end
 module Atom
   module Xml # :nodoc:
    class NamespaceMap
-      def initialize
+      def initialize(default = Atom::NAMESPACE)
+        @default = default
         @i = 0
         @map = {}
       end
       
+      def prefix(ns, element)
+        if ns == @default
+          element
+        else
+          "#{get(ns)}:#{element}"
+        end
+      end
+      
       def get(ns)
         if ns == Atom::NAMESPACE
           @map[ns] = "atom"
@@ -111,8 +120,12 @@ module Atom
         end
       end
       
+      # There doesn't seem to be a way to set namespaces using libxml-ruby,
+      # so ratom has to manage namespace to URI prefixing itself, which
+      # makes this method more complicated that it needs to be.
+      #
       def to_xml(nodeonly = false, root_name = self.class.name.demodulize.downcase, namespace = nil, namespace_map = nil)
-        namespace_map = NamespaceMap.new if namespace_map.nil?
+        namespace_map = NamespaceMap.new(self.class.namespace) if namespace_map.nil?
         node = XML::Node.new(root_name)
         node['xmlns'] = self.class.namespace unless nodeonly || !self.class.respond_to?(:namespace)
 

data/spec/atom_spec.rb

@@ -228,6 +228,10 @@ describe Atom do
       it "should have an entry" do
         @feed.should have(1).entries
       end
+      
+      it "should have a category" do
+        @feed.should have(1).categories
+      end
     end
     
     describe Atom::Entry do
@@ -1117,7 +1121,7 @@ describe Atom do
   
   describe Atom::Content::Html do
     it "should escape ampersands in entities" do
-      Atom::Content::Html.new("&nbsp;").to_xml.to_s.should == "<atom:content type=\"html\">&amp;nbsp;</atom:content>"
+      Atom::Content::Html.new("&nbsp;").to_xml.to_s.should == "<content type=\"html\">&amp;nbsp;</content>"
     end
   end
   

data/spec/fixtures/complex_single_entry.atom

@@ -15,6 +15,7 @@
   <generator uri="http://www.example.com/" version="1.0">
     Example Toolkit
   </generator>
+  <category term="atom" scheme="http://example.org" label="Atom" />
   <entry>
     <title>Atom draft-07 snapshot</title>
     <link rel="alternate" type="text/html" 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: ratom
 version: !ruby/object:Gem::Version 
-  version: 0.3.5
+  version: 0.3.6
 platform: ruby
 authors: 
 - Peerworks
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-05-03 00:00:00 +09:30
+date: 2008-05-16 00:00:00 +09:30
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency