preservation-client 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 87f6d28de114c911290ae02d86e45dc39728ffd2ca63e76c7868f40a44656b01
-  data.tar.gz: 623f1c5881b8cb1cc402376bd934494708c0ee5d388ee3e6e7d78a366d6ebdee
+  metadata.gz: 40602017c072b2c6acf9ac778a53171a10102477e0783f42c18006b6783d3cc2
+  data.tar.gz: 8069794031fff97a91cfb4a8e43dab2f4112f01659d9157aa2347c1cbf06d70e
 SHA512:
-  metadata.gz: 6a8a7c2f696815790e7fc8142049867f5a5a138cde7e22d966ddef7ba4f12b5314b25266d9093757008e81eab5943221c234b4ce3618791fa20a7d93aa5d63f9
-  data.tar.gz: a9e1d7b4b08b208882b900c83509a5f4f79699f2aec5509ae206ff1659b032ed5bd43a63a130ceccfab11ac68c02092a913d184802ab63c1e073f38ff939691f
+  metadata.gz: a3caae88635c58bc4ff0fdee436cad522c3442855dbc9cde2ccdda6570a9ac310f27645e6171438cc29b102c69bcb9b94d5d75e06cec443b333d3cf885c5795e
+  data.tar.gz: 459b15285b9231257d0c28da3ba22a8f40942aed7f334f8aa8dc1aa83a6bfafd3137eb214a799cdd71fac4c6760df45987b1c1b45d7b5910de227cba407b1df9

data/.rubocop.yml

@@ -18,7 +18,7 @@ Metrics/LineLength:
     - 'spec/**/*'
 
 Metrics/MethodLength:
-  Max: 15
+  Max: 25
 
 Style/Documentation:
   Exclude:

data/.rubocop_todo.yml

@@ -1,6 +1,6 @@
 # This configuration was generated by
 # `rubocop --auto-gen-config`
-# on 2019-09-24 11:53:40 -0700 using RuboCop version 0.74.0.
+# on 2019-09-25 11:19:34 -0700 using RuboCop version 0.74.0.
 # The point is for the user to remove these configuration records
 # one by one as the offenses are removed from the code base.
 # Note that changes in the inspected code, or installation of new
@@ -8,4 +8,4 @@
 
 # Offense count: 2
 Metrics/AbcSize:
-  Max: 26
+  Max: 31

data/lib/preservation/client/response_error_formatter.rb

@@ -28,7 +28,7 @@ module Preservation
         status_info = status_msg.blank? ? status_code : "#{status_msg} (#{status_code})"
         object_id_info = " for #{object_id}" if object_id.present?
 
-        "Preservation::Client.#{client_method_name}#{object_id_info} got #{status_info} from Preservation Catalog at #{req_url}: #{body}"
+        "Preservation::Client.#{client_method_name}#{object_id_info} got #{status_info} from Preservation at #{req_url}: #{body}"
       end
     end
   end

data/lib/preservation/client/version.rb

@@ -2,6 +2,6 @@
 
 module Preservation
   class Client
-    VERSION = '0.2.1'
+    VERSION = '0.2.2'
   end
 end

data/lib/preservation/client/versioned_api_service.rb

@@ -15,21 +15,27 @@ module Preservation
 
       # @param path [String] path to be appended to connection url (no leading slash)
       def get_json(path, object_id, caller_method_name)
+        req_url = api_version.present? ? "#{api_version}/#{path}" : path
         resp = connection.get do |req|
-          req.url api_version.present? ? "#{api_version}/#{path}" : path
+          req.url req_url
           req.headers['Content-Type'] = 'application/json'
           req.headers['Accept'] = 'application/json'
         end
         return JSON.parse(resp.body).with_indifferent_access if resp.success?
 
-        errmsg = ResponseErrorFormatter
-                 .format(response: resp, object_id: object_id, client_method_name: caller_method_name)
-        raise Preservation::Client::UnexpectedResponseError, errmsg
+        if resp.status == 404
+          errmsg = "#{object_id} not found in Preservation at #{connection.url_prefix}#{req_url}"
+          raise Preservation::Client::NotFoundError, errmsg
+        else
+          errmsg = ResponseErrorFormatter
+                   .format(response: resp, object_id: object_id, client_method_name: caller_method_name)
+          raise Preservation::Client::UnexpectedResponseError, errmsg
+        end
       rescue Faraday::ResourceNotFound => e
-        errmsg = "HTTP GET to #{connection.url_prefix}#{path} failed with #{e.class}: #{e.message}"
+        errmsg = "HTTP GET to #{connection.url_prefix}#{req_url} failed with #{e.class}: #{e.message}"
         raise Preservation::Client::NotFoundError, errmsg
       rescue Faraday::ParsingError, Faraday::RetriableResponse => e
-        errmsg = "HTTP GET to #{connection.url_prefix}#{path} failed with #{e.class}: #{e.message}"
+        errmsg = "HTTP GET to #{connection.url_prefix}#{req_url} failed with #{e.class}: #{e.message}"
         raise Preservation::Client::UnexpectedResponseError, errmsg
       end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: preservation-client
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - Naomi Dushay
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-09-24 00:00:00.000000000 Z
+date: 2019-09-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport