lib/oauth/models/consumers/token.rb in oauth_consumer-0.1.0 vs lib/oauth/models/consumers/token.rb in oauth_consumer-0.1.1

@@ -28,11 +28,11 @@
 
           def get_request_token(callback_url)
             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
             access_token=request_token.get_access_token options
             find_or_create_from_access_token user, access_token
@@ -56,13 +56,13 @@
               else
                 token = self.find_or_initialize_by_token(access_token.token)
               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
 
           # Set the details such as the secret, refresh token and expiration time to an instance of ConsumerToken
@@ -93,10 +93,10 @@
         module InstanceMethods
 
           # 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
             @simple_client ||= SimpleClient.new(client)
           end