xml-mapping_extensions 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6974aa25a580ab47d6ffc41468fe2afb54c6ad91
-  data.tar.gz: 4fd09884318b53fdbdf1f3de954fbe87677e867a
+  metadata.gz: 4ad2038c6915f4e3195269c95f734366b100701f
+  data.tar.gz: e9385d3e05c59809e21425a2a2fada61975a35bf
 SHA512:
-  metadata.gz: 54d02c4c2bbae8388b21956cdc68f7183e100c321c3eb38ae3c54c597308fe6969d20e296aac0375eea25a886565e120eec9b815c72cfa1ad1ca4e5c7f27329d
-  data.tar.gz: bb25f1d1b4de7cdf86d8110a2b1264f4b8f31fa83058418a4c3743ff7499160764c7377dd47222a76f754a6c8131d3dfad249bd0f6ab921ccfad50db35e0f5ec
+  metadata.gz: 6f3af4513a661edf05a8ad119745fe5556e59e7ca4bf0de81def9962fe8e00446f8005af34f82c1273dc8d724b87c49f1350881048c9e29d103eb481ecaeaaee
+  data.tar.gz: 4af18d3e1fb46313683ea91e9ba60fc9e62ee36237783fda16cc691fa1c37b3148336deb6be2ab44e966bb03d8e68690862113ba4156c6de0edd07baa15f8a8e

data/CHANGES.md

@@ -1,3 +1,9 @@
+## 0.2.1 (16 November 2015)
+
+- Modified `EnumNodeBase` to deal with either enum object instances or enum value
+  constants (e.g. `MyEnum::MY_VALUE` -- which happens to be the string value
+  of that enum instance, not the enum instance itself as one might expect).
+
 ## 0.2.0 (16 November 2015)
 
 - Fixed `EnumNodeBase` to correctly parse string values as enum instances,

data/lib/xml/mapping_extensions/enum_node_base.rb

@@ -22,7 +22,7 @@ module XML
       end
 
       def to_xml_text(value)
-        value.value
+        value.respond_to?(:value) ? value.value : value.to_s
       end
 
     end

data/lib/xml/mapping_extensions/version.rb

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

data/spec/.rubocop.yml

@@ -0,0 +1,7 @@
+inherit_from: ../.rubocop.yml
+
+Metrics/MethodLength:
+  Enabled: false
+
+Metrics/ModuleLength:
+  Enabled: false

data/spec/rspec_custom_matchers.rb

@@ -1,5 +1,51 @@
 require 'rspec/expectations'
 require 'mime/types'
+require 'equivalent-xml'
+
+RSpec::Matchers.define :be_xml do |expected|
+
+  def to_nokogiri(xml)
+    return nil unless xml
+    case xml
+    when Nokogiri::XML::Element
+      xml
+    when Nokogiri::XML::Document
+      xml.root
+    when String
+      to_nokogiri(Nokogiri::XML(xml))
+    when REXML::Element
+      to_nokogiri(xml.to_s)
+    else
+      fail "be_xml() expected XML, got #{xml.class}"
+    end
+  end
+
+  def to_pretty(nokogiri)
+    return nil unless nokogiri
+    out = StringIO.new
+    save_options = Nokogiri::XML::Node::SaveOptions::FORMAT | Nokogiri::XML::Node::SaveOptions::NO_DECLARATION
+    nokogiri.write_xml_to(out, encoding: 'UTF-8', indent: 2, save_with: save_options)
+    out.string
+  end
+
+  match do |actual|
+    expected_xml = to_nokogiri(expected) || fail("expected value #{expected} does not appear to be XML")
+    actual_xml = to_nokogiri(actual)
+
+    EquivalentXml.equivalent?(expected_xml, actual_xml, element_order: false, normalize_whitespace: true)
+  end
+
+  failure_message do |actual|
+    expected_string = to_pretty(to_nokogiri(expected))
+    actual_string = to_pretty(to_nokogiri(actual)) || actual
+    "expected XML:\n#{expected_string}\n\nbut was:\n#{actual_string}"
+  end
+
+  failure_message_when_negated do |actual|
+    actual_xml = to_element(actual) || actual
+    "expected not to get XML:\n\t#{actual_xml}"
+  end
+end
 
 RSpec::Matchers.define :be_time do |expected|
 

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

@@ -20,6 +20,8 @@ module XML
       include ::XML::Mapping
       my_enum_node :my_enum, '@my_enum', default_value: nil
 
+      root_element_name 'elem'
+
       def self.from_str(enum_str)
         xml_string = enum_str ? "<elem my_enum='#{enum_str}'/>" : '<elem/>'
         doc = REXML::Document.new(xml_string)
@@ -58,6 +60,20 @@ module XML
       it 'doesn\'t set an attribute for a nil value' do
         expect(to_text(nil)).to be_nil
       end
+
+      it 'accepts enum constants' do
+        elem = EnumNodeBaseSpecElem.new
+        elem.my_enum = MyEnum::BAZ_QUX
+        xml_string = '<elem my_enum="baz_qux"/>'
+        expect(elem.save_to_xml).to be_xml(xml_string)
+      end
+
+      it 'round-trips to XML' do
+        xml_string = '<elem my_enum="baz_qux"/>'
+        doc = REXML::Document.new(xml_string)
+        elem = EnumNodeBaseSpecElem.load_from_xml(doc.root)
+        expect(elem.save_to_xml).to be_xml(xml_string)
+      end
     end
   end
 end

data/xml-mapping_extensions.gemspec

@@ -26,6 +26,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'ruby-enum', '~> 0.4'
   spec.add_dependency 'xml-mapping', '~> 0.10'
 
+  spec.add_development_dependency 'equivalent-xml', '~> 0.6.0'
   spec.add_development_dependency 'rake', '~> 10.4'
   spec.add_development_dependency 'rspec', '~> 3.2'
   spec.add_development_dependency 'rubocop', '~> 0.32.1'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: xml-mapping_extensions
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - David Moles
@@ -52,6 +52,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.10'
+- !ruby/object:Gem::Dependency
+  name: equivalent-xml
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.6.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.6.0
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -175,6 +189,7 @@ files:
 - lib/xml/mapping_extensions/time_node.rb
 - lib/xml/mapping_extensions/uri_node.rb
 - lib/xml/mapping_extensions/version.rb
+- spec/.rubocop.yml
 - spec/rspec_custom_matchers.rb
 - spec/spec_helper.rb
 - spec/unit/xml/mapping_extensions/date_node_spec.rb
@@ -209,6 +224,7 @@ signing_key:
 specification_version: 4
 summary: Some extensions for for XML::Mapping
 test_files:
+- spec/.rubocop.yml
 - spec/rspec_custom_matchers.rb
 - spec/spec_helper.rb
 - spec/unit/xml/mapping_extensions/date_node_spec.rb