google_drive-persistent_session 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 0b67e3482df9ee92791d942800255769a7f94218
-  data.tar.gz: c5d45932dbcd371b20dabd8ba57a7ec1e40072e6
+SHA256:
+  metadata.gz: 9a1a8c546ac3cd9ba880dc7068a27e955eab85b790edbbfbde8b40e1a1cd9c4d
+  data.tar.gz: 321e034033e5c35b3c7bb47e1ecdc31731fb5c5b8ed6e5a8594abe9d6da7598e
 SHA512:
-  metadata.gz: ec7b5e0d73864b5f05b3e147dc303f81596c1d32f241b9e3ef3f53cde3ce181c0abbf6e356ce390ff1741ad546cafcbef311da6b4cd06cb0ce61003045643cb0
-  data.tar.gz: e512231aaf892076cc1f449ffd5191b096c192c394a22d367719d326f94679ccbfc044e193ec5ff366c8afad03362ff3247014aae0c5e688c84d9e993afbabaf
+  metadata.gz: 9b7f6a6dfa29a22a5617e29093e5131e27cf85fe4b6c44f3df3458bbd194e1d05c3a23fe69b9e2f54f3dbfb5f48d22b80902fd5211f8d91ef56d8da6e6375194
+  data.tar.gz: a3c9cdcfdc3b5bb177c7c94e75e37ddad43ef9decb592c301f5ee2774205fd839874c4edfb8da37ac143956184ce5b6041322f05b64380fc3b6f371be5236ee8

data/README.md

@@ -23,7 +23,7 @@ Or install it yourself as:
 ```ruby
 require 'google_drive/persistent_session'
 
-#GoogleDrive::PersistentSession.credential_store_file = '~/.google_drive-oauth2.json'
+#GoogleDrive::CredentialStorage.store = Google::APIClient::FileStore.new('~/.google_drive-oauth2.json')
 
 session = GoogleDrive::PersistentSession.login
 

data/google_drive-persistent_session.gemspec

@@ -1,12 +1,13 @@
 # coding: utf-8
 lib = File.expand_path('../lib', __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
+require 'google_drive/persistent_session/version'
 
 Gem::Specification.new do |spec|
   spec.name          = 'google_drive-persistent_session'
-  spec.version       = '0.1.0'
+  spec.version       = GoogleDrive::PersistentSession::VERSION
   spec.authors       = ['Genki Sugawara']
-  spec.email         = ['sgwr_dts@yahoo.co.jp']
+  spec.email         = ['sugawara@winebarrel.jp']
   spec.summary       = %q{Persist credential for google-drive-ruby.}
   spec.description   = %q{Persist credential for google-drive-ruby.}
   spec.homepage      = 'https://github.com/winebarrel/google_drive-persistent_session'
@@ -17,7 +18,7 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ['lib']
 
-  spec.add_dependency 'google_drive', '>= 1.0.0'
+  spec.add_dependency 'google_drive', '>= 3.0.7'
   spec.add_dependency 'highline'
   spec.add_development_dependency 'bundler'
   spec.add_development_dependency 'rake'

data/lib/google_drive/persistent_session.rb

@@ -1,120 +1,9 @@
 require 'fileutils'
 require 'forwardable'
-require 'google/api_client'
-require 'google/api_client/auth/file_storage'
 require 'google_drive'
 require 'highline'
 
-module GoogleDrive
-  class PersistentSession
-    extend Forwardable
-
-    def_delegator :@highline, :ask
-
-    THREAD_KEY = "#{self.to_s}::THREAD_KEY"
-
-    DEFAULE_CREDENTIAL_STORE_FILE = '~/.google_drive-oauth2.json'
-    @credential_store_file = ::File.expand_path(DEFAULE_CREDENTIAL_STORE_FILE)
-
-    class << self
-      attr_accessor :credential_store_file
-
-      def login
-        self.new
-      end
-    end
-
-    def initialize
-      @highline = HighLine.new
-      ensure_login
-    end
-
-    private
-
-    def ensure_login
-      unless is_credential_stored?
-        create_credential_store_file
-      end
-
-      credential = file_storage.load_credentials
-
-      if !credential.access_token
-        fetch_access_token(credential)
-      elsif expired?(credential)
-        refresh(credential)
-      end
-
-      unless session
-        login_with_oauth(credential.access_token)
-      end
-    end
-
-    def is_credential_stored?
-      ::File.exist?(self.class.credential_store_file)
-    end
-
-    def expired?(credential)
-      credential.issued_at + credential.expires_in <= Time.new
-    end
-
-    def create_credential_store_file
-      client_id = ask('Enter CLIENT ID: ')
-      client_secret = ask('Enter CLIENT SECRET: ') {|q| q.echo = false }
-      puts # line break
-
-      credential = Signet::OAuth2::Client.new(
-        :client_id => client_id,
-        :client_secret => client_secret,
-        :refresh_token => ''
-      )
-
-      file_storage.write_credentials(credential)
-      FileUtils.chmod(0600, credential_store_file)
-    end
-
-    def fetch_access_token(credential)
-      credential.scope = %w(
-        https://www.googleapis.com/auth/drive
-        https://spreadsheets.google.com/feeds/
-      ).join(' ')
-
-      credential.redirect_uri = 'urn:ietf:wg:oauth:2.0:oob'
-      credential.grant_type = 'authorization_code'
-
-      message =  "1. Open this page:\n%s\n\n" % credential.authorization_uri
-      message << "2. Enter the authorization code shown in the page: "
-      credential.code = ask(message)
-
-      credential.fetch_access_token!
-      file_storage.write_credentials(credential)
-      login_with_oauth(credential.access_token)
-    end
-
-    def refresh(credential)
-      credential.refresh!
-      file_storage.write_credentials(credential)
-      login_with_oauth(credential.access_token)
-    end
-
-    def session
-      Thread.current[THREAD_KEY]
-    end
-
-    def login_with_oauth(access_token)
-      Thread.current[THREAD_KEY] = GoogleDrive.login_with_oauth(access_token)
-    end
-
-    def file_storage
-      @file_storage ||= Google::APIClient::FileStorage.new(credential_store_file)
-    end
-
-    def credential_store_file
-      self.class.credential_store_file
-    end
-
-    def method_missing(method_name, *args , &block)
-      ensure_login
-      session.send(method_name, *args, &block)
-    end
-  end
-end
+require 'google_drive/persistent_session/version'
+require 'google_drive/persistent_session/file_store_ext'
+require 'google_drive/persistent_session/credential_storage'
+require 'google_drive/persistent_session/persistent_session'

data/lib/google_drive/persistent_session/credential_storage.rb

@@ -0,0 +1,27 @@
+require 'google/api_client/auth/storage'
+
+module GoogleDrive::CredentialStorage
+  DEFAULE_FILE_STORE_PATH = '~/.google_drive-oauth2.json'
+
+  class << self
+    def store
+      @store ||= Google::APIClient::FileStore.new(::File.expand_path(DEFAULE_FILE_STORE_PATH))
+    end
+
+    def store=(value)
+      @store = value
+    end
+  end # of class methods
+
+  def store
+    GoogleDrive::CredentialStorage.store
+  end
+
+  def credential_stored?
+    not store.load_credentials.nil?
+  end
+
+  def storage
+    @storage ||= Google::APIClient::Storage.new(store)
+  end
+end

data/lib/google_drive/persistent_session/file_store_ext.rb

@@ -0,0 +1,10 @@
+require 'google/api_client/auth/storages/file_store'
+
+class Google::APIClient::FileStore
+  alias write_credentials_orig write_credentials
+
+  def write_credentials(credentials_hash)
+    write_credentials_orig(credentials_hash)
+    FileUtils.chmod(0600, path)
+  end
+end

data/lib/google_drive/persistent_session/persistent_session.rb

@@ -0,0 +1,81 @@
+class GoogleDrive::PersistentSession
+  extend Forwardable
+  include GoogleDrive::CredentialStorage
+
+  def_delegator :@highline, :ask
+
+  THREAD_KEY = "#{self.to_s}::THREAD_KEY"
+
+  def self.login
+    self.new
+  end
+
+  def initialize
+    @highline = HighLine.new
+    ensure_login
+  end
+
+  private
+
+  def ensure_login
+    store_credential unless credential_stored?
+    credential = storage.authorize
+
+    if credential.expired?
+      refresh(credential)
+    end
+
+    unless session
+      login_with_oauth(credential.access_token)
+    end
+  end
+
+  def store_credential
+    client_id = ask('Enter CLIENT ID: ')
+    client_secret = ask('Enter CLIENT SECRET: ') {|q| q.echo = false }
+    puts # line break
+
+    credential =  Google::Auth::UserRefreshCredentials.new(
+      :client_id => client_id,
+      :client_secret => client_secret,
+      :scope => [
+        'https://www.googleapis.com/auth/drive',
+        'https://spreadsheets.google.com/feeds/'
+      ],
+      :redirect_uri => 'urn:ietf:wg:oauth:2.0:oob',
+      :grant_type => 'authorization_code'
+    )
+
+    fetch_access_token(credential)
+    storage.write_credentials(credential)
+  end
+
+  def fetch_access_token(credential)
+    message =  "1. Open this page:\n%s\n\n" % credential.authorization_uri
+    message << "2. Enter the authorization code shown in the page: "
+    credential.code = ask(message)
+
+    credential.fetch_access_token!
+    storage.write_credentials(credential)
+    login_with_oauth(credential.access_token)
+  end
+
+  def refresh(credential)
+    credential.refresh!
+    storage.write_credentials(credential)
+    login_with_oauth(credential.access_token)
+  end
+
+  def session
+    Thread.current[THREAD_KEY]
+  end
+
+  def login_with_oauth(access_token)
+    Thread.current[THREAD_KEY] = GoogleDrive.login_with_oauth(access_token)
+  end
+
+  def method_missing(method_name, *args , &block)
+    ensure_login
+    session.send(method_name, *args, &block)
+  end
+end

data/lib/google_drive/persistent_session/version.rb

@@ -0,0 +1,5 @@
+module GoogleDrive
+  class PersistentSession
+    VERSION = '0.2.0'
+  end
+end

metadata

@@ -1,107 +1,110 @@
 --- !ruby/object:Gem::Specification
 name: google_drive-persistent_session
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Genki Sugawara
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2015-02-17 00:00:00.000000000 Z
+date: 2021-06-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: google_drive
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: 3.0.7
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: 3.0.7
 - !ruby/object:Gem::Dependency
   name: highline
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: Persist credential for google-drive-ruby.
 email:
-- sgwr_dts@yahoo.co.jp
+- sugawara@winebarrel.jp
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
+- ".gitignore"
 - Gemfile
 - LICENSE.txt
 - README.md
 - Rakefile
 - google_drive-persistent_session.gemspec
 - lib/google_drive/persistent_session.rb
+- lib/google_drive/persistent_session/credential_storage.rb
+- lib/google_drive/persistent_session/file_store_ext.rb
+- lib/google_drive/persistent_session/persistent_session.rb
+- lib/google_drive/persistent_session/version.rb
 homepage: https://github.com/winebarrel/google_drive-persistent_session
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.0.14
-signing_key: 
+rubygems_version: 3.1.4
+signing_key:
 specification_version: 4
 summary: Persist credential for google-drive-ruby.
 test_files: []