xmlparsable 1.4.1 → 1.4.2

data/lib/xmlparsable.rb

@@ -25,7 +25,12 @@ module XmlParsable
       element ||= arguments.shift if arguments.first.is_a?(Class)
       element ||= Elements::StringElement
 
-      (@parsers ||= {})[name.to_s] = [element.parsable, *arguments]
+      # Look up the inheritance hierarchy to map element name to parser
+      parent = superclass < XmlParsable ?
+        superclass.instance_variable_get(:@parsers) : Hash.new
+
+      @parsers ||= Hash.new{|h,k| parent[k] }
+      @parsers[name.to_s] = [element.parsable, *arguments]
 
       define_method(name) { instance_variable_get("@#{name}") }
     end
@@ -35,7 +40,12 @@ module XmlParsable
       element ||= arguments.shift if arguments.first.is_a?(Class)
       element ||= Elements::StringElement
 
-      (@parsers ||= {})[name.to_s.singularize] = [element.parsable, *arguments.push(:repeated)]
+      # Look up the inheritance hierarchy to map element name to parser
+      parent = superclass < XmlParsable ?
+        superclass.instance_variable_get(:@parsers) : Hash.new
+
+      @parsers ||= Hash.new{|h,k| parent[k] }
+      @parsers[name.to_s.singularize] = [element.parsable, *arguments.push(:repeated)]
 
       define_method(name) { instance_variable_get("@#{name.to_s.singularize}") }
     end

data/spec/examples/inheritance.example

@@ -0,0 +1,155 @@
+require "spec_helper"
+
+describe XmlParsable::Elements::RecordElement, "inheritance" do
+
+  class BaseRecord
+    include XmlParsable
+
+    class Record
+      include XmlParsable
+      element :id, StringElement
+      element :size, NumericElement
+    end
+
+    element :record, Record
+  end
+
+  class FirstRecord
+    include XmlParsable
+
+    class Record < BaseRecord::Record
+      element :id, TimeElement
+      element :name, StringElement
+    end
+
+    element :record, Record
+  end
+
+  class SecondRecord
+    include XmlParsable
+
+    class Record < BaseRecord::Record
+      element :id, NumericElement
+    end
+
+    element :record, Record
+  end
+
+  class ThirdRecord < BaseRecord
+    include XmlParsable
+
+    class Record < BaseRecord::Record
+      element :parent, Record
+    end
+
+    element :record, Record
+  end
+
+  describe "parent" do
+    subject { BaseRecord::Record.new }
+    specify { should respond_to(:id) }
+    specify { should respond_to(:size) }
+    specify { should_not respond_to(:name) }
+    specify { should_not respond_to(:parent) }
+
+    it "parses attributes" do
+      data = BaseRecord.parse(<<-XML.strip)
+        <record>
+          <id>0xCAFE</id>
+          <size>0xFE</size>
+        </record>
+      XML
+
+      data.record.should be_a(BaseRecord::Record)
+      data.record.id.should == "0xCAFE"
+      data.record.size.should == 0xFE
+    end
+  end
+
+  describe "first" do
+    subject { FirstRecord::Record.new }
+    specify { should respond_to(:id) }
+    specify { should respond_to(:size) }
+    specify { should respond_to(:name) }
+    specify { should_not respond_to(:parent) }
+
+    it "parses attributes" do
+      data = FirstRecord.parse(<<-XML.strip)
+        <record>
+          <id>20120530T154500</id>
+          <size>0xCA7</size>
+          <name>Sabji</name>
+        </record>
+      XML
+
+      data.record.should be_a(FirstRecord::Record)
+      data.record.id.should == Time.local(2012, 5, 30, 15, 45)
+      data.record.size.should == 0xCA7
+      data.record.name.should == "Sabji"
+    end
+  end
+
+  describe "second" do
+    subject { SecondRecord::Record.new }
+    specify { should respond_to(:id) }
+    specify { should respond_to(:size) }
+    specify { should_not respond_to(:name) }
+    specify { should_not respond_to(:parent) }
+
+    it "parses attributes" do
+      data = SecondRecord.parse(<<-XML)
+        <record>
+          <id>0.314</id>
+          <size>3.014</size>
+        </record>
+      XML
+
+      data.record.should be_a(SecondRecord::Record)
+      data.record.id.should == 0.314
+      data.record.size.should == 3.014
+    end
+  end
+
+  describe "third" do
+    subject { ThirdRecord::Record.new }
+    specify { should respond_to(:id) }
+    specify { should respond_to(:size) }
+    specify { should_not respond_to(:name) }
+    specify { should respond_to(:parent) }
+
+    it "parses attributes" do
+      data = ThirdRecord.parse(<<-XML)
+        <record>
+          <id>X039-P99-THX1138-U</id>
+          <size>11235813</size>
+          <parent>
+            <id>X039-P99-THX1138</id>
+            <size>112358</size>
+            <parent>
+              <id>X039-P99</id>
+              <size>11235</size>
+              <parent>
+                <id>X039</id>
+                <size>1123</size>
+              </parent>
+            </parent>
+          </parent>
+        </record>
+      XML
+
+      data.record.should be_a(ThirdRecord::Record)
+      data.record.id.should == "X039-P99-THX1138-U"
+      data.record.size.should == 11235813
+
+      data.record.parent.id.should == "X039-P99-THX1138"
+      data.record.parent.size.should == 112358
+
+      data.record.parent.parent.id.should == "X039-P99"
+      data.record.parent.parent.size.should == 11235
+
+      data.record.parent.parent.parent.id.should == "X039"
+      data.record.parent.parent.parent.size.should == 1123
+    end
+  end
+
+end

data/spec/examples/record.example

@@ -156,7 +156,7 @@ describe XmlParsable::Elements::RecordElement do
 
     it "parses rationals" do
       number = rand(1_000) + rand
-      Record.parse("<number>#{number}</number>").number.should == number
+      Record.parse("<number>#{number}</number>").number.should == BigDecimal(number.to_s)
     end
 
     it "ignores comments" do
@@ -205,7 +205,7 @@ describe XmlParsable::Elements::RecordElement do
 
     it "parses number" do
       number = rand(1_000) + rand
-      Record.parse("<record><number>#{number}</number></record>").record.number.should == number
+      Record.parse("<record><number>#{number}</number></record>").record.number.should == BigDecimal(number.to_s)
     end
 
     it "parses multiple elements" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: xmlparsable
 version: !ruby/object:Gem::Version
-  version: 1.4.1
+  version: 1.4.2
   prerelease: 
 platform: ruby
 authors:
@@ -47,6 +47,7 @@ files:
 - lib/xmlparsable/elements.rb
 - lib/xmlparsable/parser.rb
 - lib/xmlparsable.rb
+- spec/examples/inheritance.example
 - spec/examples/record.example
 - spec/spec_helper.rb
 homepage: https://github.com/kputnam/xmlparsable
@@ -74,4 +75,5 @@ signing_key:
 specification_version: 3
 summary: Simple declarative XML parsing
 test_files:
+- spec/examples/inheritance.example
 - spec/examples/record.example