oxm 0.1.1 → 0.1.2

data/CHANGELOG.markdown

@@ -1,3 +1,6 @@
+### 0.1.2 / 2011/09/20
+* Bug fix: Invalid handling of empty content
+
 ### 0.1.1 / 2011/09/19
 * Bug fix: OXM::Object#compact! incorrectly nilified elements
 ### 0.1.0 / 2011/09/19

data/VERSION

@@ -1 +1 @@
-0.1.1
+0.1.2

data/lib/oxm/object.rb

@@ -12,14 +12,14 @@ module OXM
     # @return [String]
     def content= val
       @cdata = false
-      process val
+      @data = val
     end
 
     # @param [String] val CDATA content
     # @return [String]
     def cdata= val
       @cdata = true
-      process val
+      @data = val
     end
 
     # @return [Boolean]
@@ -43,9 +43,9 @@ module OXM
           end
           if node.content
             if node.cdata?
-              builder.cdata! node.content
+              builder.cdata! node.to_s
             else
-              builder.text! node.content
+              builder.text! node.to_s
             end
           end
         end
@@ -143,12 +143,6 @@ module OXM
         raise NoMethodError.new("undefined method or attribute `#{symb}'")
       end
     end
-
-    def process str
-      str = str.to_s.strip
-      @data = str
-    end
-
   end#Object
 end#OXM
 

data/lib/oxm/sax_handler.rb

@@ -34,8 +34,17 @@ module OXM
 
     def end_element tag
       unless @objects.empty?
+        obj = @objects.pop
+
+        # Strip content
+        if obj.cdata?
+          obj.cdata = obj.to_s.strip
+        else
+          obj.content = obj.to_s.strip
+        end
+        obj.content = nil if obj.to_s.empty?
+
         if match?
-          obj = @objects.pop
           if @block
             @block.call obj
           else
@@ -43,7 +52,6 @@ module OXM
           end
           @object = nil
         else
-          @objects.pop
           @object = @objects.last
         end
       end

data/test/test_oxm.rb

@@ -109,6 +109,25 @@ class TestOxm < Test::Unit::TestCase
     end
   end
 
+  def test_nil
+    str = <<-EOF
+    <container>
+      <item></item>
+      <item>        </item>
+      <item>
+      </item>
+      <item>
+      
+      </item>
+    </container>
+    EOF
+
+    OXM.from_xml(str, 'container/item') do |item|
+      assert_nil item.content
+      assert_equal "<item></item>", item.to_xml
+    end
+  end
+
   def test_compaction
     str = <<-EOF
     <container attr1="1" attr2="2">

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: oxm
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-09-19 00:00:00.000000000Z
+date: 2011-09-20 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: builder
-  requirement: &2152887260 !ruby/object:Gem::Requirement
+  requirement: &2152490720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: 3.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *2152887260
+  version_requirements: *2152490720
 - !ruby/object:Gem::Dependency
   name: nokogiri
-  requirement: &2152885680 !ruby/object:Gem::Requirement
+  requirement: &2152489620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: 1.5.0
   type: :runtime
   prerelease: false
-  version_requirements: *2152885680
+  version_requirements: *2152489620
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &2152884200 !ruby/object:Gem::Requirement
+  requirement: &2152488420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *2152884200
+  version_requirements: *2152488420
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &2152883120 !ruby/object:Gem::Requirement
+  requirement: &2152485060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: 1.6.4
   type: :development
   prerelease: false
-  version_requirements: *2152883120
+  version_requirements: *2152485060
 - !ruby/object:Gem::Dependency
   name: rcov
-  requirement: &2152882320 !ruby/object:Gem::Requirement
+  requirement: &2152483840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,7 +65,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2152882320
+  version_requirements: *2152483840
 description: A tiny Object-XML-Mapper using Nokogiri SAX parser
 email: junegunn.c@gmail.com
 executables: []
@@ -102,7 +102,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 723951543129720723
+      hash: 3232406390729243010
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: