xml-mapping_extensions 0.4.6 → 0.4.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c4e7ef0d9b37dd1ecc3569d5aeadb75a9da079b1
-  data.tar.gz: 59a93fa0fa398f3ea4d493c7751f93e3ae34c9de
+  metadata.gz: 80244c4ebbcf9f398b53a71edff5b5ec7c884fc5
+  data.tar.gz: 55fc77d2fba3a0a5e701e2328d076cd173f854bc
 SHA512:
-  metadata.gz: de2478465f7e44829e949505834d290274466d43d643bab3f8cef180fe35e7db1fd3c4ad0a1a07a022b818c5e5d84fb15f108c8a01eb1e58157dc27abaeec8a9
-  data.tar.gz: 19a67e611dfaf5ae7a8b509598faaa0c84546f0f5a98a3f27058f26cef646c278642b8e39a73a844eaa9a3eaf798698ac95bda6158737816fab92d7a0ba52234
+  metadata.gz: 7b1388133c111c18d26a5e4509a12a8ac99e225886164b07e42ab203313c1cae64076b946157252ad0b0ebcd795a84459387c5fa437920d6fa337ce1317c9ca7
+  data.tar.gz: a75557813d6716fce717f2a163afce686830b937a0c544dec915e3d6c96b5dee25415ec869c551ea9def763e0158d8b354cc3ef3edae2ecbb20e74c2484cb205

data/CHANGES.md

@@ -1,3 +1,7 @@
+## 0.4.7 (21 September 2016)
+
+- Fix issue where `ArrayNodes` with `fallback_mapping` wouldn't honor the new mapping.
+
 ## 0.4.6 (15 August 2016)
 
 - `TypesafeEnumNode.to_value()` now raises `ArgumentError` if the argument is not a valid value for the node's

data/lib/xml/mapping_extensions/version.rb

@@ -1,6 +1,6 @@
 module XML
   module MappingExtensions
     # The version of this gem
-    VERSION = '0.4.6'
+    VERSION = '0.4.7'
   end
 end

data/lib/xml/mapping_extensions.rb

@@ -75,6 +75,22 @@ module XML
       attr_accessor :mapping
     end
 
+    # Monkey-patch ArrayNode to regenerate marshallers and unmarshallers after cloning
+    class ArrayNode
+      old_init = instance_method(:initialize)
+      define_method(:initialize) do |*args|
+        @init_args = args
+        old_init.bind(self).call(*args)
+      end
+
+      define_method(:re_initialize) do |args|
+        old_init.bind(self).call(*args)
+      end
+
+      attr_reader :init_args
+      attr_accessor :options
+    end
+
     module ClassMethods
 
       # Gets the configured root element names for this object.
@@ -156,6 +172,13 @@ module XML
       def clone_node(fallback_node, new_mapping)
         node = fallback_node.clone
         node.mapping = new_mapping
+        if node.is_a?(ArrayNode)
+          args = node.init_args.clone
+          options = args.pop.clone
+          options[:mapping] = new_mapping
+          args << options
+          node.re_initialize(args)
+        end
         node
       end
     end

data/spec/unit/xml/mapping_extensions/fallback_mapping_custom_node_spec.rb

@@ -0,0 +1,67 @@
+require 'spec_helper'
+
+module XML
+  module Mapping
+    class Value
+      attr_reader :value
+
+      def initialize(value:)
+        @value = value
+      end
+    end
+
+    class ValueNode < SingleAttributeNode
+      def initialize(*args)
+        path, *args = super(*args)
+        @path = ::XML::XXPath.new(path)
+        args
+      end
+
+      def set_attr_value(xml, value)
+        element = @path.first(xml, ensure_created: true)
+        if mapping == :fancy
+          element.attributes << REXML::Attribute.new('value', value)
+        else
+          element.text = value
+        end
+      end
+    end
+    XML::Mapping.add_node_class ValueNode
+
+    class Holder
+      include XML::Mapping
+
+      def initialize(value)
+        @value = value
+      end
+
+      value_node :value, 'value', default_value: nil
+      use_mapping :fancy
+      fallback_mapping :fancy, :_default
+    end
+
+    class HolderHolder
+      include XML::Mapping
+      array_node :holders, 'holders', 'holder', class: Holder, default_value: []
+      use_mapping :fancy
+      fallback_mapping :fancy, :_default
+    end
+
+    describe '#fallback_mapping' do
+      it 'works with arrays mapped by custom nodes' do
+        expected = '<holder-holder>
+          <holders>
+            <holder><value value="foo"/></holder>
+            <holder><value value="bar"/></holder>
+          </holders>
+        </holder-holder>'
+
+        hh = HolderHolder.new
+        hh.holders = [Holder.new('foo'), Holder.new('bar')]
+        xml = hh.write_xml(mapping: :fancy)
+        expect(xml).to be_xml(expected)
+      end
+    end
+
+  end
+end

data/spec/unit/xml/mapping_extensions/mapping_extensions_spec.rb

@@ -77,7 +77,6 @@ module XML
           outfile = "#{tmp}/mxspec.xml"
           @obj.write_to_file(outfile, indent: 4)
           outxml = File.read(outfile)
-          puts("'#{outxml}'")
           expect(outxml).to be_xml(@expected)
         end
       end
@@ -87,7 +86,6 @@ module XML
           outfile = "#{tmp}/mxspec.xml"
           @obj.write_to_file(outfile, pretty: true)
           outxml = File.read(outfile)
-          puts("'#{outxml}'")
           expect(outxml).to be_xml(@expected)
         end
       end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: xml-mapping_extensions
 version: !ruby/object:Gem::Version
-  version: 0.4.6
+  version: 0.4.7
 platform: ruby
 authors:
 - David Moles
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-15 00:00:00.000000000 Z
+date: 2016-09-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mime-types
@@ -202,6 +202,7 @@ files:
 - spec/spec_helper.rb
 - spec/unit/xml/mapping_extensions/array_node_spec.rb
 - spec/unit/xml/mapping_extensions/date_node_spec.rb
+- spec/unit/xml/mapping_extensions/fallback_mapping_custom_node_spec.rb
 - spec/unit/xml/mapping_extensions/fallback_mapping_spec.rb
 - spec/unit/xml/mapping_extensions/mapping_extensions_spec.rb
 - spec/unit/xml/mapping_extensions/mime_type_node_spec.rb
@@ -232,7 +233,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.6.6
 signing_key: 
 specification_version: 4
 summary: Some extensions for for XML::Mapping
@@ -242,6 +243,7 @@ test_files:
 - spec/spec_helper.rb
 - spec/unit/xml/mapping_extensions/array_node_spec.rb
 - spec/unit/xml/mapping_extensions/date_node_spec.rb
+- spec/unit/xml/mapping_extensions/fallback_mapping_custom_node_spec.rb
 - spec/unit/xml/mapping_extensions/fallback_mapping_spec.rb
 - spec/unit/xml/mapping_extensions/mapping_extensions_spec.rb
 - spec/unit/xml/mapping_extensions/mime_type_node_spec.rb