nokogiri-happymapper 0.6.0 → 0.7.0

data/spec/spec_helper.rb

@@ -1,3 +1,21 @@
+# frozen_string_literal: true
+
+require 'simplecov'
+SimpleCov.start do
+  track_files 'lib/**/*.rb'
+  add_filter '/spec/'
+  add_filter 'lib/happymapper/version.rb'
+end
+
+if ENV['CI']
+  begin
+    require 'coveralls'
+    Coveralls.wear!
+  rescue LoadError
+    nil
+  end
+end
+
 require 'rspec'
 
 require 'happymapper'

data/spec/to_xml_spec.rb

@@ -1,14 +1,15 @@
-require 'spec_helper'
+# frozen_string_literal: true
 
-describe "Saving #to_xml" do
+require 'spec_helper'
 
+describe 'Saving #to_xml' do
   module ToXML
     class Address
       include HappyMapper
 
       tag 'address'
 
-      attribute :location, String, :on_save => :when_saving_location
+      attribute :location, String, on_save: :when_saving_location
 
       element :street, String
       element :postcode, String
@@ -16,8 +17,8 @@ describe "Saving #to_xml" do
 
       element :housenumber, String
 
-      attribute :modified, Boolean, :read_only => true
-      element :temporary, Boolean, :read_only => true
+      attribute :modified, Boolean, read_only: true
+      element :temporary, Boolean, read_only: true
       #
       # to_xml will default to the attr_accessor method and not the attribute,
       # allowing for that to be overwritten
@@ -28,19 +29,18 @@ describe "Saving #to_xml" do
       end
 
       def when_saving_location(loc)
-        loc + "-live"
+        loc + '-live'
       end
 
       #
       # Write a empty element even if this is not specified
       #
-      element :description, String, :state_when_nil => true
+      element :description, String, state_when_nil: true
 
       #
       # Perform the on_save operation when saving
       #
-      has_one :date_created, Time, :on_save => lambda {|time| DateTime.parse(time).strftime("%T %D") if time }
-
+      has_one :date_created, Time, on_save: ->(time) { Time.parse(time).strftime('%T %D') if time }
 
       #
       # Execute the method with the same name
@@ -48,23 +48,23 @@ describe "Saving #to_xml" do
       #
       # Write multiple elements and call on_save when saving
       #
-      has_many :dates_updated, Time, :on_save => lambda {|times|
-        times.compact.map {|time| DateTime.parse(time).strftime("%T %D") } if times }
+      has_many :dates_updated, Time, on_save: lambda { |times|
+        times.compact.map { |time| Time.parse(time).strftime('%T %D') } if times
+      }
 
       #
       # Class composition
       #
-      element :country, 'Country', :tag => 'country'
+      element :country, 'Country', tag: 'country'
 
       attribute :occupied, Boolean
 
       def initialize(parameters)
-        parameters.each_pair do |property,value|
-          send("#{property}=",value) if respond_to?("#{property}=")
+        parameters.each_pair do |property, value|
+          send("#{property}=", value) if respond_to?("#{property}=")
         end
         @modified = @temporary = true
       end
-
     end
 
     #
@@ -75,9 +75,9 @@ describe "Saving #to_xml" do
     class Country
       include HappyMapper
 
-      attribute :code, String, :tag => 'countryCode'
-      has_one :name, String, :tag => 'countryName'
-      has_one :description, 'Description', :tag => 'description'
+      attribute :code, String, tag: 'countryCode'
+      has_one :name, String, tag: 'countryName'
+      has_one :description, 'Description', tag: 'description'
 
       #
       # This inner-class here is to demonstrate saving a text node
@@ -86,8 +86,8 @@ describe "Saving #to_xml" do
       class Description
         include HappyMapper
         content :description, String
-        attribute :category, String, :tag => 'category'
-        attribute :rating, String, :tag => 'rating', :state_when_nil => true
+        attribute :category, String, tag: 'category'
+        attribute :rating, String, tag: 'rating', state_when_nil: true
 
         def initialize(desc)
           @description = desc
@@ -95,107 +95,108 @@ describe "Saving #to_xml" do
       end
 
       def initialize(parameters)
-        parameters.each_pair do |property,value|
-          send("#{property}=",value) if respond_to?("#{property}=")
+        parameters.each_pair do |property, value|
+          send("#{property}=", value) if respond_to?("#{property}=")
         end
       end
-
     end
   end
 
   let(:subject) do
+    country = ToXML::Country.new(name: 'USA', code: 'us', empty_code: nil,
+                                 description: ToXML::Country::Description.new('A lovely country'))
+
     address = ToXML::Address.new 'street' => 'Mockingbird Lane',
-      'location' => 'Home',
-      'housenumber' => '1313',
-      'postcode' => '98103',
-      'city' => 'Seattle',
-      'country' => ToXML::Country.new(:name => 'USA', :code => 'us', :empty_code => nil,
-        :description => ToXML::Country::Description.new("A lovely country") ),
-      'date_created' => '2011-01-01 15:00:00',
-      'occupied' => false
+                                 'location' => 'Home',
+                                 'housenumber' => '1313',
+                                 'postcode' => '98103',
+                                 'city' => 'Seattle',
+                                 'country' => country,
+                                 'date_created' => '2011-01-01 15:00:00',
+                                 'occupied' => false
 
-    address.dates_updated = ["2011-01-01 16:01:00","2011-01-02 11:30:01"]
+    address.dates_updated = ['2011-01-01 16:01:00', '2011-01-02 11:30:01']
 
     Nokogiri::XML(address.to_xml).root
   end
 
-  it "saves elements" do
+  it 'saves elements' do
     elements = { 'street' => 'Mockingbird Lane', 'postcode' => '98103', 'city' => 'Seattle' }
-    elements.each_pair do |property,value|
-      expect(subject.xpath("#{property}").text).to eq value
+    elements.each_pair do |property, value|
+      expect(subject.xpath(property.to_s).text).to eq value
     end
   end
 
-  it "saves attributes" do
-    expect(subject.xpath('@location').text).to eq "Home-live"
+  it 'saves attributes' do
+    expect(subject.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(subject.xpath('@occupied').text).to eq 'false'
   end
 
   context "when an element has a 'read_only' parameter" do
-    it "does not save elements" do
+    it 'does not save elements' do
       expect(subject.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
+    it 'does not save attributes' do
+      expect(subject.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 ""
+    it 'saves an empty element' do
+      expect(subject.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]"
+    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]'
       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"
+    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'
       end
     end
   end
 
   context "when a has_many has a 'on_save' parameter" do
-    context "with a lambda" do
-      it "saves the results" 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"
+        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
 
   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"
+    context 'with a symbol which represents a function' do
+      it 'saves the result' do
+        expect(subject.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"
+  context 'when an element type is a HappyMapper subclass' do
+    it 'saves attributes' do
+      expect(subject.xpath('country/@countryCode').text).to eq 'us'
     end
 
-    it "saves elements" do
-      expect(subject.xpath('country/countryName').text).to eq "USA"
+    it 'saves elements' do
+      expect(subject.xpath('country/countryName').text).to eq 'USA'
     end
 
-    it "saves elements" do
-      expect(subject.xpath('country/description').text).to eq "A lovely country"
+    it 'saves elements' do
+      expect(subject.xpath('country/description').text).to eq 'A lovely country'
     end
   end
 end

data/spec/to_xml_with_namespaces_spec.rb

@@ -1,7 +1,8 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 module ToXMLWithNamespaces
-
   #
   # Similar example as the to_xml but this time with namespacing
   #
@@ -14,9 +15,9 @@ module ToXMLWithNamespaces
     tag 'Address'
     namespace 'address'
 
-    element :country, 'Country', :tag => 'country', :namespace => 'country'
+    element :country, 'Country', tag: 'country', namespace: 'country'
 
-    attribute :location, String, :on_save => :when_saving_location
+    attribute :location, String, on_save: :when_saving_location
 
     element :street, String
     element :postcode, String
@@ -40,29 +41,29 @@ module ToXMLWithNamespaces
     #
     # Write a empty element even if this is not specified
     #
-    element :description, String, :state_when_nil => true
+    element :description, String, state_when_nil: true
 
     #
     # Perform the on_save operation when saving
     #
-    has_one :date_created, Time, :on_save => lambda {|time| DateTime.parse(time).strftime("%T %D") if time }
+    has_one :date_created, Time, on_save: ->(time) { Time.parse(time).strftime('%T %D') if time }
 
     #
     # Write multiple elements and call on_save when saving
     #
-    has_many :dates_updated, Time, :on_save => lambda {|times|
-      times.compact.map {|time| DateTime.parse(time).strftime("%T %D") } if times }
+    has_many :dates_updated, Time, on_save: lambda { |times|
+      times.compact.map { |time| Time.parse(time).strftime('%T %D') } if times
+    }
 
     #
     # Class composition
     #
 
     def initialize(parameters)
-      parameters.each_pair do |property,value|
-        send("#{property}=",value) if respond_to?("#{property}=")
+      parameters.each_pair do |property, value|
+        send("#{property}=", value) if respond_to?("#{property}=")
       end
     end
-
   end
 
   #
@@ -75,122 +76,124 @@ module ToXMLWithNamespaces
 
     register_namespace 'countryName', 'http://www.company.com/countryName'
 
-    attribute :code, String, :tag => 'countryCode'
-    has_one :name, String, :tag => 'countryName', :namespace => 'countryName'
+    attribute :code, String, tag: 'countryCode'
+    has_one :name, String, tag: 'countryName', namespace: 'countryName'
 
     def initialize(parameters)
-      parameters.each_pair do |property,value|
-        send("#{property}=",value) if respond_to?("#{property}=")
+      parameters.each_pair do |property, value|
+        send("#{property}=", value) if respond_to?("#{property}=")
       end
     end
-
   end
 
-
   #
   # This class is an example of a class that has a default namespace
-  #xmlns="urn:eventis:prodis:onlineapi:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+  # xmlns="urn:eventis:prodis:onlineapi:1.0"
+  # xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  # xmlns:xsd="http://www.w3.org/2001/XMLSchema"
   #
   class Recipe
     include HappyMapper
 
     # this is the default namespace of the document
     register_namespace 'xmlns', 'urn:eventis:prodis:onlineapi:1.0'
-    register_namespace 'xsi', "http://www.w3.org/2001/XMLSchema-instance"
-    register_namespace 'xsd', "http://www.w3.org/2001/XMLSchema"
+    register_namespace 'xsi', 'http://www.w3.org/2001/XMLSchema-instance'
+    register_namespace 'xsd', 'http://www.w3.org/2001/XMLSchema'
 
     has_many :ingredients, String
 
     def initialize(parameters)
-      parameters.each_pair {|property,value| send("#{property}=",value) if respond_to?("#{property}=") }
+      parameters.each_pair { |property, value| send("#{property}=", value) if respond_to?("#{property}=") }
     end
   end
 end
 
-describe "Saving #to_xml", "with xml namespaces" do
-
-  context "#to_xml", "with namespaces" do
-
+describe 'Saving #to_xml', 'with xml namespaces' do
+  context '#to_xml', 'with namespaces' do
     let(:subject) do
+      country = ToXMLWithNamespaces::Country.new(name: 'USA', code: 'us')
       address = ToXMLWithNamespaces::Address.new('street' => 'Mockingbird Lane',
-      'location' => 'Home',
-      'housenumber' => '1313',
-      'postcode' => '98103',
-      'city' => 'Seattle',
-      'country' => ToXMLWithNamespaces::Country.new(:name => 'USA', :code => 'us'),
-      'date_created' => '2011-01-01 15:00:00')
-
+                                                 'location' => 'Home',
+                                                 'housenumber' => '1313',
+                                                 'postcode' => '98103',
+                                                 'city' => 'Seattle',
+                                                 'country' => country,
+                                                 'date_created' => '2011-01-01 15:00:00')
 
-      address.dates_updated = ["2011-01-01 16:01:00","2011-01-02 11:30:01"]
+      address.dates_updated = ['2011-01-01 16:01:00', '2011-01-02 11:30:01']
 
       Nokogiri::XML(address.to_xml).root
     end
 
-    it "saves elements" do
+    it 'sets the namespace specified in the class' do
+      expect(subject.xpath('/').children.first.namespace.prefix).to eq 'address'
+    end
+
+    it 'saves elements' do
       elements = { 'street' => 'Mockingbird Lane', 'postcode' => '98103', 'city' => 'Seattle' }
 
-      elements.each_pair do |property,value|
+      elements.each_pair do |property, value|
         expect(subject.xpath("address:#{property}").text).to eq value
       end
     end
 
-    it "saves attributes" do
-      expect(subject.xpath('@location').text).to eq "Home-live"
+    it 'saves attributes' do
+      expect(subject.xpath('@location').text).to eq 'Home-live'
     end
 
     context "when an element has a 'state_when_nil' parameter" do
-      it "saves an empty element" do
-        expect(subject.xpath('address:description').text).to eq ""
+      it 'saves an empty element' do
+        expect(subject.xpath('address: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 a function call and not the value of the instance variable" do
-          expect(subject.xpath("address:housenumber").text).to eq "[1313]"
+      context 'with a symbol which represents a function' do
+        it 'saves the element with the result of a function call and not the value of the ivar' do
+          expect(subject.xpath('address:housenumber').text).to eq '[1313]'
         end
       end
 
-      context "with a lambda" do
-        it "saves the results" do
-          expect(subject.xpath('address:date_created').text).to eq "15:00:00 01/01/11"
+      context 'with a lambda' do
+        it 'saves the results' do
+          expect(subject.xpath('address:date_created').text).to eq '15:00:00 01/01/11'
         end
       end
     end
 
     context "when an attribute has a 'on_save' parameter" do
-      context "with a lambda" do
-        it "saves the result" do
-          expect(subject.xpath('@location').text).to eq "Home-live"
+      context 'with a lambda' do
+        it 'saves the result' do
+          expect(subject.xpath('@location').text).to eq 'Home-live'
         end
       end
     end
 
     context "when a has_many has a 'on_save' parameter" do
-      context "with a lambda" do
-        it "saves the result" do
+      context 'with a lambda' do
+        it 'saves the result' do
           dates_updated = subject.xpath('address: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"
+          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
 
-    context "when an element type is a HappyMapper subclass" do
-      it "saves attributes" do
-        expect(subject.xpath('country:country/@countryCode').text).to eq "us"
+    context 'when an element type is a HappyMapper subclass' do
+      it 'saves attributes' do
+        expect(subject.xpath('country:country/@countryCode').text).to eq 'us'
       end
 
-      it "saves elements" do
-        expect(subject.xpath('country:country/countryName:countryName').text).to eq "USA"
+      it 'saves elements' do
+        expect(subject.xpath('country:country/countryName:countryName').text).to eq 'USA'
       end
     end
   end
 
-  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'])
+  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\"/)
     end
   end
@@ -201,7 +204,7 @@ describe "Saving #to_xml", "with xml namespaces" 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">
+        |<coffeemachine xmlns:beverage="http://beverages.org/Beverage/0.1" xmlns:coffee="http://coffee.org/Coffee/0.1">
         |  <beverage:beverage name="coffee"/>
         |</coffeemachine>
       XML
@@ -216,17 +219,16 @@ describe "Saving #to_xml", "with xml namespaces" do
 
     class CoffeeMachine
       include HappyMapper
-      register_namespace 'coffee', "http://coffee.org/Coffee/0.1"
-      register_namespace 'beverage', "http://beverages.org/Beverage/0.1"
+      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'}
+      machine.beverage = Beverage.new.tap { |obj| obj.name = 'coffee' }
       expect(machine.to_xml).to eq(expected_xml)
     end
   end
-
 end