om 1.8.0 → 1.8.1

data/spec/unit/validation_spec.rb

@@ -1,7 +1,7 @@
 require 'spec_helper'
 
 describe "OM::XML::Validation" do
-  
+
   before(:all) do
     class ValidationTest
       include OM::XML::Container
@@ -9,38 +9,38 @@ describe "OM::XML::Validation" do
       self.schema_url = "http://www.loc.gov/standards/mods/v3/mods-3-2.xsd"
     end
   end
-  
+
   before(:each) do
     @sample = ValidationTest.from_xml("<foo><bar>1</bar></foo>")
   end
-  
-  ## Validation Support 
+
+  ## Validation Support
   # Some of these tests fail when you don't have an internet connection because the mods schema includes other xsd schemas by URL reference.
 
   describe '#schema_url' do
     it "should allow you to set the schema url" do
-      ValidationTest.schema_url.should == "http://www.loc.gov/standards/mods/v3/mods-3-2.xsd"
+      expect(ValidationTest.schema_url).to eq("http://www.loc.gov/standards/mods/v3/mods-3-2.xsd")
     end
   end
-  
+
   describe "#schema" do
     it "should return an instance of Nokogiri::XML::Schema loaded from the schema url -- fails if no internet connection" do
-      pending "no internet connection"
-      ValidationTest.schema.should be_kind_of Nokogiri::XML::Schema
+      skip "no internet connection"
+      expect(ValidationTest.schema).to be_kind_of Nokogiri::XML::Schema
     end
   end
 
   describe "#validate" do
     it "should validate the provided document against the schema provided in class definition  -- fails if no internet connection" do
-      pending "no internet connection"
-      ValidationTest.schema.expects(:validate).with(@sample).returns([])
+      skip "no internet connection"
+      expect(ValidationTest.schema).to receive(:validate).with(@sample).and_return([])
       ValidationTest.validate(@sample)
     end
   end
 
   describe ".validate" do
     it "should rely on class validate method" do
-      ValidationTest.expects(:validate).with(@sample)
+      expect(ValidationTest).to receive(:validate).with(@sample)
       @sample.validate
     end
   end
@@ -49,32 +49,32 @@ describe "OM::XML::Validation" do
     before(:all) do
       ValidationTest.schema_file = nil
     end
-  
+
     after(:all) do
       ValidationTest.schema_file = fixture("mods-3-2.xsd")
     end
-  
+
     it "should lazy load the schema file from the @schema_url" do
-      ValidationTest.instance_variable_get(:@schema_file).should be_nil
-      ValidationTest.expects(:file_from_url).with(ValidationTest.schema_url).returns("fake file").once
+      expect(ValidationTest.instance_variable_get(:@schema_file)).to be_nil
+      expect(ValidationTest).to receive(:file_from_url).with(ValidationTest.schema_url).and_return("fake file").once
       ValidationTest.schema_file
-      ValidationTest.instance_variable_get(:@schema_file).should == "fake file"
-      ValidationTest.schema_file.should == "fake file"
+      expect(ValidationTest.instance_variable_get(:@schema_file)).to eq("fake file")
+      expect(ValidationTest.schema_file).to eq("fake file")
     end
   end
 
   describe "#file_from_url" do
     it "should retrieve a file from the provided url over HTTP" do
-      ValidationTest.expects(:open).with("http://google.com")
+      expect(ValidationTest).to receive(:open).with("http://google.com")
       ValidationTest.send(:file_from_url, "http://google.com")
     end
     it "should raise an error if the url is invalid" do
-      lambda {ValidationTest.send(:file_from_url, "")}.should raise_error(RuntimeError, "Could not retrieve file from . Error: No such file or directory - ")
-      lambda {ValidationTest.send(:file_from_url, "foo")}.should raise_error(RuntimeError, "Could not retrieve file from foo. Error: No such file or directory - foo")
+      expect {ValidationTest.send(:file_from_url, "")}.to raise_error(RuntimeError, "Could not retrieve file from . Error: No such file or directory - ")
+      expect {ValidationTest.send(:file_from_url, "foo")}.to raise_error(RuntimeError, "Could not retrieve file from foo. Error: No such file or directory - foo")
     end
     it "should raise an error if file retrieval fails" do
-      pending "no internet connection"
-      lambda {ValidationTest.send(:file_from_url, "http://fedora-commons.org/nonexistent_file")}.should raise_error(RuntimeError, "Could not retrieve file from http://fedora-commons.org/nonexistent_file. Error: 404 Not Found")  
+      skip "no internet connection"
+      expect {ValidationTest.send(:file_from_url, "http://fedora-commons.org/nonexistent_file")}.to raise_error(RuntimeError, "Could not retrieve file from http://fedora-commons.org/nonexistent_file. Error: 404 Not Found")
     end
   end
 end

data/spec/unit/xml_serialization_spec.rb

@@ -7,14 +7,13 @@ describe "OM::XML::Terminology.to_xml" do
   it "should put terminology details into the xml" do
     expected_xml = "<namespaces>\n  <namespace>\n    <name>oxns</name>\n    <identifier>http://www.loc.gov/mods/v3</identifier>\n  </namespace>\n  <namespace>\n    <name>xmlns:foo</name>\n    <identifier>http://my.custom.namespace</identifier>\n  </namespace>\n  <namespace>\n    <name>xmlns</name>\n    <identifier>http://www.loc.gov/mods/v3</identifier>\n  </namespace>\n</namespaces>"
     xml = @terminology.to_xml
-    xml.xpath("/terminology/schema").to_xml.should == "<schema>http://www.loc.gov/standards/mods/v3/mods-3-2.xsd</schema>"    
-    xml.xpath("/terminology/namespaces").to_xml.should be_equivalent_to expected_xml
+    expect(xml.xpath("/terminology/schema").to_xml).to eq("<schema>http://www.loc.gov/standards/mods/v3/mods-3-2.xsd</schema>")
+    expect(xml.xpath("/terminology/namespaces").to_xml).to be_equivalent_to expected_xml
   end
   it "should call .to_xml on all of the terms" do
-    options = {}
     doc = Nokogiri::XML::Document.new
-    @terminology.terms.values.each {|term| term.expects(:to_xml) }
-    @terminology.to_xml(options,doc)
+    @terminology.terms.values.each {|term| expect(term).to receive(:to_xml) }
+    @terminology.to_xml({}, doc)
   end
 end
 
@@ -27,33 +26,33 @@ describe "OM::XML::Term.to_xml" do
   end
   it "should return an xml representation of the Term" do
     xml = @person_first_name.to_xml
-    xml.xpath("/term").first.attributes["name"].value.should == "first_name"
-    xml.xpath("/term/attributes/type").first.text.should == "given"
-    xml.xpath("/term/path").first.text.should == "namePart"
-    xml.xpath("/term/namespace_prefix").first.text.should == "oxns"
-    xml.xpath("/term/children/*").should be_empty
-    xml.xpath("/term/xpath/relative").first.text.should == "oxns:namePart[@type=\"given\"]"
-    xml.xpath("/term/xpath/absolute").first.text.should == "//oxns:name[@type=\"personal\"]/oxns:namePart[@type=\"given\"]"
-    xml.xpath("/term/xpath/constrained").first.text.should == "//oxns:name[@type=\\\"personal\\\"]/oxns:namePart[@type=\\\"given\\\" and contains(., \\\"\#{constraint_value}\\\")]"
-    xml.xpath("/term/index_as").first.text.should == ""
-    xml.xpath("/term/required").first.text.should == "false"
-    xml.xpath("/term/data_type").first.text.should == "string"
+    expect(xml.xpath("/term").first.attributes["name"].value).to eq("first_name")
+    expect(xml.xpath("/term/attributes/type").first.text).to eq("given")
+    expect(xml.xpath("/term/path").first.text).to eq("namePart")
+    expect(xml.xpath("/term/namespace_prefix").first.text).to eq("oxns")
+    expect(xml.xpath("/term/children/*")).to be_empty
+    expect(xml.xpath("/term/xpath/relative").first.text).to eq("oxns:namePart[@type=\"given\"]")
+    expect(xml.xpath("/term/xpath/absolute").first.text).to eq("//oxns:name[@type=\"personal\"]/oxns:namePart[@type=\"given\"]")
+    expect(xml.xpath("/term/xpath/constrained").first.text).to eq("//oxns:name[@type=\\\"personal\\\"]/oxns:namePart[@type=\\\"given\\\" and contains(., \\\"\#{constraint_value}\\\")]")
+    expect(xml.xpath("/term/index_as").first.text).to eq("")
+    expect(xml.xpath("/term/required").first.text).to eq("false")
+    expect(xml.xpath("/term/data_type").first.text).to eq("string")
   end
   it "should capture root term info" do
     xml = @terminology.root_terms.first.to_xml
-    xml.xpath("/term/is_root_term").text.should == "true"
-    @person_first_name.to_xml.xpath("/term/is_root_term").should be_empty
+    expect(xml.xpath("/term/is_root_term").text).to eq("true")
+    expect(@person_first_name.to_xml.xpath("/term/is_root_term")).to be_empty
   end
   it "should allow you to pass in a document to add the term to" do
     doc = Nokogiri::XML::Document.new
-    @person_first_name.to_xml({}, doc).should == doc
+    expect(@person_first_name.to_xml({}, doc)).to eq(doc)
   end
   it "should include children" do
     children = @person.to_xml.xpath("//term[@name=\"person\"]/children/*")
-    children.length.should == 12
-    children.each {|child| child.name.should == "term"}
+    expect(children.length).to eq(12)
+    children.each {|child| expect(child.name).to eq("term")}
   end
   it "should skip children if :children=>false" do
-    @person.to_xml(:children=>false).xpath("children").should be_empty
+    expect(@person.to_xml(:children=>false).xpath("children")).to be_empty
   end
 end

data/spec/unit/xml_spec.rb

@@ -1,22 +1,22 @@
 require 'spec_helper'
 
 describe "OM::XML::Container" do
-  
+
   before(:all) do
     class XMLTest
       include OM::XML
     end
   end
-  
+
   it "should automatically include the other modules" do
-    XMLTest.included_modules.should include(OM::XML::Container)
-    XMLTest.included_modules.should include(OM::XML::Validation)
+    expect(XMLTest.included_modules).to include(OM::XML::Container)
+    expect(XMLTest.included_modules).to include(OM::XML::Validation)
   end
-  
+
   describe "#sanitize_pointer" do
     it "should convert any nested arrays into hashes" do
-      XMLTest.sanitize_pointer( [[:person,1],:role] ).should == [{:person=>1},:role]
+      expect(XMLTest.sanitize_pointer( [[:person,1],:role] )).to eq([{:person=>1},:role])
     end
   end
-  
+
 end

metadata

@@ -1,175 +1,174 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: om
-version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-  - 1
-  - 8
-  - 0
-  version: 1.8.0
+version: !ruby/object:Gem::Version
+  version: 1.8.1
 platform: ruby
-authors: 
+authors:
 - Matt Zumwalt
 - Justin Coyne
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2012-11-30 00:00:00 -06:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2015-10-17 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: activesupport
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
-    requirements: 
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
     - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        version: "0"
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: activemodel
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
-    requirements: 
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: activemodel
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
     - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        version: "0"
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: nokogiri
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
-    requirements: 
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: nokogiri
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
     - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 1
-        - 4
-        - 2
+      - !ruby/object:Gem::Version
         version: 1.4.2
   type: :runtime
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: mediashelf-loggable
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
-    requirements: 
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.4.2
+- !ruby/object:Gem::Dependency
+  name: mediashelf-loggable
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
     - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        version: "0"
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  name: deprecation
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
-    requirements: 
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: deprecation
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
     - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        version: "0"
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id005
-- !ruby/object:Gem::Dependency 
-  name: rspec
   prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 2
-        - 0
-        version: "2.0"
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.99'
   type: :development
-  version_requirements: *id006
-- !ruby/object:Gem::Dependency 
-  name: rake
   prerelease: false
-  requirement: &id007 !ruby/object:Gem::Requirement 
-    requirements: 
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.99'
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
     - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        version: "0"
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id007
-- !ruby/object:Gem::Dependency 
-  name: rdoc
   prerelease: false
-  requirement: &id008 !ruby/object:Gem::Requirement 
-    requirements: 
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rdoc
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
     - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        version: "0"
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id008
-- !ruby/object:Gem::Dependency 
-  name: awesome_print
   prerelease: false
-  requirement: &id009 !ruby/object:Gem::Requirement 
-    requirements: 
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
     - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        version: "0"
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: awesome_print
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id009
-- !ruby/object:Gem::Dependency 
-  name: mocha
   prerelease: false
-  requirement: &id010 !ruby/object:Gem::Requirement 
-    requirements: 
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
     - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        - 9
-        - 8
-        version: 0.9.8
-  type: :development
-  version_requirements: *id010
-- !ruby/object:Gem::Dependency 
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
   name: equivalent-xml
-  prerelease: false
-  requirement: &id011 !ruby/object:Gem::Requirement 
-    requirements: 
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
     - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        - 2
-        - 4
+      - !ruby/object:Gem::Version
         version: 0.2.4
   type: :development
-  version_requirements: *id011
-description: "OM (Opinionated Metadata): A library to help you tame sprawling XML schemas like MODS.  Wraps Nokogiri documents in objects with miscellaneous helper methods for doing things like retrieve generated xpath queries or look up properties based on a simplified DSL"
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.2.4
+description: 'OM (Opinionated Metadata): A library to help you tame sprawling XML
+  schemas like MODS.  Wraps Nokogiri documents in objects with miscellaneous helper
+  methods for doing things like retrieve generated xpath queries or look up properties
+  based on a simplified DSL'
 email: matt.zumwalt@yourmediashelf.com justin.coyne@mediashelf.com
 executables: []
-
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - LICENSE
 - README.rdoc
 - README.textile
-files: 
-- .document
-- .gitignore
+files:
+- ".document"
+- ".gitignore"
+- ".rspec"
+- ".rubocop.yml"
+- ".rubocop_todo.yml"
+- ".travis.yml"
 - COMMON_OM_PATTERNS.textile
 - GETTING_FANCY.textile
 - GETTING_STARTED.textile
@@ -183,6 +182,8 @@ files:
 - UPDATING_DOCUMENTS.textile
 - container_spec.rb
 - devel/notes.txt
+- gemfiles/gemfile.rails3
+- gemfiles/gemfile.rails4
 - lib/om.rb
 - lib/om/samples.rb
 - lib/om/samples/mods_article.rb
@@ -237,37 +238,31 @@ files:
 - spec/unit/validation_spec.rb
 - spec/unit/xml_serialization_spec.rb
 - spec/unit/xml_spec.rb
-has_rdoc: true
 homepage: http://github.com/projecthydra/om
 licenses: []
-
+metadata: {}
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
-  requirements: 
+required_ruby_version: !ruby/object:Gem::Requirement
+  requirements:
   - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
-  requirements: 
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements:
   - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
-      - 0
-      version: "0"
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.3.6
+rubygems_version: 2.4.8
 signing_key: 
-specification_version: 3
-summary: "OM (Opinionated Metadata): A library to help you tame sprawling XML schemas like MODS."
-test_files: 
+specification_version: 4
+summary: 'OM (Opinionated Metadata): A library to help you tame sprawling XML schemas
+  like MODS.'
+test_files:
 - spec/fixtures/CBF_MODS/ARS0025_016.xml
 - spec/fixtures/RUBRIC_mods_article_template.xml
 - spec/fixtures/mods-3-2.xsd
@@ -302,3 +297,4 @@ test_files:
 - spec/unit/validation_spec.rb
 - spec/unit/xml_serialization_spec.rb
 - spec/unit/xml_spec.rb
+has_rdoc: