model_xml 1.0.2 → 1.0.3

data/lib/model_xml/generator.rb

@@ -72,7 +72,7 @@ module ModelXML
 
       field_list = generate_field_list(options)
 
-      xml = Builder::XmlMarkup.new
+      xml = options.delete(:builder) || Builder::XmlMarkup.new(:indent => 2)
       unless options[:skip_instruct]
         xml.instruct!
       end
@@ -96,9 +96,9 @@ module ModelXML
            raise "ModelXML unable to parse #{field.inspect}"
           end
 
-          # if the content implements a to_xml method which returns a non-nil value, insert as raw xml
-          if content.respond_to?(:to_xml) && inline_content = content.to_xml(:skip_instruct => true, :skip_types => true)
-            xml << inline_content
+          # if the content responds to to_xml, call it passing the current builder
+          if content.respond_to?(:to_xml)
+            content.to_xml(options.merge(:builder => xml, :skip_instruct => true))
 
           # otherwise create the tag normally
           else
@@ -107,10 +107,7 @@ module ModelXML
         end
       end
 
-      # builder will screw up the indentation of embedded xml objects, so use nokogiri to format it nicely
-      output = xml.target!.gsub("\n","").gsub("  ","")
-      xml = Nokogiri.parse(output)
-      options[:skip_instruct] ? xml.root.to_s : xml.to_s
+      xml.target!
 
     end
   end

data/model_xml.gemspec

@@ -1,13 +1,12 @@
 Gem::Specification.new do |s|
   s.name        = "model_xml"
-  s.version     = '1.0.2'
+  s.version     = '1.0.3'
   s.authors     = "Rob Anderson"
   s.email       = "rob.anderson@paymentcardsolutions.co.uk"
   s.summary     = "Ruby object to xml converter"
   s.description = "Simple replacement for ActiveRecord's default to_xml"
 
   s.add_dependency 'builder', '>= 2.1.2'
-  s.add_dependency 'nokogiri', '>= 1.4.2'
 
   s.files = `git ls-files`.split("\n")
   s.require_path = "lib"

data/test/test_model_xml.rb

@@ -7,6 +7,16 @@ class TestStruct < OpenStruct
   include ModelXML
 end
 
+class Parent < OpenStruct
+  include ModelXML
+  model_xml :foo, :child
+end
+
+class Child < OpenStruct
+  include ModelXML
+  model_xml :bar
+end
+
 class ModelXMLTest < Test::Unit::TestCase
 
   def setup
@@ -78,8 +88,28 @@ class ModelXMLTest < Test::Unit::TestCase
     res = '<teststruct>
   <foo>1</foo>
   <bar>2</bar>
-</teststruct>'
+</teststruct>
+'
     assert_equal res, @t.to_xml(:skip_instruct => true)
 
   end
+
+  def test_embedded_xml
+    p = Parent.new(:foo => 1, :child => Child.new(:bar => 2))
+
+    res = '<?xml version="1.0" encoding="UTF-8"?>
+<parent>
+  <foo>1</foo>
+  <child>
+    <bar>2</bar>
+  </child>
+</parent>
+'
+    assert_equal res, p.to_xml
+  end
+
+
+
+
+
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: model_xml
 version: !ruby/object:Gem::Version 
-  hash: 19
+  hash: 17
   prerelease: 
   segments: 
   - 1
   - 0
-  - 2
-  version: 1.0.2
+  - 3
+  version: 1.0.3
 platform: ruby
 authors: 
 - Rob Anderson
@@ -33,22 +33,6 @@ dependencies:
         version: 2.1.2
   type: :runtime
   version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: nokogiri
-  prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 1
-        - 4
-        - 2
-        version: 1.4.2
-  type: :runtime
-  version_requirements: *id002
 description: Simple replacement for ActiveRecord's default to_xml
 email: rob.anderson@paymentcardsolutions.co.uk
 executables: []