simple_gdrive 0.5.1 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d902a5c411c4653ff785e6823688a329bafaa54704ea6cfa4879d1ef4e8b5008
-  data.tar.gz: e33b580013b636094743b6454d152bb304c899e7a65dd0d90a243a02112cfe69
+  metadata.gz: 830b1e3136947e662d8f01f0e6dd16a6c8d7e71f1b7826736b36723480f04e88
+  data.tar.gz: 5550817d094e9889c7d0e556549db3406966935d525fd883541c2f446cff1048
 SHA512:
-  metadata.gz: 831787d7e1206a592a5d61fc4f0e9d1a953f3808d687a21b626d3ac9a959fafbef8c970d09e8ed4508f037d16277570139dc41a52bd71ceb77aaaebe864e6b8a
-  data.tar.gz: d9834b0484a72c5ba19e7e5c8441d152eb3a687719201fa7bc4e17b91ad81ee564e0911364535643805310314eb1b0aaff4232377a8f59676214e8e308ee7736
+  metadata.gz: 74231e22e7fa5b71f2f5e7e2bd968919375423abd6213933901ec77501e32eb790b7c91ce13ac17e3fda0f74277cac34c19507340391299b3298c81e2632dbd7
+  data.tar.gz: f939245fd8c67e23ba1168317d94ca5cd378c83a5e7743e152ff69e042cbdb42e7f44d105b02620960267048c948fc4ca1fe19a634ea0f61a9e86c26e4a0e42c

data/.travis.yml

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

data/README.md

@@ -42,7 +42,7 @@ SimpleGdrive.configure do |config|
   config.credential_file = Rails.root.join('config', 'credentials.yaml') # optional, default ~/.credentials/gdrive-uploader.yaml  
 end
 ```
-3. Start uploading test file from rails console and follow instructions to create `credentials.yaml`.
+3. Call `Authorizer.call` in console and follow instructions to create `credentials.yaml`.
 
 ### File upload
 ```ruby
@@ -71,6 +71,14 @@ removes all files and folders in
 SimpleGdrive.clear
 ```
 
+option `move_to_trash`, default: `false`
+
+### Trash clear
+clears the user's trash bin
+```ruby
+SimpleGdrive.clear_trash
+```
+
 ## Known issues
 
 * incorrect behaviour with cyrillic symbols in filenames:

data/lib/simple_gdrive.rb

@@ -1,8 +1,10 @@
 require 'simple_gdrive/version'
+
 require 'simple_gdrive/authorizer'
 require 'simple_gdrive/base'
 require 'simple_gdrive/uploader'
 require 'simple_gdrive/cleaner'
+require 'simple_gdrive/trash_cleaner'
 
 module SimpleGdrive
   Config = Struct.new(
@@ -35,7 +37,14 @@ module SimpleGdrive
       .call(full_filename, upload_source, content_type: content_type, mime_type: mime_type)
   end
 
-  def self.clear
-    Cleaner.new(base_folder_id: config.base_folder_id).call
+  def self.clear(move_to_trash: false)
+    Cleaner.new(
+      base_folder_id: config.base_folder_id,
+      move_to_trash: move_to_trash
+    ).call
+  end
+
+  def self.clear_trash
+    TrashCleaner.new.call
   end
 end

data/lib/simple_gdrive/authorizer.rb

@@ -13,6 +13,7 @@ module SimpleGdrive
       FileUtils.mkdir_p File.dirname(::SimpleGdrive.config.credential_file)
 
       credentials = user_authorizer.get_credentials(DEFAULT_USER_ID)
+      # FIXME: rails?
       credentials = request_credentials if credentials.nil? && defined?(Rails::Console)
 
       credentials

data/lib/simple_gdrive/base.rb

@@ -2,12 +2,6 @@ require 'google/apis/drive_v3'
 
 module SimpleGdrive
   class Base
-    FOLDER_MIME_TYPE = 'application/vnd.google-apps.folder'.freeze
-    OPTIONS = {retries: 5}.freeze
-
-    def initialize(base_folder_id:)
-      @base_folder_id = base_folder_id
-    end
 
     private
 

data/lib/simple_gdrive/cleaner.rb

@@ -2,13 +2,19 @@ module SimpleGdrive
   # Cleans the directory
   # Returns array of removed file names
   class Cleaner < Base
+    def initialize(base_folder_id:, move_to_trash: false)
+      @base_folder_id = base_folder_id
+      @move_to_trash = move_to_trash
+    end
+
     def call
       @page_token = nil
       @files_to_remove = {}
 
-      begin
+      loop do
         fetch_batch
-      end until @page_token.nil?
+        break if @page_token.nil?
+      end
 
       remove_files
 
@@ -30,7 +36,13 @@ module SimpleGdrive
     end
 
     def remove_files
-      @files_to_remove.keys.each { |id| service.delete_file(id) }
+      @files_to_remove.keys.each do |id|
+        if @move_to_trash
+          service.update_file(id, {trashed: true}, {})
+        else
+          service.delete_file(id)
+        end
+      end
     end
   end
 end

data/lib/simple_gdrive/trash_cleaner.rb

@@ -0,0 +1,8 @@
+module SimpleGdrive
+  # cleans then user's trash bin
+  class TrashCleaner < Base
+    def call
+      service.empty_file_trash
+    end
+  end
+end

data/lib/simple_gdrive/uploader.rb

@@ -1,6 +1,13 @@
 module SimpleGdrive
   # Uploads file
   class Uploader < Base
+    FOLDER_MIME_TYPE = 'application/vnd.google-apps.folder'.freeze
+    OPTIONS = {retries: 5}.freeze
+
+    def initialize(base_folder_id:)
+      @base_folder_id = base_folder_id
+    end
+
     def call(full_filename, upload_source, content_type:, mime_type: nil)
       names = full_filename.split('/')
       filename = names.pop

data/lib/simple_gdrive/version.rb

@@ -1,3 +1,3 @@
 module SimpleGdrive
-  VERSION = '0.5.1'.freeze
+  VERSION = '0.6.0'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: simple_gdrive
 version: !ruby/object:Gem::Version
-  version: 0.5.1
+  version: 0.6.0
 platform: ruby
 authors:
 - Maxim Tretyakov
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-02-12 00:00:00.000000000 Z
+date: 2019-04-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: google-api-client
@@ -156,6 +156,7 @@ files:
 - lib/simple_gdrive/authorizer.rb
 - lib/simple_gdrive/base.rb
 - lib/simple_gdrive/cleaner.rb
+- lib/simple_gdrive/trash_cleaner.rb
 - lib/simple_gdrive/uploader.rb
 - lib/simple_gdrive/version.rb
 - simple_gdrive.gemspec
@@ -178,7 +179,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.1
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Simple Google Drive file uploader