oauth_consumer 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 722d2b73fe0515ce4cb7f332ff7a20a28ce660a6
-  data.tar.gz: f4424beb1696f4fd3733802b5c70b80cb090ee1e
+  metadata.gz: 7ceecb46c16d3d34f253f83293b017c4a760cc23
+  data.tar.gz: c8f55ba25ae3b9888edba7de8fa01d5458d95e29
 SHA512:
-  metadata.gz: 047ac94d1844c592a1335832d3ccfe6bcf191fa409b3cef26f059b9398f81dc0b61a27767a28a3488deae3e3f6c6c113d162e503b012578ac112e7a4a433c44d
-  data.tar.gz: e612eb41d57a5951abaeca8604dbd8dd798128756ddf75adbd832e1826fa295de843e732c22c19a88b44f77db21fc99d0b4b1cefc602185dae5911675bf3e9ce
+  metadata.gz: b982f1987df5032246666249677534416f8195853fb8d43f8d3c743ef16263a190947ff24334747de19883f7982d4e7481bf9b2ebc6441efb9913b2723807c38
+  data.tar.gz: 68a8be188e77a15d9f206825545e1300f623748e95d44886b540edad57c6e2b3a8d942eb2677b8fc9fe1644cf7423bf94e69efb442f0889d3355933f2a5fbb89

data/lib/oauth/controllers/consumer_controller.rb

@@ -25,8 +25,8 @@ module Oauth
 
         unless @token
           if @consumer.ancestors.include?(Oauth2Token)
-            request_url = callback2_oauth_consumer_url + callback2_querystring
-            redirect_to @consumer.authorize_url(request_url)
+            callback_url = callback2_oauth_consumer_url + callback2_querystring
+            redirect_to @consumer.authorize_url(callback_url)
           else
             request_url = callback_oauth_consumer_url(params[:id]) + callback2_querystring
             @request_token = @consumer.get_request_token(request_url)

data/lib/oauth/models/consumers/services/oauth2_token.rb

@@ -14,6 +14,7 @@ class Oauth2Token < ConsumerToken
     options = { redirect_uri: callback_url }
     options[:scope] = credentials[:scope] if credentials[:scope].present?
     options[:access_type] = credentials[:access_type] if credentials[:access_type].present?
+    options[:approval_prompt] = credentials[:approval_prompt] if credentials[:approval_prompt].present?
     consumer.auth_code.authorize_url(options)
   end
 
@@ -34,7 +35,11 @@ class Oauth2Token < ConsumerToken
 
   # Refreshes the access token to ensure access
   def ensure_access
-    self.class.find_or_create_from_access_token user, self, client.refresh!
+    begin
+      self.class.find_or_create_from_access_token(user, self, client.refresh!)
+    rescue
+      Rails.logger.info "Unable to refresh token."
+    end
   end
 
   # Returns the expiration date (expires_in, expires_at)

data/lib/oauth/models/consumers/token.rb

@@ -30,7 +30,7 @@ module Oauth
             consumer.get_request_token(:oauth_callback=>callback_url)
           end
 
-          def find_or_create_from_request_token(user,token,secret,oauth_verifier)
+          def find_or_create_from_request_token(user, token, secret, oauth_verifier)
             request_token=OAuth::RequestToken.new consumer,token,secret
             options={}
             options[:oauth_verifier]=oauth_verifier if oauth_verifier
@@ -58,9 +58,9 @@ module Oauth
               end
             end
 
-            token = if new_token then set_details(new_token, access_token) else set_details(access_token, token) end
+            token = new_token.present? ? set_details(new_token, access_token) : set_details(access_token, token)
 
-            token.save! if token.new_record? or token.changed?
+            token.save! if token.new_record? || token.changed?
 
             token
           end
@@ -95,7 +95,7 @@ module Oauth
           # Main client for interfacing with remote service. Override this to use
           # preexisting library eg. Twitter gem.
           def client
-            @client||=OAuth::AccessToken.new(self.class.consumer, token, secret)
+            @client ||= OAuth::AccessToken.new(self.class.consumer, token, secret)
           end
 
           def simple_client

data/lib/oauth_consumer/version.rb

@@ -1,3 +1,3 @@
 module OauthConsumer
-  VERSION = "0.1.0"
+  VERSION = "0.1.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: oauth_consumer
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Mauricio Gomes
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-05 00:00:00.000000000 Z
+date: 2013-12-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: oauth