activeresource-google_spreadsheets 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b995e5457991666c29e03f231f6380215ecf66ed
-  data.tar.gz: 47788f07574dd25d260d70a085358d3ac5ae324b
+  metadata.gz: f0cf560b7e1ad86a01a4da5fa90b21a87be23345
+  data.tar.gz: a263c4f30a55a6ae8998f36fa7eea38dc2e82ce1
 SHA512:
-  metadata.gz: 199f57e9fea57908b1f0bdbbcdb3aeb91577dc008b478cb52c1e28c97003fdc5cace92dfab95a4704b50fccfb4d2c9d87baef1969e0f5ff6627808de49a8ee6a
-  data.tar.gz: 51cdfbdb99e66806b4952556538e384cd98c5d4107fa55e7d32680d44f11708852367e989aecd8d09793d70cad9ca230635087ae7b7ba43e49cb62dc38c449a4
+  metadata.gz: c31d3c6496c981452ce5de604c884ff6d4df5698db719bf448a8aac70e700a58495ad7e940b01f1ef361a2b245942941a74a46a932d7ea764051095bc45009aa
+  data.tar.gz: 7b1bf3cb53c7beb94d49b73abf841dbf3ad9b93b8773b134d645c6a604e60918b171c24e114b31d72c4bd12d8b431cf4a639482aaa5f661a35d20537ddb4e954

data/README.md

@@ -22,6 +22,32 @@ Or install it yourself as:
 
 http://webos-goodies.jp/archives/active_resource_google_spreadsheets_data_api.html
 
+### Authorization example (Service Account)
+
+#### 1. Using JSON key file
+
+in `config/initializers/google_spreadsheet.rb`
+
+```ruby
+GoogleSpreadsheets::Base.auth_type = :bearer
+GoogleSpreadsheets::Base.access_token =
+  GoogleSpreadsheets::Auth::ServiceAccountsAccessToken.new(
+    json_key_io: File.open('/path/to/service_account_json_key.json')
+  )
+```
+
+#### 2. Using client email & private key
+
+in `config/initializers/google_spreadsheet.rb`
+
+```ruby
+GoogleSpreadsheets::Base.auth_type = :bearer
+GoogleSpreadsheets::Base.access_token =
+  GoogleSpreadsheets::Auth::ServiceAccountsAccessToken.new
+```
+and set the values to `ENV['GOOGLE_CLIENT_EMAIL']` & `ENV['GOOGLE_PRIVATE_KEY']`
+
+
 ### ActiveRecord Syncing Feature (Experimental)
 
 http://qiita.com/tkawa/items/04fc6f0574122d4a3fd2

data/activeresource-google_spreadsheets.gemspec

@@ -18,9 +18,9 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.add_dependency 'activeresource', '~> 4.1.0'
+  spec.add_dependency 'activeresource', '>= 4.1.0'
   spec.add_dependency 'activesupport'
-  spec.add_dependency 'google-api-client', '~> 0.8.6'
+  spec.add_dependency 'googleauth'
 
   spec.add_development_dependency "bundler", "~> 1.3"
   spec.add_development_dependency "rake"

data/lib/google_spreadsheets/auth/service_accounts_access_token.rb

@@ -1,34 +1,17 @@
-require 'google/api_client'
-require 'openssl'
+require 'googleauth'
 
 module GoogleSpreadsheets
   module Auth
     class ServiceAccountsAccessToken
       def initialize(options = {})
-        @options = options.reverse_merge(
-          application_name: 'Ruby',
-          token_credential_uri: 'https://accounts.google.com/o/oauth2/token',
-          audience:             'https://accounts.google.com/o/oauth2/token',
-          scope:                'https://spreadsheets.google.com/feeds/'
-        )
+        @options = options
+        @options[:scope] ||= 'https://spreadsheets.google.com/feeds/'
       end
 
       def call(connection)
-        # cf. http://d.hatena.ne.jp/sugyan/20130112/1357996092
-        @client ||= Google::APIClient.new(application_name: @options[:application_name]).tap do |c|
-          c.authorization = Signet::OAuth2::Client.new(
-            token_credential_uri: @options[:token_credential_uri],
-            audience:             @options[:audience],
-            scope:                @options[:scope],
-            issuer:               @options[:client_email],
-            signing_key:          OpenSSL::PKey::RSA.new(@options[:private_key_pem])
-          )
-          c.authorization.fetch_access_token!
-        end
-        if @client.authorization.expired?
-          @client.authorization.refresh!
-        end
-        @client.authorization.access_token
+        @authorizer ||= Google::Auth::ServiceAccountCredentials.make_creds(@options)
+        @authorizer.refresh! if @authorizer.expires_at.nil? || @authorizer.expired?
+        @authorizer.access_token
       end
     end
   end

data/lib/google_spreadsheets/version.rb

@@ -1,3 +1,3 @@
 module GoogleSpreadsheets
-  VERSION = "0.2.0"
+  VERSION = "0.3.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: activeresource-google_spreadsheets
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Chihiro Ito
@@ -9,20 +9,20 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-05-02 00:00:00.000000000 Z
+date: 2017-12-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activeresource
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 4.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 4.1.0
 - !ruby/object:Gem::Dependency
@@ -40,19 +40,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: google-api-client
+  name: googleauth
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.8.6
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.8.6
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -135,8 +135,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.6.14
 signing_key: 
 specification_version: 4
 summary: Google Spreadsheets accessor with ActiveResource
 test_files: []
+has_rdoc: