julien51-sax-machine 0.0.16 → 0.0.17

data/lib/sax-machine.rb

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

data/lib/sax-machine/sax_collection_config.rb

@@ -8,16 +8,25 @@ module SAXMachine
         @name   = name.to_s
         @class  = options[:class]
         @as     = options[:as].to_s
+        @xmlns  = case options[:xmlns]
+                  when Array then options[:xmlns]
+                  when String then [options[:xmlns]]
+                  else nil
+                  end
       end
       
-      def handler
-        SAXHandler.new(@class.new)
+      def handler(nsstack)
+        SAXHandler.new(@class.new, nsstack)
       end
       
       def accessor
         as
       end
       
+      def xmlns_match?(ns)
+        @xmlns.nil? || @xmlns.include?(ns)
+      end
+      
     protected
       
       def as
@@ -30,4 +39,4 @@ module SAXMachine
     end
     
   end
-end
+end

data/lib/sax-machine/sax_config.rb

@@ -18,11 +18,19 @@ module SAXMachine
       @collection_elements << CollectionConfig.new(name, options)
     end
 
-    def collection_config(name)
-      @collection_elements.detect { |ce| ce.name.to_s == name.to_s }
+    def collection_config(name, nsstack)
+      prefix, name = name.split(':', 2)
+      prefix, name = nil, prefix unless name  # No prefix
+      namespace = nsstack[prefix]
+
+      @collection_elements.detect { |ce|
+        ce.name.to_s == name.to_s &&
+        ce.xmlns_match?(namespace)
+      }
     end
 
     def element_configs_for_attribute(name, attrs)
+      name = name.split(':', 2).last
       @top_level_elements.select do |element_config|
         element_config.name == name &&
         element_config.has_value_and_attrs_match?(attrs)

data/lib/sax-machine/sax_handler.rb

@@ -5,9 +5,9 @@ module SAXMachine
   class SAXHandler < Nokogiri::XML::SAX::Document
     attr_reader :object
 
-    def initialize(object)
+    def initialize(object, nsstack=nil)
       @object = object
-      @nsstack = nil
+      @nsstack = nsstack || NSStack.new
     end
 
     def characters(string)
@@ -23,7 +23,7 @@ module SAXMachine
     end
 
     def start_element(name, attrs = [])
-      
+
       @name   = name
       @attrs  = attrs.map { |a| SAXHandler.decode_xml(a) }
       @nsstack  = NSStack.new(@nsstack, @attrs)
@@ -31,8 +31,8 @@ module SAXMachine
       if parsing_collection?
         @collection_handler.start_element(@name, @attrs)
 
-      elsif @collection_config = sax_config.collection_config(@name)
-        @collection_handler = @collection_config.handler
+      elsif @collection_config = sax_config.collection_config(@name, @nsstack)
+        @collection_handler = @collection_config.handler(@nsstack)
         @collection_handler.start_element(@name, @attrs)
 
       elsif (element_configs = sax_config.element_configs_for_attribute(@name, @attrs)).any?
@@ -46,6 +46,7 @@ module SAXMachine
 
     def end_element(name)
       if parsing_collection? && @collection_config.name == name
+        @collection_handler.end_element(name)
         @object.send(@collection_config.accessor) << @collection_handler.object
         reset_current_collection
 

data/spec/sax-machine/sax_document_spec.rb

@@ -326,6 +326,11 @@ describe "SAXMachine" do
           document = @klass.parse("<x:b>hello</x:b>")
           document.b.should == 'hello'
         end
+
+        it "should get the namespaced element even it's not first" do
+          document = @klass.parse("<root xmlns:a='urn:test'><a>foo</a><a>foo</a><a:a>bar</a:a></root>")
+          document.a.should == 'bar'
+        end
       end
       
     end
@@ -410,13 +415,16 @@ describe "SAXMachine" do
   end
   
   describe "full example" do
+    XMLNS_ATOM = "http://www.w3.org/2005/Atom"
+    XMLNS_FEEDBURNER = "http://rssnamespace.org/feedburner/ext/1.0"
+
     before :each do
       @xml = File.read('spec/sax-machine/atom.xml')
       class AtomEntry
         include SAXMachine
         element :title
         element :name, :as => :author
-        element "feedburner:origLink", :as => :url
+        element :origLink, :as => :orig_link, :xmlns => XMLNS_FEEDBURNER
         element :summary
         element :content
         element :published
@@ -427,7 +435,7 @@ describe "SAXMachine" do
         element :title
         element :link, :value => :href, :as => :url, :with => {:type => "text/html"}
         element :link, :value => :href, :as => :feed_url, :with => {:type => "application/atom+xml"}
-        elements :entry, :as => :entries, :class => AtomEntry
+        elements :entry, :as => :entries, :class => AtomEntry, :xmlns => XMLNS_ATOM
       end
     end # before
     
@@ -435,5 +443,15 @@ describe "SAXMachine" do
       f = Atom.parse(@xml)
       f.url.should == "http://www.pauldix.net/"
     end
+
+    it "should parse all entries" do
+      f = Atom.parse(@xml)
+      f.entries.length.should == 5
+    end
+
+    it "should parse the feedburner:origLink" do
+      f = Atom.parse(@xml)
+      f.entries[0].orig_link.should == 'http://www.pauldix.net/2008/09/marshal-data-to.html'
+    end
   end
 end

metadata

@@ -1,10 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: julien51-sax-machine
 version: !ruby/object:Gem::Version 
-  version: 0.0.16
+  version: 0.0.17
 platform: ruby
 authors: 
 - Paul Dix
+- astro
+- julien51
+- superfeedr
 autorequire: 
 bindir: bin
 cert_chain: []