nokogiri-happymapper 0.6.0 → 0.7.0

data/spec/wilcard_tag_name_spec.rb

@@ -1,8 +1,9 @@
-require 'spec_helper'
+# frozen_string_literal: true
 
-describe "Wildcard Root Tag" do
+require 'spec_helper'
 
-  generic_class_xml = %{
+describe 'Wildcard Root Tag' do
+  generic_class_xml = %(
     <root>
         <description>some description</description>
         <blarg name='blargname1' href='http://blarg.com'/>
@@ -11,7 +12,7 @@ describe "Wildcard Root Tag" do
         <subelement>
           <jello name='subjelloname' href='http://ohnojello.com' other='othertext'/>
         </subelement>
-      </root>}
+      </root>)
 
   module GenericBase
     class Base
@@ -29,28 +30,31 @@ describe "Wildcard Root Tag" do
       attribute :href, String
       attribute :other, String
 
-      def <=>(compared)
-        name <=> compared.name && href <=> compared.href && other <=> compared.other
+      def <=>(other)
+        result = name <=> other.name
+        return result unless result == 0
+        result = href <=> other.href
+        return result unless result == 0
+        self.other <=> other.other
       end
     end
     class Sub
       include HappyMapper
       tag 'subelement'
-      has_one :jello, Base, :tag => 'jello'
+      has_one :jello, Base, tag: 'jello'
     end
     class Root
       include HappyMapper
       tag 'root'
       element :description, String
-      has_many :blargs, Base, :tag => 'blarg', :xpath => '.'
-      has_many :jellos, Base, :tag => 'jello', :xpath => '.'
-      has_many :subjellos, Base, :tag => 'jello', :xpath => 'subelement/.', :read_only => true
+      has_many :blargs, Base, tag: 'blarg', xpath: '.'
+      has_many :jellos, Base, tag: 'jello', xpath: '.'
+      has_many :subjellos, Base, tag: 'jello', xpath: 'subelement/.', read_only: true
       has_one :sub_element, Sub
     end
   end
 
   describe "can have generic classes using tag '*'" do
-
     let(:subject) { GenericBase::Root.parse(generic_class_xml) }
     let(:xml) { Nokogiri::XML(subject.to_xml) }
 
@@ -65,18 +69,18 @@ describe "Wildcard Root Tag" do
       expect(subject.subjellos.size).to eq(1)
     end
 
-    def base_with(name,href,other)
-      GenericBase::Base.new(:name => name,:href => href,:other => other)
+    def base_with(name, href, other)
+      GenericBase::Base.new(name: name, href: href, other: other)
     end
 
     it 'should parse correct values onto generic class' do
-      expect(subject.blargs[0]).to eq base_with('blargname1','http://blarg.com',nil)
-      expect(subject.blargs[1]).to eq base_with('blargname2','http://blarg.com',nil)
-      expect(subject.jellos[0]).to eq base_with('jelloname','http://jello.com',nil)
-      expect(subject.subjellos[0]).to eq base_with('subjelloname','http://ohnojello.com','othertext')
+      expect(subject.blargs[0]).to eq base_with('blargname1', 'http://blarg.com', nil)
+      expect(subject.blargs[1]).to eq base_with('blargname2', 'http://blarg.com', nil)
+      expect(subject.jellos[0]).to eq base_with('jelloname', 'http://jello.com', nil)
+      expect(subject.subjellos[0]).to eq base_with('subjelloname', 'http://ohnojello.com', 'othertext')
     end
 
-    def validate_xpath(xpath,name,href,other)
+    def validate_xpath(xpath, name, href, other)
       expect(xml.xpath("#{xpath}/@name").text).to eq name
       expect(xml.xpath("#{xpath}/@href").text).to eq href
       expect(xml.xpath("#{xpath}/@other").text).to eq other
@@ -84,9 +88,9 @@ describe "Wildcard Root Tag" do
 
     it 'should #to_xml using parent element tag name' do
       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","")
+      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

data/spec/wrap_spec.rb

@@ -1,13 +1,14 @@
-require 'spec_helper'
+# frozen_string_literal: true
 
-describe "wrap which allows you to specify a wrapper element" do
+require 'spec_helper'
 
+describe 'wrap which allows you to specify a wrapper element' do
   module Wrap
     class SubClass
       include HappyMapper
       tag 'subclass'
       attribute :myattr, String
-      has_many :items, String, :tag => 'item'
+      has_many :items, String, tag: 'item'
     end
     class Root
       include HappyMapper
@@ -22,8 +23,8 @@ describe "wrap which allows you to specify a wrapper element" do
     end
   end
 
-  describe ".parse" do
-    context "when given valid XML" do
+  describe '.parse' do
+    context 'when given valid XML' do
       let(:subject) { Wrap::Root.parse fixture_file('wrapper.xml') }
 
       it 'sets the values correctly' do
@@ -38,16 +39,16 @@ describe "wrap which allows you to specify a wrapper element" do
       end
     end
 
-    context "when initialized without XML" do
+    context 'when initialized without XML' do
       let(:subject) { Wrap::Root.new }
 
-      it "anonymous classes are created so nil class values does not occur" do
+      it 'anonymous classes are created so nil class values does not occur' do
         expect { subject.description = 'anything' }.to_not raise_error
       end
     end
   end
 
-  describe ".to_xml" do
+  describe '.to_xml' do
     let(:subject) do
       root = Wrap::Root.new
       root.attr1 = 'somevalue'
@@ -66,7 +67,7 @@ describe "wrap which allows you to specify a wrapper element" do
       root
     end
 
-    it "generates the correct xml" do
+    it 'generates the correct xml' do
       xml = Nokogiri::XML(subject.to_xml)
       expect(xml.xpath('/root/@attr1').text).to eq 'somevalue'
       expect(xml.xpath('/root/name').text).to eq 'myname'
@@ -77,6 +78,5 @@ describe "wrap which allows you to specify a wrapper element" do
       expect(xml.xpath('/root/mywraptag/subclass/item[2]').text).to eq 'item2'
       expect(xml.xpath('/root/number').text).to eq '12345'
     end
-
   end
-end
+end

data/spec/xpath_spec.rb

@@ -1,7 +1,8 @@
-require 'spec_helper'
+# frozen_string_literal: true
 
-describe "Specifying elements and attributes with an xpath" do
+require 'spec_helper'
 
+describe 'Specifying elements and attributes with an xpath' do
   class Item
     include HappyMapper
 
@@ -9,15 +10,15 @@ describe "Specifying elements and attributes with an xpath" do
     namespace 'amazing'
 
     element :title, String
-    attribute :link, String, :xpath => 'amazing:link/@href'
-    has_one :different_link, String, :xpath => 'different:link/@href'
-    element :detail, String, :xpath => 'amazing:subitem/amazing:detail'
-    has_many :more_details_text, String, :xpath => 'amazing:subitem/amazing:more'
-    has_many :more_details, String, :xpath => 'amazing:subitem/amazing:more/@first|amazing:subitem/amazing:more/@alternative'
-    has_many :more_details_alternative, String, :xpath => 'amazing:subitem/amazing:more/@*'
-
-    has_one :baby, 'Baby', :name => 'baby', :namespace => 'amazing'
-
+    attribute :link, String, xpath: 'amazing:link/@href'
+    has_one :different_link, String, xpath: 'different:link/@href'
+    element :detail, String, xpath: 'amazing:subitem/amazing:detail'
+    has_many :more_details_text, String, xpath: 'amazing:subitem/amazing:more'
+    has_many :more_details, String,
+             xpath: 'amazing:subitem/amazing:more/@first|amazing:subitem/amazing:more/@alternative'
+    has_many :more_details_alternative, String, xpath: 'amazing:subitem/amazing:more/@*'
+
+    has_one :baby, 'Baby', name: 'baby', namespace: 'amazing'
   end
 
   class Baby
@@ -26,12 +27,13 @@ describe "Specifying elements and attributes with an xpath" do
     has_one :name, String
   end
 
-  let(:subject) { Item.parse(xml_string,:single => true) }
+  let(:subject) { Item.parse(xml_string, single: true) }
 
   let(:xml_string) do
-    %{
+    %(
     <rss>
-      <amazing:item xmlns:amazing="http://www.amazing.com/amazing" xmlns:different="http://www.different.com/different">
+      <amazing:item xmlns:amazing="http://www.amazing.com/amazing"
+                    xmlns:different="http://www.different.com/different">
         <amazing:title>Test XML</amazing:title>
         <different:link href="different_link" />
         <amazing:link href="link_to_resources" />
@@ -45,45 +47,44 @@ describe "Specifying elements and attributes with an xpath" do
         </amazing:baby>
       </amazing:item>
     </rss>
-    }
+    )
   end
 
-  it "should have a title" do
-    expect(subject.title).to eq "Test XML"
+  it 'should have a title' do
+    expect(subject.title).to eq 'Test XML'
   end
 
-  it "should find the link href value" do
+  it 'should find the link href value' do
     expect(subject.link).to eq 'link_to_resources'
   end
 
-  it "should find the link href value" do
+  it 'should find the link href value' do
     expect(subject.different_link).to eq 'different_link'
   end
 
-  it "should find this subitem based on the xpath" do
+  it 'should find this subitem based on the xpath' do
     expect(subject.detail).to eq 'I want to parse this'
   end
 
-  it "should find the subitems based on the xpath" do
+  it 'should find the subitems based on the xpath' do
     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"
+    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
+  it 'should find the subitems based on the xpath' do
     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"
+    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
+  it 'should find the subitems based on the xpath' do
     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"
+    expect(subject.more_details_alternative.first).to eq 'this one'
+    expect(subject.more_details_alternative.last).to eq 'another one'
   end
 
-  it "should have a baby name" do
-    expect(subject.baby.name).to eq "Jumbo"
+  it 'should have a baby name' do
+    expect(subject.baby.name).to eq 'Jumbo'
   end
-
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: nokogiri-happymapper
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.7.0
 platform: ruby
 authors:
 - Damien Le Berrigaud
@@ -14,7 +14,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-09-17 00:00:00.000000000 Z
+date: 2018-08-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -30,6 +30,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.5'
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '12.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '12.0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -44,6 +58,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
+- !ruby/object:Gem::Dependency
+  name: simplecov
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.16.1
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.16.1
 description: Object to XML Mapping Library, using Nokogiri (fork from John Nunemaker's
   Happymapper)
 email: matijs@matijs.net
@@ -124,7 +152,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 1.9.3
+      version: 2.3.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -132,9 +160,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.11
+rubygems_version: 2.7.6
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Provides a simple way to map XML to Ruby Objects and back again.
 test_files:
 - spec/attribute_default_value_spec.rb