xml-mapping_extensions 0.4.4 → 0.4.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 36f81c099c7ffafcad6ffa1af533b3a5f9ced684
-  data.tar.gz: 09a3a094c1855d14b2e3f89d72ba210bc0a7ede1
+  metadata.gz: 91ed4292829e9d05dae2299e8d9f79d6e8e668db
+  data.tar.gz: 7980a10f39051df33fe45df96b0541d9242fcc00
 SHA512:
-  metadata.gz: b94a791a3a778e2e457e177a04c424011b012a422532aebfc9257a97ec08a3866b991a87b13df49f6ef8d65960e22fee4149426897437c5f74131e5b9ef8a14e
-  data.tar.gz: 247e5a8e25895cdbad0f3bddf62aafdde2dae6f89e77770e86fa22bd05d89741b0d36b342779851e2812cc55c7247e8d424639ce6c8b028fae5dac92e7e9a3b7
+  metadata.gz: 2a79811d0aac935feb3e80dfa218d08f84f8d20726c34616dde559ec18c3422501ca6686affa8c8434470efc20b2319efb8765dceff3a829b7a6ce01ed157456
+  data.tar.gz: bbfb24c26fa14bebc99d5a6b84290ca1d3d1e9050828a534fa3616710bf6411f0c98e085ed2ab71e55cdb5971380a5e2f3d1d911b11929c3f606a857f1452e2a

data/CHANGES.md

@@ -1,3 +1,8 @@
+## 0.4.5 (14 July 2016)
+
+- Make `#fallback_mapping` preserve the order of the fallback mapping instead of appending all fallback
+  nodes after all explicitly remapped nodes
+
 ## 0.4.4 (12 July 2016)
 
 - Add '#fallback_mapping'

data/lib/xml/mapping_extensions.rb

@@ -88,8 +88,7 @@ module XML
       # @param fallback [Symbol] the fallback mapping to be used if the primary
       #   mapping lacks a mapping node or root element name
       def fallback_mapping(mapping, fallback)
-        mapping_nodes = nodes_by_attrname(mapping)
-        add_fallback_nodes(mapping_nodes, mapping, fallback)
+        mapping_nodes = add_fallback_nodes(nodes_by_attrname(mapping), mapping, fallback)
         xml_mapping_nodes_hash[mapping] = mapping_nodes.values
 
         return if root_element_names[mapping]
@@ -127,14 +126,16 @@ module XML
       # @param mapping [Symbol] The primary mapping
       # @param fallback [Symbol] The fallback mapping
       def add_fallback_nodes(mapping_nodes, mapping, fallback)
-        xml_mapping_nodes(mapping: fallback).each do |fallback_node|
-          attrname = fallback_node.attrname
-          next if mapping_nodes.key?(attrname)
-
-          node = fallback_node.clone
-          fallback_node.mapping = mapping
-          mapping_nodes[attrname] = node
-        end
+        all_nodes = nodes_by_attrname(fallback).map do |attrname, fallback_node|
+          [attrname, clone_node(fallback_node, mapping)]
+        end.to_h
+        all_nodes.merge!(mapping_nodes)
+      end
+
+      def clone_node(fallback_node, new_mapping)
+        node = fallback_node.clone
+        node.mapping = new_mapping
+        node
       end
     end
   end

data/lib/xml/mapping_extensions/version.rb

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

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

@@ -10,6 +10,7 @@ module XML
       numeric_node :attribute, '@attribute'
       text_node :text, 'text()'
       array_node :children, 'child', class: String
+      numeric_node :stepchild, 'stepchild'
 
       use_mapping :alternate
       text_node :attribute, '@attribute'
@@ -22,6 +23,7 @@ module XML
                    children_text = obj.children.join(',') if obj.children && !obj.children.empty?
                    xml.add_element('children').text = children_text if children_text
                  end)
+      text_node :stepchild, 'stepchild'
 
       fallback_mapping :alternate, :_default
     end
@@ -32,8 +34,9 @@ module XML
         obj.attribute = 123
         obj.text = 'element text'
         obj.children = ['child 1', 'child 2']
+        obj.stepchild = 456
         saved_xml = obj.save_to_xml
-        expected_xml = '<element attribute="123">element text<child>child 1</child><child>child 2</child></element>'
+        expected_xml = '<element attribute="123">element text<child>child 1</child><child>child 2</child><stepchild>456</stepchild></element>'
         expect(saved_xml).to be_xml(expected_xml)
       end
 
@@ -42,27 +45,30 @@ module XML
         obj.attribute = 'elvis'
         obj.text = 'element text'
         obj.children = ['child 1', 'child 2']
+        obj.stepchild = 456
         saved_xml = obj.save_to_xml(mapping: :alternate)
-        expected_xml = '<element attribute="elvis">element text<children>child 1,child 2</children></element>'
+        expected_xml = '<element attribute="elvis">element text<children>child 1,child 2</children><stepchild>456</stepchild></element>'
         expect(saved_xml).to be_xml(expected_xml)
       end
     end
 
     describe '#parse_xml' do
       it 'parses a String' do
-        xml_string = '<element attribute="123">element text<child>child 1</child><child>child 2</child></element>'
+        xml_string = '<element attribute="123">element text<child>child 1</child><child>child 2</child><stepchild>456</stepchild></element>'
         obj = FMSpecObject.parse_xml(xml_string)
         expect(obj.attribute).to eq(123)
         expect(obj.text).to eq('element text')
         expect(obj.children).to eq(['child 1', 'child 2'])
+        expect(obj.stepchild).to eq(456)
       end
 
       it 'accepts an alternate mapping' do
-        xml_string = '<element attribute="elvis">element text<children>child 1,child 2</children></element>'
+        xml_string = '<element attribute="elvis">element text<children>child 1,child 2</children><stepchild>456</stepchild></element>'
         obj = FMSpecObject.parse_xml(xml_string, mapping: :alternate)
         expect(obj.attribute).to eq('elvis')
         expect(obj.text).to eq('element text')
         expect(obj.children).to eq(['child 1', 'child 2'])
+        expect(obj.stepchild).to eq('456')
       end
     end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: xml-mapping_extensions
 version: !ruby/object:Gem::Version
-  version: 0.4.4
+  version: 0.4.5
 platform: ruby
 authors:
 - David Moles
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-12 00:00:00.000000000 Z
+date: 2016-07-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mime-types