sporkmonger-sax-machine 0.1.0 → 0.1.1

data/CHANGELOG

@@ -1,3 +1,8 @@
+== 0.1.1
+
+* fixed bug with element contents being copied into attributes
+* fixed a few warnings
+
 == 0.1.0
 
 * forked from julien51/sax-machine

data/lib/sax-machine/sax_document.rb

@@ -7,11 +7,14 @@ module SAXMachine
   end
 
   def parse(xml_text)
-    unless @parser
+    @parser ||= (begin
       sax_handler = SAXHandler.new(self)
-      @parser = Nokogiri::XML::SAX::PushParser.new(sax_handler)
-      @parser.options |= Nokogiri::XML::ParseOptions::RECOVER if @parser.respond_to?(:options)
-    end
+      parser = Nokogiri::XML::SAX::PushParser.new(sax_handler)
+      if parser.respond_to?(:options)
+        parser.options |= Nokogiri::XML::ParseOptions::RECOVER
+      end
+      parser
+    end)
     @parser << xml_text
     self
   end
@@ -24,7 +27,6 @@ module SAXMachine
   end
 
   module ClassMethods
-
     def parse(xml_text)
       # It might be cleaner to aditionally call parse_finish here, but
       # then Nokogiri/libxml2 barfs on incomplete documents. Desired
@@ -44,11 +46,9 @@ module SAXMachine
     end
 
     def columns
-      r = []
-      sax_config.top_level_elements.each do |name, ecs|
-        r += ecs
+      sax_config.top_level_elements.inject([]) do |accu, (name, ecs)|
+        accu += ecs; accu
       end
-      r
     end
 
     def column(sym)

data/lib/sax-machine/sax_element_config.rb

@@ -64,8 +64,12 @@ module SAXMachine
         end
       end
 
+      def has_value?
+        !@value.nil?
+      end
+
       def has_value_and_attrs_match?(attrs)
-        !@value.nil? && attrs_match?(attrs)
+        has_value? && attrs_match?(attrs)
       end
 
       def xmlns_match?(ns)

data/lib/sax-machine/sax_handler.rb

@@ -56,7 +56,7 @@ module SAXMachine
         reset_current_collection
       elsif parsing_collection?
         @collection_handler.end_element(name)
-      elsif characaters_captured?
+      elsif characters_captured? && !@element_config.has_value?
         @object.send(@element_config.setter, @value)
       end
 
@@ -64,12 +64,12 @@ module SAXMachine
       @nsstack = @nsstack.pop
     end
 
-    def characaters_captured?
+    def characters_captured?
       !@value.nil? && !@value.empty?
     end
 
     def parsing_collection?
-      !@collection_handler.nil?
+      !(@collection_handler ||= nil).nil?
     end
 
     def parse_element_attributes(element_configs)
@@ -103,7 +103,7 @@ module SAXMachine
     ##
     # Decodes XML special characters.
     def self.decode_xml(str)
-      return str.map &method(:decode_xml) if str.kind_of?(Array)
+      return str.map(&method(:decode_xml)) if str.kind_of?(Array)
 
       # entities = {
       #         '#38'   => '&',

data/lib/sax-machine/version.rb

@@ -25,7 +25,7 @@ unless defined? SAXMachine::VERSION
     module VERSION
       MAJOR = 0
       MINOR = 1
-      TINY  = 0
+      TINY  = 1
 
       STRING = [MAJOR, MINOR, TINY].join('.')
     end

data/spec/sax-machine/sax_document_spec.rb

@@ -229,6 +229,31 @@ describe "SAXMachine" do
           end
         end
 
+        it "should not save a value when the attribute is missing" do
+          document = @klass.parse("<link />")
+          document.link.should == nil
+        end
+
+        it "should not save a value when the attribute is missing" do
+          document = @klass.parse("<link bar='foo' />")
+          document.link.should == nil
+        end
+
+        it "should not save a value when the attribute is missing" do
+          document = @klass.parse("<link></link>")
+          document.link.should == nil
+        end
+
+        it "should not save a value when the attribute is missing" do
+          document = @klass.parse("<link>\n</link>")
+          document.link.should == nil
+        end
+
+        it "should not save a value when the attribute is missing" do
+          document = @klass.parse("<link>not foo</link>")
+          document.link.should == nil
+        end
+
         it "should save the attribute value" do
           document = @klass.parse("<link foo='test'>hello</link>")
           document.link.should == 'test'
@@ -283,6 +308,27 @@ describe "SAXMachine" do
           document.link_foo.should == 'test1'
           document.link_bar.should == 'test2'
         end
+
+        it "should parse the element and attribute values" do
+          document = @klass.parse("<link foo='test1'>hello</link>")
+          document.link.should == 'hello'
+          document.link_foo.should == 'test1'
+          document.link_bar.should == nil
+        end
+
+        it "should parse the element and attribute values" do
+          document = @klass.parse("<link bar='test2'>hello</link>")
+          document.link.should == 'hello'
+          document.link_foo.should == nil
+          document.link_bar.should == 'test2'
+        end
+
+        it "should parse the element and attribute values" do
+          document = @klass.parse("<link>hello</link>")
+          document.link.should == 'hello'
+          document.link_foo.should == nil
+          document.link_bar.should == nil
+        end
       end
 
       describe "when specifying namespaces" do

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: sporkmonger-sax-machine
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 25
   prerelease: 
   segments: 
   - 0
   - 1
-  - 0
-  version: 0.1.0
+  - 1
+  version: 0.1.1
 platform: ruby
 authors: 
 - Paul Dix
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-07 00:00:00 -08:00
+date: 2011-01-11 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency