google_drive 3.0.2 → 3.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: f2865f6f60afd35f662963e20dc007435b2423e7
-  data.tar.gz: '0188065da34b278318d377920761293e8dd136a6'
+SHA256:
+  metadata.gz: 8579ea758131c51c083928052abf518b1f327b9b9666e798c17007801f0c1476
+  data.tar.gz: c04c47fe2d0337bb2e471227ad66e90b857b33784f01f8d60d7406f63fcad92b
 SHA512:
-  metadata.gz: e80dc181f7403c13789cc232383de52746f0ebbf080dfa9d218c2d58d018e9682ee7afffbde8dafe50ab13e82d8d03aa6862a590580782200f9afce5899d4585
-  data.tar.gz: 2d966006bf5b7176c62d23d7fc89adc206ede7ed5597e4886df9b2f719a2813e3f433b08c24e58c20bf504a3ff2f3f7954de72e2237ba4b7fcf761da4130e022
+  metadata.gz: d52bac1e4e05bd2dee4503a67a4c9da7eaeee700dfa9bca2f668bc88c04df065b5a7c209a4808d98a63610cb27318df3bef859e6e016ba4fbe1029782440aa58
+  data.tar.gz: 24facac6a6116210ea76b82f139fcd5c93e5624fbdb889f2fb89de65c98a6eb11ae31fb0c892cb221a5b689e2fc5271bb6636ad1215559e2689a8ef9b5edbf85

data/lib/google_drive/acl.rb

@@ -22,7 +22,7 @@ module GoogleDrive
       @session = session
       @file = file
       api_permissions = @session.drive_service.list_permissions(
-        @file.id, fields: '*', supports_team_drives: true
+        @file.id, fields: '*', supports_all_drives: true
       )
       @entries =
         api_permissions.permissions.map { |perm| AclEntry.new(perm, self) }
@@ -73,7 +73,7 @@ module GoogleDrive
       api_permission = @session.drive_service.create_permission(
         @file.id,
         entry.params,
-        { fields: '*', supports_team_drives: true }.merge(options)
+        **{ fields: '*', supports_all_drives: true }.merge(options)
       )
       new_entry = AclEntry.new(api_permission, self)
       @entries.push(new_entry)
@@ -86,7 +86,7 @@ module GoogleDrive
     #   spreadsheet.acl.delete(spreadsheet.acl[1])
     def delete(entry)
       @session.drive_service.delete_permission(
-        @file.id, entry.id, supports_team_drives: true
+        @file.id, entry.id, supports_all_drives: true
       )
       @entries.delete(entry)
     end
@@ -98,7 +98,7 @@ module GoogleDrive
         entry.id,
         { role: entry.role },
         fields: '*',
-        supports_team_drives: true
+        supports_all_drives: true
       )
       entry.api_permission = api_permission
       entry

data/lib/google_drive/collection.rb

@@ -20,7 +20,7 @@ module GoogleDrive
     # Adds the given GoogleDrive::File to the folder.
     def add(file)
       @session.drive_service.update_file(
-        file.id, add_parents: id, fields: '', supports_team_drives: true
+        file.id, add_parents: id, fields: '', supports_all_drives: true
       )
       nil
     end
@@ -28,7 +28,7 @@ module GoogleDrive
     # Removes the given GoogleDrive::File from the folder.
     def remove(file)
       @session.drive_service.update_file(
-        file.id, remove_parents: id, fields: '', supports_team_drives: true
+        file.id, remove_parents: id, fields: '', supports_all_drives: true
       )
     end
 
@@ -62,7 +62,7 @@ module GoogleDrive
       }.merge(file_properties)
 
       file = @session.drive_service.create_file(
-        file_metadata, fields: '*', supports_team_drives: true
+        file_metadata, fields: '*', supports_all_drives: true
       )
 
       @session.wrap_api_file(file)

data/lib/google_drive/file.rb

@@ -39,7 +39,7 @@ module GoogleDrive
     # Reloads file metadata such as title and acl.
     def reload_metadata
       @api_file = @session.drive_service.get_file(
-        id, fields: '*', supports_team_drives: true
+        id, fields: '*', supports_all_drives: true
       )
       @acl = Acl.new(@session, self) if @acl
     end
@@ -96,7 +96,7 @@ module GoogleDrive
     def download_to_file(path, params = {})
       @session.drive_service.get_file(
         id,
-        { download_dest: path, supports_team_drives: true }.merge(params)
+        { download_dest: path, supports_all_drives: true }.merge(params)
       )
     end
 
@@ -115,7 +115,7 @@ module GoogleDrive
     def download_to_io(io, params = {})
       @session.drive_service.get_file(
         id,
-        { download_dest: io, supports_team_drives: true }.merge(params)
+        **{ download_dest: io, supports_all_drives: true }.merge(params)
       )
     end
 
@@ -184,8 +184,8 @@ module GoogleDrive
 
     # Reads content from +io+ and updates the file with the content.
     def update_from_io(io, params = {})
-      params = { upload_source: io, supports_team_drives: true }.merge(params)
-      @session.drive_service.update_file(id, nil, params)
+      params = { upload_source: io, supports_all_drives: true }.merge(params)
+      @session.drive_service.update_file(id, nil, **params)
       nil
     end
 
@@ -193,10 +193,10 @@ module GoogleDrive
     # If +permanent+ is +true+, deletes the file permanently.
     def delete(permanent = false)
       if permanent
-        @session.drive_service.delete_file(id, supports_team_drives: true)
+        @session.drive_service.delete_file(id, supports_all_drives: true)
       else
         @session.drive_service.update_file(
-          id, { trashed: true }, supports_team_drives: true
+          id, { trashed: true }, supports_all_drives: true
         )
       end
       nil
@@ -205,7 +205,7 @@ module GoogleDrive
     # Renames title of the file.
     def rename(title)
       @session.drive_service.update_file(
-        id, { name: title }, supports_team_drives: true
+        id, { name: title }, supports_all_drives: true
       )
       nil
     end
@@ -215,7 +215,7 @@ module GoogleDrive
     # Creates copy of this file with the given title.
     def copy(title, file_properties = {})
       api_file = @session.drive_service.copy_file(
-        id, { name: title }.merge(file_properties), fields: '*', supports_team_drives: true
+        id, { name: title }.merge(file_properties), fields: '*', supports_all_drives: true
       )
       @session.wrap_api_file(api_file)
     end

data/lib/google_drive/session.rb

@@ -141,15 +141,13 @@ module GoogleDrive
         config.client_id = options[:client_id]
         config.client_secret = options[:client_secret]
       end
-      if !config.client_id && !config.client_secret
-        config.client_id =
-          '452925651630-egr1f18o96acjjvphpbbd1qlsevkho1d.' \
-          'apps.googleusercontent.com'
-        config.client_secret = '1U3-Krii5x1oLPrwD5zgn-ry'
-      elsif !config.client_id || !config.client_secret
+      if !config.client_id || !config.client_secret
         raise(
           ArgumentError,
-          'client_id and client_secret must be both specified or both omitted'
+          'client_id or client_secret is missing in the config. Follow ' \
+          'https://github.com/gimite/google-drive-ruby/blob/master/doc/authorization.md ' \
+          'to provide a valid config. google_drive library no longer provides ' \
+          'the default credential due to a limitation of Google API.'
         )
       end
 
@@ -255,7 +253,7 @@ module GoogleDrive
       params = convert_params(params)
       execute_paged!(
         method: drive_service.method(:list_files),
-        parameters: { fields: '*', supports_team_drives: true }.merge(params),
+        parameters: { fields: '*', supports_all_drives: true, include_items_from_all_drives: true }.merge(params),
         items_method_name: :files,
         converter: proc { |af| wrap_api_file(af) },
         &block
@@ -287,7 +285,7 @@ module GoogleDrive
     # Returns an instance of GoogleDrive::File or its subclass
     # (GoogleDrive::Spreadsheet, GoogleDrive::Collection).
     def file_by_id(id)
-      api_file = drive_service.get_file(id, fields: '*', supports_team_drives: true)
+      api_file = drive_service.get_file(id, fields: '*', supports_all_drives: true)
       wrap_api_file(api_file)
     end
 
@@ -510,7 +508,7 @@ module GoogleDrive
       }.merge(file_properties)
 
       file = drive_service.create_file(
-        file_metadata, fields: '*', supports_team_drives: true
+        file_metadata, fields: '*', supports_all_drives: true
       )
 
       wrap_api_file(file)
@@ -600,7 +598,7 @@ module GoogleDrive
         end
 
       elsif opts[:parameters] && opts[:parameters].key?(:page_token)
-        response = opts[:method].call(opts[:parameters])
+        response = opts[:method].call(**opts[:parameters])
         items    = response.__send__(opts[:items_method_name]).map do |item|
           opts[:converter] ? opts[:converter].call(item) : item
         end
@@ -656,7 +654,7 @@ module GoogleDrive
         upload_source: source,
         content_type: 'application/octet-stream',
         fields: '*',
-        supports_team_drives: true
+        supports_all_drives: true
       }
       for k, v in params
         unless %i[convert convert_mime_type parents].include?(k)
@@ -674,7 +672,7 @@ module GoogleDrive
       end
       file_metadata[:parents] = params[:parents] if params[:parents]
 
-      file = drive_service.create_file(file_metadata, api_params)
+      file = drive_service.create_file(file_metadata, **api_params)
       wrap_api_file(file)
     end
 

data/lib/google_drive/worksheet.rb

@@ -50,7 +50,7 @@ module GoogleDrive
     # @api private
     # A regexp which matches an invalid character in XML 1.0:
     # https://en.wikipedia.org/wiki/Valid_characters_in_XML#XML_1.0
-    XML_INVAILD_CHAR_REGEXP =
+    XML_INVALID_CHAR_REGEXP =
       /[^\u0009\u000a\u000d\u0020-\ud7ff\ue000-\ufffd\u{10000}-\u{10ffff}]/
 
     # @api private
@@ -73,13 +73,16 @@ module GoogleDrive
     def worksheet_feed_entry
       @worksheet_feed_entry ||= @session.request(:get, worksheet_feed_url).root
     end
-    
+
     # Google::Apis::SheetsV4::SheetProperties object for this worksheet.
     attr_reader :properties
 
     # Title of the worksheet (shown as tab label in Web interface).
     attr_reader :title
 
+    # Index of the worksheet (affects tab order in web interface).
+    attr_reader :index
+
     # GoogleDrive::Spreadsheet which this worksheet belongs to.
     attr_reader :spreadsheet
 
@@ -139,6 +142,24 @@ module GoogleDrive
       format("%s\#gid=%s", spreadsheet.human_url, gid)
     end
 
+    # Copy worksheet to specified spreadsheet.
+    # This method can take either instance of GoogleDrive::Spreadsheet or its id.
+    def copy_to(spreadsheet_or_id)
+      destination_spreadsheet_id =
+        spreadsheet_or_id.respond_to?(:id) ?
+          spreadsheet_or_id.id : spreadsheet_or_id
+      request = Google::Apis::SheetsV4::CopySheetToAnotherSpreadsheetRequest.new(
+        destination_spreadsheet_id: destination_spreadsheet_id,
+      )
+      @session.sheets_service.copy_spreadsheet(spreadsheet.id, sheet_id, request)
+      nil
+    end
+
+    # Copy worksheet to owner spreadsheet.
+    def duplicate
+      copy_to(spreadsheet)
+    end
+
     # Returns content of the cell as String. Arguments must be either
     # (row number, column number) or cell name. Top-left cell is [1, 1].
     #
@@ -280,6 +301,13 @@ module GoogleDrive
       @meta_modified = true
     end
 
+    # Updates index of the worksheet.
+    # Note that update is not sent to the server until you call save().
+    def index=(index)
+      @index = index
+      @meta_modified = true
+    end
+
     # @api private
     def cells
       reload_cells unless @cells
@@ -380,6 +408,7 @@ module GoogleDrive
             properties: {
               sheet_id: sheet_id,
               title: title,
+              index: index,
               grid_properties: {row_count: max_rows, column_count: max_cols},
             },
             fields: '*',
@@ -392,7 +421,7 @@ module GoogleDrive
         @v4_requests = []
         sent = true
       end
-      
+
       @remote_title = @title
 
       unless @modified.empty?
@@ -406,7 +435,7 @@ module GoogleDrive
           min_modified_col = c if c < min_modified_col
           max_modified_col = c if c > max_modified_col
         end
-        
+
         # Uses update_spreadsheet_value instead batch_update_spreadsheet with
         # update_cells. batch_update_spreadsheet has benefit that the request
         # can be batched with other requests. But it has drawback that the
@@ -570,8 +599,8 @@ module GoogleDrive
     # A1 to have red text that is bold and italic:
     #   worksheet.set_text_format(
     #     1, 1, 1, 1,
-    #     bold: true, 
-    #     italic: true, 
+    #     bold: true,
+    #     italic: true,
     #     foreground_color: GoogleDrive::Worksheet::Colors::RED_BERRY)
     #
     # foreground_color is an instance of Google::Apis::SheetsV4::Color.
@@ -638,6 +667,7 @@ module GoogleDrive
     def set_properties(properties)
       @properties = properties
       @title = @remote_title = properties.title
+      @index = properties.index
       if properties.grid_properties.nil?
         @max_rows = @max_cols = 0
       else
@@ -673,7 +703,7 @@ module GoogleDrive
           k = [r + 1, c + 1]
           @cells[k] = cell_data.formatted_value || ''
           @input_values[k] = extended_value_to_str(cell_data.user_entered_value)
-          @numeric_values[k] = 
+          @numeric_values[k] =
               cell_data.effective_value && cell_data.effective_value.number_value ?
                   cell_data.effective_value.number_value.to_f : nil
         end
@@ -709,7 +739,7 @@ module GoogleDrive
     end
 
     def validate_cell_value(value)
-      if value =~ XML_INVAILD_CHAR_REGEXP
+      if value =~ XML_INVALID_CHAR_REGEXP
         raise(
           ArgumentError,
           format('Contains invalid character %p for XML 1.0: %p', $&, value)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: google_drive
 version: !ruby/object:Gem::Version
-  version: 3.0.2
+  version: 3.0.7
 platform: ruby
 authors:
 - Hiroshi Ichikawa
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-03-06 00:00:00.000000000 Z
+date: 2021-04-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -31,25 +31,45 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 2.0.0
 - !ruby/object:Gem::Dependency
-  name: google-api-client
+  name: google-apis-drive_v3
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.11.0
+        version: 0.5.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: 0.29.0
+        version: 1.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.11.0
+        version: 0.5.0
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 1.0.0
+- !ruby/object:Gem::Dependency
+  name: google-apis-sheets_v4
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.4.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: 0.29.0
+        version: 1.0.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.4.0
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 1.0.0
 - !ruby/object:Gem::Dependency
   name: googleauth
   requirement: !ruby/object:Gem::Requirement
@@ -168,8 +188,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.14
+rubygems_version: 3.2.3
 signing_key: 
 specification_version: 4
 summary: A library to read/write files/spreadsheets in Google Drive/Docs.