nokogiri-happymapper 0.5.9 → 0.6.0

data/spec/has_many_empty_array_spec.rb

@@ -34,10 +34,10 @@ describe "emptyness" do
   end
 
   it "returns an empty array" do
-    navigator.items_with_a_different_name.should be_empty
+    expect(navigator.items_with_a_different_name).to be_empty
   end
 
   it "returns an empty array" do
-    navigator.items.should be_empty
+    expect(navigator.items).to be_empty
   end
 end

data/spec/ignay_spec.rb

@@ -43,40 +43,40 @@ end
 describe HappyMapper do
 
   it "should not be nil" do
-    catalog_tree.should_not be_nil
+    expect(catalog_tree).not_to be_nil
   end
 
   it "should have the attribute code" do
-    catalog_tree.code.should == "NLD"
+    expect(catalog_tree.code).to eq("NLD")
   end
 
   it "should have many nodes" do
-    catalog_tree.nodes.should_not be_empty
-    catalog_tree.nodes.length.should == 2
+    expect(catalog_tree.nodes).not_to be_empty
+    expect(catalog_tree.nodes.length).to eq(2)
   end
 
   context "first node" do
 
     it "should have a name" do
-      first_node.name.should == "Parent 1"
+      expect(first_node.name).to eq("Parent 1")
     end
 
     it "should have translations" do
-      first_node.translations.length.should == 2
+      expect(first_node.translations.length).to eq(2)
 
-      first_node.translations.first.language.should == "en-GB"
+      expect(first_node.translations.first.language).to eq("en-GB")
 
-      first_node.translations.last.name.should == "Parent 1 de"
+      expect(first_node.translations.last.name).to eq("Parent 1 de")
     end
 
     it "should have subnodes" do
-      first_node.nodes.should be_kind_of(Enumerable)
-      first_node.nodes.should_not be_empty
-      first_node.nodes.length.should == 1
+      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)
     end
 
     it "first node - first node name" do
-      first_node.nodes.first.name.should == "First"
+      expect(first_node.nodes.first.name).to eq("First")
     end
 
     def first_node

data/spec/inheritance_spec.rb

@@ -76,7 +76,7 @@ describe "Using inheritance to share elements and attributes" do
         expect(subject.love).to eq 99
         expect(subject.genetics.dna).to eq "ABBA"
         expect(subject.naivety).to eq "trusting"
-        expect(subject.immunities).to have(1).item
+        expect(subject.immunities.size).to eq(1)
       end
     end
 
@@ -99,7 +99,7 @@ describe "Using inheritance to share elements and attributes" do
 
       it "saves both the Child and Parent elements" do
         expect(subject.xpath("genetics").text).to eq "GATTACA"
-        expect(subject.xpath("immunities")).to have(3).items
+        expect(subject.xpath("immunities").size).to eq(3)
       end
     end
 

data/spec/parse_with_object_to_update_spec.rb

@@ -82,7 +82,7 @@ describe "Updating existing objects with .parse and #parse" do
   end
 
   it 'initial values are correct' do
-    subject.attr1.should == 'initial'
+    expect(subject.attr1).to eq('initial')
     item_is_correctly_defined( subject.items[0] )
     item_is_correctly_defined( subject.items[1] )
   end

data/spec/to_xml_spec.rb

@@ -22,6 +22,7 @@ describe "Saving #to_xml" do
       # to_xml will default to the attr_accessor method and not the attribute,
       # allowing for that to be overwritten
       #
+      undef :housenumber
       def housenumber
         "[#{@housenumber}]"
       end
@@ -197,4 +198,4 @@ describe "Saving #to_xml" do
       expect(subject.xpath('country/description').text).to eq "A lovely country"
     end
   end
-end
+end

data/spec/to_xml_with_namespaces_spec.rb

@@ -28,6 +28,7 @@ module ToXMLWithNamespaces
     # to_xml will default to the attr_accessor method and not the attribute,
     # allowing for that to be overwritten
     #
+    undef :housenumber
     def housenumber
       "[#{@housenumber}]"
     end
@@ -178,7 +179,7 @@ describe "Saving #to_xml", "with xml namespaces" do
 
     context "when an element type is a HappyMapper subclass" do
       it "saves attributes" do
-        expect(subject.xpath('country:country/@country:countryCode').text).to eq "us"
+        expect(subject.xpath('country:country/@countryCode').text).to eq "us"
       end
 
       it "saves elements" do
@@ -190,7 +191,42 @@ describe "Saving #to_xml", "with xml namespaces" do
   context "with a default namespace" do
     it "writes the default namespace to xml without repeating xmlns" do
       recipe = ToXMLWithNamespaces::Recipe.new(:ingredients => ['One Cup Flour', 'Two Scoops of Lovin'])
-      expect(recipe.to_xml).to match /xmlns=\"urn:eventis:prodis:onlineapi:1\.0\"/
+      expect(recipe.to_xml).to match(/xmlns=\"urn:eventis:prodis:onlineapi:1\.0\"/)
     end
   end
+
+  context 'namespace supplied by element declaration trumps namespace ' \
+          'specified by element class' do
+
+    let(:expected_xml) do
+      <<-XML.gsub(/^\s*\|/, '')
+        |<?xml version="1.0"?>
+        |<coffeemachine xmlns:coffee="http://coffee.org/Coffee/0.1" xmlns:beverage="http://beverages.org/Beverage/0.1">
+        |  <beverage:beverage name="coffee"/>
+        |</coffeemachine>
+      XML
+    end
+
+    class Beverage
+      include HappyMapper
+      namespace 'coffee'
+
+      attribute :name, String
+    end
+
+    class CoffeeMachine
+      include HappyMapper
+      register_namespace 'coffee', "http://coffee.org/Coffee/0.1"
+      register_namespace 'beverage', "http://beverages.org/Beverage/0.1"
+
+      element :beverage, 'beverage', namespace: 'beverage'
+    end
+
+    it 'uses the element declaration namespace on the element' do
+      machine = CoffeeMachine.new
+      machine.beverage = Beverage.new.tap {|obj| obj.name = 'coffee'}
+      expect(machine.to_xml).to eq(expected_xml)
+    end
+  end
+
 end

data/spec/wilcard_tag_name_spec.rb

@@ -55,14 +55,14 @@ describe "Wildcard Root Tag" do
     let(:xml) { Nokogiri::XML(subject.to_xml) }
 
     it 'should map different elements to same class' do
-      subject.blargs.should_not be_nil
-      subject.jellos.should_not be_nil
+      expect(subject.blargs).not_to be_nil
+      expect(subject.jellos).not_to be_nil
     end
 
     it 'should filter on xpath appropriately' do
-      subject.blargs.should have(2).items
-      subject.jellos.should have(1).items
-      subject.subjellos.should have(1).items
+      expect(subject.blargs.size).to eq(2)
+      expect(subject.jellos.size).to eq(1)
+      expect(subject.subjellos.size).to eq(1)
     end
 
     def base_with(name,href,other)
@@ -83,14 +83,14 @@ describe "Wildcard Root Tag" do
     end
 
     it 'should #to_xml using parent element tag name' do
-      xml.xpath('/root/description').text.should == 'some description'
+      expect(xml.xpath('/root/description').text).to eq('some description')
       validate_xpath("/root/blarg[1]","blargname1","http://blarg.com","")
       validate_xpath("/root/blarg[2]","blargname2","http://blarg.com","")
       validate_xpath("/root/jello[1]","jelloname","http://jello.com","")
     end
 
     it "should properly respect child HappyMapper tags if tag isn't provided on the element defintion" do
-      xml.xpath('root/subelement').should have(1).item
+      expect(xml.xpath('root/subelement').size).to eq(1)
     end
   end
 end

data/spec/wrap_spec.rb

@@ -31,7 +31,7 @@ describe "wrap which allows you to specify a wrapper element" do
         expect(subject.name).to eq 'myname'
         expect(subject.description).to eq 'some description'
         expect(subject.subclass.myattr).to eq 'attrvalue'
-        expect(subject.subclass.items).to have(2).items
+        expect(subject.subclass.items.size).to eq(2)
         expect(subject.subclass.items[0]).to eq 'item1'
         expect(subject.subclass.items[1]).to eq 'item2'
         expect(subject.number).to eq 12345
@@ -72,7 +72,7 @@ describe "wrap which allows you to specify a wrapper element" do
       expect(xml.xpath('/root/name').text).to eq 'myname'
       expect(xml.xpath('/root/mywraptag/description').text).to eq 'some description'
       expect(xml.xpath('/root/mywraptag/subclass/@myattr').text).to eq 'attrvalue'
-      expect(xml.xpath('/root/mywraptag/subclass/item')).to have(2).items
+      expect(xml.xpath('/root/mywraptag/subclass/item').size).to eq(2)
       expect(xml.xpath('/root/mywraptag/subclass/item[1]').text).to eq 'item1'
       expect(xml.xpath('/root/mywraptag/subclass/item[2]').text).to eq 'item2'
       expect(xml.xpath('/root/number').text).to eq '12345'

data/spec/xpath_spec.rb

@@ -65,19 +65,19 @@ describe "Specifying elements and attributes with an xpath" do
   end
 
   it "should find the subitems based on the xpath" do
-    expect(subject.more_details_text).to have(2).items
+    expect(subject.more_details_text.size).to eq(2)
     expect(subject.more_details_text.first).to eq  "more 1"
     expect(subject.more_details_text.last).to eq "more 2"
   end
 
   it "should find the subitems based on the xpath" do
-    expect(subject.more_details).to have(2).items
+    expect(subject.more_details.size).to eq(2)
     expect(subject.more_details.first).to eq "this one"
     expect(subject.more_details.last).to eq "another one"
   end
 
   it "should find the subitems based on the xpath" do
-    expect(subject.more_details_alternative).to have(2).items
+    expect(subject.more_details_alternative.size).to eq(2)
     expect(subject.more_details_alternative.first).to eq "this one"
     expect(subject.more_details_alternative.last).to eq "another one"
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: nokogiri-happymapper
 version: !ruby/object:Gem::Version
-  version: 0.5.9
+  version: 0.6.0
 platform: ruby
 authors:
 - Damien Le Berrigaud
@@ -10,48 +10,53 @@ authors:
 - Roland Swingler
 - Etienne Vallette d'Osia
 - Franklin Webber
+- Matijs van Zuijlen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-18 00:00:00.000000000 Z
+date: 2017-09-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.5'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.8'
+        version: '3.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.8'
+        version: '3.0'
 description: Object to XML Mapping Library, using Nokogiri (fork from John Nunemaker's
   Happymapper)
-email: franklin.webber@gmail.com
+email: matijs@matijs.net
 executables: []
 extensions: []
 extra_rdoc_files:
 - README.md
 - CHANGELOG.md
+- License
 files:
+- CHANGELOG.md
+- License
+- README.md
 - lib/happymapper.rb
 - lib/happymapper/anonymous_mapper.rb
 - lib/happymapper/attribute.rb
@@ -60,8 +65,6 @@ files:
 - lib/happymapper/supported_types.rb
 - lib/happymapper/text_node.rb
 - lib/happymapper/version.rb
-- README.md
-- CHANGELOG.md
 - spec/attribute_default_value_spec.rb
 - spec/attributes_spec.rb
 - spec/fixtures/address.xml
@@ -90,6 +93,7 @@ files:
 - spec/fixtures/set_config_options.xml
 - spec/fixtures/statuses.xml
 - spec/fixtures/subclass_namespace.xml
+- spec/fixtures/unformatted_address.xml
 - spec/fixtures/wrapper.xml
 - spec/happymapper/attribute_spec.rb
 - spec/happymapper/element_spec.rb
@@ -108,7 +112,7 @@ files:
 - spec/wilcard_tag_name_spec.rb
 - spec/wrap_spec.rb
 - spec/xpath_spec.rb
-homepage: http://github.com/dam5s/happymapper
+homepage: http://github.com/mvz/happymapper
 licenses:
 - MIT
 metadata: {}
@@ -118,17 +122,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.1.9
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 3
 summary: Provides a simple way to map XML to Ruby Objects and back again.
@@ -161,6 +165,7 @@ test_files:
 - spec/fixtures/set_config_options.xml
 - spec/fixtures/statuses.xml
 - spec/fixtures/subclass_namespace.xml
+- spec/fixtures/unformatted_address.xml
 - spec/fixtures/wrapper.xml
 - spec/happymapper/attribute_spec.rb
 - spec/happymapper/element_spec.rb
@@ -179,4 +184,3 @@ test_files:
 - spec/wilcard_tag_name_spec.rb
 - spec/wrap_spec.rb
 - spec/xpath_spec.rb
-has_rdoc: