nokogiri-happymapper 0.10.0 → 0.10.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4037488d0324e3ef30b397bb88363d45724dbfff725c3fa34c011d6530463cce
-  data.tar.gz: 8db235cf492da7f19b42ff3b10b59556fd580039a31d7e0afe1041f613db67fa
+  metadata.gz: 0c2ddd36e3f39dfd51fdfdb4118c2cd3fe029dd145815384806759446e2c87ed
+  data.tar.gz: f48845f6496492351a180e93622ed99036ce2a30238a44cef1bb335a7f64a879
 SHA512:
-  metadata.gz: e74d65ab359a268fe0c0af0adba002cea497280111479f523858b063d36d6e182e1594b2cece9728f3ee10fd7d36fa024df1583e568042b915ebe502773d92d5
-  data.tar.gz: d5b197a8d3163ccbd27ed542546b61b6e364301ef43503c38636da40fec50f0c1a0e78f88ca161690dc2b495ea645684247c78faf9053b3ab555380750f0e91b
+  metadata.gz: bed47897fd2164b210b57e4a501c48424350db82de9b33992fa48f65377d4cddf51b77dcb353af129ed769dcb0cac506e704fd439a0a283c42b002621dbe910c
+  data.tar.gz: e531831bab32cd36eb3aa8471d4d85ae8213a9ecf78ef27cd41ca18087cc3d5782bf0092b6c94f0b03d989f1d7a4ae097e10639107de66bd3447e0e845cd2e91

data/CHANGELOG.md

@@ -1,5 +1,12 @@
 # Changelog
 
+## 0.10.1 / 2025-10-25
+
+* Fix namespace prefix collisions ([#231] by [petersen])
+
+[petersen]: https://github.com/petersen
+[#231]: https://github.com/mvz/happymapper/pull/231
+
 ## 0.10.0 / 2024-01-05
 
 * Fix typo in README code sample ([#198] by [Spone])

data/lib/happymapper/anonymous_mapper.rb

@@ -42,6 +42,7 @@ module HappyMapper
       klass = Class.new
       klass.class_eval do
         include HappyMapper
+
         tag tag_name
       end
       klass

data/lib/happymapper/class_methods.rb

@@ -289,7 +289,7 @@ module HappyMapper
         node = xml.root
 
         # merge any namespaces found on the xml node into the namespace hash
-        namespaces = namespaces.merge(xml.collect_namespaces)
+        namespaces = namespaces.merge(xml.collect_namespaces).merge(node.namespaces)
 
         # if the node name is equal to the tag name then the we are parsing the
         # root element and that is important to record so that we can apply
@@ -372,8 +372,6 @@ module HappyMapper
       # when at the root use the xpath '/' otherwise use a more gready './/'
       # unless an xpath has been specified, which should overwrite default
       # and finally attach the current namespace if one has been defined
-      #
-
       xpath = if options[:xpath]
                 options[:xpath].to_s.sub(%r{([^/])$}, '\1/')
               elsif root
@@ -389,31 +387,14 @@ module HappyMapper
         xpath += "#{namespace}:"
       end
 
-      nodes = []
-
-      # when finding nodes, do it in this order:
-      # 1. specified tag if one has been provided
-      # 2. name of element
-      # 3. tag_name (derived from class name by default)
-
-      # If a tag has been provided we need to search for it.
-
-      if options.key?(:tag)
-        nodes = node.xpath(xpath + options[:tag].to_s, namespaces)
+      # Find the nodes by the :tag option if given, or by tag_name (derived
+      # from the class name by default). If the :tag option is given, the
+      # tag_name will not be used.
+      if (xpath_ext = options[:tag] || tag_name)
+        node.xpath(xpath + xpath_ext.to_s, namespaces)
       else
-
-        # This is the default case when no tag value is provided.
-        # First we use the name of the element `items` in `has_many items`
-        # Second we use the tag name which is the name of the class cleaned up
-
-        [options[:name], tag_name].compact.each do |xpath_ext|
-          nodes = node.xpath(xpath + xpath_ext.to_s, namespaces)
-          break if nodes && !nodes.empty?
-        end
-
+        []
       end
-
-      nodes
     end
 
     def parse_node(node, options, namespace, namespaces)

data/lib/happymapper/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module HappyMapper
-  VERSION = "0.10.0"
+  VERSION = "0.10.1"
 end

data/lib/happymapper.rb

@@ -73,7 +73,6 @@ module HappyMapper
   #
   def to_xml(builder = nil, default_namespace = nil, namespace_override = nil,
              tag_from_parent = nil)
-
     #
     # If to_xml has been called without a passed in builder instance that
     # means we are going to return xml output. When it has been called with
@@ -152,6 +151,7 @@ module HappyMapper
     def self.get(name, &blk)
       Class.new do
         include HappyMapper
+
         tag name
         instance_eval(&blk)
       end
@@ -208,7 +208,12 @@ module HappyMapper
       next if value.nil? && !attribute.options[:state_when_nil]
 
       attribute_namespace = attribute.options[:namespace]
-      ["#{attribute_namespace ? "#{attribute_namespace}:" : ""}#{attribute.tag}", value]
+      attribute_name = if attribute_namespace
+                         "#{attribute_namespace}:#{attribute.tag}"
+                       else
+                         attribute.tag.to_s
+                       end
+      [attribute_name, value]
     end
 
     attributes.to_h

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: nokogiri-happymapper
 version: !ruby/object:Gem::Version
-  version: 0.10.0
+  version: 0.10.1
 platform: ruby
 authors:
 - Damien Le Berrigaud
@@ -11,10 +11,9 @@ authors:
 - Etienne Vallette d'Osia
 - Franklin Webber
 - Matijs van Zuijlen
-autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-01-05 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -30,20 +29,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.5'
-- !ruby/object:Gem::Dependency
-  name: pry
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.14.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.14.0
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -92,56 +77,56 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.56'
+        version: '1.80'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.56'
+        version: '1.80'
 - !ruby/object:Gem::Dependency
   name: rubocop-packaging
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.5.2
+        version: 0.6.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.5.2
+        version: 0.6.0
 - !ruby/object:Gem::Dependency
   name: rubocop-performance
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.19'
+        version: '1.25'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.19'
+        version: '1.25'
 - !ruby/object:Gem::Dependency
   name: rubocop-rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.24'
+        version: '3.7'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.24'
+        version: '3.7'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
@@ -162,9 +147,9 @@ email: matijs@matijs.net
 executables: []
 extensions: []
 extra_rdoc_files:
-- README.md
 - CHANGELOG.md
 - License
+- README.md
 files:
 - CHANGELOG.md
 - License
@@ -185,7 +170,6 @@ licenses:
 - MIT
 metadata:
   rubygems_mfa_required: 'true'
-post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -200,8 +184,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.3
-signing_key:
+rubygems_version: 3.7.2
 specification_version: 4
 summary: Provides a simple way to map XML to Ruby Objects and back again.
 test_files: []