lionel_richie 0.2.4 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 45c95903e74283e8e40a956410abc877b4fdce2c
-  data.tar.gz: d74aa9ec02e9a078d66b04f0f46aca3560fbf759
+  metadata.gz: f27fcc463388c7304b7ad1962c6e1a9410395eb8
+  data.tar.gz: 8bc504b7f0f628f7c9929b81e5e10b2f44cf67c7
 SHA512:
-  metadata.gz: 683221356b95e9255ca999fd6454a3228fa69694534f9bc7aa9de5fe1e2c72d305f83994304421e97b2ab11a369af2f081df61ec38faab1a00285e0544783050
-  data.tar.gz: 25cd6db202a126e59ef1cd20f7f028afeb8621007eb980ed3141545ca120a4d20251ccc4cda40e39fd799933f72eb0ae10c79fe217abbcf05e769c735ab3de5a
+  metadata.gz: b82b9e20b78ee845efcf62b2e95ebdbe779c1ff410f8cd74bc4e5275cdc06d1b6bc624b47a8890dbb8b6c5afe48ba87ec43c42fad6e565132f17730b93cf3462
+  data.tar.gz: 484b84c4d2f7756afa9ca66819a7b62fea7365d49f4ca87ea0a401fa441c61d5c8c507d910be137ae1fb786019af4746e69d8593a87831f29785f894d3febe4d

data/lib/lionel.rb

@@ -1,6 +1,6 @@
 require 'yajl'
 require 'trello'
-require 'google_drive_v0'
+require 'google_drive'
 require 'launchy'
 require 'thor'
 require 'logger'

data/lib/lionel/cli.rb

@@ -66,7 +66,7 @@ module Lionel
 
       begin
         export.authenticate
-      rescue GoogleDriveV0::Error, GoogleDriveV0::AuthenticationError
+      rescue GoogleDrive::Error, GoogleDrive::AuthenticationError
         @google_attempts ||= 0
         @google_attempts += 1
         Lionel::GoogleAuthentication.new.refresh

data/lib/lionel/export.rb

@@ -131,7 +131,7 @@ module Lionel
     end
 
     def google_session
-      @google_session ||= GoogleDriveV0.login_with_oauth(configuration.google_token)
+      @google_session ||= GoogleDrive.login_with_oauth(configuration.google_token)
     end
 
     def trello_session

data/lib/lionel/google_authentication.rb

@@ -1,56 +1,75 @@
+require "google/api_client"
+
 module Lionel
   class GoogleAuthentication
     include Configurable
 
-    attr_accessor :access_token
+    attr_accessor :access_token, :refresh_token
     attr_writer :client
     config_accessor :google_client_id, :google_client_secret
 
     def data
       raise "No access token" unless access_token
       {
-        google_token: access_token.token,
-        google_refresh_token: access_token.refresh_token,
+        google_token: access_token,
+        google_refresh_token: refresh_token,
         google_client_id: google_client_id,
         google_client_secret: google_client_secret
       }
     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")
+      authorization.code = authorization_code
+      authorization.fetch_access_token!
+      @access_token = authorization.access_token
+      @refresh_token = authorization.refresh_token
     end
 
     def refresh
-      return false unless refresh_token
+      return false unless refresh_token && access_token
+
+      authorization.access_token = access_token
+      authorization.refresh_token = refresh_token
+      authorization.refresh!
 
-      current_token = OAuth2::AccessToken.from_hash(client,
-                                                    :refresh_token => refresh_token,
-                                                    :expires_in => one_year
-                                                   )
-      @access_token = current_token.refresh! # returns new access_token
+      @access_token = authorization.access_token
     end
 
     def authorize_url
-      client.auth_code.authorize_url(
-        :redirect_uri => "urn:ietf:wg:oauth:2.0:oob",
-        :scope => scopes.join(' ')
-      )
+      authorization.authorization_uri
     end
 
     def api_console_url
       "https://code.google.com/apis/console"
     end
 
+    def authorization
+      @authorization ||= begin
+                           auth = client.authorization
+                           auth.client_id = google_client_id
+                           auth.client_secret = google_client_secret
+                           auth.scope = scopes
+                           auth.expires_in = one_year
+                           auth.redirect_uri = "urn:ietf:wg:oauth:2.0:oob"
+                           auth
+                         end
+    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")
+      @client ||= Google::APIClient.new(auto_refresh_token: true)
     end
 
     private
 
+    def build_client
+      auth = client.authorization
+      auth.client_id = google_client_id
+      auth.client_secret = google_client_secret
+      auth.scope = scopes
+      auth.redirect_uri = "urn:ietf:wg:oauth:2.0:oob"
+      client
+    end
+
     def refresh_token
       @refresh_token || configuration.google_refresh_token
     end
@@ -64,7 +83,7 @@ module Lionel
     end
 
     def one_year # in seconds
-      31557600
+      60*60*24*36
     end
 
   end

data/lib/lionel/version.rb

@@ -1,3 +1,3 @@
 module Lionel
-  VERSION = "0.2.4"
+  VERSION = "0.3.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: lionel_richie
 version: !ruby/object:Gem::Version
-  version: 0.2.4
+  version: 0.3.0
 platform: ruby
 authors:
 - Ross Kaffenberger