synapse_client 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c46836e82f8fd5cadaf0f92f1f63a3d1ea1e8aef
-  data.tar.gz: 0ecf16d300d068f81a8492e14c37b20d87424a9a
+  metadata.gz: 1383017e5b19893e1e5a72491da9ca52acfb5160
+  data.tar.gz: 1a7fd28f77a7f4a030907c890c0c0a90300367b7
 SHA512:
-  metadata.gz: d0b24502cc145f806e2a2aab43df57154f6dd7de6f7153c594764b64af6bf994485495d1a0ac0543aa50e951150da6499667d22ca8d57bcc539795ed8df636ea
-  data.tar.gz: 555c437e3273c0c4a0a0ab2f192c80079a2e1a4a15a6791e8ce587edd1ee5f0999581a2f7ad9681e2187c6bae0192a725cf9711f8d750345e30591c97edab2fc
+  metadata.gz: 5afe0053efeaf1ba4b0b55859afb5283b7dd4bc18470ea93ce7dae8a5d18b8743fff0d505f637bea7c1b72f987b62239affa3feaf7222453a57a9a484f58732d
+  data.tar.gz: bf5d82448ff3e4129de3f7fa29494af779cdf89c96ec07aa90211a6ad0d6f474766f8a9471358866537e9b6c2182b72369fe3aaadb47ebd20bc027aa1c356cd6

data/lib/synapse_client.rb

@@ -94,11 +94,15 @@ module SynapseClient
       }
 
     #
-      #begin
+      begin
         response = execute_request(request_opts)
       # TODO: https://github.com/stripe/stripe-ruby/blob/master/lib/stripe.rb#L127
-      #rescue 
-      #end
+      rescue RestClient::Exception, Errno::ECONNREFUSED => e
+        return SynapseClient::APIOperations::Response.new({
+          :success     => false,
+          :status_code => e.http_code
+        })
+      end
 
       parse(response)
   end

data/lib/synapse_client/api_operations/response.rb

@@ -3,17 +3,19 @@ module SynapseClient
     class Response
       attr_reader :data
       attr_reader :error_msg
-      attr_reader :success
       attr_reader :cookies
+      attr_reader :status_code
+      attr_reader :success
       alias_method :successful?, :success
 
       def initialize(response, cookies=nil)
         response = Map.new(response)
 
-        @success   = response.delete(:success)
-        @error_msg = response.delete(:reason)
-        @data      = response
-        @cookies   = cookies
+        @status_code = response.delete(:status_code)
+        @success     = response.delete(:success)
+        @error_msg   = response.delete(:reason)
+        @data        = response
+        @cookies     = cookies
       end
     end
   end

data/lib/synapse_client/customer.rb

@@ -41,13 +41,22 @@ module SynapseClient
     end
 
     def self.retrieve(access_token, refresh_token)
-      response = SynapseClient.request(:post, url + "show", {:access_token => access_token})
+      response = Customer.get_user({
+              :access_token  => access_token,
+              :refresh_token => refresh_token
+            })
+
+      unless response.successful? # refresh tokens & try once more.
+        new_tokens = Customer.refresh_tokens(access_token, refresh_token)
+        return new_tokens if new_tokens.instance_of?(SynapseClient::Error)
+        return Customer.get_user({
+            :access_token  => new_tokens.access_token,
+            :refresh_token => new_tokens.refresh_token,
+            :expires_in    => new_tokens.expires_in
+          })
+      end
 
-      return response unless response.successful?
-      Customer.new(response.data.user.merge({
-        :access_token  => access_token,
-        :refresh_token => refresh_token
-      }))
+      response
     end
 
     # TODO
@@ -99,21 +108,30 @@ module SynapseClient
       end
     end
 
-    def refresh_tokens
+    def self.refresh_tokens(access_token, refresh_token)
       rt = SynapseClient::RefreshedTokens.new({
-        :old_access_token  => @access_token,
-        :old_refresh_token => @refresh_token
+        :old_access_token  => access_token,
+        :old_refresh_token => refresh_token
       }).refresh_old_tokens
 
       return rt if rt.instance_of?(SynapseClient::Error)
 
-      @access_token  = rt.new_access_token
-      @refresh_token = rt.new_refresh_token
-      @expires_in    = rt.new_expires_in
-
-      return self
+      Map.new({
+        :access_token  => rt.new_access_token,
+        :refresh_token => rt.new_refresh_token,
+        :expires_in    => rt.new_expires_in
+      })
     end
 
+    def self.get_user(opts={})
+      response = SynapseClient.request(:post, url + "show", {:access_token => opts[:access_token]})
+
+      return response unless response.successful?
+
+      opts.delete(:expires_in) if opts[:expires_in].nil?
+
+      Customer.new(response.data.user.merge(opts))
+    end
 
 private
     def update_attributes(data)

data/lib/synapse_client/version.rb

@@ -1,3 +1,3 @@
 module SynapseClient
-  VERSION = "0.1.3"
+  VERSION = "0.1.4"
 end

data/spec/synapse_client_customer_spec.rb

@@ -64,16 +64,32 @@ describe SynapseClient::Customer do
     end
   end
 
-  describe "refreshing a customer's token" do
+  describe "refreshing and retrieving customer" do
     it "should successfully get new oauth consumer key, refresh token, and expires in." do
       customer = SynapseClient::Customer.retrieve(@customer.access_token, @customer.refresh_token)
 
       old_access_token  = @customer.access_token.dup
       old_refresh_token = @customer.refresh_token.dup
 
-      response = customer.refresh_tokens
+      response = SynapseClient::Customer.refresh_tokens(old_access_token, old_refresh_token)
 
-      expect(response).to be_a SynapseClient::Customer
+      expect(response).to be_a Map
+
+      expect(response.access_token).to be_a String
+      expect(response.refresh_token).to be_a String
+      expect(response.expires_in).to be_a Fixnum
+
+      expect(response.access_token).not_to be eq(old_access_token)
+      expect(response.refresh_token).not_to be eq(old_refresh_token)
+    end
+
+    it "should successfully retrieve a customer with a broken access token" do
+      old_access_token  = @customer.access_token.dup
+      old_refresh_token = @customer.refresh_token.dup
+
+      customer = SynapseClient::Customer.retrieve("accexpired", @customer.refresh_token)
+
+      expect(customer).to be_a SynapseClient::Customer
 
       expect(customer.access_token).to be_a String
       expect(customer.refresh_token).to be_a String

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: synapse_client
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - Miles Matthias
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-11 00:00:00.000000000 Z
+date: 2015-05-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client