simple_gdrive 0.4.0 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2deb1b8f04443033e24dca718a8fda59d4a5121b5d5e1b48ac1cc7bf54c64bbf
-  data.tar.gz: edf2eb26eb05a6e6f150759a5e83fa8b6bf3a688f6d1fc4c96c7ba189b33e118
+  metadata.gz: 2879e311aa9ed8e6532eaf6867f854fd9de9874953d79a97ff74689954b3722f
+  data.tar.gz: 4e387fef89aec0a4ee20cf8af1d56d39f341bf1753ac749a18cd4b422ff739c4
 SHA512:
-  metadata.gz: 927522cd800319aecbebbe3e22569a77faff86512e0d5720265cd8e584a9846a4d3432750951ed2023a90e31dd3617131674b32c425f38e3d7b5de2395fc0b9a
-  data.tar.gz: 69c8528403cbc6c836840c2bcd7982e9c031a5a58e1834246f19be38349a6d125fda8f0d191258cb01bd0346b2ce426586f2b414f126d72a11db0917149cd17b
+  metadata.gz: e92c41260ed8515b52954c6ad21e8b9e5ebc41bc5d74fa8ea304ebd267a70ecdd033e91aac7c3281b70847fdcdb32fafa762ef14c1958de3905f099182227ad7
+  data.tar.gz: 737f383994b9d474222c889e956b06382cd357add02d04600c9daa6eeb488bd9414713a8e5aeb1bf460fe81ddb3c65c33fd7e77cd88096198d07ab24c74d502b

data/.travis.yml

@@ -1,7 +1,7 @@
 sudo: false
 language: ruby
 rvm:
-  - 2.5.3
+  - 2.6.1
 before_install: gem install bundler
 before_script:
   - bundle install

data/lib/simple_gdrive.rb

@@ -1,4 +1,5 @@
 require 'simple_gdrive/version'
+require 'simple_gdrive/authorizer'
 require 'simple_gdrive/base'
 require 'simple_gdrive/uploader'
 require 'simple_gdrive/cleaner'
@@ -29,20 +30,12 @@ module SimpleGdrive
   end
 
   def self.upload(full_filename, upload_source, content_type: 'text/plain', mime_type: nil)
-    Uploader.new(
-      app_name: config.app_name,
-      base_folder_id: config.base_folder_id,
-      credential_file: config.credential_file,
-      client_secrets_file: config.client_secrets_file
-    ).call(full_filename, upload_source, content_type: content_type, mime_type: mime_type)
+    Uploader
+      .new(base_folder_id: config.base_folder_id)
+      .call(full_filename, upload_source, content_type: content_type, mime_type: mime_type)
   end
 
   def self.clear
-    Cleaner.new(
-      app_name: config.app_name,
-      base_folder_id: config.base_folder_id,
-      credential_file: config.credential_file,
-      client_secrets_file: config.client_secrets_file
-    ).call
+    Cleaner.new(base_folder_id: config.base_folder_id).call
   end
 end

data/lib/simple_gdrive/authorizer.rb

@@ -0,0 +1,51 @@
+require 'fileutils'
+
+require 'google/apis/drive_v3'
+require 'googleauth/stores/file_token_store'
+
+module SimpleGdrive
+  class Authorizer
+    OOB_URI = 'urn:ietf:wg:oauth:2.0:oob'.freeze
+    DEFAULT_USER_ID = 'default'.freeze
+    API_SCOPE = [Google::Apis::DriveV3::AUTH_DRIVE].freeze
+
+    def call
+      FileUtils.mkdir_p File.dirname(::SimpleGdrive.config.credential_file)
+
+      credentials = user_authorizer.get_credentials(DEFAULT_USER_ID)
+      credentials = request_credentials if credentials.nil? && defined?(Rails::Console)
+
+      credentials
+    end
+
+    def self.call
+      new.call
+    end
+
+    private
+
+    def user_authorizer
+      return @user_authorizer if defined?(@user_authorizer)
+
+      client_id = ::Google::Auth::ClientId.from_file(::SimpleGdrive.config.client_secrets_file)
+      token_store = ::Google::Auth::Stores::FileTokenStore.new(file: ::SimpleGdrive.config.credential_file)
+
+      @user_authorizer = ::Google::Auth::UserAuthorizer.new(
+        client_id,
+        API_SCOPE,
+        token_store,
+        OOB_URI
+      )
+    end
+
+    def request_credentials
+      puts 'Open the following URL in the browser and enter the '\
+           "resulting code after authorization:\n#{user_authorizer.get_authorization_url}"
+
+      user_authorizer.get_and_store_credentials_from_code(
+        user_id: DEFAULT_USER_ID,
+        code: gets
+      )
+    end
+  end
+end

data/lib/simple_gdrive/base.rb

@@ -1,63 +1,21 @@
-require 'fileutils'
-
 require 'google/apis/drive_v3'
-require 'googleauth'
-require 'googleauth/stores/file_token_store'
 
 module SimpleGdrive
   class Base
-    OOB_URI = 'urn:ietf:wg:oauth:2.0:oob'.freeze
-    USER_ID = 'default'.freeze
     FOLDER_MIME_TYPE = 'application/vnd.google-apps.folder'.freeze
     OPTIONS = {retries: 5}.freeze
 
-    def initialize(app_name:, base_folder_id:, credential_file:, client_secrets_file:)
-      @app_name = app_name
+    def initialize(base_folder_id:)
       @base_folder_id = base_folder_id
-      @credential_file = credential_file
-      @client_secrets_file = client_secrets_file
     end
 
+    private
+
     def service
       @service ||= Google::Apis::DriveV3::DriveService.new.tap do |service|
-        service.client_options.application_name = @app_name
-        service.authorization = credentials
+        service.client_options.application_name = SimpleGdrive.config.app_name
+        service.authorization = Authorizer.call
       end
     end
-
-    private
-
-    def auth_request(authorizer)
-      url = authorizer.get_authorization_url(base_url: OOB_URI)
-
-      puts 'Open the following URL in the browser and enter the '\
-            'resulting code after authorization'
-
-      puts url
-      code = gets
-
-      authorizer.get_and_store_credentials_from_code(
-        user_id: USER_ID,
-        code: code,
-        base_url: OOB_URI
-      )
-    end
-
-    def credentials
-      return @credentials if defined?(@credentials)
-
-      FileUtils.mkdir_p File.dirname(@credential_file)
-
-      client_id = Google::Auth::ClientId.from_file(@client_secrets_file)
-      token_store = Google::Auth::Stores::FileTokenStore.new(file: @credential_file)
-
-      authorizer = Google::Auth::UserAuthorizer.new(
-        client_id,
-        Google::Apis::DriveV3::AUTH_DRIVE,
-        token_store
-      )
-
-      @credentials = authorizer.get_credentials(USER_ID) || auth_request(authorizer)
-    end
   end
 end

data/lib/simple_gdrive/version.rb

@@ -1,3 +1,3 @@
 module SimpleGdrive
-  VERSION = '0.4.0'.freeze
+  VERSION = '0.5.0'.freeze
 end

data/simple_gdrive.gemspec

@@ -29,6 +29,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'rake', '~> 10.0'
   spec.add_development_dependency 'rspec', '~> 3.0'
   spec.add_development_dependency 'shoulda-matchers'
+  spec.add_development_dependency 'timecop'
   spec.add_development_dependency 'vcr'
   spec.add_development_dependency 'webmock'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: simple_gdrive
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.5.0
 platform: ruby
 authors:
 - Maxim Tretyakov
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-10-31 00:00:00.000000000 Z
+date: 2019-02-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: google-api-client
@@ -94,6 +94,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: timecop
+  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: vcr
   requirement: !ruby/object:Gem::Requirement
@@ -139,6 +153,7 @@ files:
 - bin/console
 - bin/setup
 - lib/simple_gdrive.rb
+- lib/simple_gdrive/authorizer.rb
 - lib/simple_gdrive/base.rb
 - lib/simple_gdrive/cleaner.rb
 - lib/simple_gdrive/uploader.rb
@@ -163,8 +178,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 3.0.1
 signing_key: 
 specification_version: 4
 summary: Simple Google Drive file uploader