nomis-api-client 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9f01c00cc53dffe021c027cca1743b7520afac04
-  data.tar.gz: 26f5e98a39244bfa62122d50fb7cfe7639712203
+  metadata.gz: 8331486777f74943467a188c9edd6a6159f8b581
+  data.tar.gz: fabcabb0dd2386dd6068c12e4fe256dddbdd0d54
 SHA512:
-  metadata.gz: 794b3286287839ad68b1b9ecb332e3f366ce77614fdad4c913c6ef9aaa2d662acee92024e4b84fe3c4f6a94ce18bef046450515230443dd12ed6fe5cbdca920a
-  data.tar.gz: 22d4c0e3db9102a61a01e0095bd8d05558df775b63a0d1835eb64a7acb1ceaa9b524c1218f57418a0e791a42417783d982180d6da1118140ce893d7e3d3b0d75
+  metadata.gz: c6c1cebfac9ea504914bdffcd69e23202b992c15094b60649bc2a96f76ca22105445583dfffb4758eaf87676b45888cb4a3fd2b71b275ba1f547b2be4d9cf4ff
+  data.tar.gz: a243ab79b348eafaf939a402e29593d97de93572cb8af935f34ca3f99c54568b82b1321be03c0dde999afd2786dd170230f778866e3175643fcffda81ce91185

data/lib/nomis/api/auth_token.rb

@@ -74,15 +74,13 @@ module NOMIS
       end
 
       def default_client_key(params = {})
-        read_client_key_file(
-          params[:client_key_file] || ENV['NOMIS_API_CLIENT_KEY_FILE']
-        )
+        path = params[:client_key_file] || ENV['NOMIS_API_CLIENT_KEY_FILE']
+        path ? read_client_key_file(path) : nil
       end
       
       def default_client_token(params = {})
-        read_client_key_file(
-          params[:client_token_file] || ENV['NOMIS_API_CLIENT_TOKEN_FILE']
-        )
+        path = params[:client_token_file] || ENV['NOMIS_API_CLIENT_TOKEN_FILE']
+        path ? read_client_key_file(path) : nil
       end
 
       def default_iat_fudge_factor(params={})

data/lib/nomis/api/parsed_response.rb

@@ -9,12 +9,18 @@ module NOMIS
 
       def initialize(raw_response)
         self.raw_response = raw_response
-        self.data = JSON.parse(raw_response.body)
+        self.data = parse(raw_response)
       end
 
       def body
         raw_response.body
       end
+
+      def parse(response)
+        response.content_type == 'application/json' ? \
+            JSON.parse(response.body) : response.body
+      end
+
       def status
         raw_response.code
       end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: nomis-api-client
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Al Davidson