lib/lionel/google_authentication.rb in lionel_richie-0.2.0 vs lib/lionel/google_authentication.rb in lionel_richie-0.2.1

@@ -16,44 +16,56 @@
       }
     end
 
     def retrieve_access_token(authorization_code)
       @access_token = client.auth_code.get_token(authorization_code,
-        :redirect_uri => "urn:ietf:wg:oauth:2.0:oob")
+                                                 :redirect_uri => "urn:ietf:wg:oauth:2.0:oob")
     end
 
     def refresh
       return false unless refresh_token
 
       current_token = OAuth2::AccessToken.from_hash(client,
-          {:refresh_token => refresh_token, :expires_at => 604800}) # 1 week
+                                                    :refresh_token => refresh_token,
+                                                    :expires_in => one_year
+                                                   )
       @access_token = current_token.refresh! # returns new access_token
     end
 
     def authorize_url
       client.auth_code.authorize_url(
         :redirect_uri => "urn:ietf:wg:oauth:2.0:oob",
-        :scope =>
-            "https://docs.google.com/feeds/ " +
-            "https://docs.googleusercontent.com/ " +
-            "https://spreadsheets.google.com/feeds/")
+        :scope => scopes.join(' ')
+      )
     end
 
     def api_console_url
       "https://code.google.com/apis/console"
     end
 
     def client
       @client ||= OAuth2::Client.new(google_client_id, google_client_secret,
-        :site => "https://accounts.google.com",
-        :token_url => "/o/oauth2/token",
-        :authorize_url => "/o/oauth2/auth")
+                                     :site => "https://accounts.google.com",
+                                     :token_url => "/o/oauth2/token",
+                                     :authorize_url => "/o/oauth2/auth")
     end
 
     private
 
     def refresh_token
       @refresh_token || configuration.google_refresh_token
+    end
+
+    def scopes
+      [
+        "https://docs.google.com/feeds/",
+        "https://docs.googleusercontent.com/",
+        "https://spreadsheets.google.com/feeds/"
+      ]
+    end
+
+    def one_year # in seconds
+      31557600
     end
 
   end
 end