xmlparsable 1.5.1 → 1.5.2

data/lib/xmlparsable.rb

@@ -5,11 +5,11 @@ module XmlParsable
   autoload :Parser,   "xmlparsable/parser"
   autoload :Elements, "xmlparsable/elements"
 
-  def self.parser(input)
+  def self.parser(input, *extra)
     case input
-    when String then LibXML::XML::SaxParser.string(input)
-    when File   then LibXML::XML::SaxParser.file(input)
-    when IO     then LibXML::XML::SaxParser.io(input)
+    when String then LibXML::XML::SaxParser.string(input, *extra)
+    when File   then LibXML::XML::SaxParser.file(input, *extra)
+    when IO     then LibXML::XML::SaxParser.io(input, *extra)
     else raise ArgumentError, "argument must be a String, File, or IO"
     end
   end
@@ -74,8 +74,8 @@ module XmlParsable
       end
     end
 
-    def parse(input)
-      root   = XmlParsable::Elements::RecordElement.new(nil, nil, nil, new, @parsers)
+    def parse(input, *extras)
+      root   = XmlParsable::Elements::RecordElement.new(nil, nil, nil, new, @parsers, Hash.new)
       stack  = XmlParsable::Parser.new(root)
       parser = XmlParsable.parser(input)
 

data/lib/xmlparsable/elements/array.rb

@@ -2,19 +2,20 @@ module XmlParsable
   module Elements
 
     class ArrayElement < AbstractElement
-      attr_reader :name
 
       class Array < ::Array
         attr_reader :xmlattrs
       end
 
+      attr_reader :name
+
       def initialize(name, attributes, parent, arguments)
-        @name, @parent, @elements = name, parent, Array.new
+        @name, @attributes, @parent, @elements =
+          name, attributes, parent, Array.new
 
         @item_name = arguments[:item_name].to_s
         @item_type = arguments[:class]
         @item_args = arguments[:item]
-        @elements.instance_variable_set(:@xmlattrs, attributes)
       end
 
       def open(name, attributes)
@@ -28,6 +29,7 @@ module XmlParsable
       end
 
       def finalize
+        @elements.instance_variable_set(:@xmlattrs, @attributes)
         @parent.close(self, @elements)
       end
     end

data/lib/xmlparsable/elements/date.rb

@@ -6,10 +6,16 @@ module XmlParsable
     # Parses content into a ruby Date value
     #
     class DateElement < AbstractElement
+      
+      class Date < ::Date
+        attr_reader :xmlattrs
+      end
+
       attr_reader :name
 
-      def initialize(name, attributes, parent, *arguments)
-        @name, @parent, @string = name, parent, ""
+      def initialize(name, attributes, parent, arguments)
+        @name, @attributes, @parent, @string =
+          name, attributes, parent, ""
       end
 
       def read(text)
@@ -18,7 +24,10 @@ module XmlParsable
 
       def finalize
         stripped = @string.strip
-        @parent.close(self, stripped == "" ? nil : Date.parse(stripped))
+        date     = stripped == "" ? nil : Date.parse(stripped)
+        date.instance_variable_set(:@xmlattrs, @attributes)
+
+        @parent.close(self, date)
       end
     end
   end

data/lib/xmlparsable/elements/numeric.rb

@@ -6,8 +6,9 @@ module XmlParsable
     class NumericElement < AbstractElement
       attr_reader :name
 
-      def initialize(name, attributes, parent, *arguments)
-        @name, @parent, @string = name, parent, ""
+      def initialize(name, attributes, parent, arguments)
+        @name, @attributes, @parent, @string =
+          name, attributes, parent, ""
       end
 
       def read(text)
@@ -22,6 +23,8 @@ module XmlParsable
                      Integer(stripped)
                    end
 
+        # TODO: Subclass BigDecimal and Integer to add an accessor method
+        numeric.instance_variable_set(:@xmlattrs, @attributes)
         @parent.close(self, numeric)
       end
     end

data/lib/xmlparsable/elements/record.rb

@@ -3,14 +3,9 @@ module XmlParsable
     class RecordElement < AbstractElement
       attr_reader :name, :attributes, :parent, :target
 
-      def initialize(name, attributes, parent, target, parsers, *arguments)
-        @name       = name
-        @attributes = attributes
-        @parent     = parent
-        @target     = target
-        @parsers    = parsers
-        @elements   = Hash.new
-        @target.instance_variable_set(:@xmlattrs, @attributes)
+      def initialize(name, attributes, parent, target, parsers, arguments)
+        @name, @attributes, @parent, @target, @parsers, @elements =
+          name, attributes, parent, target, parsers, Hash.new
       end
 
       def open(name, attributes)
@@ -32,6 +27,7 @@ module XmlParsable
       end
 
       def finalize
+        @target.instance_variable_set(:@xmlattrs, @attributes)
         @target.instance_variable_set(:@xmlelems, @elements)
         @parent.close(self, @target) if @parent
       end
@@ -41,8 +37,8 @@ module XmlParsable
           @base, @parsers = base, parsers
         end
 
-        def new(name, attributes, parent, *arguments)
-          RecordElement.new(name, attributes, parent, @base.new, @parsers)
+        def new(name, attributes, parent, arguments)
+          RecordElement.new(name, attributes, parent, @base.new, @parsers, arguments)
         end
       end
     end

data/lib/xmlparsable/elements/string.rb

@@ -5,10 +5,16 @@ module XmlParsable
     # elements so "abc <!-- foo --> def <b>whatever</b>" is read as "abc def"
     #
     class StringElement < AbstractElement
+
+      class String < ::String
+        attr_reader :xmlattrs
+      end
+
       attr_reader :name
 
-      def initialize(name, attributes, parent, *arguments)
-        @name, @parent, @string = name, parent, ""
+      def initialize(name, attributes, parent, arguments)
+        @name, @attributes, @parent, @string =
+          name, attributes, parent, String.new
       end
 
       def read(text)
@@ -16,6 +22,7 @@ module XmlParsable
       end
 
       def finalize
+        @string.instance_variable_set(:@xmlattrs, @attributes)
         @parent.close(self, @string)
       end
     end

data/lib/xmlparsable/elements/text.rb

@@ -5,14 +5,20 @@ module XmlParsable
     # elements so "abc def <b>what<!-- foo -->ever</b>" is read as "abc def whatever"
     #
     class TextElement < XmlElement::Node
+
+      class String < ::String
+        attr_reader :xmlattrs
+      end
+
       attr_reader :name, :attributes, :parent
 
-      def initialize(name, attributes, parent, *arguments)
-        @name, @attributes, @parent, @text = name, attributes, parent, ""
+      def initialize(name, attributes, parent, arguments)
+        @name, @attributes, @parent, @arguments, @text =
+          name, attributes, parent, arguments, String.new
       end
 
       def open(name, attributes)
-        TextElement.new(name, attributes, self)
+        TextElement.new(name, attributes, self, @arguments)
       end
 
       def read(text)
@@ -27,6 +33,7 @@ module XmlParsable
       end
 
       def finalize
+        @text.instance_variable_set(:@xmlattrs, @attributes)
         @parent.close(self, @text)
       end
     end

data/lib/xmlparsable/elements/time.rb

@@ -6,10 +6,16 @@ module XmlParsable
     # Parses content into a ruby Time value
     #
     class TimeElement < AbstractElement
+
+      class Time < ::Time
+        attr_reader :xmlattrs
+      end
+
       attr_reader :name
 
-      def initialize(name, attributes, parent, *arguments)
-        @name, @parent, @string = name, parent, ""
+      def initialize(name, attributes, parent, arguments)
+        @name, @attributes, @parent, @string =
+          name, attributes, parent, ""
       end
 
       def read(text)
@@ -18,7 +24,10 @@ module XmlParsable
 
       def finalize
         stripped = @string.strip
-        @parent.close(self, stripped == "" ? nil : Time.parse(stripped))
+        time     = stripped == "" ? nil : Time.parse(stripped)
+        time.instance_variable_set(:@xmlattrs, @attributes)
+
+        @parent.close(self, time)
       end
     end
   end

data/lib/xmlparsable/elements/xml.rb

@@ -11,14 +11,15 @@ module XmlParsable
       end
 
       class Node < AbstractElement
-        attr_reader :name, :attributes, :parent, :children
+        attr_reader :name, :attributes, :parent, :children, :xmlattr
 
-        def initialize(name, attributes, parent, *arguments)
-          @parent, @name, @attributes, @children = parent, name, attributes, Array.new
+        def initialize(name, attributes, parent, arguments)
+          @name, @attributes, @parent, @arguments, @children =
+            name, attributes, parent, arguments, Array.new
         end
 
         def open(name, attributes)
-          Node.new(name, attributes, self)
+          Node.new(name, attributes, self, @arguments)
         end
 
         def read(text)

data/spec/examples/elements/array.example

@@ -72,6 +72,13 @@ describe XmlParsable::Elements::ArrayElement do
       parser.parse(input).list.xmlattrs.should == expected
     end
 
+    it "parses item attributes" do
+      input  = '<list><item thang="yarn"/><item milk="yawn"/></list>'
+      result = parser.parse(input)
+      result.list[0].xmlattrs.should == Hash["thang" => "yarn"]
+      result.list[1].xmlattrs.should == Hash["milk"  => "yawn"]
+    end
+
     it "parses non-empty list into an Array" do
       input    = "<list><item>a</item><item>b</item></list>"
       expected = ["a", "b"]

data/spec/examples/elements/date.example

@@ -10,6 +10,20 @@ describe XmlParsable::Elements::DateElement do
       end
     end
 
+    describe "parses attributes" do
+      let(:expected) { Hash["thang" => "yarn", "milk" => "yawn"] }
+
+      it "on non-empty elements" do
+        input = "<date thang='yarn' milk='yawn'>#{Date.today}</date>"
+        parser.parse(input).date.xmlattrs.should == expected
+      end
+
+      pending "on empty elements" do
+        input = '<date thang="yarn" milk="yawn"/>'
+        parser.parse(input).date.xmlattrs.should == expected
+      end
+    end
+
     it "parses date into a ruby Date" do
       expected = Date.today
       input    = "<date>#{expected}</date>"

data/spec/examples/elements/numeric.example

@@ -10,6 +10,20 @@ describe XmlParsable::Elements::StringElement do
       end
     end
 
+    describe "parses attributes" do
+      let(:expected) { Hash["thang" => "yarn", "milk" => "yawn"] }
+
+      pending "for non-empty elements" do
+        input = '<number thang="yarn" milk="yawn">0</number>'
+        parser.parse(input).number.xmlattrs.should == expected
+      end
+
+      pending "for empty elements" do
+        input = '<number thang="yarn" milk="yawn"/>'
+        parser.parse(input).number.xmlattrs.should == expected
+      end
+    end
+
     it "parses integers" do
       expected = rand(1_000)
       input    = "<number>#{expected}</number>"

data/spec/examples/elements/record.example

@@ -6,6 +6,8 @@ describe XmlParsable::Elements::RecordElement do
     Class.new do
       include XmlParsable
 
+      attr_reader :xmlattrs
+
       element :date,    XmlParsable::Elements::DateElement
       element :string,  XmlParsable::Elements::StringElement
       element :text,    XmlParsable::Elements::TextElement
@@ -61,6 +63,20 @@ describe XmlParsable::Elements::RecordElement do
       DOC
     end
 
+    describe "parses attributes" do
+      let(:expected) { Hash["thang" => "yarn", "milk" => "yawn"] }
+
+      it "for non-empty elements" do
+        input = '<record thang="yarn" milk="yawn"><number>1</number></record>'
+        parser.parse(input).record.xmlattrs.should == expected
+      end
+
+      it "for empty elements" do
+        input = '<record thang="yarn" milk="yawn"/>'
+        parser.parse(input).record.xmlattrs.should == expected
+      end
+    end
+
     it "parses recursive records" do
       xml = parser.parse(<<-XML)
         <record>

data/spec/examples/elements/string.example

@@ -10,6 +10,20 @@ describe XmlParsable::Elements::StringElement do
       end
     end
 
+    describe "parses attributes" do
+      let(:expected) { Hash["thang" => "yarn", "milk" => "yawn"] }
+
+      it "for empty elements" do
+        input = '<string thang="yarn" milk="yawn"/>'
+        parser.parse(input).string.xmlattrs.should == expected
+      end
+
+      it "for non-empty elements" do
+        input = '<string thang="yarn" milk="yawn">wormever</string>'
+        parser.parse(input).string.xmlattrs.should == expected
+      end
+    end
+
     it "parses empty string" do
       expected = ""
       input    = "<string></string>"

data/spec/examples/elements/text.example

@@ -10,6 +10,20 @@ describe XmlParsable::Elements::StringElement do
       end
     end
 
+    describe "parses attributes" do
+      let(:expected) { Hash["thang" => "yarn", "milk" => "yawn"] }
+
+      it "for empty elements" do
+        input = '<text thang="yarn" milk="yawn"/>'
+        parser.parse(input).text.xmlattrs.should == expected
+      end
+
+      it "for non-empty elements" do
+        input = '<text thang="yarn" milk="yawn">wormever</text>'
+        parser.parse(input).text.xmlattrs.should == expected
+      end
+    end
+
     it "parses text" do
       expected = "lo and behold"
       input    = "<text>lo and behold</text>"

data/spec/examples/elements/time.example

@@ -10,6 +10,20 @@ describe XmlParsable::Elements::StringElement do
       end
     end
 
+    describe "parses attributes" do
+      let(:expected) { Hash["thang" => "yarn", "milk" => "yawn"] }
+
+      pending "for empty elements" do
+        input = '<time thang="yarn" milk="yawn"/>'
+        parser.parse(input).time.xmlattrs.should == expected
+      end
+
+      specify "for non-empty elements" do
+        input = "<time thang='yarn' milk='yawn'>#{Time.now}</time>"
+        parser.parse(input).time.xmlattrs.should == expected
+      end
+    end
+
     it "parses time" do
       expected = Time.now
       input    = "<time>#{expected}</time>"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: xmlparsable
 version: !ruby/object:Gem::Version
-  version: 1.5.1
+  version: 1.5.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-30 00:00:00.000000000 Z
+date: 2012-06-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: libxml-ruby