bps-google-api 0.2.2 → 0.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 899cc313e6b5e72312c23bde1a9d16f129baced9
-  data.tar.gz: b70921ec7472e2e187194c4ee33483ab90929bb4
+  metadata.gz: e31fcc3561f54e4e1c81770287c13ba26a226911
+  data.tar.gz: 10dc3a67b664fe45a43f1a968bc25135a1f29f1a
 SHA512:
-  metadata.gz: e7f4b5b46818a23efa0d897369288dda6610463565b4b6950c4b468fc2de1885a066a6f882e6554ea68b2ed7bc0b3f9671aa10f648db605c352dd4d81010e292
-  data.tar.gz: 58e69aa261ddd94beafd4880dcca17b5e969f19eaf9c8a097b56138527659a8a8b3489bf4302df483f362175e1a05bccdbe1080871c9e2e03579790b91d9ef97
+  metadata.gz: bb9060833604e6ba41e77968cd4ebec2f07f08c773bdc7f9298b4731b030b52c69b393d84282d152490a3446ae11e952463df937a355050f50ce1f5308ab5d46
+  data.tar.gz: fab01b55b6e722e5d64a7449f3db89d6f89947f4a7bc5e2fc68556b650940af2100e8655d75e17c25179c1a9646987437544fa69a45dff501abf4268838613e0

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    bps-google-api (0.2.2)
+    bps-google-api (0.2.3)
       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.2'
+  s.version       = '0.2.3'
   s.date          = '2019-06-20'
   s.summary       = 'Configured Google API'
   s.description   = 'A configured Google API wrapper.'

data/lib/google_api.rb

@@ -1,6 +1,8 @@
 # frozen_string_literal: true
 
 module GoogleAPI
+  ROOT_PATH ||= defined?(Rails) ? Rails.root : '.'
+
   require 'google/apis/calendar_v3'
   require 'google/apis/groupssettings_v1'
   require 'google/apis/admin_directory_v1'

data/lib/google_api/base.rb

@@ -30,13 +30,5 @@ module GoogleAPI
     def call(method, *args)
       ExpRetry.for(exception: RETRIES) { service.send(method, *args) }
     end
-
-    def root_path
-      defined?(Rails) ? Rails.root : '.'
-    end
-
-    def last_token_path
-      File.join(root_path, 'tmp', 'run', 'last_page_token')
-    end
   end
 end

data/lib/google_api/base/authorization.rb

@@ -81,7 +81,7 @@ module GoogleAPI
 
       def client_id_file
         store_key(
-          File.join(root_path, 'config/keys/google_api_client.json'),
+          File.join(GoogleAPI::ROOT_PATH, 'config/keys/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 +93,7 @@ module GoogleAPI
 
       def token_file
         store_key(
-          File.join(root_path, 'config/keys/google_token.yaml'),
+          File.join(GoogleAPI::ROOT_PATH, 'config/keys/google_token.yaml'),
           <<~KEY
             ---
             default: '{"client_id":"#{ENV['GOOGLE_CLIENT_ID']}","access_token":"#{ENV['GOOGLE_ACCESS_TOKEN']}",

data/lib/google_api/calendar.rb

@@ -4,6 +4,8 @@ module GoogleAPI
   require 'google_api/calendar/clear_test_calendar'
 
   class Calendar < GoogleAPI::Base
+    LAST_TOKEN_PATH ||= File.join(ROOT_PATH, 'tmp', 'run', 'last_page_token')
+
     include GoogleAPI::Calendar::ClearTestCalendar
 
     SERVICE_CLASS = Google::Apis::CalendarV3::CalendarService

data/lib/google_api/calendar/clear_test_calendar.rb

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

data/spec/lib/google_api/base_spec.rb

@@ -15,7 +15,7 @@ RSpec.describe GoogleAPI::Base do
     subject { GoogleAPI::Calendar }
 
     it 'returns the correct last token path' do
-      expect(subject.new.send(:last_token_path)).to eql('./tmp/run/last_page_token')
+      expect(GoogleAPI::Calendar::LAST_TOKEN_PATH).to eql('./tmp/run/last_page_token')
     end
 
     it 'returns an array from authorize with reveal' do

metadata

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