google_drive 2.1.11 → 2.1.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ab18bbc182b3ffa7d363b03b7969457b311158af
-  data.tar.gz: 3a1803545d767797bd8062b1c8bf7010f628be87
+  metadata.gz: a6e8bc240087cb507a378a4ff02886cad3e2b7ed
+  data.tar.gz: 07a8f238c8cc89072248fd6db3b2ca0b7ab18d37
 SHA512:
-  metadata.gz: 5066596c8f5720484ba23f18690164cbb796d4e4e7748a1b1f16f1fcf6240b47bcff1580101c1d9f69e4f00f05f683bbb74335f3a473d407c65a3b487d6c1702
-  data.tar.gz: ef1b363d2a00c794d2a00a2837a178dc3215886a3b9fbc4ddcde6c6f854fde11b7e38cf6ad78a0c1490e06b53cbc24cb5f975bc4b3f562bb0f3a0c1fd817cbfc
+  metadata.gz: 55ff686961a787c15738c8177f6aada5b4df2851019116e120310e2523684fed2d389b9658ad7f7d832ce125bcaf608467e7f7244a76109c0c649491d14ac773
+  data.tar.gz: b89df0376ae01ef915ae88193059a809eccbfa410f2a84a0e30c35415f08789f4021567d8da52a85e8f7cddd53319b084ddbc161deeb6ba19f0a0dd072e3cfec

data/lib/google_drive/api_client_fetcher.rb

@@ -17,7 +17,7 @@ module GoogleDrive
       attr_reader(:code, :body)
     end
 
-    def initialize(authorization)
+    def initialize(authorization, client_options, request_options)
       @drive = Google::Apis::DriveV3::DriveService.new
       @drive.authorization = authorization
 
@@ -28,6 +28,18 @@ module GoogleDrive
       @drive.client_options.open_timeout_sec = t
       @drive.client_options.read_timeout_sec = t
       @drive.client_options.send_timeout_sec = t
+
+      if client_options
+        @drive.client_options.members.each do |name|
+          if !client_options[name].nil?
+            @drive.client_options[name] = client_options[name]
+          end
+        end
+      end
+
+      if request_options
+        @drive.request_options = @drive.request_options.merge(request_options)
+      end
     end
 
     attr_reader(:drive)

data/lib/google_drive/session.rb

@@ -50,13 +50,19 @@ module GoogleDrive
     # See
     # https://github.com/gimite/google-drive-ruby/blob/master/doc/authorization.md
     # for a usage example.
-    def self.from_credentials(credentials)
-      Session.new(credentials)
+    #
+    # See from_config documentation for an explanation of client_options and
+    # request_options.
+    def self.from_credentials(credentials, client_options = nil, request_options = nil)
+      Session.new(credentials, nil, client_options, request_options)
     end
 
     # Constructs a GoogleDrive::Session object from OAuth2 access token string.
-    def self.from_access_token(access_token)
-      Session.new(access_token)
+    #
+    # See from_config documentation for an explanation of client_options and
+    # request_options.
+    def self.from_access_token(access_token, client_options = nil, request_options = nil)
+      Session.new(access_token, nil, client_options, request_options)
     end
 
     # Constructs a GoogleDrive::Session object from a service account key JSON.
@@ -67,23 +73,28 @@ module GoogleDrive
     # See
     # https://github.com/gimite/google-drive-ruby/blob/master/doc/authorization.md
     # for a usage example.
+    #
+    # As with from_config, you can configure Google API client behavior with
+    # +client_options+ and +request_options+. Unlike in from_config, these
+    # are passed as positional arguments.
     def self.from_service_account_key(
-        json_key_path_or_io, scope = DEFAULT_SCOPE
+        json_key_path_or_io, scope = DEFAULT_SCOPE, client_options = nil,
+        request_options = nil
     )
       if json_key_path_or_io.is_a?(String)
         open(json_key_path_or_io) do |f|
-          from_service_account_key(f, scope)
+          from_service_account_key(f, scope, client_options, request_options)
         end
       else
         credentials = Google::Auth::ServiceAccountCredentials.make_creds(
           json_key_io: json_key_path_or_io, scope: scope
         )
-        Session.new(credentials)
+        Session.new(credentials, nil, client_options, request_options)
       end
     end
 
     # Returns GoogleDrive::Session constructed from a config JSON file at
-    # +config+.
+    # +config+, potenially modified with +options+.
     #
     # +config+ is the path to the config file.
     #
@@ -102,13 +113,24 @@ module GoogleDrive
     #   scope
     #   scope=
     #   save
+    #
+    # +options+ is a hash which may contain the following keys:
+    #   client_secret: if present, this will overwrite config.client_secret
+    #   client_id: if present, this will overwrite config.client_id
+    #   client_options: a hash or ::Google::Apis::ClientOptions. See
+    #     https://www.rubydoc.info/github/google/google-api-ruby-client/Google/Apis/ClientOptions
+    #     for an explanation of legal sub-fields.
+    #   request_options: a hash or ::Google::Apis::RequestOptions. See
+    #     https://www.rubydoc.info/github/google/google-api-ruby-client/Google/Apis/RequestOptions
+    #     for an explanation of legal sub-fields.
     def self.from_config(config, options = {})
       if config.is_a?(String)
         config_path = config
         config = Config.new(config_path)
         if config.type == 'service_account'
           return from_service_account_key(
-            config_path, options[:scope] || DEFAULT_SCOPE
+            config_path, options[:scope] || DEFAULT_SCOPE, options[:client_options],
+            options[:request_options]
           )
         end
       end
@@ -153,10 +175,15 @@ module GoogleDrive
 
       config.save
 
-      Session.new(credentials)
+      Session.new(
+        credentials, nil, options[:client_options], options[:request_options]
+      )
     end
 
-    def initialize(credentials_or_access_token, proxy = nil)
+    def initialize(
+        credentials_or_access_token, proxy = nil, client_options = nil,
+        request_options = nil
+    )
       if proxy
         raise(
           ArgumentError,
@@ -179,7 +206,9 @@ module GoogleDrive
         else
           credentials = credentials_or_access_token
         end
-        @fetcher = ApiClientFetcher.new(credentials)
+        @fetcher = ApiClientFetcher.new(
+          credentials, client_options, request_options
+        )
       else
         @fetcher = nil
       end
@@ -418,6 +447,24 @@ module GoogleDrive
 
     alias folder_by_url collection_by_url
 
+    # Returns GoogleDrive::Collection with given +id+.
+    #
+    # e.g.
+    #   # https://drive.google.com/drive/folders/1rPPuzAew4tO3ORc88Vz1JscPCcnrX7-J
+    #   session.collection_by_id("1rPPuzAew4tO3ORc88Vz1JscPCcnrX7-J")
+    def collection_by_id(id)
+      file = file_by_id(id)
+      unless file.is_a?(Collection)
+        raise(
+          GoogleDrive::Error,
+          format('The file with the ID is not a folder: %s', id)
+        )
+      end
+      file
+    end
+
+    alias folder_by_id collection_by_id
+
     # Creates a top-level folder with given title. Returns GoogleDrive::Collection
     # object.
     def create_collection(title, file_properties = {})

data/lib/google_drive/spreadsheet.rb

@@ -24,7 +24,7 @@ module GoogleDrive
     def key
       id
     end
-
+    
     # URL of worksheet-based feed of the spreadsheet.
     def worksheets_feed_url
       format(

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: google_drive
 version: !ruby/object:Gem::Version
-  version: 2.1.11
+  version: 2.1.12
 platform: ruby
 authors:
 - Hiroshi Ichikawa
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-05-13 00:00:00.000000000 Z
+date: 2018-09-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri