Merge pull request #3 from digidentity/hotfix/nokogiri-dependency

Ensure the right nokogiri version

Author: jdongelmans

CHANGELOG.md

@@ -1,3 +1,14 @@
+## 0.8.1 / 2021-08-13
+
+* Version 0.8.0 fixed a bug with newer versions of nokogiri, however due to the way this fix works it breaks compatability with
+  older versions so we now added `'nokogiri', '~> 1.11'` as dependency 
+* Update gemspec
+
+## 0.8.0 / 2021-08-12
+
+### WARNING: COMPATABILITY (see 0.8.1)
+* [Fix](https://github.com/digidentity/xmlmapper/pull/2) missing namespace when adding a child
+
 ## 0.7.0
 
 * Set xml_value with a non canonicalized version

README.md

@@ -1,7 +1,7 @@
-Xmlmapper
+XmlMapper
 ===========
 
-Xmlmapper allows you to parse XML data and convert it quickly and easily into ruby data structures.
+XmlMapper allows you to parse XML data and convert it quickly and easily into ruby data structures.
 
 This project is a fork of the great work done first by
 [jnunemaker](https://github.com/jnunemaker/happymapper).

lib/xmlmapper/version.rb

@@ -1,3 +1,3 @@
 module XmlMapper
-  VERSION = '0.8.0'.freeze
+  VERSION = '0.8.1'.freeze
 end

xmlmapper.gemspec

@@ -1,45 +1,36 @@
-# -*- encoding: utf-8 -*-
-lib = File.expand_path('../lib', __FILE__)
-$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-require 'xmlmapper/version'
+begin
+  require File.expand_path(File.join(File.dirname(__FILE__), 'lib/xmlmapper/version'))
+rescue LoadError
+  puts 'WARNING: Could not load XmlMapper::VERSION'
+end
 
 Gem::Specification.new do |s|
-  s.name = %q{xmlmapper}
-  s.version = ::XmlMapper::VERSION
-
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = ["Damien Le Berrigaud",
-    "John Nunemaker",
-    "David Bolton",
-    "Roland Swingler",
+  s.name = 'xmlmapper'
+  s.version = XmlMapper::VERSION
+  s.authors = [
+    'Damien Le Berrigaud',
+    'John Nunemaker',
+    'David Bolton',
+    'Roland Swingler',
     "Etienne Vallette d'Osia",
-    "Franklin Webber"]
+    'Franklin Webber',
+    'Benoist Claassen',
+    'Johnny Dongelmans'
+  ]
 
-  s.email = 'bclaassen@digidentity.eu'
-  s.date = %q{2015-11-23}
-  s.description = %q{Object to XML Mapping Library, using Nokogiri (fork from John Nunemaker's Happymapper)}
-  s.extra_rdoc_files = [ "README.md", "CHANGELOG.md" ]
+  s.email = 'jdongelmans@digidentity.com'
+  s.homepage = 'https://github.com/digidentity/xmlmapper'
+  s.description = "Object to XML Mapping Library, using Nokogiri (fork from John Nunemaker's Happymapper)"
+  s.summary = 'Provides a simple way to map XML to Ruby Objects and back again.'
+  s.license = 'MIT'
+
+  s.require_paths = ['lib']
   s.files = `git ls-files -- lib/*`.split("\n")
-  s.homepage = %q{http://github.com/digidentity/xmlmapper}
-  s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.4.1}
-  s.summary = %q{Provides a simple way to map XML to Ruby Objects and back again.}
-  s.license = "MIT"
   s.test_files = `git ls-files -- spec/*`.split("\n")
+  s.extra_rdoc_files = %w[README.md CHANGELOG.md]
 
-  if s.respond_to? :specification_version then
-    s.specification_version = 3
+  s.required_ruby_version = '>= 2.5.0' # copied from nokogiri.gemspec as this should be aligned
 
-    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<nokogiri>, "~> 1.5" )
-      s.add_development_dependency(%q<rspec>, ["~> 2.8"])
-    else
-      s.add_dependency(%q<nokogiri>, "~> 1.5" )
-      s.add_dependency(%q<rspec>, ["~> 2.8"])
-    end
-  else
-    s.add_dependency(%q<nokogiri>, "~> 1.5" )
-    s.add_dependency(%q<rspec>, ["~> 2.8"])
-  end
+  s.add_runtime_dependency 'nokogiri', '~> 1.11'
+  s.add_development_dependency 'rspec', '~> 2.8'
 end
-