unhappymapper 0.4.1 → 0.4.2

data/lib/happymapper.rb

@@ -598,6 +598,12 @@ module HappyMapper
 
     end
 
+    # Write out to XML, this value was set above, based on whether or not an XML
+    # builder object was passed to it as a parameter. When there was no parameter
+    # we assume we are at the root level of the #to_xml call and want the actual
+    # xml generated from the object. If an XML builder instance was specified 
+    # then we assume that has been called recursively to generate a larger 
+    # XML document.
     write_out_to_xml ? builder.to_xml : builder
     
   end

data/lib/happymapper/item.rb

@@ -43,7 +43,7 @@ module HappyMapper
           if n.respond_to?(:content)
             typecast(n.content)
           else
-            typecast(n.to_s)
+            typecast(n)
           end
         end
       elsif constant == XmlContent

data/spec/fixtures/optional_attributes.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<addresses>
+  <address street=""/>
+  <address street="Milchstrasse"/>
+  <address />
+</addresses>

data/spec/happymapper_spec.rb

@@ -530,6 +530,13 @@ class Video
   
 end
 
+class OptionalAttribute
+  include HappyMapper
+  tag 'address'
+  
+  attribute :street, String
+end
+
 
 describe HappyMapper do
 
@@ -882,6 +889,25 @@ describe HappyMapper do
     l = Location.parse(fixture_file('lastfm.xml'))
     l.first.latitude.should == "51.53469"
   end
+  
+  describe "Parse optional attributes" do
+    
+    it "should parse an empty String as empty" do
+      a = OptionalAttribute.parse(fixture_file('optional_attributes.xml'))
+      a[0].street.should == ""
+    end
+    
+    it "should parse a String with value" do
+      a = OptionalAttribute.parse(fixture_file('optional_attributes.xml'))
+      a[1].street.should == "Milchstrasse"
+    end
+    
+    it "should parse a String with value" do
+      a = OptionalAttribute.parse(fixture_file('optional_attributes.xml'))
+      a[2].street.should be_nil
+    end
+    
+  end
 
   describe 'Xml Content' do
     before(:each) do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: unhappymapper
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.4.2
   prerelease: 
 platform: ruby
 authors:
@@ -18,7 +18,7 @@ date: 2011-08-22 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
-  requirement: &70134376050820 !ruby/object:Gem::Requirement
+  requirement: &70233821937220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -26,10 +26,10 @@ dependencies:
         version: 1.4.2
   type: :runtime
   prerelease: false
-  version_requirements: *70134376050820
+  version_requirements: *70233821937220
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70134376050340 !ruby/object:Gem::Requirement
+  requirement: &70233821936180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -37,7 +37,7 @@ dependencies:
         version: 1.3.0
   type: :development
   prerelease: false
-  version_requirements: *70134376050340
+  version_requirements: *70233821936180
 description: Object to XML Mapping Library, using Nokogiri (fork from John Nunemaker's
   Happymapper)
 email: franklin.webber@gmail.com
@@ -67,6 +67,7 @@ files:
 - spec/fixtures/lastfm.xml
 - spec/fixtures/multiple_namespaces.xml
 - spec/fixtures/multiple_primitives.xml
+- spec/fixtures/optional_attributes.xml
 - spec/fixtures/pita.xml
 - spec/fixtures/posts.xml
 - spec/fixtures/product_default_namespace.xml
@@ -124,6 +125,7 @@ test_files:
 - spec/fixtures/lastfm.xml
 - spec/fixtures/multiple_namespaces.xml
 - spec/fixtures/multiple_primitives.xml
+- spec/fixtures/optional_attributes.xml
 - spec/fixtures/pita.xml
 - spec/fixtures/posts.xml
 - spec/fixtures/product_default_namespace.xml