xml-sax-machines 0.4.1 → 0.4.2

data/VERSION.yml

@@ -1,5 +1,5 @@
 --- 
 :major: 0
 :minor: 4
-:patch: 1
+:patch: 2
 :build: 

data/lib/xml-sax-machines/builder.rb

@@ -32,14 +32,20 @@ module XML
         @context  = @document
       end
 
-      def start_element(name, attributes = []) #:nodoc:
+      def start_element_namespace(name, attributes = [], prefix = nil, uri = nil, ns = [])
         super
-        el = Nokogiri::XML::Element.new(name, @document)
-        Hash[*attributes.flatten].each_pair{|k, v| el[k] = v}
+        el           = Nokogiri::XML::Element.new(name, @document)
+        el.namespace = el.add_namespace_definition(prefix, uri) if uri
+        ns.each{|prefix, href| el.add_namespace_definition(prefix, href)}
         @context = @context.add_child(el)
+
+        # Node needs to be added to the document so namespaces are available.
+        attributes.each{|attribute| el[[attribute.prefix, attribute.localname].compact.join(':')] = attribute.value}
       end
 
-      def end_element(name) #:nodoc:
+      #--
+      # TODO: Check namespace of context as well?
+      def end_element_namespace(name, prefix = nil, uri = nil)
         super
         raise "Unmatched closing element. Got '#{name}' but expected '#{@context.name}'" \
           unless name == @context.name

data/lib/xml-sax-machines/debug.rb

@@ -16,12 +16,9 @@ module XML
         characters
         comment
         end_document
-        end_element
         end_element_namespace
         error
         start_document
-        start_element
-        start_element_namespace
         warning
         xmldecl
       }.each do |method|
@@ -31,6 +28,12 @@ module XML
         end
       end
 
+      def start_element_namespace name, attributes = [], prefix = nil, uri = nil, ns = []
+        atts = attributes.map{|attribute| [[attribute.prefix, attribute.localname].compact.join(':'), attribute.value]}
+        warn "start_element_namespace: [#{name.inspect}, #{atts.inspect}, #{prefix.inspect}, #{uri.inspect}, #{ns.inspect}]"
+        super
+      end
+
     end # Debug
   end # SAX
 end # XML

data/lib/xml-sax-machines/filter.rb

@@ -42,8 +42,8 @@ module XML
         @filter.end_document if @filter
       end
 
-      def end_element(name) #:nodoc:
-        @filter.end_element(name) if @filter
+      def end_element_namespace(name, prefix = nil, uri = nil) #:nodoc:
+        @filter.end_element_namespace(name, prefix, uri) if @filter
       end
 
       def error(string) #:nodoc:
@@ -54,8 +54,8 @@ module XML
         @filter.start_document if @filter
       end
 
-      def start_element(name, attributes = []) #:nodoc:
-        @filter.start_element(name, attributes = []) if @filter
+      def start_element_namespace(name, attributes = [], prefix = nil, uri = nil, ns = []) #:nodoc:
+        @filter.start_element_namespace(name, attributes, prefix, uri, ns) if @filter
       end
 
       def warning(string) #:nodoc:

data/lib/xml-sax-machines/fragment_builder.rb

@@ -54,7 +54,7 @@ module XML
         @buffer = 0
       end
 
-      def start_element(name, attributes = []) #:nodoc:
+      def start_element_namespace(name, attributes = [], prefix = nil, uri = nil, ns = []) #:nodoc:
         super
         @find.each_pair do |xpath, block|
           if match = @document.at(xpath)
@@ -66,7 +66,7 @@ module XML
         end
       end
 
-      def end_element(name) #:nodoc:
+      def end_element_namespace(name, prefix = nil, uri = nil) #:nodoc:
         path = @context.path
         if @buffer > 0 && block = @found.delete(path)
           @buffer -= 1

data/test/test_builder.rb

@@ -40,6 +40,14 @@ describe 'Builder' do
     assert_equal 2, el.children.length
   end
 
+  it 'creates elements with namespaces' do
+    assert build('<r xmlns:bar="http://bar.local"><bar:foo/></r>').at('/r/bar:foo')
+  end
+
+  it 'create elements with namespaced attributes' do
+    assert build('<r xmlns:bar="http://bar.local"><foo bar:id="1"/></r>').at('/r/foo[@bar:id="1"]')
+  end
+
   protected
     def build(string)
       builder = XML::SAX::Builder.new

data/test/test_debug.rb

@@ -9,16 +9,16 @@ describe 'XML::SAX::Debug event method warning' do
     assert_match regexp('end_document: []'), parse('<r/>')
   end
 
-  it 'warns #start_element' do
-    assert_match regexp('start_element: ["r", []]'), parse('<r/>')
+  it 'warns #start_element_namespace' do
+    assert_match regexp('start_element_namespace: ["r", [], nil, nil, []]'), parse('<r/>')
   end
 
   it 'warns #start_element with attributes' do
-    assert_match regexp('start_element: ["r", [["id", "1"]]]'), parse('<r id="1"/>')
+    assert_match regexp('start_element_namespace: ["r", [["id", "1"]], nil, nil, []]'), parse('<r id="1"/>')
   end
 
   it 'warns #end_element' do
-    assert_match regexp('end_element: ["r"]'), parse('<r/>')
+    assert_match regexp('end_element_namespace: ["r", nil, nil]'), parse('<r/>')
   end
 
   it 'warns #characters' do

data/test/test_fragment_builder.rb

@@ -1,4 +1,5 @@
 require_relative 'helper'
+# TODO: These tests don't fail if the lambda doesn't run.
 
 describe 'XML::SAX::FragmentBuilder' do
   it 'calls callback for record' do
@@ -21,4 +22,17 @@ describe 'XML::SAX::FragmentBuilder' do
     parser << '<r><foo>text<el>el</el></foo></r>'
     parser.finish
   end
+
+  it 'handles namespaces like a boss' do
+    builder = XML::SAX::FragmentBuilder.new(
+      '//foo:title' => lambda{|el|
+        assert_equal 'foo',              el.namespace.prefix
+        assert_equal 'http://foo.local', el.namespace.href
+        assert_equal 'title',            el.name
+      }
+    )
+    parser = Nokogiri::XML::SAX::PushParser.new(builder)
+    parser << '<r xmlns:foo="http://foo.local"><title /><foo:title/></r>'
+    parser.finish
+  end
 end

data/xml-sax-machines.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{xml-sax-machines}
-  s.version = "0.4.1"
+  s.version = "0.4.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Shane Hanna"]
-  s.date = %q{2010-11-29}
+  s.date = %q{2011-02-04}
   s.description = %q{XML SAX Machines}
   s.email = %q{shane.hanna@gmail.com}
   s.extra_rdoc_files = [

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 4
-  - 1
-  version: 0.4.1
+  - 2
+  version: 0.4.2
 platform: ruby
 authors: 
 - Shane Hanna
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-29 00:00:00 +11:00
+date: 2011-02-04 00:00:00 +11:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency