ealdent-sax-machine 0.0.7 → 0.0.12

data/README.textile

@@ -48,6 +48,15 @@ feed.entries.first.title # => title of the first entry
 feed.entries.first.author # => the author of the first entry
 feed.entries.first.url # => the permalink on the blog for this entry
 # etc ...
+
+# you can also use the elements method without specifying a class like so
+class SomeServiceResponse
+  elements :message, :as => :messages
+end
+
+response = SomeServiceResponse.parse("<response><message>hi</message><message>world</message></response>")
+response.messages.first # => "hi"
+response.messages.last  # => "world"
 </pre>
 
 h2. LICENSE

data/lib/sax-machine.rb

@@ -7,5 +7,5 @@ require "sax-machine/sax_handler"
 require "sax-machine/sax_config"
 
 module SAXMachine
-  VERSION = "0.0.7"
+  VERSION = "0.0.12"
 end

data/lib/sax-machine/sax_config.rb

@@ -21,10 +21,11 @@ module SAXMachine
     end
 
     def element_config_for_attribute(name, attrs)
-      @top_level_elements.detect do |element_config|
+      element_configs = @top_level_elements.select do |element_config|
         element_config.name == name &&
         element_config.has_value_and_attrs_match?(attrs)
       end
+      element_configs.empty? ? nil : element_configs
     end
   
     def element_config_for_tag(name, attrs)

data/lib/sax-machine/sax_document.rb

@@ -23,19 +23,25 @@ module SAXMachine
       options[:as] ||= name
       sax_config.add_top_level_element(name, options)
       
-      # we only want to insert the setter if they haven't defined it from elsewhere.
+      # we only want to insert the getter and setter if they haven't defined it from elsewhere.
       # this is how we allow custom parsing behavior. So you could define the setter
       # and have it parse the string into a date or whatever.
-      if instance_methods.include?("#{options[:as]}=")
-        attr_reader options[:as]
-      else
-        attr_accessor options[:as]
-      end
+      attr_reader options[:as] unless instance_methods.include?(options[:as].to_s)
+      attr_writer options[:as] unless instance_methods.include?("#{options[:as]}=")
     end
     
     def elements(name, options = {})
       options[:as] ||= name
-      sax_config.add_collection_element(name, options)
+      if options[:class]
+        sax_config.add_collection_element(name, options)
+      else
+        class_eval <<-SRC
+          def add_#{options[:as]}(value)
+            #{options[:as]} << value
+          end
+        SRC
+        sax_config.add_top_level_element(name, options.merge(:collection => true))
+      end
       
       class_eval <<-SRC
         def #{options[:as]}

data/lib/sax-machine/sax_element_config.rb

@@ -2,7 +2,7 @@ module SAXMachine
   class SAXConfig
     
     class ElementConfig
-      attr_reader :name
+      attr_reader :name, :setter
       
       def initialize(name, options)
         @name = name.to_s
@@ -21,16 +21,19 @@ module SAXMachine
         end
         
         @as = options[:as]
+        @collection = options[:collection]
+        
+        if @collection
+          @setter = "add_#{options[:as]}"
+        else
+          @setter = "#{@as}="
+        end
       end
 
       def value_from_attrs(attrs)
         attrs[attrs.index(@value) + 1]
       end
       
-      def setter
-        "#{@as}="
-      end
-      
       def attrs_match?(attrs)
         if @with
           @with == (@with & attrs)
@@ -42,6 +45,10 @@ module SAXMachine
       def has_value_and_attrs_match?(attrs)
         !@value.nil? && attrs_match?(attrs)
       end
+      
+      def collection?
+        @collection
+      end
     end
     
   end

data/lib/sax-machine/sax_handler.rb

@@ -30,6 +30,7 @@ module SAXMachine
         
       elsif @collection_config = sax_config.collection_config(@name)
         @collection_handler = @collection_config.handler
+        @collection_handler.start_element(@name, @attrs)
         
       elsif @element_config = sax_config.element_config_for_attribute(@name, @attrs)
         parse_element_attribute
@@ -67,14 +68,18 @@ module SAXMachine
     def parse_element_attribute
       unless parsed_config?
         mark_as_parsed
-        @object.send(@element_config.setter, @element_config.value_from_attrs(@attrs))
+        @element_config.each do |config|
+          @object.send(config.setter, config.value_from_attrs(@attrs))
+        end
       end
       
       @element_config = nil
     end
     
     def mark_as_parsed
-      @parsed_configs[@element_config] = true
+      # TODO: make this code not suck like this
+      @parsed_configs[@element_config] = true unless (@element_config.respond_to?(:collection?) && @element_config.collection?) || 
+        (@element_config.class == Array && @element_config.first.collection?)
     end
     
     def parsed_config?

data/spec/sax-machine/sax_document_spec.rb

@@ -209,37 +209,55 @@ describe "SAXMachine" do
           document = @klass.parse("<link foo='test'/>")
           document.link.should == 'test'
         end
+        
+        it "should save two different attribute values on a single tag" do
+          @klass = Class.new do
+            include SAXMachine
+            element :link, :value => :foo, :as => :first
+            element :link, :value => :bar, :as => :second
+          end
+          document = @klass.parse("<link foo='foo value' bar='bar value'></link>")
+          document.first.should == "foo value"
+          document.second.should == "bar value"
+        end
       end
     end
   end
   
   describe "elements" do
-    # I took this stuff out because I'm not sure yet if this is something I want to bother supporting.
-    
-    # describe "when parsing multiple elements" do
-    #   before :each do
-    #     @klass = Class.new do
-    #       include SAXMachine
-    #       elements :entry, :as => :entries
-    #     end
-    #   end
-    #   
-    #   it "should provide a collection accessor" do
-    #     document = @klass.new
-    #     document.entries << :foo
-    #     document.entries.should == [:foo]
-    #   end
-    #   
-    #   it "should parse a single element" do
-    #     document = @klass.parse("<entry>hello</entry>")
-    #     document.entries.should == ["hello"]
-    #   end
-    #   
-    #   it "should parse multiple elements" do
-    #     document = @klass.parse("<xml><entry>hello</entry><entry>world</entry></xml>")
-    #     document.entries.should == ["hello", "world"]
-    #   end
-    # end
+    describe "when parsing multiple elements" do
+      before :each do
+        @klass = Class.new do
+          include SAXMachine
+          elements :entry, :as => :entries
+        end
+      end
+      
+      it "should provide a collection accessor" do
+        document = @klass.new
+        document.entries << :foo
+        document.entries.should == [:foo]
+      end
+      
+      it "should parse a single element" do
+        document = @klass.parse("<entry>hello</entry>")
+        document.entries.should == ["hello"]
+      end
+      
+      it "should parse multiple elements" do
+        document = @klass.parse("<xml><entry>hello</entry><entry>world</entry></xml>")
+        document.entries.should == ["hello", "world"]
+      end
+      
+      it "should parse multiple elements when taking an attribute value" do
+        attribute_klass = Class.new do
+          include SAXMachine
+          elements :entry, :as => :entries, :value => :foo
+        end
+        doc = attribute_klass.parse("<xml><entry foo='asdf' /><entry foo='jkl' /></xml>")
+        doc.entries.should == ["asdf", "jkl"]
+      end
+    end
     
     describe "when using the class option" do
       before :each do
@@ -271,6 +289,16 @@ describe "SAXMachine" do
         document.entries.size.should == 1
         document.entries.first.title.should == "correct title"
       end
+      
+      it "should parse out an attribute value from the tag that starts the collection" do
+        class Foo
+          element :entry, :value => :href, :as => :url
+        end
+        document = @klass.parse("<xml><entry href='http://pauldix.net'><title>paul</title></entry></xml>")
+        document.entries.size.should == 1
+        document.entries.first.title.should == "paul"
+        document.entries.first.url.should == "http://pauldix.net"
+      end
     end    
   end
   

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: ealdent-sax-machine
 version: !ruby/object:Gem::Version 
-  version: 0.0.7
+  version: 0.0.12
 platform: ruby
 authors: 
 - Paul Dix
@@ -14,6 +14,7 @@ default_executable:
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: nokogiri
+  type: :runtime
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: