google_drive-persistent_session 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 02d1e3ec096c8f506a575c50c72c0804c5c52748
-  data.tar.gz: d89b4046840c2fa7acdc5e726a7a9b588d63771d
+  metadata.gz: c4b4980bcca37db0193bc388f295a098e199eb95
+  data.tar.gz: 39056f78dc0d6475f2fce5697e587dffcb0f4011
 SHA512:
-  metadata.gz: bb84c133b11ffcea6f00068593765360fb24c777c87e77626a77ef18b352d16236c6dec4e42777d33c9e7ee37430dd144aea32fcc8e6a203781827eb96511240
-  data.tar.gz: 2f327b5ea9ba619e2abeeb8fa61b5291981bd8318da8e50804436fdd3e2204443f3b4eb6796156419cf1c0a6065c2159853c28106f8fe0118e08d63a7ed9d53a
+  metadata.gz: 3a1ca0fd1bf638640717c1a0ead36b4da31a719e0b449891d067955c40627dec41eb2b0ecf1570afafdf82face609013a7b5ad8e2e1b8c97d489d42cb94552e5
+  data.tar.gz: c2eab48f54a3b366fa0e7e30e6df605abfaf22a7dc12296076077947ed4c122e0ac9706129c42bd08ef8a01458780c47127cb29d44cb5ad085d9c8baa30976c5

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,10 +1,11 @@
 # 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.1'
+  spec.version       = GoogleDrive::PersistentSession::VERSION
   spec.authors       = ['Genki Sugawara']
   spec.email         = ['sgwr_dts@yahoo.co.jp']
   spec.summary       = %q{Persist credential for google-drive-ruby.}

data/lib/google_drive/persistent_session.rb

@@ -1,124 +1,10 @@
 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'
-
-    class << self
-      def credential_store_file
-        @credential_store_file ||= ::File.expand_path(DEFAULE_CREDENTIAL_STORE_FILE)
-      end
-
-      def credential_store_file=(value)
-        @credential_store_file = value
-      end
-
-      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,25 @@
+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,8 @@
+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,85 @@
+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.access_token
+      fetch_access_token(credential)
+    elsif 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 = Signet::OAuth2::Client.new(
+      :client_id => client_id,
+      :client_secret => client_secret,
+      :refresh_token => ''
+    )
+
+    storage.write_credentials(credential)
+  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!
+    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.1.2'
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: google_drive-persistent_session
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Genki Sugawara
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-17 00:00:00.000000000 Z
+date: 2015-02-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: google_drive
@@ -80,6 +80,10 @@ files:
 - 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