xqsr3 0.22.2 → 0.22.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 91fb18a7f4ffac6b0ad761c9d41dc29b325f172c
-  data.tar.gz: 06db1f1fb19d9afed8e77e65c1c4f543af6fdee6
+SHA256:
+  metadata.gz: f9ba5e26e05f852e8093d7fad6e1ea1b3aea26e596bac32483b5a0c0ec6176a5
+  data.tar.gz: 034b29eb4f8ce8ff96bfe05d98adcdca2c255e8f54ae295daafb00bce93ee942
 SHA512:
-  metadata.gz: 265250202da381835bb2a4d8fdde5197293dffc01f0fdf4da89fb51672883ec31ba1f6e1bfe01c2745e5b92dfaff417a50163be63e098bc328f1d82a2189a7d2
-  data.tar.gz: 85318de93eeb417cee8b49fe45455b19ad8a7d3a5c8d2467edb68b22ac7196c52c79c84a06435ec6ccda5a226e43001cc0594a9540e6f4ea05cb592743330a2a
+  metadata.gz: 634f55ac0143b7285caf59a41b06b96f3bc4aaacaa343dc68fdad6372916de3b8d58f5adf23179948ba5bef665c4da1fe6abe285d51925655ffc920f68aa59a1
+  data.tar.gz: 90b016538c14a6d7f24e2d3b0e379eacf4b1e33be938ba5f4a7adfa016848d0482d973ab99ae24293c4fecf98839d7c8d799b371f825caef982cd5cb7302086d

data/lib/xqsr3/version.rb

@@ -5,7 +5,7 @@
 # Purpose:      Version for Xqsr3 library
 #
 # Created:      3rd April 2016
-# Updated:      1st February 2018
+# Updated:      28th February 2018
 #
 # Home:         http://github.com/synesissoftware/xqsr3
 #
@@ -50,7 +50,7 @@
 module Xqsr3
 
 	# Current version of the Xqsr3 library
-	VERSION				=	'0.22.2'
+	VERSION				=	'0.22.4'
 
 	private
 	VERSION_PARTS_		=	VERSION.split(/[.]/).collect { |n| n.to_i } # :nodoc:

data/lib/xqsr3/xml/utilities/compare.rb

@@ -6,7 +6,7 @@
 #               module
 #
 # Created:      30th July 2017
-# Updated:      1st February 2018
+# Updated:      28th February 2018
 #
 # Home:         http://github.com/synesissoftware/xqsr3
 #
@@ -170,6 +170,7 @@ module Compare
 			ignore_attributes: false,
 			ignore_attribute_order: true,
 			ignore_child_node_order: true,
+			ignore_xml_declarations: true,
 			normalise_whitespace: true,
 #			normalize_whitespace: true,
 			validate_params: true,
@@ -244,6 +245,7 @@ module Compare
 		# +:equate_nil_and_empty+
 		# +:ignore_attributes+
 		# +:ignore_attribute_order+
+		# +:ignore_xml_declarations+
 		# +:normalise_whitespace+
 		# +:normalize_whitespace+
 		# +:validate_params+
@@ -289,6 +291,25 @@ module Compare
 			rhs	=	Nokogiri::XML(rhs) if ::String === rhs
 
 
+
+			# deal with XML Declaration(s)
+
+			if options[:ignore_xml_declarations]
+
+				if ::Nokogiri::XML::Document === lhs
+
+					lhs_root	=	lhs.root
+					lhs			=	lhs_root if lhs_root
+				end
+
+				if ::Nokogiri::XML::Document === rhs
+
+					rhs_root	=	rhs.root
+					rhs			=	rhs_root if rhs_root
+				end
+			end
+
+
 			self.xml_compare_nodes_ lhs, rhs, options
 		end
 

data/test/unit/xml/utilities/tc_compare.rb

@@ -127,5 +127,62 @@ END_OF_rhs
 		assert r.same?, "#{r.details}"
 	end
 
+	def test_different_declarations_and_dont_ignore
+
+		lhs_str	=	<<END_OF_lhs_doc
+<?xml version="1.0"?>
+<outer>
+ <mid>
+  <inner>some text</inner>
+ </mid>
+</outer>
+END_OF_lhs_doc
+
+		rhs_str	=	<<END_OF_rhs_doc
+<?xml version="1.0"?>
+ <mid>
+  <inner>some text</inner>
+ </mid>
+END_OF_rhs_doc
+
+		lhs_doc		=	Nokogiri::XML lhs_str
+		rhs_doc		=	Nokogiri::XML rhs_str
+
+		expected	=	rhs_doc
+		actual		=	lhs_doc.at_xpath('/outer/mid')
+
+		r			=	xml_compare expected, actual, normalise_whitespace: true, ignore_xml_declarations: false
+
+		assert !r.same?
+	end
+
+	def test_different_declarations_and_do_ignore
+
+		lhs_str	=	<<END_OF_lhs_doc
+<?xml version="1.0"?>
+<outer>
+ <mid>
+  <inner>some text</inner>
+ </mid>
+</outer>
+END_OF_lhs_doc
+
+		rhs_str	=	<<END_OF_rhs_doc
+<?xml version="1.0"?>
+ <mid>
+  <inner>some text</inner>
+ </mid>
+END_OF_rhs_doc
+
+		lhs_doc		=	Nokogiri::XML lhs_str
+		rhs_doc		=	Nokogiri::XML rhs_str
+
+		expected	=	rhs_doc
+		actual		=	lhs_doc.at_xpath('/outer/mid')
+
+		r			=	xml_compare expected, actual, normalise_whitespace: true, ignore_xml_declarations: true
+
+		assert r.same?, "#{r.details}"
+	end
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: xqsr3
 version: !ruby/object:Gem::Version
-  version: 0.22.2
+  version: 0.22.4
 platform: ruby
 authors:
 - Matt Wilson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-02-05 00:00:00.000000000 Z
+date: 2018-02-28 00:00:00.000000000 Z
 dependencies: []
 description: |
   eXtensions by fine Quantum for Standard Ruby and 3rd-party libraries is a
@@ -128,7 +128,7 @@ files:
 - test/unit/xml/utilities/ts_all.rb
 homepage: http://github.com/synesissoftware/xqsr3
 licenses:
-- 3-clause BSD
+- BSD-3-Clause
 metadata: {}
 post_install_message: 
 rdoc_options: []
@@ -136,19 +136,18 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - "~>"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '2.0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.2
+rubygems_version: 2.7.5
 signing_key: 
 specification_version: 4
 summary: xqsr3
 test_files: []
-has_rdoc: