dor-services 5.7.0 → 5.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5bcf35abdc1bd0a65db743cf5d878cd69407c844
-  data.tar.gz: 50ae2af9196a9e6c2fce640653dd8dbbb317c348
+  metadata.gz: baec1d9dac35a77a2fa9ca2465240a8e050131c9
+  data.tar.gz: 6a073c0f903234a844e2944f9554a9ca56911d26
 SHA512:
-  metadata.gz: 17d5f020c434ca6fe2279ff74091495aad6195570a0a729a4bdd5fd378b905e826dcc9cca53c46ee138a03ca3243b6ccb1b25a41cc0718a5844cb24e9db04b40
-  data.tar.gz: eeb1e14c56abb72485ed20367cf28f2b1a07d04ac1a7e01d7812c00ea6db984027b972c3eda6daf35eec09cf4f7fcf716b327252afd40fdb7f04b552b0965611
+  metadata.gz: c5be39dc050d1c7592cca1b0752f69a5e52761c416b80438625513aaa28a23fc41fc3dd3d3a770d6f0501e9d72df6e9a0eb7ac0ce3b63c35bf6f554203913f83
+  data.tar.gz: f10b4baeb3e9c610bb3bd2b719a32c4b106ef57170e790cd40080fd8322716c2c2703df969423a641e220477263673c512a41b66bda2c89e76707e5d8ecc1234

data/lib/dor/models/contentable.rb

@@ -62,12 +62,7 @@ module Dor
     end
 
     def get_preserved_file(file, version)
-      uri = URI(Config.content.sdr_server + "/sdr/objects/#{pid}/content/" + URI.encode(file) + "?version=#{version}")
-      req = Net::HTTP::Get.new(uri.request_uri)
-      req.basic_auth Config.content.sdr_user, Config.content.sdr_pass
-      Net::HTTP.start(uri.hostname, uri.port, :use_ssl => uri.scheme == 'https') {|http|
-        http.request(req)
-      }
+      Sdr::Client.get_preserved_file_content(pid, file, version)
     end
 
     def get_file(file)

data/lib/dor/utils/sdr_client.rb

@@ -47,6 +47,10 @@ module Sdr
         Moab::FileInventoryDifference.parse(response)
       end
 
+      def get_preserved_file_content(druid, filename, version)
+        client["objects/#{druid}/content/#{URI.encode(filename)}?version=#{version}"].get
+      end
+
       def client
         if Dor::Config.sdr.url
           Dor::Config.sdr.rest_client

data/lib/dor/version.rb

@@ -1,3 +1,3 @@
 module Dor
-  VERSION = '5.7.0'.freeze
+  VERSION = '5.8.0'.freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dor-services
 version: !ruby/object:Gem::Version
-  version: 5.7.0
+  version: 5.8.0
 platform: ruby
 authors:
 - Michael Klein
@@ -14,7 +14,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-30 00:00:00.000000000 Z
+date: 2016-03-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: active-fedora
@@ -652,7 +652,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.6
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: Ruby implmentation of DOR services used by the SULAIR Digital Library