uphold 1.0.1 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 00473b601ec27323673b55ba2318a4a04fb37ed1
-  data.tar.gz: 8b5ce0ca9f8efaebe34e8fac6607396658a70da1
+  metadata.gz: 0ea311052aefef8d48f00041ec404a864e296d07
+  data.tar.gz: c0daaf546e7a1c033b1d58306952e027b01c87f7
 SHA512:
-  metadata.gz: 4c5378f901a9b721e0d8d5bcc45b5819d0d687e29aa27ba5af8f91bd380131a761b083ad3781291eb0eb145a9ba9215096b9ece0a484ef554f00c87f520ca2d9
-  data.tar.gz: c6a661cc19d0908f587148005a54c8766da56abca5735306b10a72a29b71fefbe1f92b1d239b645def0602a01305f0d6f3f09d7e4f04f995007c007729602240
+  metadata.gz: 8562644ea03754faf17641ba96ac1d3728a3c70936226ff2816657a322329970cf92414a55efd59ce76117ba0ea5915cb0e8d33aefd6d2e9ddaa122b32af1d68
+  data.tar.gz: 6c7ea074cafd84793b25c662964d2594fb73dc9a7eb22a77189122e7a9ecb0c59cca427cdf426c4acb92e1a01bcb3dabe2d44b017b459d197090e35ca6693cce

data/.gitignore

@@ -17,3 +17,4 @@ tags
 .tags
 path
 .ruby-version
+*.gem

data/lib/uphold/options.rb

@@ -9,7 +9,11 @@ module Uphold
     end
 
     def bearer_token
-      @bearer_token ||= authenticate!
+      @bearer_token ||= (
+        options[:token] ||
+        ENV['UPHOLD_AUTH_TOKEN'] ||
+        ENV['BITRESERVE_AUTH_TOKEN']
+      )
     end
 
     def authorization_header
@@ -17,23 +21,5 @@ module Uphold
 
       { 'Authorization' => "Bearer #{bearer_token}" }
     end
-
-    private
-
-    def authenticate!
-      return options[:token] if options[:token]
-      return ENV['UPHOLD_AUTH_TOKEN'] if !options[:client_id] || !options[:client_secret]
-
-      response = Request.new(RequestData.new('/me/tokens', nil, {}, authentication_body)).post #perform(:post, '/oauth/token', body: authentication_body)
-      Hash(response).fetch('access_token', nil)
-    end
-
-    def authentication_body
-      {
-        grant_type: 'client_credentials',
-        client_id: options[:client_id],
-        client_secret: options[:client_secret]
-      }
-    end
   end
 end

data/lib/uphold/version.rb

@@ -1,3 +1,3 @@
 module Uphold
-  VERSION = '1.0.1'
+  VERSION = '1.1.0'
 end

data/spec/unit/client_spec.rb

@@ -21,13 +21,13 @@ module Uphold
     end
 
     it 'uses the production api by default' do
-      Uphold.sandbox = false
       expect(Uphold.api_base).to eq Uphold::Options::API_BASE
     end
 
     it 'uses the sandbox api when asked to' do
       Uphold.sandbox = true
       expect(Uphold.api_base).to eq Uphold::Options::SANDBOX_API_BASE
+      Uphold.sandbox = false
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: uphold
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.1.0
 platform: ruby
 authors:
 - Subvisual
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-14 00:00:00.000000000 Z
+date: 2015-10-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty