jimmyz-happymapper 0.3.2 → 0.3.3

data/History

@@ -1,3 +1,9 @@
+== 0.3.3
+* 1 bug fix 2 minor enhancements
+	* Don't serialize nil elements of primitive type (jimmyz)
+	* Added the xml version/encoding header to serialized xml string on to_xml (jimmyz)
+	* Bug fix: Don't parse deep on non-primitive elements unless :deep => true (jimmyz)
+
 == 0.3.2
 * 1 bug fix
 	* to_xml_node was blowing up if a non-primitive element was nil. Fixed (jimmyz) 

data/happymapper.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{happymapper}
-  s.version = "0.3.2"
+  s.version = "0.3.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
   s.authors = ["John Nunemaker"]
-  s.date = %q{2009-02-19}
+  s.date = %q{2009-02-21}
   s.description = %q{object to xml mapping library}
   s.email = %q{nunemaker@gmail.com}
   s.extra_rdoc_files = ["lib/happymapper/attribute.rb", "lib/happymapper/element.rb", "lib/happymapper/item.rb", "lib/happymapper/version.rb", "lib/happymapper.rb", "README", "TODO"]

data/lib/happymapper.rb

@@ -20,31 +20,34 @@ module HappyMapper
   end
   
   def to_xml
-    node = to_xml_node
-    node.to_s
+    doc = LibXML::XML::Document.new
+    doc.root = to_xml_node
+    doc.to_s
   end
   
   def to_xml_node(root_node = nil)
     node = XML::Node.new(self.class.tag_name)
     root_node ||= node
+    # add namespace to node and to root_element if not already set
     if self.class.namespace_url
       if root_node
         namespace_object = root_node.namespaces.find_by_href(self.class.namespace_url)
         namespace_object ||= XML::Namespace.new root_node, self.class.namespace, self.class.namespace_url
         node.namespaces.namespace = namespace_object
       end
-    else
-      nil
     end
+    # serialize elements
     self.class.elements.each do |e|
       if e.options[:single] == false
         self.send("#{e.method_name}").each do |array_element|
           node << e.to_xml_node(array_element,root_node)
         end
       else
-        node << e.to_xml_node(self.send("#{e.method_name}"),root_node)
+        element_value = self.send("#{e.method_name}")
+        node << e.to_xml_node(element_value,root_node) unless element_value.nil?
       end
     end
+    # serialize attributes
     self.class.attributes.each do |a|
       attribute_value = self.send("#{a.method_name}")
       node.attributes[a.tag] = attribute_value.to_s unless attribute_value.nil? 
@@ -152,7 +155,7 @@ module HappyMapper
         namespace ||= DEFAULT_NS
       end
 
-      xpath = root ? '/' : './/'
+      xpath = root ? '/' : (options[:deep]) ? './/' : './'
       xpath += "#{namespace}:" if namespace
       xpath += tag_name
       # puts "parse: #{xpath}"

data/lib/happymapper/version.rb

@@ -1,3 +1,3 @@
 module HappyMapper
-  Version = '0.3.2'
+  Version = '0.3.3'
 end

data/spec/fixtures/family_tree.xml

@@ -16,6 +16,8 @@
 				<fsapi-v1:gender>Male</fsapi-v1:gender>
 				<fsapi-v1:living>false</fsapi-v1:living>
 			</fsapi-v1:information>
+			<!-- element to make sure that we're not parsing deep when not supposed to -->
+			<person id="KWQS-BBR" />
 		</person>
 	</persons>
 </familytree>

data/spec/happymapper_spec.rb

@@ -170,7 +170,8 @@ end
 
 class Radar
   include HappyMapper
-  has_many :places, Place
+  # places needs to be deep because it lives out in places/place
+  has_many :places, Place, :deep => true
 end
 
 class Post
@@ -550,6 +551,12 @@ describe HappyMapper do
     track.tran_detail.cust_tran_id.should == '20090102-111321'
   end
   
+  it "should not parse deep for elements unless deep option is set" do
+    tree = FamilySearch::FamilyTree.parse(fixture_file('family_tree.xml'))
+    tree.persons.person.size.should_not == 2
+    tree.persons.person.size.should == 1
+  end
+  
   it "should parse family search xml" do
     tree = FamilySearch::FamilyTree.parse(fixture_file('family_tree.xml'))
     tree.version.should == '1.0.20071213.942'
@@ -595,6 +602,12 @@ describe HappyMapper do
       doc.should match_xpath("/address/country","Germany")
     end
     
+    it "should include an xml version/encoding header" do
+      address = Address.new
+      xml = address.to_xml
+      xml.should =~ /<?xml version=".*" encoding=".*"?>/
+    end
+    
     it "should return xml with non-primitive elements from ruby objects" do
       posts = Posts.parse(fixture_file('posts.xml'))
       xml = posts.to_xml
@@ -645,6 +658,13 @@ describe HappyMapper do
       lambda{
         ft.to_xml
       }.should_not raise_error
+      
+      # Check for nil elements of primitive type 
+      info = FamilySearch::Information.new
+      namespace = {'fsapi-v1' => 'http://api.familysearch.org/v1'}
+      doc = REXML::Document.new info.to_xml
+      doc.should have_nodes("/fsapi-v1:information/fsapi-v1:gender",0,namespace)
+      doc.should have_nodes("/fsapi-v1:information/fsapi-v1:living",0,namespace)
     end
     
     describe "with namespace url and prefix" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: jimmyz-happymapper
 version: !ruby/object:Gem::Version 
-  version: 0.3.2
+  version: 0.3.3
 platform: ruby
 authors: 
 - John Nunemaker
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-02-19 00:00:00 -08:00
+date: 2009-02-21 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency