google-apis 0.1.7 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ea78fc750c376284814fe0fb104144d9815a115b
-  data.tar.gz: 25ea95f6f6c5aa5481a2edd48391a7e05cd0d4be
+  metadata.gz: b8abfe8e90b604e1864519024ff89a4202b9ff73
+  data.tar.gz: aee2ebae2543cba7bed7e20712be3d3d218cf249
 SHA512:
-  metadata.gz: 796038a79d21bf2ff602b79c5f6fa15f905a51e80db9b3a28032f2918ef14b83d8b7041d2a0d502dc64936a3f4162f91b87b848ea96e2a3d4d29d7640bfd44cd
-  data.tar.gz: 0a45ed7db4210bb5485b59652f7b4bbff757e39e91a690a85bbbeac43d595b778dd9acea2942f127354351c9c74c6ecc661c911e3dec867678afd6a79b983a73
+  metadata.gz: 773bbb888a374a15f06ef18dc6297251507d4b08e35781effd4268771c1d87ba4825fb0446563a9259a193b492125a9a718f009a6e79036270f9339cdc73a085
+  data.tar.gz: 7429aa5f1ca2848b5b87712c94d13a919008e771aad9200618755a35624ab2722d6a50ce8244b7b09e40b0bed5c2fa7c55ef20ef96ef76e60d5f9f6223a6d0d6

data/.gitignore

@@ -6,6 +6,7 @@ Gemfile.lock
 doc
 pkg
 *.log
+*.json
 *.p12
 *.yml
 test/coverage

data/CHANGELOG.rdoc

@@ -1,5 +1,10 @@
 = Google APIs CHANGELOG
 
+== Version 0.2.0 (December 31, 2017)
+
+* Tackle gzip error for when using Faraday >= 0.9.2
+* Solve "Invalid JWT Signature" by using JSON private key
+
 == Version 0.1.7 (July 16, 2015)
 
 * Respecting (optionally) passed :content_type or :mime_type option when dealing with upload media

data/README.md

@@ -20,10 +20,10 @@ Make sure you have created a Client ID (application type "Service account") at y
 
 Enable the API at your Console API page (https://console.developers.google.com/project/your_project_id/apiui/api).
 
-Do not forget to download the private key by generating a P12 key file.
+Do not forget to download the private key by generating a JSON key file.
 
 ```ruby
-[1] pry(main)> GoogleApis.connect :email_address => "lorem@developer.gserviceaccount.com", :private_key => "/path/to/private/key.p12"
+[1] pry(main)> GoogleApis.connect :email_address => "lorem@developer.gserviceaccount.com", :private_key => "/path/to/private/key.json"
 => #<GoogleApis::Connection:0x007fa5a4743668 [lorem@developer.gserviceaccount.com]>
 [2] pry(main)> bq = Google::BigQuery.new :project_id => "your_project_id", :dataset_id => "your_dataset_id"
 => #<Google::BigQuery:0x007fc5c68647a8 v2:[datasets,jobs,projects,tabledata,tables] {projectId:"your_project_id",datasetId:"your_dataset_id"}>
@@ -76,7 +76,7 @@ You can also configure an application-wide API connection. Let's say you also st
 ```yaml
 ---
   email_address: lorem@developer.gserviceaccount.com
-  private_key: "/path/to/private/key.p12"
+  private_key: "/path/to/private/key.json"
   project_id: your_project_id
   dataset_id: your_dataset_id
 ```
@@ -102,7 +102,7 @@ Please note that `Google::BigQuery.connection` is provided with several methods
 The following example demonstrates how to download and upload a file from Google Storage:
 
 ```ruby
-[1] pry(main)> Google::Storage.connect :email_address => "lorem@developer.gserviceaccount.com", :private_key => "/path/to/private/key.p12"
+[1] pry(main)> Google::Storage.connect :email_address => "lorem@developer.gserviceaccount.com", :private_key => "/path/to/private/key.json"
 => #<Google::Storage:0x007fe522024f68 v1:[bucketAccessControls,buckets,channels,defaultObjectAccessControls,objectAccessControls,objects] {}>
 [2] pry(main)> metadata = Google::Storage.objects.list :bucket => "your-bucket", :prefix => "path/to/your/file/awesome.tsv"
 => {"kind"=>"storage#objects",
@@ -154,7 +154,7 @@ Easy, huh? :)
 Please make sure that you also have created a "Public API access" server key and added your IP to the allowed IPs at the [API credentials page](https://console.developers.google.com/project/your_project_id/apiui/credential).
 
 ```ruby
-[1] pry(main)> Google::Drive.connect :email_address => "lorem@developer.gserviceaccount.com", :private_key => "/path/to/private/key.p12"
+[1] pry(main)> Google::Drive.connect :email_address => "lorem@developer.gserviceaccount.com", :private_key => "/path/to/private/key.json"
 => #<Google::Drive:0x007f83ee39fcc8 v2:[about,apps,changes,channels,children,comments,files,parents,permissions,properties,realtime,replies,revisions] {}>
 [2] pry(main)> Google::Drive.files.list
 => {"kind"=>"drive#fileList",
@@ -173,7 +173,7 @@ If it isn't already clear, you can specify a global Google API connection and us
 ```yaml
 ---
   email_address: lorem@developer.gserviceaccount.com
-  private_key: "/path/to/private/key.p12"
+  private_key: "/path/to/private/key.json"
   project_id: your_project_id
   dataset_id: your_dataset_id
   bucket: your_bucket
@@ -205,8 +205,8 @@ Run the following command in your console:
 
 ```ruby
 $ script/console
-Loading Google APIs development environment (0.1.5)
-[1] pry(main)> GoogleApis.connect :email_address => "lorem@developer.gserviceaccount.com", :private_key => "/path/to/private/key.p12"
+Loading Google APIs development environment (0.2.0)
+[1] pry(main)> GoogleApis.connect :email_address => "lorem@developer.gserviceaccount.com", :private_key => "/path/to/private/key.json"
 => #<GoogleApis::Connection:0x007ff3d356cbf0 [lorem@developer.gserviceaccount.com]>
 [2] pry(main)> bq = Google::BigQuery.new :project_id => "your_project_id", :dataset_id => "your_dataset_id"
 => #<Google::BigQuery:0x007f8c09a05338 v2:[datasets,jobs,projects,tabledata,tables] {projectId:"your_project_id",datasetId:"your_dataset_id"}>
@@ -217,7 +217,7 @@ You can also define `script/config.yml` containing the connection config:
 ```yaml
 ---
   email_address: lorem@developer.gserviceaccount.com
-  private_key: "/path/to/private/key.p12"
+  private_key: "/path/to/private/key.json"
   project_id: your_project_id
   dataset_id: your_dataset_id
 ```
@@ -226,7 +226,7 @@ And immediately start instantiating a Google API:
 
 ```ruby
 $ script/console
-Loading Google APIs development environment (0.1.5)
+Loading Google APIs development environment (0.2.0)
 [1] pry(main)> Google::BigQuery.connection
 => #<Google::BigQuery:0x007fa6c9cc3450 v2:[datasets,jobs,projects,tabledata,tables] {projectId:"your_project_id",datasetId:"your_dataset_id"}>
 ```
@@ -248,11 +248,10 @@ Please feel free to fork this repository and send in pull requests to help impro
 ### TODO
 
 * Add more Google API definitions (see [google-apis/lib/google_apis/api](https://github.com/archan937/google-apis/tree/master/lib/google_apis/api))
-* Add more tests
 
 ### License
 
-Copyright (c) 2015 Paul Engel, released under the MIT License
+Copyright (c) 2017 Paul Engel, released under the MIT License
 
 http://github.com/archan937 – http://twitter.com/archan937 – http://gettopup.com – pm_engel@icloud.com
 

data/VERSION

@@ -1 +1 @@
-0.1.7
+0.2.0

data/lib/google_apis.rb

@@ -1,4 +1,5 @@
 require "google/api_client"
+require "googleauth"
 
 require "google_apis/core_ext"
 require "google_apis/connection"
@@ -24,4 +25,11 @@ module GoogleApis
 
 end
 
+# Use httpclient to avoid broken pipe errors with large uploads
 Faraday.default_adapter = :httpclient
+
+# Only add the following statement if using Faraday >= 0.9.2
+# Override gzip middleware with no-op for httpclient
+if (Faraday::VERSION.split(".").collect(&:to_i) <=> [0, 9, 2]) > -1
+  Faraday::Response.register_middleware :gzip => Faraday::Response::Middleware
+end

data/lib/google_apis/connection.rb

@@ -12,15 +12,9 @@ module GoogleApis
         :application_version => GoogleApis::VERSION
       )
 
-      key = Google::APIClient::PKCS12.load_key(
-        File.open(options[:private_key], "rb"),
-        options[:passphrase] || "notasecret"
-      )
-
-      @asserter = Google::APIClient::JWTAsserter.new(
-        options[:email_address],
-        "",
-        key
+      @client.authorization = Google::Auth::ServiceAccountCredentials.make_creds(
+        json_key_io: File.open(options[:private_key], "rb"),
+        scope: []
       )
     end
 
@@ -79,9 +73,9 @@ module GoogleApis
     end
 
     def authenticate!(api)
-      if !@asserter.scope.include?(api.auth_scope) || @client.authorization.expired?
-        @asserter.scope = (@asserter.scope.split(" ") << api.auth_scope).uniq
-        @client.authorization = @asserter.authorize
+      if !@client.authorization.scope.include?(api.auth_scope) || @client.authorization.expired?
+        @client.authorization.scope.push(api.auth_scope).uniq!
+        @client.authorization.fetch_access_token!
       end
     end
 

data/lib/google_apis/version.rb

@@ -1,7 +1,7 @@
 module GoogleApis
   MAJOR = 0
-  MINOR = 1
-  TINY  = 7
+  MINOR = 2
+  TINY  = 0
 
   VERSION = [MAJOR, MINOR, TINY].join(".")
 end

data/test/unit/test_connection.rb

@@ -6,22 +6,23 @@ module Unit
     describe GoogleApis::Connection do
       describe "#initialize" do
         it "instantiates a Google::APIClient and Google::APIClient::JWTAsserter" do
+          client = mock()
+          client.expects(:authorization=).with("< authorization >")
+
           Google::APIClient.expects(:new).with({
             :application_name => "rubygem:google-apis",
             :application_version => GoogleApis::VERSION
-          }).returns("< client >")
+          }).returns(client)
 
           File.expects(:open).with("< private_key >", "rb").returns("< file >")
-          Google::APIClient::PKCS12.expects(:load_key).with("< file >", "notasecret").returns("< key >")
-          Google::APIClient::JWTAsserter.expects(:new).with("< email_address >", "", "< key >").returns("< asserter >")
+          Google::Auth::ServiceAccountCredentials.expects(:make_creds).returns("< authorization >")
 
           connection = GoogleApis::Connection.new(
             :email_address => "< email_address >",
             :private_key => "< private_key >"
           )
 
-          assert_equal "< client >", connection.instance_variable_get(:@client)
-          assert_equal "< asserter >", connection.instance_variable_get(:@asserter)
+          assert_equal client, connection.instance_variable_get(:@client)
         end
       end
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: google-apis
 version: !ruby/object:Gem::Version
-  version: 0.1.7
+  version: 0.2.0
 platform: ruby
 authors:
 - Paul Engel
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-16 00:00:00.000000000 Z
+date: 2017-12-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: google-api-client
@@ -184,7 +184,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.3
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: A thin layer on top of Google::APIClient (google-api-client) for a more intuitive
@@ -200,4 +200,3 @@ test_files:
 - test/unit/core_ext/test_kernel.rb
 - test/unit/test_connection.rb
 - test/unit/test_google_apis.rb
-has_rdoc: