nypl_sierra_api_client 1.0.1 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 97ad20a44e5b1d4dc53174144e79f4aa629e1d94e9921c0ef70d25d39833caa3
-  data.tar.gz: 8052d7fc2ca5d8dc05b4499155987b3715c6a55d73334f9b4252aefa42fe97d8
+  metadata.gz: f83a3d06d4010dd2b229b09358e70ff5c4afadbffb92c0d6407b6cf79b41d7dc
+  data.tar.gz: 2dab1288ee02fe238c9517a4bddb7ddcde36dc3a036ed61890c57854186d0dc0
 SHA512:
-  metadata.gz: 6a517f2d692e88148538d832a007202e5fed71633585e67df3f08812fd7cd1b1e6c33a4d7bdd41869ab99db4cfaee1710b5981d29527cbb8e762e3d6b65bd7a3
-  data.tar.gz: 7da59ea28ed543feb1f1aca8d36868c82faa65ca2901893c498d5762f1bd3f5f8137101b604118515f2e1c1a09bc21ffdae440983e055f053b375cd8861999b4
+  metadata.gz: a349f8a998f13cce0180ecce092f79601c06cc376059fc349add4e98d802532bc8dcf487c0dd2ce574bffa16e70e2c6bce9f4a50e92f392258670a63eb3157af
+  data.tar.gz: 46cb45de0dbb360f12177af4d51102d84e056f7f223d6545a3ff3bc5d1a700f1c5a06115747b00cb6583283a2f28367e95cd8851a25bf90d7205807e9fe09987

data/lib/nypl_sierra_api_client.rb

@@ -8,18 +8,25 @@ require_relative 'sierra_api_response'
 
 class SierraApiClient
   def initialize(config = {})
-    @config = {
-      base_url: ENV['SIERRA_API_BASE_URL'],
-      client_id: ENV['SIERRA_OAUTH_ID'],
-      client_secret: ENV['SIERRA_OAUTH_SECRET'],
-      oauth_url: ENV['SIERRA_OAUTH_URL'],
-      log_level: 'info'
-    }.merge config
-
-    raise SierraApiClientError.new 'Missing config: neither config.base_url nor ENV.SIERRA_API_BASE_URL are set' unless @config[:base_url]
-    raise SierraApiClientError.new 'Missing config: neither config.client_id nor ENV.SIERRA_OAUTH_ID are set' unless @config[:client_id]
-    raise SierraApiClientError.new 'Missing config: neither config.client_secret nor ENV.SIERRA_OAUTH_SECRET are set ' unless @config[:client_secret]
-    raise SierraApiClientError.new 'Missing config: neither config.oauth_url nor ENV.SIERRA_OAUTH_URL are set ' unless @config[:oauth_url]
+    config_defaults = {
+      env: {
+        base_url: 'SIERRA_API_BASE_URL',
+        client_id: 'SIERRA_OAUTH_ID',
+        client_secret: 'SIERRA_OAUTH_SECRET',
+        oauth_url: 'SIERRA_OAUTH_URL'
+      },
+      static: {
+        log_level: 'info'
+      }
+    }
+
+    @config = config_defaults[:env].map {|k,v| [k, ENV[k]]}.to_h
+      .merge config_defaults[:static]
+      .merge config
+
+    config_defaults[:env].each do |key, value|
+      raise SierraApiClient.new "Missing config: neither config.#{key} nor ENV.#{value} are set" unless @config[key]
+    end
   end
 
   def get (path, options = {})
@@ -58,7 +65,7 @@ class SierraApiClient
     request_headers['Content-Type'] = options[:headers]['Content-Type'] unless options.dig(:headers, 'Content-Type').nil?
 
     # Create HTTP::Get or HTTP::Post
-    request =  Net::HTTP.const_get(method.capitalize).new(uri.path, request_headers)
+    request =  Net::HTTP.const_get(method.capitalize).new(uri, request_headers)
 
     # Add bearer token header
     request['Authorization'] = "Bearer #{@access_token}" if options[:authenticated]
@@ -87,7 +94,7 @@ class SierraApiClient
       @access_token = nil
       raise SierraApiClientTokenError.new("Got a 401: #{response.body}")
     end
-    
+
     SierraApiResponse.new(response)
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: nypl_sierra_api_client
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
 platform: ruby
 authors:
 - nonword