nokogiri-happymapper 0.8.0 → 0.8.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 20c74c3600aeae595d9851fdc864364df4af72d3b5ea1257cb7323a5f4032439
-  data.tar.gz: b1fe72afe90bebc42fe52130fe1d4fb6681815f9c9e79a9f8dccabf93f5e9003
+  metadata.gz: 29c4973fa94bd305d925426e58d62690a2929c57af50a2e9d1666957b030db0c
+  data.tar.gz: e93f66003fc2991d3a28acf775d4224e2d2184751d082e48393c371580949803
 SHA512:
-  metadata.gz: ab001b07e41193a760a37d87600f2020310aa4f753b1bdcca2fad7251a5ac50346267c61cce18a5d5fc20f3ec683a3f8b67a305de2183a5fb8b3187731f8eab8
-  data.tar.gz: db0cb626e8d21eaf4b388bdb414165dbcb6b63ab3d6c6c3f61077255983fa3ec833e10e223ad429a9162d669d0ede349010c9b8c123ad231e34b4949ee2c4288
+  metadata.gz: 9ecf514caadcbce076cafe31127cc3a108a004b7abc75e3bfe2aa18c3d22f1fc86294c5912e43cb30f6d89b26021199d6a8e1cb3f9f63d331ba8eb4afcb2ee2f
+  data.tar.gz: 3811e5811bc2205708e038629155a195cb949c41f11d096c13db991251d939c1e2327c8c1f80b6e5aab4783ca71f898f06ab3adaa5c20e66e57b90adce634880

data/CHANGELOG.md

@@ -1,5 +1,10 @@
 # Changelog
 
+## 0.8.1 / 2019-03-18
+
+* Allow requiring `nokogiri-happymapper`
+  ([#103](https://github.com/mvz/happymapper/pull/103))
+
 ## 0.8.0 / 2018-08-28
 
 ### Breaking Changes

data/README.md

@@ -32,6 +32,10 @@ Or add the `nokogiri-happymapper` gem to your project's `Gemfile`.
 
     gem 'nokogiri-happymapper', require: 'happymapper'
 
+You can now also require `nokogiri-happymapper` directly.
+
+    gem 'nokogiri-happymapper'
+
 Run Bundler to install the gem:
 
     $ bundle install

data/lib/happymapper.rb

@@ -405,6 +405,7 @@ module HappyMapper
               end
       if namespace
         return [] unless namespaces.find { |name, _url| ["xmlns:#{namespace}", namespace].include? name }
+
         xpath += "#{namespace}:"
       end
 
@@ -674,6 +675,7 @@ module HappyMapper
   #
   def register_namespaces_with_builder(builder)
     return unless self.class.instance_variable_get('@registered_namespaces')
+
     self.class.instance_variable_get('@registered_namespaces').sort.each do |name, href|
       name = nil if name == 'xmlns'
       builder.doc.root.add_namespace(name, href)

data/lib/happymapper/element.rb

@@ -34,11 +34,13 @@ module HappyMapper
 
     def handle_attributes_option(result, value, xpath_options)
       return unless options[:attributes].is_a?(Hash)
+
       result = result.first unless result.respond_to?(:attribute_nodes)
       return unless result.respond_to?(:attribute_nodes)
 
       result.attribute_nodes.each do |xml_attribute|
         next unless (attribute_options = options[:attributes][xml_attribute.name.to_sym])
+
         attribute_value = Attribute.new(xml_attribute.name.to_sym, *attribute_options).
                           from_xml_node(result, namespace, xpath_options)
 

data/lib/happymapper/supported_types.rb

@@ -110,14 +110,12 @@ module HappyMapper
       end
     end
 
-    # rubocop:disable Style/DateTime
     register_type DateTime do |value|
-      DateTime.parse(value.to_s) if value && !value.empty?
+      DateTime.parse(value.to_s, true, Date::ITALY) if value && !value.empty?
     end
-    # rubocop:enable Style/DateTime
 
     register_type Date do |value|
-      Date.parse(value.to_s) if value && !value.empty?
+      Date.parse(value.to_s, true, Date::ITALY) if value && !value.empty?
     end
 
     register_type Boolean do |value|

data/lib/happymapper/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module HappyMapper
-  VERSION = '0.8.0'
+  VERSION = '0.8.1'
 end

data/lib/nokogiri-happymapper.rb

@@ -0,0 +1,4 @@
+# frozen_string_literal: true
+
+# TODO: Deprecate requiring 'happymapper' in favor of 'nokogiri-happymapper'.
+require 'happymapper'

data/spec/features/after_parse_callbacks_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-RSpec.describe 'after_parse callbacks' do
+RSpec.describe 'after_parse callbacks', type: :feature do
   module AfterParseSpec
     class Address
       include HappyMapper
@@ -23,7 +23,10 @@ RSpec.describe 'after_parse callbacks' do
     AfterParseSpec::Address.after_parse(&cb2)
 
     object = AfterParseSpec::Address.parse fixture_file('address.xml')
-    expect(from_cb).to eq(object)
-    expect(called).to eq(true)
+
+    aggregate_failures do
+      expect(from_cb).to eq(object)
+      expect(called).to eq(true)
+    end
   end
 end

data/spec/features/attribute_default_value_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'Attribute Default Value' do
+RSpec.describe 'Attribute Default Value', type: :feature do
   context 'when given a default value' do
     class Meal
       include HappyMapper
@@ -10,12 +10,11 @@ describe 'Attribute Default Value' do
       attribute :type, String, default: 'omnivore'
     end
 
-    let(:subject) { Meal }
     let(:default_meal_type) { 'omnivore' }
 
     context 'when no value has been specified' do
       it 'returns the default value' do
-        meal = subject.parse('<meal />')
+        meal = Meal.parse('<meal />')
         expect(meal.type).to eq default_meal_type
       end
     end
@@ -24,7 +23,7 @@ describe 'Attribute Default Value' do
       let(:expected_xml) { %(<?xml version="1.0"?>\n<meal/>\n) }
 
       it 'the default value is not included' do
-        meal = subject.new
+        meal = Meal.new
         expect(meal.to_xml).to eq expected_xml
       end
     end
@@ -33,14 +32,14 @@ describe 'Attribute Default Value' do
       let(:expected_xml) { %(<?xml version="1.0"?>\n<meal type="kosher"/>\n) }
 
       it 'returns the new value' do
-        meal = subject.parse('<meal />')
+        meal = Meal.parse('<meal />')
         meal.type = 'vegan'
 
         expect(meal.type).not_to eq default_meal_type
       end
 
       it 'saves the new value to the xml' do
-        meal = subject.new
+        meal = Meal.new
         meal.type = 'kosher'
         expect(meal.to_xml).to eq expected_xml
       end

data/spec/features/attributes_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'Attribute Method Conversion' do
+RSpec.describe 'Attribute Method Conversion', type: :feature do
   module AttributeMethodConversion
     class Document
       include HappyMapper

data/spec/features/has_many_empty_array_spec.rb

@@ -21,7 +21,7 @@ module Sheep
   end
 end
 
-describe 'emptyness' do
+RSpec.describe 'empty arrays of items based on tags', type: :feature do
   let(:xml) do
     <<-XML
     <navigator>

data/spec/features/ignay_spec.rb

@@ -38,7 +38,7 @@ class CatalogNode
   has_many :nodes, CatalogNode, tag: 'Node', xpath: 'child::*'
 end
 
-describe HappyMapper do
+RSpec.describe 'parsing a VOD catalog', type: :feature do
   let(:catalog_tree) { CatalogTree.parse(fixture_file('inagy.xml'), single: true) }
 
   it 'is not nil' do
@@ -50,11 +50,15 @@ describe HappyMapper do
   end
 
   it 'has many nodes' do
-    expect(catalog_tree.nodes).not_to be_empty
-    expect(catalog_tree.nodes.length).to eq(2)
+    nodes = catalog_tree.nodes
+
+    aggregate_failures do
+      expect(nodes).not_to be_empty
+      expect(nodes.length).to eq(2)
+    end
   end
 
-  context 'first node' do
+  describe 'first node' do
     let(:first_node) { catalog_tree.nodes.first }
 
     it 'has a name' do
@@ -62,17 +66,23 @@ describe HappyMapper do
     end
 
     it 'has translations' do
-      expect(first_node.translations.length).to eq(2)
+      translations = first_node.translations
 
-      expect(first_node.translations.first.language).to eq('en-GB')
-
-      expect(first_node.translations.last.name).to eq('Parent 1 de')
+      aggregate_failures do
+        expect(translations.length).to eq(2)
+        expect(translations.first.language).to eq('en-GB')
+        expect(translations.last.name).to eq('Parent 1 de')
+      end
     end
 
     it 'has subnodes' do
-      expect(first_node.nodes).to be_kind_of(Enumerable)
-      expect(first_node.nodes).not_to be_empty
-      expect(first_node.nodes.length).to eq(1)
+      nodes = first_node.nodes
+
+      aggregate_failures do
+        expect(nodes).to be_kind_of(Enumerable)
+        expect(nodes).not_to be_empty
+        expect(nodes.length).to eq(1)
+      end
     end
 
     it 'first node - first node name' do

data/spec/features/inheritance_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'Using inheritance to share elements and attributes' do
+RSpec.describe 'Using inheritance to share elements and attributes', type: :feature do
   class Genetics
     include HappyMapper
     content :dna, String
@@ -28,7 +28,7 @@ describe 'Using inheritance to share elements and attributes' do
   end
 
   describe 'Overwrite' do
-    let(:subject) do
+    let(:overwrite) do
       xml =
         '<overwrite love="love" naivety="trusting">' \
         '<genetics>1001</genetics><immunities>Chicken Pox</immunities>' \
@@ -37,22 +37,24 @@ describe 'Using inheritance to share elements and attributes' do
     end
 
     it 'overrides the parent elements and attributes' do
-      expect(Overwrite.attributes.count).to be == Parent.attributes.count
-      expect(Overwrite.elements.count).to be == Parent.elements.count
+      aggregate_failures do
+        expect(Overwrite.attributes.count).to eq Parent.attributes.count
+        expect(Overwrite.elements.count).to eq Parent.elements.count
+      end
     end
 
     context 'when parsing xml' do
       it 'parses the new overwritten attribut' do
-        expect(subject.love).to be == 'love'
+        expect(overwrite.love).to be == 'love'
       end
 
       it 'parses the new overwritten element' do
-        expect(subject.genetics).to be == 1001
+        expect(overwrite.genetics).to be == 1001
       end
     end
 
     context 'when saving to xml' do
-      subject do
+      let(:xml) do
         overwrite = Overwrite.new
         overwrite.genetics = 1
         overwrite.love = 'love'
@@ -60,17 +62,17 @@ describe 'Using inheritance to share elements and attributes' do
       end
 
       it 'has only 1 genetics element' do
-        expect(subject.xpath('//genetics').count).to be == 1
+        expect(xml.xpath('//genetics').count).to be == 1
       end
 
       it 'has only 1 love attribute' do
-        expect(subject.xpath('@love').text).to be == 'love'
+        expect(xml.xpath('@love').text).to be == 'love'
       end
     end
   end
 
   describe 'Child', 'a subclass of the Parent' do
-    let(:subject) do
+    let(:child) do
       xml =
         '<child love="99" naivety="trusting">' \
         '<genetics>ABBA</genetics><immunities>Chicken Pox</immunities>' \
@@ -80,15 +82,17 @@ describe 'Using inheritance to share elements and attributes' do
 
     context 'when parsing xml' do
       it 'is possible to deserialize XML into a Child class instance' do
-        expect(subject.love).to eq 99
-        expect(subject.genetics.dna).to eq 'ABBA'
-        expect(subject.naivety).to eq 'trusting'
-        expect(subject.immunities.size).to eq(1)
+        aggregate_failures do
+          expect(child.love).to eq 99
+          expect(child.genetics.dna).to eq 'ABBA'
+          expect(child.naivety).to eq 'trusting'
+          expect(child.immunities.size).to eq(1)
+        end
       end
     end
 
     context 'when saving to xml' do
-      let(:subject) do
+      let(:xml) do
         child = Child.new
         child.love = 100
         child.naivety = 'Bright Eyed'
@@ -100,13 +104,17 @@ describe 'Using inheritance to share elements and attributes' do
       end
 
       it 'saves both the Child and Parent attributes' do
-        expect(subject.xpath('@naivety').text).to eq 'Bright Eyed'
-        expect(subject.xpath('@love').text).to eq '100'
+        aggregate_failures do
+          expect(xml.xpath('@naivety').text).to eq 'Bright Eyed'
+          expect(xml.xpath('@love').text).to eq '100'
+        end
       end
 
       it 'saves both the Child and Parent elements' do
-        expect(subject.xpath('genetics').text).to eq 'GATTACA'
-        expect(subject.xpath('immunities').size).to eq(3)
+        aggregate_failures do
+          expect(xml.xpath('genetics').text).to eq 'GATTACA'
+          expect(xml.xpath('immunities').size).to eq(3)
+        end
       end
     end
   end

data/spec/features/mixed_namespaces_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'A document with mixed namespaces' do
+RSpec.describe 'A document with mixed namespaces', type: :feature do
   module MixedNamespaces
     class Address
       include HappyMapper

data/spec/features/parse_with_object_to_update_spec.rb

@@ -2,8 +2,8 @@
 
 require 'spec_helper'
 
-describe 'Updating existing objects with .parse and #parse' do
-  let(:subject) { ParseInstanceSpec::Root.parse(parse_instance_initial_xml) }
+RSpec.describe 'Updating existing objects with .parse and #parse', type: :feature do
+  let(:root) { ParseInstanceSpec::Root.parse(parse_instance_initial_xml) }
 
   let(:parse_instance_initial_xml) do
     %(<root attr1="initial">
@@ -83,28 +83,34 @@ describe 'Updating existing objects with .parse and #parse' do
   end
 
   it 'initial values are correct' do
-    expect(subject.attr1).to eq('initial')
-    item_is_correctly_defined(subject.items[0])
-    item_is_correctly_defined(subject.items[1])
+    aggregate_failures do
+      expect(root.attr1).to eq('initial')
+      item_is_correctly_defined(root.items[0])
+      item_is_correctly_defined(root.items[1])
+    end
   end
 
   describe '.parse', 'specifying an existing object to update' do
     it 'all fields are correct' do
-      ParseInstanceSpec::Root.parse(parse_instance_updated_xml, update: subject)
-      expect(subject.attr1).to eq 'updated'
+      ParseInstanceSpec::Root.parse(parse_instance_updated_xml, update: root)
 
-      item_is_correctly_defined(subject.items[0], 'updated')
-      item_is_correctly_defined(subject.items[1], 'updated')
+      aggregate_failures do
+        expect(root.attr1).to eq 'updated'
+        item_is_correctly_defined(root.items[0], 'updated')
+        item_is_correctly_defined(root.items[1], 'updated')
+      end
     end
   end
 
   describe '#parse' do
     it 'all fields are correct' do
-      subject.parse(parse_instance_updated_xml)
-      expect(subject.attr1).to eq 'updated'
+      root.parse(parse_instance_updated_xml)
 
-      item_is_correctly_defined(subject.items[0], 'updated')
-      item_is_correctly_defined(subject.items[1], 'updated')
+      aggregate_failures do
+        expect(root.attr1).to eq 'updated'
+        item_is_correctly_defined(root.items[0], 'updated')
+        item_is_correctly_defined(root.items[1], 'updated')
+      end
     end
   end
 end

data/spec/features/same_tag_different_meaning_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-RSpec.describe 'parsing the same tag differently in different contexts' do
+RSpec.describe 'parsing the same tag differently in different contexts', type: :feature do
   module SameTagSpec
     class Bar
       include HappyMapper

data/spec/features/to_xml_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'Saving #to_xml' do
+RSpec.describe 'Saving #to_xml', type: :feature do
   module ToXML
     class Address
       include HappyMapper
@@ -102,7 +102,7 @@ describe 'Saving #to_xml' do
     end
   end
 
-  let(:subject) do
+  let(:xml) do
     country = ToXML::Country.new(name: 'USA', code: 'us', empty_code: nil,
                                  description: ToXML::Country::Description.new('A lovely country'))
 
@@ -123,46 +123,46 @@ describe 'Saving #to_xml' do
   it 'saves elements' do
     elements = { 'street' => 'Mockingbird Lane', 'postcode' => '98103', 'city' => 'Seattle' }
     elements.each_pair do |property, value|
-      expect(subject.xpath(property.to_s).text).to eq value
+      expect(xml.xpath(property.to_s).text).to eq value
     end
   end
 
   it 'saves attributes' do
-    expect(subject.xpath('@location').text).to eq 'Home-live'
+    expect(xml.xpath('@location').text).to eq 'Home-live'
   end
 
   it 'saves attributes that are Boolean and have a value of false' do
-    expect(subject.xpath('@occupied').text).to eq 'false'
+    expect(xml.xpath('@occupied').text).to eq 'false'
   end
 
   context "when an element has a 'read_only' parameter" do
     it 'does not save elements' do
-      expect(subject.xpath('temporary')).to be_empty
+      expect(xml.xpath('temporary')).to be_empty
     end
   end
 
   context "when an attribute has a 'read_only' parameter" do
     it 'does not save attributes' do
-      expect(subject.xpath('@modified')).to be_empty
+      expect(xml.xpath('@modified')).to be_empty
     end
   end
 
   context "when an element has a 'state_when_nil' parameter" do
     it 'saves an empty element' do
-      expect(subject.xpath('description').text).to eq ''
+      expect(xml.xpath('description').text).to eq ''
     end
   end
 
   context "when an element has a 'on_save' parameter" do
     context 'with a symbol which represents a function' do
       it 'saves the element with the result of the function' do
-        expect(subject.xpath('housenumber').text).to eq '[1313]'
+        expect(xml.xpath('housenumber').text).to eq '[1313]'
       end
     end
 
     context 'with a lambda' do
       it 'saves the result of the lambda' do
-        expect(subject.xpath('date_created').text).to eq '15:00:00 01/01/11'
+        expect(xml.xpath('date_created').text).to eq '15:00:00 01/01/11'
       end
     end
   end
@@ -170,10 +170,13 @@ describe 'Saving #to_xml' do
   context "when a has_many has a 'on_save' parameter" do
     context 'with a lambda' do
       it 'saves the results' do
-        dates_updated = subject.xpath('dates_updated')
-        expect(dates_updated.length).to eq 2
-        expect(dates_updated.first.text).to eq '16:01:00 01/01/11'
-        expect(dates_updated.last.text).to eq '11:30:01 01/02/11'
+        dates_updated = xml.xpath('dates_updated')
+
+        aggregate_failures do
+          expect(dates_updated.length).to eq 2
+          expect(dates_updated.first.text).to eq '16:01:00 01/01/11'
+          expect(dates_updated.last.text).to eq '11:30:01 01/02/11'
+        end
       end
     end
   end
@@ -181,22 +184,22 @@ describe 'Saving #to_xml' do
   context "when an attribute has a 'on_save' parameter" do
     context 'with a symbol which represents a function' do
       it 'saves the result' do
-        expect(subject.xpath('@location').text).to eq 'Home-live'
+        expect(xml.xpath('@location').text).to eq 'Home-live'
       end
     end
   end
 
   context 'when an element type is a HappyMapper subclass' do
     it 'saves attributes' do
-      expect(subject.xpath('country/@countryCode').text).to eq 'us'
+      expect(xml.xpath('country/@countryCode').text).to eq 'us'
     end
 
     it 'saves elements with a specified tag' do
-      expect(subject.xpath('country/countryName').text).to eq 'USA'
+      expect(xml.xpath('country/countryName').text).to eq 'USA'
     end
 
     it 'saves elements with content' do
-      expect(subject.xpath('country/description').text).to eq 'A lovely country'
+      expect(xml.xpath('country/description').text).to eq 'A lovely country'
     end
   end
 end