bps-google-api 0.6.2.pre.1 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3289f4d16d65e63d55f50a64eee1f304a9bdc09cbde938f768bd7f21905cb297
-  data.tar.gz: bd3b5363ec5fe6612029d8cbf084682384f60db8060f9b67f1b9a2c8230944f2
+  metadata.gz: 3d03de79db68f08c0dd05c7e91955c855f8c3ece70d22a7c8002a6a82c6ecc14
+  data.tar.gz: 54d786a5e83008507af3a6aaed1cc9e5a8583e4c7b56f7fab51a3ca547c3f6ce
 SHA512:
-  metadata.gz: 598ebafb62a6dea9464f51515bf5909438ed0c418398e2a4ecf77d3e9ee3cc71d5694c476a0bd759c06ca0f5089855e0db2ac63987465f43314642bbf382eb13
-  data.tar.gz: a0092ecc8d0e6c2e171626eaa33ba307ef653b2a932e3975403a26fa0f976ed33182871d9edcfecfb5536c9ea7b1072a0896f28486aa797a644e63f9c3f648ab
+  metadata.gz: a85417faada4b864ca801a2176f2fdcdd9e73eeb23f01309cc2baf636958556d751ff3303707273740b5e451f1b42b6224600e84973399282e809b327f02f803
+  data.tar.gz: 011633b06862cf729406cb513ec8eedb24c70b012d31de15178774c6d6619933a9a7f4cb5f9d9020fa8e5fdb8441bd661b14c4d8b6dc291c875086c79a8bcd5b

data/.gitignore

@@ -2,3 +2,4 @@ config/
 coverage/
 tmp/
 lib/google_api/tmp
+.env

data/.rubocop.yml

@@ -1,21 +1,22 @@
 AllCops:
-  TargetRubyVersion: 2.4
+  TargetRubyVersion: 3.0
   Exclude:
     - bin/**/*
     - config/**/*
     - db/**/*
     - vendor/**/*
     - tmp/**/*
+  NewCops: enable
 
-Layout/IndentFirstHashElement:
+Layout/FirstHashElementIndentation:
   EnforcedStyle: consistent
 Layout/AccessModifierIndentation:
   EnforcedStyle: outdent
 Layout/EmptyLinesAroundAccessModifier:
   Enabled: true
-Layout/AlignArray:
+Layout/ArrayAlignment:
   Enabled: true
-Layout/AlignHash:
+Layout/HashAlignment:
   Enabled: true
 Layout/EmptyLineAfterGuardClause:
   Enabled: true
@@ -52,7 +53,7 @@ Metrics/AbcSize:
 
 Naming/MemoizedInstanceVariableName:
   Enabled: false
-Naming/UncommunicativeMethodParamName:
+Naming/MethodParameterName:
   Enabled: false
 
 Style/Documentation:
@@ -69,6 +70,8 @@ Style/ClassCheck:
   Enabled: true
 Style/GuardClause:
   Enabled: true
+Style/OptionalBooleanParameter:
+  Enabled: false
 
 Security/Eval:
   Enabled: true

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    bps-google-api (0.6.1)
+    bps-google-api (0.7.0)
       exp_retry (~> 0.0.13)
       fileutils (~> 1.4, >= 1.4.1)
       google-apis-admin_directory_v1 (~> 0.40)
@@ -19,6 +19,7 @@ GEM
     declarative (0.0.20)
     diff-lcs (1.5.1)
     docile (1.4.0)
+    dotenv (2.8.1)
     exp_retry (0.0.14)
     faraday (2.9.0)
       faraday-net_http (>= 2.0, < 3.2)
@@ -27,8 +28,8 @@ GEM
     fileutils (1.7.2)
     google-apis-admin_directory_v1 (0.54.0)
       google-apis-core (>= 0.14.0, < 2.a)
-    google-apis-calendar_v3 (0.40.0)
-      google-apis-core (>= 0.14.0, < 2.a)
+    google-apis-calendar_v3 (0.27.0)
+      google-apis-core (>= 0.11.0, < 2.a)
     google-apis-core (0.15.0)
       addressable (~> 2.5, >= 2.5.1)
       googleauth (~> 1.9)
@@ -119,6 +120,7 @@ PLATFORMS
 
 DEPENDENCIES
   bps-google-api!
+  dotenv
   rspec (~> 3.8, >= 3.8.0)
   rubocop (~> 0.71, >= 0.71.0)
   simplecov (~> 0.16, >= 0.16.1)

data/bps-google-api.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name          = 'bps-google-api'
-  s.version       = '0.6.2-1'
+  s.version       = '0.7.0'
   s.date          = '2024-05-17'
   s.summary       = 'Configured Google API'
   s.description   = 'A configured Google API wrapper.'
@@ -17,11 +17,12 @@ Gem::Specification.new do |s|
 
   s.add_runtime_dependency 'exp_retry',                      '~> 0.0.13'
   s.add_runtime_dependency 'fileutils',                      '~> 1.4', '>= 1.4.1'
+  s.add_runtime_dependency 'google-apis-admin_directory_v1', '~> 0.40'
   s.add_runtime_dependency 'google-apis-calendar_v3',        '~> 0.27'
   s.add_runtime_dependency 'google-apis-groupssettings_v1',  '~> 0.13'
-  s.add_runtime_dependency 'google-apis-admin_directory_v1', '~> 0.40'
   s.add_runtime_dependency 'ruby-progressbar',               '~> 1.10'
 
+  s.add_development_dependency 'dotenv'
   s.add_development_dependency 'rspec',     '~> 3.8',  '>= 3.8.0'
   s.add_development_dependency 'rubocop',   '~> 0.71', '>= 0.71.0'
   s.add_development_dependency 'simplecov', '~> 0.16', '>= 0.16.1'

data/lib/google_api/base.rb

@@ -27,11 +27,11 @@ class GoogleAPI
       @service ||= service_class.new
     end
 
-    def call(method, *args)
+    def call(...)
       if GoogleAPI.mock
-        send(:mock, method, *args)
+        mock(...)
       else
-        ExpRetry.for(exception: RETRIES) { service.send(method, *args) }
+        ExpRetry.for(exception: RETRIES) { service.send(...) }
       end
     end
 

data/lib/google_api/calendar.rb

@@ -22,7 +22,7 @@ class GoogleAPI
     end
 
     def create(calendar_id, **event_options)
-      call(:insert_event, calendar_id, event(**event_options), conference_data_version: 1)
+      call(:insert_event, calendar_id, event(false, **event_options), conference_data_version: 1)
     end
 
     def list(calendar_id, max_results: 2500, page_token: nil)
@@ -32,13 +32,13 @@ class GoogleAPI
     def list_all(calendar_id, verbose: false)
       events = []
 
-      list = call(:list_events, calendar_id)
-      events += list.items
+      l = call(:list_events, calendar_id)
+      events += l.items
 
-      while (page_token = list.next_page_token)
-        list = call(:list_events, calendar_id, page_token: page_token)
-        page_token = list.next_page_token
-        events += list.items
+      while (page_token = l.next_page_token)
+        l = call(:list_events, calendar_id, page_token: page_token)
+        page_token = l.next_page_token
+        events += l.items
         print('.') if verbose
       end
 
@@ -50,7 +50,7 @@ class GoogleAPI
     end
 
     def patch(calendar_id, event_id, **patch_options)
-      call(:patch_event, calendar_id, event_id, **patch_options, conference_data_version: 1)
+      call(:patch_event, calendar_id, event_id, patch_options, conference_data_version: 1)
     end
 
     def update(calendar_id, event_id, **event_options)
@@ -85,21 +85,21 @@ class GoogleAPI
 
   private
 
-    def event(event_options, patch: false)
-      validate_keys(event_options, patch)
+    def event(patch = false, **event_options)
+      validate_keys(patch, **event_options)
 
-      event_options = format_dates(event_options)
-      event_options = format_conference_data(event_options)
+      event_options = format_dates(**event_options)
+      event_options = format_conference_data(**event_options)
 
-      Google::Apis::CalendarV3::Event.new(event_options.reject { |_, v| v.nil? })
+      Google::Apis::CalendarV3::Event.new(**event_options.reject { |_, v| v.nil? })
     end
 
-    def validate_keys(event_options, patch)
+    def validate_keys(patch = false, **event_options)
       event_options.assert_valid_keys(VALID_EVENT_KEYS) unless patch
       event_options.assert_valid_keys(VALID_PATCH_KEYS) if patch
     end
 
-    def format_dates(event_options)
+    def format_dates(**event_options)
       event_options[:start] = format_date(event_options[:start])
       event_options[:end] = format_date(event_options[:end])
       event_options
@@ -108,7 +108,7 @@ class GoogleAPI
     def format_date(date)
       return date if date.is_a?(Google::Apis::CalendarV3::EventDateTime)
 
-      key = date&.is_a?(String) ? :date : :date_time
+      key = date.is_a?(String) ? :date : :date_time
       Google::Apis::CalendarV3::EventDateTime.new(key => date, time_zone: ENV['TZ'])
     end
 

data/spec/.rubocop.yml

@@ -1,3 +1,7 @@
+AllCops:
+  TargetRubyVersion: 3.0
+  NewCops: enable
+
 Metrics/LineLength:
   Max: 100
 Metrics/BlockLength:

data/spec/lib/google_api/calendar_spec.rb

@@ -78,7 +78,7 @@ RSpec.describe GoogleAPI::Calendar do
     end
 
     it 'returns the array of all events from list_all' do
-      subject.create(test_event) # Ensure at least one event exists
+      subject.create(**test_event) # Ensure at least one event exists
 
       expect(subject.list_all.map(&:class).uniq).to eql([Google::Apis::CalendarV3::Event])
     end
@@ -97,7 +97,7 @@ RSpec.describe GoogleAPI::Calendar do
         ]
       end
 
-      before { allow(calendar).to receive(:call).and_return(events) }
+      before { allow(calendar).to receive(:call).and_return(*events) }
 
       it 'returns the array of all events from list_all when paginated' do
         expect(calendar).to receive(:call).twice
@@ -107,18 +107,18 @@ RSpec.describe GoogleAPI::Calendar do
     end
 
     it 'creates an event' do
-      expect(subject.create(test_event)).to be_a(Google::Apis::CalendarV3::Event)
+      expect(subject.create(**test_event)).to be_a(Google::Apis::CalendarV3::Event)
     end
 
     describe 'conference data' do
       it 'creates an event with a new conference' do
         event = test_event.merge(conference: { id: :new })
 
-        expect(subject.create(event)).to be_a(Google::Apis::CalendarV3::Event)
+        expect(subject.create(**event)).to be_a(Google::Apis::CalendarV3::Event)
       end
 
       it 'creates an event with conference data', :aggregate_failures do
-        event = subject.create(test_event)
+        event = subject.create(**test_event)
         event = subject.add_conference(event.id)
         event_options = test_event.merge(
           conference: {
@@ -127,13 +127,13 @@ RSpec.describe GoogleAPI::Calendar do
           }
         )
 
-        event = subject.create(event_options)
+        event = subject.create(**event_options)
         expect(event).to be_a(Google::Apis::CalendarV3::Event)
         expect(event.conference_data).not_to be_nil
       end
 
       it 'returns valid conference information' do
-        event = subject.create(test_event)
+        event = subject.create(**test_event)
         event = subject.add_conference(event.id)
 
         expect(subject.conference_info(event.id)).to eql(
@@ -144,27 +144,27 @@ RSpec.describe GoogleAPI::Calendar do
     end
 
     it 'gets an event ' do
-      event = subject.create(test_event)
+      event = subject.create(**test_event)
       expect(subject.get(event.id)).to be_a(Google::Apis::CalendarV3::Event)
     end
 
     it 'patches an event' do
-      event = subject.create(test_event)
+      event = subject.create(**test_event)
       subject.patch(event.id, description: 'Patched.')
 
       expect(subject.get(event.id).description).to eql('Patched.')
     end
 
     it 'updates an event' do
-      event = subject.create(test_event)
+      event = subject.create(**test_event)
       updated_test_event = test_event.merge(description: 'Updated.')
-      subject.update(event.id, updated_test_event)
+      subject.update(event.id, **updated_test_event)
 
       expect(subject.get(event.id).description).to eql('Updated.')
     end
 
     it 'deletes an event' do
-      event = subject.create(test_event)
+      event = subject.create(**test_event)
 
       expect(subject.delete(event.id)).to eql('')
     end
@@ -187,7 +187,7 @@ RSpec.describe GoogleAPI::Calendar do
       end
 
       it 'does not raise any errors with verbose' do
-        subject.create(test_event)
+        subject.create(**test_event)
 
         silently do
           expect do
@@ -198,7 +198,7 @@ RSpec.describe GoogleAPI::Calendar do
     end
 
     it 'adds conference data' do
-      event = subject.create(test_event)
+      event = subject.create(**test_event)
 
       expect(subject.add_conference(event.id)).to be_a(Google::Apis::CalendarV3::Event)
     end

data/spec/lib/google_api/event_spec.rb

@@ -15,7 +15,7 @@ RSpec.describe GoogleAPI::Configured::Calendar::Event do
   let(:test_cal_id) { ENV['GOOGLE_CALENDAR_ID_TEST'] }
 
   subject do
-    event = GoogleAPI::Configured::Calendar.new(test_cal_id).create(test_event)
+    event = GoogleAPI::Configured::Calendar.new(test_cal_id).create(**test_event)
     GoogleAPI::Configured::Calendar::Event.new(test_cal_id, event.id)
   end
 
@@ -31,7 +31,7 @@ RSpec.describe GoogleAPI::Configured::Calendar::Event do
 
   it 'updates the event' do
     updated_test_event = test_event.merge(description: 'Updated.')
-    subject.update(updated_test_event)
+    subject.update(**updated_test_event)
 
     expect(subject.get.description).to eql('Updated.')
   end

data/spec/spec_helper.rb

@@ -9,6 +9,7 @@ SimpleCov.start do
 end
 SimpleCov.minimum_coverage(100)
 
+require 'dotenv/load'
 require 'google_api'
 
 def silently

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bps-google-api
 version: !ruby/object:Gem::Version
-  version: 0.6.2.pre.1
+  version: 0.7.0
 platform: ruby
 authors:
 - Julian Fiander
@@ -45,47 +45,47 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 1.4.1
 - !ruby/object:Gem::Dependency
-  name: google-apis-calendar_v3
+  name: google-apis-admin_directory_v1
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.27'
+        version: '0.40'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.27'
+        version: '0.40'
 - !ruby/object:Gem::Dependency
-  name: google-apis-groupssettings_v1
+  name: google-apis-calendar_v3
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.13'
+        version: '0.27'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.13'
+        version: '0.27'
 - !ruby/object:Gem::Dependency
-  name: google-apis-admin_directory_v1
+  name: google-apis-groupssettings_v1
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.40'
+        version: '0.13'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.40'
+        version: '0.13'
 - !ruby/object:Gem::Dependency
   name: ruby-progressbar
   requirement: !ruby/object:Gem::Requirement
@@ -100,6 +100,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.10'
+- !ruby/object:Gem::Dependency
+  name: dotenv
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -210,9 +224,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '3.0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubygems_version: 3.2.33
 signing_key: