xmlparsable 1.3.0 → 1.4.0

data/README.md

@@ -78,3 +78,48 @@ relies on LibXML::XML::SaxParser.
     
         vlad.email    #=> "vlad@gmail.com"
         vlad.spouse   #=> #<AddressBook::Contact @givenname="Lyudmila" @familyname="Putina">
+
+## Data Types
+
+### DateElement
+
+Parses content into a Ruby `Date` object, using `Date.parse`.
+
+### ListElement
+
+Parses children nodes into an `Array` using some other `AbstractElement`
+child class.
+
+### NumericElement
+
+Parses content into a Ruby `Integer` or `BigDecimal`, depending on whether
+the input contains a decimal point or not. Parses using `Integer(..)` and
+`BigDecimal(..)` constructor methods.
+
+### RecordElement
+
+Parses children nodes according to `element` and `collection` declarations
+on an `XmlParsable` class.
+
+### StringElement
+
+Parses content into a Ruby `String` object.
+
+### TextElement
+
+Concatenates all subordinate text nodes into a single `String`. For example,
+`"abc def <b>what<!-- ever --></b>"` is read as `"abc def what"`.
+
+### TimeElement
+
+Parses content into a Ruby `Time` object, using `Time.parse`.
+
+### XmlElement
+
+Parses children elements into an `Array` whose elements are one of these three
+classes. These really should be the same node types that `LibXML` uses, but
+that's not the case for now.
+
+* `XmlParsable::Elements::XmlElement::Node`
+* `XmlParsable::Elements::XmlElement::Text`
+* `XmlParsable::Elements::XmlElement::Comment`

data/lib/xmlparsable/elements/date.rb

@@ -18,7 +18,7 @@ module XmlParsable
 
       def finalize
         stripped = @string.strip
-        @parent.closed(self, Date.parse(stripped)) if stripped != ""
+        @parent.close(self, stripped == "" ? nil : Date.parse(stripped))
       end
     end
   end

data/lib/xmlparsable/elements/list.rb

@@ -18,12 +18,12 @@ module XmlParsable
         end
       end
 
-      def closed(element, value)
+      def close(element, value)
         @elements << value
       end
 
       def finalize
-        @parent.closed(self, @elements)
+        @parent.close(self, @elements)
       end
     end
 

data/lib/xmlparsable/elements/numeric.rb

@@ -0,0 +1,30 @@
+module XmlParsable
+  module Elements
+    #
+    # Parses content into a ruby Numeric value.
+    #
+    class NumericElement < AbstractElement
+      attr_reader :name
+
+      def initialize(name, attributes, parent, *arguments)
+        @name, @parent, @string = name, parent, ""
+      end
+
+      def read(text)
+        @string << text
+      end
+
+      def finalize
+        stripped = @string.strip
+        numeric  = if stripped =~ /[e.]/i and stripped !~ /x/i
+                     BigDecimal(stripped)
+                   elsif stripped != ""
+                     Integer(stripped)
+                   end
+
+        @parent.close(self, numeric)
+      end
+    end
+  end
+end
+

data/lib/xmlparsable/elements/record.rb

@@ -19,7 +19,7 @@ module XmlParsable
         end
       end
 
-      def closed(element, value)
+      def close(element, value)
         parser, *arguments = @parsers[element.name]
         if arguments.include?(:repeated)
           (@elements[element.name] ||= []) << value
@@ -30,7 +30,7 @@ module XmlParsable
 
       def finalize
         @elements.each{|name, value| @target.instance_variable_set("@#{name}", value) }
-        @parent.closed(self, @target) if @parent
+        @parent.close(self, @target) if @parent
       end
 
       class Proxy

data/lib/xmlparsable/elements/string.rb

@@ -16,7 +16,7 @@ module XmlParsable
       end
 
       def finalize
-        @parent.closed(self, @string)
+        @parent.close(self, @string)
       end
     end
   end

data/lib/xmlparsable/elements/text.rb

@@ -22,12 +22,12 @@ module XmlParsable
       def comment(text)
       end
       
-      def closed(element, value)
+      def close(element, value)
         @text << value
       end
 
       def finalize
-        @parent.closed(self, @text)
+        @parent.close(self, @text)
       end
     end
   end

data/lib/xmlparsable/elements/time.rb

@@ -18,7 +18,7 @@ module XmlParsable
 
       def finalize
         stripped = @string.strip
-        @parent.closed(self, Time.parse(stripped)) if stripped != ""
+        @parent.close(self, stripped == "" ? nil : Time.parse(stripped))
       end
     end
   end

data/lib/xmlparsable/elements/xml.rb

@@ -29,12 +29,12 @@ module XmlParsable
           @children << Comment.new(text, self)
         end
         
-        def closed(element, value)
+        def close(element, value)
           @children << value
         end
 
         def finalize
-          @parent.closed(self, self)
+          @parent.close(self, self)
         end
 
         def to_s(buffer = "")

data/lib/xmlparsable/elements.rb

@@ -3,6 +3,7 @@ module XmlParsable
     autoload :AbstractElement,  "xmlparsable/elements/abstract"
     autoload :DateElement,      "xmlparsable/elements/date"
     autoload :ListElement,      "xmlparsable/elements/list"
+    autoload :NumericElement,   "xmlparsable/elements/numeric"
     autoload :RecordElement,    "xmlparsable/elements/record"
     autoload :StringElement,    "xmlparsable/elements/string"
     autoload :TextElement,      "xmlparsable/elements/text"

data/spec/examples/record.example

@@ -6,11 +6,12 @@ describe XmlParsable::Elements::RecordElement do
     include XmlParsable
 
     element :date,    DateElement
-    element :record,  self
     element :string,  StringElement
     element :text,    TextElement
     element :time,    TimeElement
     element :xml,     XmlElement
+    element :number,  NumericElement
+    element :record,  self
 
     collection :kids, self
     collection :list, :item
@@ -147,6 +148,31 @@ describe XmlParsable::Elements::RecordElement do
     end
   end
 
+  describe "number" do
+    it "parses integers" do
+      number = rand(1_000)
+      Record.parse("<number>#{number}</number>").number.should == number
+    end
+
+    it "parses rationals" do
+      number = rand(1_000) + rand
+      Record.parse("<number>#{number}</number>").number.should == number
+    end
+
+    it "ignores comments" do
+      Record.parse("<time><!-- 65432 --></time>").number.should be_nil
+    end
+
+    it "ignores children" do
+      Record.parse("<time><b>#{rand}</b></time>").number.should be_nil
+    end
+
+    it "ignores whitespace" do
+      number = rand(1_000)
+      Record.parse("<number>   #{number}    </number>").number.should == number
+    end
+  end
+
   describe "record" do
     it "parses date" do
       x = Record.parse("<record><date>#{Date.today}</date></record>")
@@ -177,6 +203,11 @@ describe XmlParsable::Elements::RecordElement do
       Record.parse("<record><time>#{time}</time></record>").record.time.to_i.should == time.to_i
     end
 
+    it "parses number" do
+      number = rand(1_000) + rand
+      Record.parse("<record><number>#{number}</number></record>").record.number.should == number
+    end
+
     it "parses multiple elements" do
       time = Time.now
       x = Record.parse <<-XML

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: xmlparsable
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.4.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-01-14 00:00:00.000000000 Z
+date: 2012-05-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: libxml-ruby
@@ -38,6 +38,7 @@ files:
 - lib/xmlparsable/elements/abstract.rb
 - lib/xmlparsable/elements/date.rb
 - lib/xmlparsable/elements/list.rb
+- lib/xmlparsable/elements/numeric.rb
 - lib/xmlparsable/elements/record.rb
 - lib/xmlparsable/elements/string.rb
 - lib/xmlparsable/elements/text.rb