model_xml 1.0.11 → 1.0.12

data/lib/model_xml/generator.rb

@@ -81,6 +81,7 @@ module ModelXML
       end
 
       root_node = object.class.to_s
+      root_node = root_node.demodulize if root_node.respond_to?(:demodulize) # Rails only
       root_node = root_node.underscore if root_node.respond_to?(:underscore) # Rails only
 
       xml.tag! root_node do

data/model_xml.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name        = "model_xml"
-  s.version     = '1.0.11'
+  s.version     = '1.0.12'
   s.authors     = "Rob Anderson"
   s.email       = "rob.anderson@paymentcardsolutions.co.uk"
   s.summary     = "Ruby object to xml converter"

data/test/test_block_parser.rb

@@ -16,7 +16,7 @@ class BlockParserTest < Test::Unit::TestCase
     block = Proc.new do
       field :id, 2
     end
-    assert_equal [[:id, 2]], ModelXML::BlockParser.parse(&block).inspect
+    assert_equal [[:id, 2]], ModelXML::BlockParser.parse(&block)
   end
 
 end

data/test/test_model_xml.rb

@@ -32,9 +32,9 @@ class ModelXMLTest < Test::Unit::TestCase
     assert_equal [[:foo]], TestStruct.model_xml_generator.field_sets
 
     res = '<?xml version="1.0" encoding="UTF-8"?>
-<test_struct>
+<TestStruct>
   <foo>1</foo>
-</test_struct>
+</TestStruct>
 '
     assert_equal res, @t.to_xml
   end
@@ -51,10 +51,10 @@ class ModelXMLTest < Test::Unit::TestCase
     assert_equal [[:foo, :bar]], TestStruct.model_xml_generator.field_sets
 
     res = '<?xml version="1.0" encoding="UTF-8"?>
-<test_struct>
+<TestStruct>
   <foo>1</foo>
   <bar>2</bar>
-</test_struct>
+</TestStruct>
 '
     assert_equal res, @t.to_xml
   end
@@ -70,11 +70,11 @@ class ModelXMLTest < Test::Unit::TestCase
     end
 
     res = '<?xml version="1.0" encoding="UTF-8"?>
-<test_struct>
+<TestStruct>
   <foo>1</foo>
   <bar>2</bar>
   <foobar>3</foobar>
-</test_struct>
+</TestStruct>
 '
     assert_equal res, @t.to_xml
   end
@@ -85,10 +85,10 @@ class ModelXMLTest < Test::Unit::TestCase
       model_xml :foo, :bar
     end
 
-    res = '<test_struct>
+    res = '<TestStruct>
   <foo>1</foo>
   <bar>2</bar>
-</test_struct>
+</TestStruct>
 '
     assert_equal res, @t.to_xml(:skip_instruct => true)
 
@@ -98,12 +98,12 @@ class ModelXMLTest < Test::Unit::TestCase
     p = Parent.new(:foo => 1, :child => Child.new(:bar => 2))
 
     res = '<?xml version="1.0" encoding="UTF-8"?>
-<parent>
+<Parent>
   <foo>1</foo>
-  <child>
+  <Child>
     <bar>2</bar>
-  </child>
-</parent>
+  </Child>
+</Parent>
 '
     assert_equal res, p.to_xml
   end
@@ -117,9 +117,9 @@ class ModelXMLTest < Test::Unit::TestCase
     end
 
     res = '<?xml version="1.0" encoding="UTF-8"?>
-<test_struct>
+<TestStruct>
   <id>foo</id>
-</test_struct>
+</TestStruct>
 '
     assert_equal res, @t.to_xml
   end
@@ -131,9 +131,9 @@ class ModelXMLTest < Test::Unit::TestCase
     end
 
     res = '<?xml version="1.0" encoding="UTF-8"?>
-<test_struct>
+<TestStruct>
   <foo>1</foo>
-</test_struct>
+</TestStruct>
 '
     assert_equal res, @t.to_xml(:except => [:bar])
     assert_equal res, @t.to_xml(:only => [:foo])

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: model_xml
 version: !ruby/object:Gem::Version 
-  hash: 1
+  hash: 15
   prerelease: 
   segments: 
   - 1
   - 0
-  - 11
-  version: 1.0.11
+  - 12
+  version: 1.0.12
 platform: ruby
 authors: 
 - Rob Anderson
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-04-25 00:00:00 Z
+date: 2012-06-20 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: builder