xml-mapping_extensions 0.3.4 → 0.3.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2a1dd7637b8de4a6a345debc25f742429680b254
-  data.tar.gz: eb6b2d9a0329dc1c6ebb4eec332afca4563a4590
+  metadata.gz: 1f632745c95852e892e50841d1dae290012d7941
+  data.tar.gz: 308acdeaa42233881b291b2adce912641e50a993
 SHA512:
-  metadata.gz: 863b8c8d288cef6a7786e7fc0b4855d3d35d4de5ee73065f22512a79d0a0d54c81dff407534b25cfc1cb9f3d775a162539672cc9e2ae4741b6af3f6412a85c6e
-  data.tar.gz: 5ac77afe37714a99b341b9a7f083b68fe4daa1652ee03432007577eeccbdcf9f6559f5024408abca7e97ed2fd754f9172e8d7ae56f6c93991006df0c2e53914e
+  metadata.gz: 3280dae9565abd98b0a8800ae66d217097ded31f275dde511b5c652760ad54f27462940b92b7ab539cb1550755af34773879e0fe10b38c866d97e0d290ddb140
+  data.tar.gz: 0885775aa138a6dacf348f572f9843a97994c036abeab239a36d75816ef19719af29803e54ff57889078d752f47dce67fbeb590e0c40e8c700ea1e14d858794e

data/CHANGES.md

@@ -1,3 +1,8 @@
+## 0.3.5 (28 April 2016)
+
+- `DateNode`: Fix issues with `Date.xmlschema` misbehaving in a Rails / ActiveSupport environment
+- `NodeBase`: Improve parsing error reporting, so that we get the node owner and attribute and the offending value
+
 ## 0.3.4 (27 January 2016)
 
 - Make gemspec smart enough to handle SSH checkouts

data/Rakefile

@@ -12,14 +12,13 @@ namespace :spec do
     task.pattern = 'unit/**/*_spec.rb'
   end
 
-  desc 'Run all acceptance tests'
-  RSpec::Core::RakeTask.new(:acceptance) do |task|
-    ENV['COVERAGE'] = nil
-    task.rspec_opts = %w(--color --format documentation --order default)
-    task.pattern = 'acceptance/**/*_spec.rb'
+  desc 'Run all unit tests with ActiveSupport required'
+  RSpec::Core::RakeTask.new(:active_support_unit) do |task|
+    task.rspec_opts = %w(--color --format documentation --order default --require active_support/all)
+    task.pattern = 'unit/**/*_spec.rb'
   end
 
-  task all: [:unit, :acceptance]
+  task all: [:unit, :active_support_unit]
 end
 
 desc 'Run all tests'
@@ -53,4 +52,4 @@ end
 # Defaults
 
 desc 'Run unit tests, check test coverage, run acceptance tests, check code style'
-task default: [:coverage, 'spec:acceptance', :rubocop]
+task default: [:coverage, 'spec:active_support_unit', :rubocop]

data/lib/xml/mapping_extensions/date_node.rb

@@ -28,8 +28,8 @@ module XML
       # @return [String] the value as an XML Schema date string, without
       #   time zone information unless {#zulu} is set
       def to_xml_text(value)
-        text = value.xmlschema
-        zulu ? "#{text}Z" : text
+        text = value.iso8601 # use iso8601 instead of xmlschema in case of ActiveSupport shenanigans
+        (zulu && !text.end_with?('Z')) ? "#{text}Z" : text
       end
     end
     ::XML::Mapping.add_node_class DateNode

data/lib/xml/mapping_extensions/node_base.rb

@@ -25,6 +25,9 @@ module XML
       def extract_attr_value(xml)
         xml_text = default_when_xpath_err { @path.first(xml).text }
         to_value(xml_text) if xml_text
+      rescue => e
+        bad_value = xml_text ? "'#{xml_text}'" : 'nil'
+        raise e, "#{@owner}.#{@attrname}: Can't parse #{bad_value} as #{self.class}: #{e.message}"
       end
 
       # Implements `::XML::Mapping::SingleAttributeNode#set_attr_value`.
@@ -37,9 +40,9 @@ module XML
       end
 
       # Override this method to convert XML text to an object value
-      # @param _xml_text [String] The XML string to parse
+      # @param xml_text [String] The XML string to parse
       # @return [Object] The object value
-      def to_value(_xml_text)
+      def to_value(xml_text) # rubocop:disable Lint/UnusedMethodArgument
         fail NoMethodError, "#{self.class} should override #to_value to convert an XML string to an object value"
       end
 

data/lib/xml/mapping_extensions/version.rb

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

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

@@ -63,6 +63,67 @@ module XML
         expect(actual).to eq(expected)
       end
 
+      describe 'works with Date.today' do
+        it 'as plain date' do
+          date = Date.today
+          expected = format('%04d-%02d-%02d', date.year, date.month, date.day)
+          actual = to_text(date)
+          expect(actual).to eq(expected)
+        end
+
+        it 'as "zulu" date' do
+          date = Date.today
+          expected = format('%04d-%02d-%02dZ', date.year, date.month, date.day)
+          actual = to_zulu_text(date)
+          expect(actual).to eq(expected)
+        end
+      end
+
+      if Date.respond_to?(:current)
+        describe 'works with Date.current' do
+          it 'as plain date' do
+            date = Date.current
+            expected = format('%04d-%02d-%02d', date.year, date.month, date.day)
+            actual = to_text(date)
+            expect(actual).to eq(expected)
+          end
+
+          it 'as "zulu" date' do
+            date = Date.current
+            expected = format('%04d-%02d-%02dZ', date.year, date.month, date.day)
+            actual = to_zulu_text(date)
+            expect(actual).to eq(expected)
+          end
+        end
+      end
+
+      if Time.respond_to?(:zone)
+        describe 'works with Time.zone' do
+          before(:each) do
+            @old_zone = Time.zone
+            Time.zone = 'UTC'
+          end
+          after(:each) do
+            Time.zone = @old_zone
+          end
+
+          it 'as plain date' do
+            date = Time.zone.today
+            expected = format('%04d-%02d-%02d', date.year, date.month, date.day)
+            actual = to_text(date)
+            expect(actual).to eq(expected)
+          end
+
+          it 'as "zulu" date' do
+            date = Time.zone.today
+            expected = format('%04d-%02d-%02dZ', date.year, date.month, date.day)
+            actual = to_zulu_text(date)
+            expect(actual).to eq(expected)
+          end
+
+        end
+      end
+
     end
   end
 end

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

@@ -3,11 +3,7 @@ require 'spec_helper'
 module XML
   module MappingExtensions
 
-    class SomeMappingClass
-      include ::XML::Mapping
-    end
-
-    class LaTeXRationalNode < NodeBase
+    class LatexRationalNode < NodeBase
       def to_value(xml_text)
         match_data = /\\frac\{([0-9.]+)\}\{([0-9.]+)\}/.match(xml_text)
         Rational("#{match_data[1]}/#{match_data[2]}")
@@ -17,37 +13,54 @@ module XML
         "\\frac{#{value.numerator}}{#{value.denominator}}"
       end
     end
+    ::XML::Mapping.add_node_class LatexRationalNode
 
-    describe NodeBase do
-      before :each do
-        @node = NodeBase.new(SomeMappingClass, :attr_name, 'attr_name')
-      end
+    class SomeElem
+      include ::XML::Mapping
+
+      latex_rational_node :rational, '@rational'
+    end
 
+    describe NodeBase do
       describe '#extract_attr_value' do
         it 'forwards to #to_value' do
-          node = LaTeXRationalNode.new(SomeMappingClass, :attr_name, 'attr_name')
-          expect(node.to_value('\frac{1}{2}')).to eq(Rational('1/2'))
+          xml = REXML::Document.new('<some_elem rational="\frac{1}{2}"/>').root
+          mapping = SomeElem.load_from_xml(xml)
+
+          expect(mapping.rational).to eq(Rational('1/2'))
+        end
+
+        it 'produces useful error messages' do
+          xml = REXML::Document.new('<some_elem rational="elvis"/>').root
+          expect { SomeElem.load_from_xml(xml) }.to raise_error do |e|
+            expect(e.message).to match(/SomeElem.rational.*'elvis'/)
+          end
         end
       end
 
       describe '#set_attr_value' do
         it 'forwards to #to_xml_text' do
-          node = LaTeXRationalNode.new(SomeMappingClass, :attr_name, 'attr_name')
+          node = LatexRationalNode.new(SomeElem, :rational, 'rational')
           expect(node.to_xml_text(Rational('1/2'))).to eq('\frac{1}{2}')
         end
       end
 
       describe '#xml_text' do
         it 'should be abstract' do
-          expect { @node.to_value('some text') }.to raise_error(NoMethodError)
+          node = NodeBase.allocate
+          expect { node.to_value('some text') }.to raise_error do |e|
+            expect(e).to be_a(NoMethodError)
+            expect(e.message).to include('should override #to_value')
+          end
         end
       end
 
       describe '#to_xml_text' do
         it 'should call to_s by default' do
+          node = NodeBase.allocate
           values = ['elvis', 123, Object.new]
           values.each do |v|
-            expect(@node.to_xml_text(v)).to eq(v.to_s)
+            expect(node.to_xml_text(v)).to eq(v.to_s)
           end
         end
       end

data/xml-mapping_extensions.gemspec

@@ -27,6 +27,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'typesafe_enum', '~> 0.1', '>= 0.1.5'
   spec.add_dependency 'xml-mapping', '~> 0.10'
 
+  spec.add_development_dependency 'activesupport', '~> 4.2' # for testing
   spec.add_development_dependency 'equivalent-xml', '~> 0.6.0'
   spec.add_development_dependency 'rake', '~> 10.4'
   spec.add_development_dependency 'rspec', '~> 3.2'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: xml-mapping_extensions
 version: !ruby/object:Gem::Version
-  version: 0.3.4
+  version: 0.3.5
 platform: ruby
 authors:
 - David Moles
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-27 00:00:00.000000000 Z
+date: 2016-04-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mime-types
@@ -58,6 +58,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.10'
+- !ruby/object:Gem::Dependency
+  name: activesupport
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '4.2'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '4.2'
 - !ruby/object:Gem::Dependency
   name: equivalent-xml
   requirement: !ruby/object:Gem::Requirement