harvestdor 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 679a83bf98701735495c479c2fc24c5d827c2dbb
-  data.tar.gz: 8abf3ca28f23a3c34c0db09963064302d982ab54
+  metadata.gz: 512b556fbe2a3547829f7ea157be1e984d302294
+  data.tar.gz: b6512cb57d70adea02eef25519ff0d3265253305
 SHA512:
-  metadata.gz: 500eeb2f7a6be780a92960c88a64f16823343437b368660de0f333efe5bf881f10cc2903b728467c44e84f65a5c2eda79b3328ac992f1e629083a338909eba2e
-  data.tar.gz: 79390d091eef937350a1547d5c5f79d8e0abffa55a183225e556af779f4ccab05ab9ae388d9a2cbeaff225a3cf80b99ec2bda3bffbab756f918a23526a3dec92
+  metadata.gz: 27c95f0765aa2c5a44729b5620e59fc942e490096da2d64a066e4bf3ab4babfa9c52d508b8736fcf15d268e3c917a0269ed42cdf189f4add3f933bc17617564e
+  data.tar.gz: 7094c91f20e889b729f1c507629fae1875e8f6125a4562bd1163accadd7fe42ceb2162aadc3a055fd3af3f08708bdc9efd6772f9d8b4a9b0c647019357746dff

data/.travis.yml

@@ -2,13 +2,8 @@ language: ruby
 script: rake rspec
 sudo: false
 rvm:
-  - 2.2.2
-  - 2.1.1
-  - 2.0.0
-  - 1.9.3
-  - jruby-19mode # JRuby in 1.9 mode
+  - 2.3.1
 notifications:
   email:
-    - ndushay@stanford.edu
     - laneymcg@stanford.edu
     - cbeer@stanford.edu

data/harvestdor.gemspec

@@ -19,6 +19,7 @@ Gem::Specification.new do |gem|
 
   gem.add_dependency 'confstruct'
   gem.add_dependency 'nokogiri'
+  gem.add_dependency 'faraday'
 
   # Development dependencies
   gem.add_development_dependency "rake"

data/lib/harvestdor/purl_xml.rb

@@ -13,8 +13,8 @@ module Harvestdor
   # @return [Nokogiri::XML::Document] the MODS for the fedora object
   def self.mods druid, purl_url = Harvestdor::PURL_DEFAULT
     begin
-      Nokogiri::XML(open("#{purl_url}/#{druid}.mods"),nil,'UTF-8')
-    rescue OpenURI::HTTPError
+      Nokogiri::XML(http_client.get("#{purl_url}/#{druid}.mods").body,nil,'UTF-8')
+    rescue Faraday::Error::ClientError
       raise Harvestdor::Errors::MissingMods.new(druid)
     end
   end
@@ -26,10 +26,10 @@ module Harvestdor
   def self.public_xml druid, purl_url = Harvestdor::PURL_DEFAULT
     return druid if druid.instance_of?(Nokogiri::XML::Document)
     begin
-      ng_doc = Nokogiri::XML(open("#{purl_url}/#{druid}.xml"))
+      ng_doc = Nokogiri::XML(http_client.get("#{purl_url}/#{druid}.xml").body)
       raise Harvestdor::Errors::MissingPublicXml.new(druid) if !ng_doc || ng_doc.children.empty?
       ng_doc
-    rescue OpenURI::HTTPError
+    rescue Faraday::Error::ClientError
       raise Harvestdor::Errors::MissingPurlPage.new(druid)
     end
   end
@@ -137,5 +137,18 @@ module Harvestdor
     end
     pub_xml_ng_doc
   end
+  
+  def self.http_client
+    @http_client ||= Faraday.new do |conn|
+      conn.adapter Faraday.default_adapter
+      conn.use Faraday::Response::RaiseError
+      conn.request :retry, max: 5,
+                           interval: 0.05,
+                           interval_randomness: 0.5,
+                           backoff_factor: 2,
+                           exceptions: ['Errno::ECONNRESET', 'Errno::ETIMEDOUT', 'Timeout::Error', 'Faraday::Error::TimeoutError', 'Faraday::Error::ConnectionFailed']
+    end
+  end
+  private_class_method :http_client
 
 end # module Harvestdor

data/lib/harvestdor/version.rb

@@ -1,3 +1,3 @@
 module Harvestdor
-  VERSION = "0.2.0"
+  VERSION = "0.3.0"
 end

data/lib/harvestdor.rb

@@ -6,7 +6,7 @@ require 'harvestdor/client'
 require 'confstruct'
 # stdlib
 require 'logger'
-require 'open-uri'
+require 'faraday'
 require 'yaml'
 
 module Harvestdor

data/spec/purl_xml_spec.rb

@@ -40,7 +40,7 @@ describe Harvestdor::Client do
       end
     end
     it "raises Harvestdor::Errors::MissingPublicXML if purl page returns nil document" do
-      expect_any_instance_of(URI::HTTP).to receive(:open).and_return(nil)
+      expect(Harvestdor.send(:http_client)).to receive(:get).and_return(double(body: nil))
       expect { Harvestdor.public_xml(@fake_druid, @purl) }.to raise_error(Harvestdor::Errors::MissingPublicXml)
     end
   end
@@ -89,7 +89,7 @@ describe Harvestdor::Client do
       end
     end
     it "returns a Nokogiri::XML::Document from passed Nokogiri::XML::Document and does no fetch" do
-      expect_any_instance_of(URI::HTTP).not_to receive(:open)
+      expect(Harvestdor.send(:http_client)).not_to receive(:get)
       im = Harvestdor.identity_metadata(@ng_pub_xml)
       expect(im).to be_kind_of(Nokogiri::XML::Document)
       expect(im.root.name).to eql('identityMetadata')
@@ -110,7 +110,7 @@ describe Harvestdor::Client do
       end
     end
     it "returns a Nokogiri::XML::Document from passed Nokogiri::XML::Document and does no fetch" do
-      expect_any_instance_of(URI::HTTP).not_to receive(:open)
+      expect(Harvestdor.send(:http_client)).not_to receive(:get)
       rm = Harvestdor.rights_metadata(@ng_pub_xml)
       expect(rm).to be_kind_of(Nokogiri::XML::Document)
       expect(rm.root.name).to eql('rightsMetadata')
@@ -131,7 +131,7 @@ describe Harvestdor::Client do
       end
     end
     it "returns a Nokogiri::XML::Document from passed Nokogiri::XML::Document and does no fetch" do
-      expect_any_instance_of(URI::HTTP).not_to receive(:open)
+      expect(Harvestdor.send(:http_client)).not_to receive(:get)
       rdf = Harvestdor.rdf(@ng_pub_xml)
       expect(rdf).to be_kind_of(Nokogiri::XML::Document)
       expect(rdf.root.name).to eql('RDF')
@@ -153,7 +153,7 @@ describe Harvestdor::Client do
       end
     end
     it "returns a Nokogiri::XML::Document from passed Nokogiri::XML::Document and does no fetch" do
-      expect_any_instance_of(URI::HTTP).not_to receive(:open)
+      expect(Harvestdor.send(:http_client)).not_to receive(:get)
       dc = Harvestdor.dc(@ng_pub_xml)
       expect(dc).to be_kind_of(Nokogiri::XML::Document)
       expect(dc.root.name).to eql('dc')
@@ -199,7 +199,7 @@ describe Harvestdor::Client do
       @client.mods(@druid)
     end
     it "methods for parts of public_xml should work with Nokogiri::XML::Document arg (and not fetch)" do
-      expect_any_instance_of(URI::HTTP).not_to receive(:open)
+      expect(Harvestdor.send(:http_client)).not_to receive(:get)
       expect(@client.content_metadata(@ng_pub_xml)).to be_kind_of(Nokogiri::XML::Document)
       expect(@client.identity_metadata(@ng_pub_xml)).to be_kind_of(Nokogiri::XML::Document)
       expect(@client.rights_metadata(@ng_pub_xml)).to be_kind_of(Nokogiri::XML::Document)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: harvestdor
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Naomi Dushay
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-16 00:00:00.000000000 Z
+date: 2016-08-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: confstruct
@@ -38,6 +38,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: faraday
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -219,7 +233,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Harvest DOR object metadata
@@ -236,4 +250,3 @@ test_files:
 - spec/harvestdor_client_spec.rb
 - spec/purl_xml_spec.rb
 - spec/spec_helper.rb
-has_rdoc: