restfulie 0.8.0 → 0.8.1

data/lib/restfulie/common/representation/atom/category.rb

@@ -0,0 +1,41 @@
+module Restfulie
+  module Common
+    module Representation
+      module Atom
+        class Category < XML    
+          def initialize(options_or_obj)
+            if options_or_obj.kind_of?(Hash)
+              @doc = Nokogiri::XML::Document.new()
+              options_or_obj = create_element("category", options_or_obj)
+            end
+            super(options_or_obj)
+          end
+          
+          def term
+            @doc["term"]
+          end
+          
+          def term=(value)
+            @doc["term"] = value
+          end
+          
+          def scheme
+            @doc["scheme"]
+          end
+          
+          def scheme=(value)
+            @doc["scheme"] = value
+          end
+      
+          def label
+            @doc["label"]
+          end
+          
+          def label=(value)
+            @doc["label"] = value
+          end
+        end
+      end
+    end
+  end
+end

data/lib/restfulie/common/representation/atom/entry.rb

@@ -1,107 +1,59 @@
-module Restfulie::Common::Representation::Atom
-  
-  class Entry < Base   
-    
-    def initialize(xml_obj = nil)
-      @source = nil
-      super(xml_obj)
-      @reserved = Base::ATOM_ATTRIBUTES[:entry][:required] + Base::ATOM_ATTRIBUTES[:entry][:recommended] + Base::ATOM_ATTRIBUTES[:entry][:optional]
-    end
-     
-    #text
-    def content
-      text("content")
-    end
-
-    def content=(value)
-      set_text("content", value)
-    end
-  
-    #text
-    def summary
-      text("summary")
-    end
-
-    def summary=(value)
-      set_text("summary", value)
-    end
-  
-    #rfc 3339
-    def published
-      value = text("published")
-      Time.parse(value) unless value.nil?
-    end
-
-    def published=(value)
-      set_text("published", value)
-    end
-  
-    # comp: id, title, udpated, rights (optional)
-    def source
-      unless @source
-        @doc.xpath("xmlns:source").each do |source|
-          @source = Generator.new(source)
-        end 
-      end
+module Restfulie
+  module Common
+    module Representation
+      module Atom
+        class Entry < Base   
+          def initialize(xml_obj = nil)
+            @source = nil
+            super(xml_obj)
+            @reserved = Base::ATOM_ATTRIBUTES[:entry][:required] + Base::ATOM_ATTRIBUTES[:entry][:recommended] + Base::ATOM_ATTRIBUTES[:entry][:optional]
+          end
+           
+          # text
+          def content
+            text("content")
+          end
       
-      return source
-    end
-    
-    def source=(obj)
-      @source = obj
-    end
-  end
-  
-  class Source < XML    
-    def initialize(options_or_obj)
-      if options_or_obj.kind_of?(Hash)
-        @doc = Nokogiri::XML::Document.new()
-        node = @doc.create_element("source")
-        node.add_namespace_definition(nil, "http://www.w3.org/2005/Atom")
-        node.parent = @doc
-        super(node)
-        options_or_obj.each do |key,value|
-          self.send("#{key}=".to_sym, value)
+          def content=(value)
+            set_text("content", value)
+          end
+        
+          # text
+          def summary
+            text("summary")
+          end
+      
+          def summary=(value)
+            set_text("summary", value)
+          end
+        
+          # rfc 3339
+          def published
+            value = text("published")
+            Time.parse(value) unless value.nil?
+          end
+      
+          def published=(value)
+            set_text("published", value)
+          end
+        
+          # comp: id, title, udpated, rights (optional)
+          def source
+            unless @source
+              @doc.xpath("xmlns:source").each do |source|
+                @source = Generator.new(source)
+              end 
+            end
+            
+            return source
+          end
+          
+          def source=(obj)
+            @source = obj
+          end
         end
-      else
-        super(options_or_obj)
       end
     end
-    
-    def id
-      text("id")
-    end
-
-    def id=(value)
-      set_text("id", value)
-    end
-
-    # text
-    def title
-      text("title")
-    end
-  
-    def title=(value)
-      set_text("title", value)
-    end
-
-    def updated
-      value = text("updated")
-      Time.parse(value) unless value.nil?
-    end
-  
-    def updated=(value)
-      set_text("updated", value)
-    end
-
-    # text
-    def rights
-      text("rights")
-    end
-
-    def rights=(value)
-      set_text("rights", value)
-    end
   end
 end
 

data/lib/restfulie/common/representation/atom/factory.rb

@@ -0,0 +1,43 @@
+module Restfulie
+  module Common
+    module Representation
+      module Atom
+        # Create a new Representation::Atom object using a +string_or_io+
+        # object.
+        #
+        # Examples
+        #   xml  = IO.read("spec/units/lib/atoms/full_atom.xml")
+        #   atom = Restfulie::Common::Representation::Atom.new(xml)
+        class Factory
+          # RelaxNG file to validate atom
+          RELAXNG_ATOM = File.join(File.dirname(__FILE__), 'atom.rng')
+
+          if Nokogiri::VERSION_INFO["libxml"]["loaded"] < "2.7.7"
+            puts "WARNING! In order to use schema validation on atom representations you need libxml version 2.7.7 or superior loaded in your system." 
+            SCHEMA       = nil
+          else
+            SCHEMA       = ::Nokogiri::XML::RelaxNG(File.open(RELAXNG_ATOM))
+          end
+      
+          def self.create(string_or_io)
+            doc = string_or_io.kind_of?(Nokogiri::XML::Document) ? string_or_io : Nokogiri::XML(string_or_io) 
+            
+            if SCHEMA && !(errors = SCHEMA.validate(doc)).empty?
+              raise AtomInvalid.new("Invalid Atom: "+ errors.join(", "))
+            end
+            
+            case doc.root.name
+            when "feed"
+              Restfulie::Common::Representation::Atom::Feed.new(doc)
+            when "entry"
+              Restfulie::Common::Representation::Atom::Entry.new(doc)
+            end        
+          end      
+        end
+        
+        class AtomInvalid < StandardError
+        end
+      end
+    end
+  end
+end

data/lib/restfulie/common/representation/atom/feed.rb

@@ -1,106 +1,110 @@
-module Restfulie::Common::Representation::Atom
-  
-  class Feed < Base
-    
-    def initialize(xml_obj = nil)
-      @generator = nil
-      @entries = nil
-      super(xml_obj)
-      @reserved = Base::ATOM_ATTRIBUTES[:feed][:required] + Base::ATOM_ATTRIBUTES[:feed][:recommended] + Base::ATOM_ATTRIBUTES[:feed][:optional] + [:entry]
-    end
-    
-    def entries
-      unless @entries
-        @entries = TagCollection.new(@doc)
-        @doc.xpath("xmlns:entry").each do |entry|
-          @entries << Entry.new(entry)
-        end    
-      end
+module Restfulie
+  module Common
+    module Representation
+      module Atom
+        class Feed < Base
+          def initialize(xml_obj = nil)
+            @generator = nil
+            @entries = nil
+            super(xml_obj)
+            @reserved = Base::ATOM_ATTRIBUTES[:feed][:required] + Base::ATOM_ATTRIBUTES[:feed][:recommended] + Base::ATOM_ATTRIBUTES[:feed][:optional] + [:entry]
+          end
+          
+          def entries
+            unless @entries
+              @entries = TagCollection.new(@doc)
+              @doc.xpath("xmlns:entry").each do |entry|
+                @entries << Entry.new(entry)
+              end    
+            end
+            
+            return @entries
+          end
+        
+          # comp: attr: uri, version (optionals); content (mandatory)
+          def generator
+            unless @generator
+              @doc.xpath("xmlns:generator").each do |generator|
+                @generator = Generator.new(generator)
+              end 
+            end
+            
+            return generator
+          end
+          
+          def generator=(obj)
+            @generator = obj
+          end
+        
+          # simple text
+          def icon
+            text("icon")
+          end
       
-      return @entries
-    end
-  
-    # comp: attr: uri, version (optionals); content (mandatory)
-    def generator
-      unless @generator
-        @doc.xpath("xmlns:generator").each do |generator|
-          @generator = Generator.new(generator)
-        end 
-      end
+          def icon=(value)
+            set_text("icon", value)
+          end
+        
+          # simple text
+          def logo
+            text("logo")
+          end
       
-      return generator
-    end
-    
-    def generator=(obj)
-      @generator = obj
-    end
-  
-    # simple text
-    def icon
-      text("icon")
-    end
-
-    def icon=(value)
-      set_text("icon", value)
-    end
-  
-    # simple text
-    def logo
-      text("logo")
-    end
-
-    def logo=(value)
-      set_text("logo", value)
-    end
-  
-    # text
-    def subtitle
-      text("subtitle")
-    end
-
-    def subtitle=(value)
-      set_text("subtitle", value)
-    end
-  end
-  
-  class Generator < XML    
-    def initialize(options_or_obj)
-      if options_or_obj.kind_of?(Hash)
-        @doc = Nokogiri::XML::Document.new()
-        node = @doc.create_element("generator")
-        node.add_namespace_definition(nil, "http://www.w3.org/2005/Atom")
-        node.parent = @doc
-        super(node)
-        options_or_obj.each do |key,value|
-          self.send("#{key}=".to_sym, value)
+          def logo=(value)
+            set_text("logo", value)
+          end
+        
+          # text
+          def subtitle
+            text("subtitle")
+          end
+      
+          def subtitle=(value)
+            set_text("subtitle", value)
+          end
+        end
+        
+        class Generator < XML    
+          def initialize(options_or_obj)
+            if options_or_obj.kind_of?(Hash)
+              @doc = Nokogiri::XML::Document.new()
+              node = @doc.create_element("generator")
+              node.add_namespace_definition(nil, "http://www.w3.org/2005/Atom")
+              node.parent = @doc
+              super(node)
+              options_or_obj.each do |key,value|
+                self.send("#{key}=".to_sym, value)
+              end
+            else
+              super(options_or_obj)
+            end
+          end
+          
+          def content
+            @doc.content
+          end
+          
+          def content=(value)
+            @doc.content = value
+          end
+          
+          def uri
+            @doc["uri"]
+          end
+          
+          def uri=(value)
+            @doc["uri"] = value
+          end
+      
+          def version
+            @doc["version"]
+          end
+          
+          def version=(value)
+            @doc["version"] = value
+          end
         end
-      else
-        super(options_or_obj)
       end
     end
-    
-    def content
-      @doc.content
-    end
-    
-    def content=(value)
-      @doc.content = value
-    end
-    
-    def uri
-      @doc["uri"]
-    end
-    
-    def uri=(value)
-      @doc["uri"] = value
-    end
-
-    def version
-      @doc["version"]
-    end
-    
-    def version=(value)
-      @doc["version"] = value
-    end
   end
 end