nokogiri-happymapper 0.5.2 → 0.5.3

data/lib/happymapper.rb

@@ -121,10 +121,10 @@ module HappyMapper
     # 
     # @param [Symbol] name the name of the accessor that is created
     # @param [String,Class] type the class name of the name of the class whcih
-    #     the object will be converted upon parsing
+    #     the object will be converted upon parsing. By Default String class will be taken.
     # @param [Hash] options additional parameters to send to the relationship
     #
-    def content(name, type, options={})
+    def content(name, type=String, options={})
       @content = TextNode.new(name, type, options)
       attr_accessor @content.method_name.intern
     end
@@ -309,8 +309,12 @@ module HappyMapper
       
       nodes.each_slice(limit) do |slice|
         
-        part = slice.map do |n|
-          obj = new
+        part = slice.map do |n|  
+          
+          # If an existing HappyMapper object is provided, update it with the
+          # values from the xml being parsed.  Otherwise, create a new object
+          
+          obj = options[:update] ? options[:update] : new
 
           attributes.each do |attr|
             obj.send("#{attr.method_name}=",attr.from_xml_node(n, namespace, namespaces))
@@ -612,7 +616,15 @@ module HappyMapper
     write_out_to_xml ? builder.to_xml : builder
     
   end
-  
+     
+  # Parse the xml and update this instance. This does not update instances
+  # of HappyMappers that are children of this object.  New instances will be
+  # created for any HappyMapper children of this object.       
+  #  
+  # Params and return are the same as the class parse() method above.
+  def parse(xml, options = {})
+    self.class.parse(xml, options.merge!(:update => self))
+  end
   
 end
 

data/spec/fixtures/address.xml

@@ -5,4 +5,5 @@
   <postcode>26131</postcode>
   <city>Oldenburg</city>
   <country code="de">Germany</country>
+  <state>Lower Saxony</state>
 </address>

data/spec/fixtures/product_default_namespace.xml

@@ -13,5 +13,6 @@
       <city>Oldenburg</city>
       <country code="de">Germany</country>
     </address>
+    <rate>120.25</rate>
   </product>
 </products>

data/spec/happymapper_spec.rb

@@ -119,6 +119,10 @@ class Product
   has_one :address, Address
 end
 
+class Rate
+  include HappyMapper	
+end
+
 module FamilySearch
   class AlternateIds
     include HappyMapper
@@ -307,6 +311,11 @@ class Country
   content :name, String
 end
 
+
+class State
+  include HappyMapper  
+end
+
 class Address
   include HappyMapper
 
@@ -316,6 +325,7 @@ class Address
   element :housenumber, String
   element :city, String
   has_one :country, Country
+  has_one :state, State
 end
 
 # for type coercion
@@ -663,6 +673,23 @@ describe HappyMapper do
     end
   end
 
+  describe "#content" do 
+     it "should take String as default argument for type" do     	     
+       State.content :name
+       address = Address.parse(fixture_file('address.xml'))
+       address.state.name.should == "Lower Saxony"
+       address.state.name.class == String
+     end
+     
+     it "should work when specific type is provided" do     	     
+       Rate.content :value, Float
+       Product.has_one :rate, Rate
+       product = Product.parse(fixture_file('product_default_namespace.xml'), :single => true)
+       product.rate.value.should == 120.25
+       product.rate.class == Float
+     end 
+  end
+  
   it "should parse xml attributes into ruby objects" do
     posts = Post.parse(fixture_file('posts.xml'))
     posts.size.should == 20

data/spec/parse_instance_spec.rb

@@ -0,0 +1,129 @@
+require File.dirname(__FILE__) + '/spec_helper.rb'
+
+parse_instance_initial_xml = %{
+  <root attr1="initial">
+    <item attr1="initial">
+      <description>initial</description>
+      <subitem attr1="initial">
+        <name>initial</name>
+      </subitem>
+      <subitem attr1="initial">
+        <name>initial</name>
+      </subitem>
+    </item>
+    <item attr1="initial">
+      <description>initial</description>
+      <subitem attr1="initial">
+        <name>initial</name>
+      </subitem>
+      <subitem attr1="initial">
+        <name>initial</name>
+      </subitem>
+    </item>
+  </root>
+}
+
+parse_instance_updated_xml = %{
+  <root attr1="updated">
+    <item attr1="updated">
+      <description>updated</description>
+      <subitem attr1="updated">
+        <name>updated</name>
+      </subitem>
+      <subitem attr1="updated">
+        <name>updated</name>
+      </subitem>
+    </item>
+    <item attr1="updated">
+      <description>updated</description>
+      <subitem attr1="updated">
+        <name>updated</name>
+      </subitem>
+      <subitem attr1="updated">
+        <name>updated</name>
+      </subitem>
+    </item>
+  </root>
+}
+
+module ParseInstanceSpec
+  class SubItem
+    include HappyMapper
+    tag 'subitem'
+    attribute :attr1, String
+    element :name, String
+  end
+  class Item
+    include HappyMapper
+    tag 'item'
+    attribute :attr1, String
+    element :description, String
+    has_many :sub_items, SubItem
+  end
+  class Root
+    include HappyMapper
+    tag 'root'
+    attribute :attr1, String
+    has_many :items, Item
+  end
+end
+
+describe HappyMapper do
+  describe "update existing instance by parsing new xml" do
+    
+    it 'should have initial values' do
+      @initial.attr1.should == 'initial'
+      @initial.items[0].attr1.should == 'initial'
+      @initial.items[0].description.should == 'initial'
+      @initial.items[0].sub_items[0].attr1.should == 'initial'
+      @initial.items[0].sub_items[0].name.should == 'initial'
+      @initial.items[0].sub_items[1].attr1.should == 'initial'
+      @initial.items[0].sub_items[1].name.should == 'initial'
+      @initial.items[1].attr1.should == 'initial'
+      @initial.items[1].description.should == 'initial'
+      @initial.items[1].sub_items[0].attr1.should == 'initial'
+      @initial.items[1].sub_items[0].name.should == 'initial'
+      @initial.items[1].sub_items[1].attr1.should == 'initial'
+      @initial.items[1].sub_items[1].name.should == 'initial'
+    end
+    
+    it 'should have updated values' do
+      ParseInstanceSpec::Root.parse(parse_instance_updated_xml, :update => @initial)
+      @initial.attr1.should == 'updated'
+      @initial.items[0].attr1.should == 'updated'
+      @initial.items[0].description.should == 'updated'
+      @initial.items[0].sub_items[0].attr1.should == 'updated'
+      @initial.items[0].sub_items[0].name.should == 'updated'
+      @initial.items[0].sub_items[1].attr1.should == 'updated'
+      @initial.items[0].sub_items[1].name.should == 'updated'
+      @initial.items[1].attr1.should == 'updated'
+      @initial.items[1].description.should == 'updated'
+      @initial.items[1].sub_items[0].attr1.should == 'updated'
+      @initial.items[1].sub_items[0].name.should == 'updated'
+      @initial.items[1].sub_items[1].attr1.should == 'updated'
+      @initial.items[1].sub_items[1].name.should == 'updated'
+    end
+    
+    it "should be able to update instance from 'parse()' instance method" do 
+      @initial.parse(parse_instance_updated_xml)
+      @initial.attr1.should == 'updated'
+      @initial.items[0].attr1.should == 'updated'
+      @initial.items[0].description.should == 'updated'
+      @initial.items[0].sub_items[0].attr1.should == 'updated'
+      @initial.items[0].sub_items[0].name.should == 'updated'
+      @initial.items[0].sub_items[1].attr1.should == 'updated'
+      @initial.items[0].sub_items[1].name.should == 'updated'
+      @initial.items[1].attr1.should == 'updated'
+      @initial.items[1].description.should == 'updated'
+      @initial.items[1].sub_items[0].attr1.should == 'updated'
+      @initial.items[1].sub_items[0].name.should == 'updated'
+      @initial.items[1].sub_items[1].attr1.should == 'updated'
+      @initial.items[1].sub_items[1].name.should == 'updated'
+    end
+    
+    before(:each) do
+      @initial = ParseInstanceSpec::Root.parse(parse_instance_initial_xml)
+    end
+  end
+end
+

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: nokogiri-happymapper
 version: !ruby/object:Gem::Version
-  version: 0.5.2
+  version: 0.5.3
   prerelease: 
 platform: ruby
 authors:
@@ -14,7 +14,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-08-22 00:00:00.000000000 Z
+date: 2012-09-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -50,7 +50,7 @@ dependencies:
         version: '2.8'
 description: Object to XML Mapping Library, using Nokogiri (fork from John Nunemaker's
   Happymapper)
-email: franklin.webber@gmail.com
+email: 
 executables: []
 extensions: []
 extra_rdoc_files:
@@ -96,9 +96,10 @@ files:
 - spec/happymapper_to_xml_namespaces_spec.rb
 - spec/happymapper_to_xml_spec.rb
 - spec/ignay_spec.rb
+- spec/parse_instance_spec.rb
 - spec/spec_helper.rb
 - spec/xpath_spec.rb
-homepage: http://github.com/burtlo/happymapper
+homepage: http://github.com/dam5s/happymapper
 licenses: []
 post_install_message: 
 rdoc_options: []
@@ -155,5 +156,6 @@ test_files:
 - spec/happymapper_to_xml_namespaces_spec.rb
 - spec/happymapper_to_xml_spec.rb
 - spec/ignay_spec.rb
+- spec/parse_instance_spec.rb
 - spec/spec_helper.rb
 - spec/xpath_spec.rb