bps-google-api 0.2.4 → 0.2.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 62dc0559dea2c506661457f032e9e60df284d2f9
-  data.tar.gz: 25d483983fe5607af8d87fbfaad9120674575d2f
+  metadata.gz: b81ec7c00f00165af4b968536942fc7637ef08a7
+  data.tar.gz: f560253ee4e8ae7ada9dfaaf3a69b0158070d349
 SHA512:
-  metadata.gz: af86ddc607a96df38f7bf1b2dc321898def9f3be7fffd01273423d6bf9d8ecf373e422c6fa039e5db686edc1ef7bf22438a28be2bfe477aa68df833c59b75c3e
-  data.tar.gz: ffcad31969723afadaf920de95f4ae06caa3c109786293d74f39476b09090c08f7871a92dd8fdecda0ffa48af1542d3515568121de9941732f28d98cb3350afa
+  metadata.gz: e633ccdf18625cdb33f9b7c9eb67393617ebd9644910d4bf66319ea2d824e32c2bf2d3946b7c6900643be59f9f244a50739635a1a6196fafbb70cbe628bc2839
+  data.tar.gz: fc05951a3d4af73490f1d5b594987dd518260b27727e9ae167b4e391d1c9afb4ead756707fc101dbef5c90656480c5dc1557d092342784298d74078102f3d4fd

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    bps-google-api (0.2.4)
+    bps-google-api (0.2.10)
       exp_retry (~> 0.0.11)
       fileutils (~> 1.2)
       google-api-client (~> 0.23.4)

data/bps-google-api.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name          = 'bps-google-api'
-  s.version       = '0.2.4'
+  s.version       = '0.2.10'
   s.date          = '2019-06-20'
   s.summary       = 'Configured Google API'
   s.description   = 'A configured Google API wrapper.'

data/lib/google_api/base/authorization.rb

@@ -49,12 +49,18 @@ module GoogleAPI
       def auth_client_id
         client_id_file
         Google::Auth::ClientId.from_hash(
-          JSON.parse(File.read('config/keys/google_api_client.json'))
+          JSON.parse(
+            File.read(
+              File.join(GoogleAPI::Base.root_path, 'config', 'keys', 'google_api_client.json')
+            )
+          )
         )
       end
 
       def auth_token_store
-        Google::Auth::Stores::FileTokenStore.new(file: 'config/keys/google_token.yaml')
+        Google::Auth::Stores::FileTokenStore.new(file:
+          File.join(GoogleAPI::Base.root_path, 'config', 'keys', 'google_token.yaml')
+        )
       end
 
       def auth_keys(auth)
@@ -69,10 +75,11 @@ module GoogleAPI
         Time.strptime(time, '%Y-%m-%d %H:%M:%S %:z').to_i * 1000
       end
 
-      def store_key(path, key)
+      def store_key(filename, key)
+        FileUtils.mkdir_p(File.join(GoogleAPI::Base.root_path, 'config', 'keys'))
+        path = File.join(GoogleAPI::Base.root_path, 'config', 'keys', filename)
         return if File.exist?(path)
 
-        FileUtils.mkdir_p(File.join(ROOT_PATH, 'config', 'keys'))
         File.open(path, 'w+') do |f|
           File.chmod(0o600, f)
           block_given? ? yield(f) : f.write(key)
@@ -81,7 +88,7 @@ module GoogleAPI
 
       def client_id_file
         store_key(
-          File.join(ROOT_PATH, 'config/keys/google_api_client.json'),
+          'google_api_client.json',
           <<~KEY
             {"installed":{"client_id":"#{ENV['GOOGLE_CLIENT_ID']}","project_id":"charming-scarab-208718",
             "auth_uri":"https://accounts.google.com/o/oauth2/auth","token_uri":"https://accounts.google.com/o/oauth2/token",
@@ -93,7 +100,7 @@ module GoogleAPI
 
       def token_file
         store_key(
-          File.join(ROOT_PATH, 'config/keys/google_token.yaml'),
+          'google_token.yaml',
           <<~KEY
             ---
             default: '{"client_id":"#{ENV['GOOGLE_CLIENT_ID']}","access_token":"#{ENV['GOOGLE_ACCESS_TOKEN']}",

data/lib/google_api/base.rb

@@ -1,14 +1,17 @@
 # frozen_string_literal: true
 
 module GoogleAPI
-  require 'google_api/base/authorization'
-
   class Base
     RETRIES ||= [
       Google::Apis::TransmissionError, Google::Apis::ServerError,
       Google::Apis::RateLimitError, Errno::ECONNRESET
     ].freeze
 
+    def self.root_path
+      defined?(Rails) ? Rails.root : File.dirname(__dir__)
+    end
+
+    require 'google_api/base/authorization'
     include GoogleAPI::Base::Authorization
 
     def initialize(auth: true)

data/lib/google_api/calendar/clear_test_calendar.rb

@@ -20,7 +20,8 @@ module GoogleAPI
     private
 
       def choose_page_token(page_token)
-        @page_token ||= File.read(Calendar::LAST_TOKEN_PATH) if File.exist?(Calendar::LAST_TOKEN_PATH)
+        last_token = Calendar.last_token_path
+        @page_token ||= File.read(last_token) if File.exist?(last_token)
         @page_token = page_token if token?(page_token)
       end
 
@@ -54,8 +55,8 @@ module GoogleAPI
 
       def log_last_page_token
         puts "\n\n*** Last page token cleared: #{@page_token}" if @verbose
-        File.open(Calendar::LAST_TOKEN_PATH, 'w+') { |f| f.write(@page_token) }
-        puts "\n*** Token stored in #{Calendar::LAST_TOKEN_PATH}" if @verbose
+        File.open(Calendar.last_token_path, 'w+') { |f| f.write(@page_token) }
+        puts "\n*** Token stored in #{Calendar.last_token_path}" if @verbose
       end
 
       def progress_bar(total)

data/lib/google_api/calendar.rb

@@ -2,7 +2,10 @@
 
 module GoogleAPI
   class Calendar < GoogleAPI::Base
-    LAST_TOKEN_PATH ||= File.join(ROOT_PATH, 'tmp', 'run', 'last_page_token')
+    def self.last_token_path
+      FileUtils.mkdir_p(File.join(GoogleAPI::Base.root_path, 'tmp', 'run'))
+      File.join(GoogleAPI::Base.root_path, 'tmp', 'run', 'last_page_token')
+    end
 
     require 'google_api/calendar/clear_test_calendar'
     include GoogleAPI::Calendar::ClearTestCalendar

data/lib/google_api.rb

@@ -1,8 +1,6 @@
 # frozen_string_literal: true
 
 module GoogleAPI
-  ROOT_PATH ||= File.dirname(__dir__)
-
   require 'google/apis/calendar_v3'
   require 'google/apis/groupssettings_v1'
   require 'google/apis/admin_directory_v1'

data/spec/lib/google_api/base_spec.rb

@@ -15,8 +15,8 @@ RSpec.describe GoogleAPI::Base do
     subject { GoogleAPI::Calendar }
 
     it 'returns the correct last token path' do
-      expect(GoogleAPI::Calendar::LAST_TOKEN_PATH).to eql(
-        File.join(GoogleAPI::ROOT_PATH, 'tmp', 'run', 'last_page_token')
+      expect(GoogleAPI::Calendar.last_token_path).to eql(
+        File.join(GoogleAPI::Base.root_path, 'tmp', 'run', 'last_page_token')
       )
     end
 

data/spec/spec_helper.rb

@@ -13,15 +13,15 @@ require 'google_api'
 
 def silently
   original_stdout = $stdout
-  $stdout = File.new(File.join('tmp', 'null'), 'w')
+  $stdout = File.new(File.join(GoogleAPI::Base.root_path, 'tmp', 'null'), 'w')
   yield
   $stdout = original_stdout
 end
 
 RSpec.configure do |config|
   config.before(:suite) do
-    FileUtils.mkdir_p(File.join('tmp', 'run'))
-    FileUtils.rm(Dir.glob(File.join('config', 'keys', '*')))
+    FileUtils.mkdir_p(File.join(GoogleAPI::Base.root_path, 'tmp', 'run'))
+    FileUtils.rm(Dir.glob(File.join(GoogleAPI::Base.root_path, 'config', 'keys', '*')))
 
     ENV['GOOGLE_AUTHORIZATION_CODE'] = 'test-auth-code'
     ENV['HIDE_PROGRESS_BARS'] = 'true'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bps-google-api
 version: !ruby/object:Gem::Version
-  version: 0.2.4
+  version: 0.2.10
 platform: ruby
 authors:
 - Julian Fiander