google_calendar 0.6.4 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 7566afbd7d0c1b5157f8e015004b178fed446e88
-  data.tar.gz: 9101a5db3d4daf55e78ae1aa38e56a336b372f66
+SHA256:
+  metadata.gz: acefcd4148fb09fb9ae42a28e6e2ebe85507e3388cc9a83c9ae79ec36eaa9349
+  data.tar.gz: b4df360b6242f88fcbd9d85cf32200bd47561e3482a0fad413904fc421e6832c
 SHA512:
-  metadata.gz: 75e132c4aabfc403960480fde10ed08a5534be9ddbdb4bfc4a026b89f59441cf10e76c5b44db5f389715348a5fdcf6140ebbe7a068536bdd521b7e52e01ec702
-  data.tar.gz: 977c123de8e964c0bce1d8ac390f23e2f95b39241b23144606b053215bbbf8ee38ed01e61c1d382f4c487b5fe35db8b940f629c2d8f84dffe68994a7dc03ffea
+  metadata.gz: 7705625116e7cc2c86f74c88d22f714d210f6ba955eab9775520883ee9274b6d624e118cae0d1401775bc2b28b4d5ed2ee4842652afdd2eb5dc019b61e904e50
+  data.tar.gz: 99e7c4f88747a310a2cafebd561a521c432b10fe40b7ddc658d891297fe978ec15f9d4f6ffa01c0b379800983d11ffbda3474ace8aa40e2a2ba028459a08d64e

data/.env.test

@@ -3,4 +3,4 @@ CLIENT_SECRET='roBgdbfEmJwPgrgi2mRbbO-f'
 REFRESH_TOKEN='1/eiqBWx8aj-BsdhwvlzDMFOUN1IN_HyThvYTujyksO4c'
 CALENDAR_ID='klei8jnelo09nflqehnvfzipgs@group.calendar.google.com'
 ACCESS_TOKEN='ya29.hYjPO0uHt63uWr5qmQtMEReZEvILcdGlPCOHDy6quKPyEQaQQvqaVAlLAVASaRm_O0a7vkZ91T8xyQ'
-REDIRECT_URL='urn:ietf:wg:oauth:2.0:oob'
+REDIRECT_URL='https://mytesturl.com/'

data/.github/workflows/ci.yml

@@ -0,0 +1,27 @@
+name: CI
+
+on:
+  push:
+    branches: [ master ]
+  pull_request:
+    branches: [ master ]
+
+jobs:
+  test:
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        ruby-version:
+          - '3.2'
+          - '3.3'
+          - '3.4'
+    steps:
+      - uses: actions/checkout@v4
+      - name: Set up Ruby ${{ matrix.ruby-version }}
+        uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: ${{ matrix.ruby-version }}
+          bundler-cache: true
+      - name: Run tests
+        run: bundle exec rake test

data/Gemfile

@@ -1,5 +1,4 @@
 source "https://rubygems.org"
 
 # Using google_calendar to manage dependencies
-gemspec 
-gem "codeclimate-test-reporter", group: :test, require: nil
+gemspec

data/Gemfile.lock

@@ -1,78 +1,104 @@
 PATH
   remote: .
   specs:
-    google_calendar (0.6.2)
-      TimezoneParser (~> 0.3.0)
+    google_calendar (0.7.0)
+      TimezoneParser (>= 0.3, < 1.1)
+      addressable (> 2.7.0)
       json (>= 1.8.3)
       signet (~> 0.7)
+      sorted_set (~> 1.0)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    TimezoneParser (0.3.2)
+    TimezoneParser (1.0.0)
       insensitive_hash
+      sqlite3
       tzinfo
-    addressable (2.5.2)
-      public_suffix (>= 2.0.2, < 4.0)
+    addressable (2.9.0)
+      public_suffix (>= 2.0.2, < 8.0)
     ansi (1.5.0)
-    builder (3.2.3)
-    codeclimate-test-reporter (1.0.8)
-      simplecov (<= 0.13)
+    base64 (0.3.0)
+    builder (3.2.4)
+    concurrent-ruby (1.3.7)
     docile (1.1.5)
-    dotenv (2.2.1)
-    faraday (0.14.0)
-      multipart-post (>= 1.2, < 3)
+    dotenv (2.7.6)
+    erb (6.0.4)
+    faraday (2.14.3)
+      faraday-net_http (>= 2.0, < 3.5)
+      json
+      logger
+    faraday-net_http (3.4.4)
+      net-http (~> 0.5)
     insensitive_hash (0.3.3)
-    json (2.1.0)
-    jwt (2.1.0)
-    metaclass (0.0.4)
-    minitest (5.11.3)
-    minitest-reporters (1.2.0)
+    json (2.3.1)
+    jwt (3.2.0)
+      base64
+    logger (1.7.0)
+    mini_portile2 (2.8.9)
+    minitest (5.27.0)
+    minitest-reporters (1.4.2)
       ansi
       builder
       minitest (>= 5.0)
       ruby-progressbar
-    mocha (1.4.0)
-      metaclass (~> 0.0.1)
-    multi_json (1.13.1)
-    multipart-post (2.0.0)
-    public_suffix (3.0.2)
-    rake (12.3.1)
-    rb-fsevent (0.10.3)
-    rdoc (5.1.0)
-    ruby-progressbar (1.9.0)
-    shoulda-context (1.2.2)
-    signet (0.8.1)
-      addressable (~> 2.3)
-      faraday (~> 0.9)
-      jwt (>= 1.5, < 3.0)
-      multi_json (~> 1.10)
-    simplecov (0.13.0)
-      docile (~> 1.1.0)
-      json (>= 1.8, < 3)
-      simplecov-html (~> 0.10.0)
-    simplecov-html (0.10.2)
+    mocha (2.8.2)
+      ruby2_keywords (>= 0.0.5)
+    net-http (0.9.1)
+      uri (>= 0.11.1)
+    prism (1.9.0)
+    public_suffix (7.0.5)
+    rake (13.0.1)
+    rb-fsevent (0.10.4)
+    rbs (4.0.3)
+      logger
+      prism (>= 1.6.0)
+      tsort
+    rbtree (0.4.7)
+    rdoc (8.0.0)
+      erb
+      prism (>= 1.6.0)
+      rbs (>= 4.0.0)
+      tsort
+    ruby-progressbar (1.10.1)
+    ruby2_keywords (0.0.5)
+    shoulda-context (2.0.0)
+    signet (0.22.0)
+      addressable (~> 2.8)
+      faraday (>= 0.17.5, < 3.a)
+      jwt (>= 1.5, < 4.0)
+    simplecov (0.22.0)
+      docile (~> 1.1)
+      simplecov-html (~> 0.11)
+      simplecov_json_formatter (~> 0.1)
+    simplecov-html (0.13.2)
+    simplecov_json_formatter (0.1.4)
+    sorted_set (1.1.0)
+      rbtree
+    sqlite3 (2.9.5)
+      mini_portile2 (~> 2.8.0)
     terminal-notifier-guard (1.7.0)
-    thread_safe (0.3.6)
-    tzinfo (1.2.5)
-      thread_safe (~> 0.1)
+    tsort (0.2.0)
+    tzinfo (2.0.2)
+      concurrent-ruby (~> 1.0)
+    uri (1.1.1)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
   bundler (>= 1.2)
-  codeclimate-test-reporter
   dotenv (~> 2.1)
   google_calendar!
   minitest (~> 5.1)
   minitest-reporters (~> 1.2)
-  mocha (~> 1.4)
+  mocha (~> 2.0)
   rake (>= 11)
   rb-fsevent (~> 0.9)
-  rdoc (>= 4.1)
-  shoulda-context (~> 1.2)
+  rdoc (> 6.3.1)
+  shoulda-context (~> 2.0)
+  simplecov (~> 0.22)
   terminal-notifier-guard (~> 1.6)
 
 BUNDLED WITH
-   1.16.1
+  4.0.3

data/LICENSE.txt

@@ -1,4 +1,4 @@
-Copyright (c) 2010 Steve Zich
+Copyright (c) 2010 Northworld, LLC.
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/README.rdoc

@@ -2,12 +2,14 @@
 
 A fast lightweight and minimalist wrapper around the {Google Calendar}[https://www.google.com/calendar/] api.
 
-{<img src="https://badge.fury.io/rb/google_calendar.svg" alt="Gem Version" />}[http://badge.fury.io/rb/google_calendar] {<img src="https://travis-ci.org/northworld/google_calendar.png?branch=master" alt="Build Status" />}[https://travis-ci.org/northworld/google_calendar] {<img src="https://gemnasium.com/northworld/google_calendar.png" alt="Dependency Status" />}[https://gemnasium.com/northworld/google_calendar] {<img src="https://codeclimate.com/github/northworld/google_calendar/badges/gpa.svg" />}[https://codeclimate.com/github/northworld/google_calendar] {<img src="https://codeclimate.com/github/northworld/google_calendar/badges/coverage.svg" />}[https://codeclimate.com/github/northworld/google_calendar]
+{<img src="https://badge.fury.io/rb/google_calendar.svg" alt="Gem Version" />}[http://badge.fury.io/rb/google_calendar] {<img src="https://github.com/northworld/google_calendar/actions/workflows/ci.yml/badge.svg" alt="Build Status" />}[https://github.com/northworld/google_calendar/actions/workflows/ci.yml]
 == Install
   [sudo] gem install 'google_calendar'
 
 == Setup
 
+<b>Important Changes: Google no longer supports the 'urn:ietf:wg:oauth:2.0:oob' out-of-band OAuth method.  You must setup your OAuth Credentials with a publically accessible URL where you can grab your code from the URL paramaters after approving the OAuth request.  If your product is a Web Application, you can automate this set up by pointing the redirect_url to the appropriate method of your application.</b>
+
 <b>Obtain a Client ID and Secret</b>
 
 1. Go to the {Google Developers Console}[https://console.developers.google.com/].
@@ -16,19 +18,20 @@ A fast lightweight and minimalist wrapper around the {Google Calendar}[https://w
 1. Type in 'Google Calendar' in the search box and click on 'Google Calendar API' in the results.
 1. Click on the 'Enable' link at the top of the page.
 1. In the sidebar on the left, select Credentials.
-1. If you haven't done so already, create your 'OAuth client ID' by clicking Create Credentials'.  Note: you need to set your 'Product name show to users' on the OAuth consent screen before you can create your client ID.
-1. Select the 'Other' option and click create.
-
-<em>Take note of the Client ID and Client Secret as you'll need to add it to your code later.</em>
+1. If you haven't done so already, create your 'OAuth client ID' by clicking 'Create Credentials -> OAuth client ID'.  Choose Web Application as the type.  
+1. You must also provide an "Authorized redirect URIs" which is a publically reachable URL where google will redirect to after the OAuth approval.  Google will append the paramater 'code=<your auth code>' to this URL during redirection which will include the necessary code to authenticate the usage of this application.
+1. <em>Take note of the Client ID and Client Secret as you'll need to add it to your code later.</em>
+1. In the sidebar on the left, select "OAuth consent screen".  You must setup your Application Name, and add "Test users" if this is for personal use (i.e. you are setting up links to at limited set of known users' calendars), or "Publish" your app if this is for public use.
 
 <b>Find your calendar ID</b>
 
 1. Visit {Google Calendar}[https://www.google.com/calendar/] in your web browser.
-1. In the calendar list on the left, click the down-arrow button next to the appropriate calendar, then select Calendar settings.
-1. In the Calendar Address section, locate the Calendar ID listed next to the XML, ICAL and HTML buttons.
+1. In the calendar list on the left, click the three vertical dots next to the appropriate calendar, then select 'Settings and sharing'.
+1. From the left toolbar, choose 'Integrate Calendar'.  
+1. In the Integrate Calendar section, locate the Calendar ID at the top of the section.
 1. Copy the Calendar ID.
 
-== Usage
+== Usage (readme_code.rb)
   require 'rubygems'
   require 'google_calendar'
 
@@ -36,7 +39,7 @@ A fast lightweight and minimalist wrapper around the {Google Calendar}[https://w
   cal = Google::Calendar.new(:client_id     => YOUR_CLIENT_ID,
                              :client_secret => YOUR_SECRET,
                              :calendar      => YOUR_CALENDAR_ID,
-                             :redirect_url  => "urn:ietf:wg:oauth:2.0:oob" # this is what Google uses for 'applications'
+                             :redirect_url  => YOUR_REDIRECT_URL # This must match a url you permitted in your OAuth setting
                              )
 
   puts "Do you already have a refresh token? (y/n)"
@@ -47,7 +50,7 @@ A fast lightweight and minimalist wrapper around the {Google Calendar}[https://w
     # A user needs to approve access in order to work with their calendars.
     puts "Visit the following web page in your browser and approve access."
     puts cal.authorize_url
-    puts "\nCopy the code that Google returned and paste it here:"
+    puts "\nCopy the code out of the paramters after Google redirects you to your provided redirect_url"
 
     # Pass the ONE TIME USE access code here to login and get a refresh token that you can use for access from now on.
     refresh_token = cal.login_with_auth_code( $stdin.gets.chomp )
@@ -91,7 +94,7 @@ A fast lightweight and minimalist wrapper around the {Google Calendar}[https://w
 This sample code is located in readme_code.rb in the root folder.
 
 == Ruby Support
-The current google_calendar gem supports Ruby 2.1 and higher -- because of the json gem dependency.  We maintain support for Ruby 1.8.7, 1.9.3 and 2.0 on different branches.
+The current google_calendar gem supports Ruby 3.2 and higher -- the +signet+ OAuth2 dependency requires it.  Older Ruby versions (1.8.7 through 2.7) are maintained on different branches.
 
 == Notes
 * This is not a complete implementation of the calendar api, it just includes the features we needed to support our internal calendar integration. Feel free to add additional features and we will happily integrate them.
@@ -118,4 +121,4 @@ accidentally committing to the repo as +.env+ is in the +.gitignore+.
 
 == Copyright
 
-Copyright (c) 2010-2014 Steve Zich. See LICENSE.txt for further details.
+Copyright (c) 2010-2022 Northworld, LLC. See LICENSE.txt for further details.

data/VERSION

@@ -1 +1 @@
-0.6.1
+0.7.0

data/google_calendar.gemspec

@@ -2,10 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = "google_calendar"
-  s.version = "0.6.4"
-  s.date = "2018-03-23"
+  s.version = "0.7.0"
+  s.date = "2026-07-07"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.required_ruby_version = ">= 3.2"
 
   s.authors = ["Steve Zich"]
   s.email = "steve.zich@gmail.com"
@@ -24,21 +25,23 @@ Gem::Specification.new do |s|
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
 
   s.require_paths = ["lib"]
-  s.rubygems_version = "2.6.14"
 
+  s.add_runtime_dependency(%q<addressable>, ["> 2.7.0"])
   s.add_runtime_dependency(%q<signet>, ["~> 0.7"])
   s.add_runtime_dependency(%q<json>, [">= 1.8.3"])
-  s.add_runtime_dependency(%q<TimezoneParser>, ["~> 0.3.0"])
+  s.add_runtime_dependency(%q<TimezoneParser>, ">= 0.3", "< 1.1")
+  s.add_runtime_dependency(%q<sorted_set>, ["~> 1.0"])
 
   s.add_development_dependency(%q<terminal-notifier-guard>, ["~> 1.6"])
   s.add_development_dependency(%q<rb-fsevent>, ["~> 0.9"])
   s.add_development_dependency(%q<minitest>, ["~> 5.1"])
   s.add_development_dependency(%q<minitest-reporters>, ["~> 1.2"])
-  s.add_development_dependency(%q<shoulda-context>, ["~> 1.2"])
+  s.add_development_dependency(%q<shoulda-context>, "~> 2.0")
   s.add_development_dependency(%q<bundler>, [">= 1.2"])
-  s.add_development_dependency(%q<mocha>, ["~> 1.4"])
+  s.add_development_dependency(%q<mocha>, ["~> 2.0"])
   s.add_development_dependency(%q<rake>, [">= 11"])
-  s.add_development_dependency(%q<rdoc>, [">= 4.1"])
+  s.add_development_dependency(%q<rdoc>, ["> 6.3.1"])
   s.add_development_dependency(%q<dotenv>, ["~> 2.1"])
+  s.add_development_dependency(%q<simplecov>, ["~> 0.22"])
 
 end

data/lib/google/calendar.rb

@@ -13,7 +13,7 @@ module Google
     #  the +params+ paramater accepts
     # * :client_id => the client ID that you received from Google after registering your application with them (https://console.developers.google.com/). REQUIRED
     # * :client_secret => the client secret you received from Google after registering your application with them. REQUIRED
-    # * :redirect_url => the url where your users will be redirected to after they have successfully permitted access to their calendars. Use 'urn:ietf:wg:oauth:2.0:oob' if you are using an 'application'" REQUIRED
+    # * :redirect_url => the url where your users will be redirected to after they have successfully permitted access to their calendars. REQUIRED
     # * :calendar => the id of the calendar you would like to work with (see Readme.rdoc for instructions on how to find yours). REQUIRED
     # * :refresh_token => if a user has already given you access to their calendars, you can specify their refresh token here and you will be 'logged on' automatically (i.e. they don't need to authorize access again). OPTIONAL
     #
@@ -23,7 +23,7 @@ module Google
     # Google::Calendar.new(:client_id => YOUR_CLIENT_ID,
     #                      :client_secret => YOUR_SECRET,
     #                      :calendar => YOUR_CALENDAR_ID,
-    #                      :redirect_url => "urn:ietf:wg:oauth:2.0:oob" # this is what Google uses for 'applications'
+    #                      :redirect_url => "http://myapplicationurl.com/"
     #                     )
     #
     def initialize(params={}, connection=nil)
@@ -36,7 +36,7 @@ module Google
     #  the +params+ paramater accepts
     # * :client_id => the client ID that you received from Google after registering your application with them (https://console.developers.google.com/). REQUIRED
     # * :client_secret => the client secret you received from Google after registering your application with them. REQUIRED
-    # * :redirect_url => the url where your users will be redirected to after they have successfully permitted access to their calendars. Use 'urn:ietf:wg:oauth:2.0:oob' if you are using an 'application'" REQUIRED
+    # * :redirect_url => the url where your users will be redirected to after they have successfully permitted access to their calendars. REQUIRED
     # * :summary => title of the calendar being created. OPTIONAL
     # * :location => geographic location of the calendar as free-form text. OPTIONAL
     # * :time_zone => the time zone of the calendar. (Formatted as an IANA Time Zone Database name, e.g. "Europe/Zurich".) OPTIONAL
@@ -53,7 +53,7 @@ module Google
     #                         :location => 'Somewhere',
     #                         :description => 'Test Calendar Description',
     #                         :time_zone => 'Europe/Zurich',
-    #                         :redirect_url => "urn:ietf:wg:oauth:2.0:oob" # this is what Google uses for 'applications'
+    #                         :redirect_url => "http://myapplicationurl.com/"
     #                        )
     #
     def self.create(params={}, connection=nil)
@@ -71,7 +71,7 @@ module Google
     #  the +params+ paramater accepts
     # * :client_id => the client ID that you received from Google after registering your application with them (https://console.developers.google.com/). REQUIRED
     # * :client_secret => the client secret you received from Google after registering your application with them. REQUIRED
-    # * :redirect_url => the url where your users will be redirected to after they have successfully permitted access to their calendars. Use 'urn:ietf:wg:oauth:2.0:oob' if you are using an 'application'" REQUIRED
+    # * :redirect_url => the url where your users will be redirected to after they have successfully permitted access to their calendars. REQUIRED
     # * :calendar => the id of the calendar you would like to work with (see Readme.rdoc for instructions on how to find yours). REQUIRED
     # * :refresh_token => if a user has already given you access to their calendars, you can specify their refresh token here and you will be 'logged on' automatically (i.e. they don't need to authorize access again). OPTIONAL
     #
@@ -82,7 +82,7 @@ module Google
     #                      :client_id => YOUR_CLIENT_ID,
     #                      :client_secret => YOUR_SECRET,
     #                      :calendar => YOUR_CALENDAR_ID,
-    #                      :redirect_url => "urn:ietf:wg:oauth:2.0:oob" # this is what Google uses for 'applications'
+    #                      :redirect_url => "http://myapplicationurl.com/"
     #                     )
     #
     def self.get(params={}, connection=nil)

data/lib/google/calendar_list.rb

@@ -13,7 +13,7 @@ module Google
     # The +params+ parameter accepts
     # * :client_id => the client ID that you received from Google after registering your application with them (https://console.developers.google.com/). REQUIRED
     # * :client_secret => the client secret you received from Google after registering your application with them. REQUIRED
-    # * :redirect_url => the url where your users will be redirected to after they have successfully permitted access to their calendars. Use 'urn:ietf:wg:oauth:2.0:oob' if you are using an 'application'" REQUIRED
+    # * :redirect_url => the url where your users will be redirected to after they have successfully permitted access to their calendars. REQUIRED
     # * :refresh_token => if a user has already given you access to their calendars, you can specify their refresh token here and you will be 'logged on' automatically (i.e. they don't need to authorize access again). OPTIONAL
     #
     # See Readme.rdoc or readme_code.rb for an explication on the OAuth2 authorization process.

data/lib/google/connection.rb

@@ -9,12 +9,13 @@ module Google
     BASE_URI = "https://www.googleapis.com/calendar/v3"
     TOKEN_URI ="https://accounts.google.com/o/oauth2/token"
     AUTH_URI = "https://accounts.google.com/o/oauth2/auth"
-    SCOPE = "https://www.googleapis.com/auth/calendar"
+    DEFAULT_SCOPE = "https://www.googleapis.com/auth/calendar"
+
     attr_accessor :client
 
     def self.new_with_service_account(params)
       client = Signet::OAuth2::Client.new(
-        :scope => SCOPE,
+        :scope => params.fetch(:scope, DEFAULT_SCOPE),
         :issuer => params[:client_id],
         :audience => TOKEN_URI,
         :token_credential_uri => TOKEN_URI,
@@ -43,8 +44,9 @@ module Google
     #  the +params+ paramater accepts
     # * :client_id => the client ID that you received from Google after registering your application with them (https://console.developers.google.com/)
     # * :client_secret => the client secret you received from Google after registering your application with them.
-    # * :redirect_uri => the url where your users will be redirected to after they have successfully permitted access to their calendars. Use 'urn:ietf:wg:oauth:2.0:oob' if you are using an 'application'"
+    # * :redirect_uri => the url where your users will be redirected to after they have successfully permitted access to their calendars."
     # * :refresh_token => if a user has already given you access to their calendars, you can specify their refresh token here and you will be 'logged on' automatically (i.e. they don't need to authorize access again)
+    # * :scope => Optional. The scope of the access request, expressed either as an Array or as a space-delimited String.
     #
     def initialize(params, client=nil)
 
@@ -58,7 +60,7 @@ module Google
         :state => params[:state],
         :authorization_uri => AUTH_URI,
         :token_credential_uri => TOKEN_URI,
-        :scope => SCOPE
+        :scope => params.fetch(:scope, DEFAULT_SCOPE)
       )
 
       # try to get an access token if possible.
@@ -178,7 +180,7 @@ module Google
         when "Rate Limit Exceeded"              then raise RateLimitExceededError, response.body
         when "Calendar usage limits exceeded."  then raise CalendarUsageLimitExceededError, response.body
         else                                    raise ForbiddenError, response.body
-      end      
+      end
     end
 
     #

data/lib/google/event.rb

@@ -1,5 +1,6 @@
 require 'time'
 require 'json'
+require 'sorted_set' # TimezoneParser relies on the top-level SortedSet, removed from stdlib in Ruby 3.2+
 require 'timezone_parser'
 
 module Google
@@ -216,10 +217,10 @@ module Google
     # You can pass true or false.  Defaults to transparent.
     #
     def transparency=(val)
-      if val == false || val.to_s.downcase == 'opaque'
-        @transparency = 'opaque'
-      else
+      if val == true || val.to_s.downcase == 'transparent'
         @transparency = 'transparent'
+      else
+        @transparency = 'opaque'
       end
     end
 

data/lib/google/freebusy.rb

@@ -16,7 +16,7 @@ module Google
     # The +params+ parameter accepts
     # * :client_id => the client ID that you received from Google after registering your application with them (https://console.developers.google.com/). REQUIRED
     # * :client_secret => the client secret you received from Google after registering your application with them. REQUIRED
-    # * :redirect_url => the url where your users will be redirected to after they have successfully permitted access to their calendars. Use 'urn:ietf:wg:oauth:2.0:oob' if you are using an 'application'" REQUIRED
+    # * :redirect_url => the url where your users will be redirected to after they have successfully permitted access to their calendars. REQUIRED
     # * :refresh_token => if a user has already given you access to their calendars, you can specify their refresh token here and you will be 'logged on' automatically (i.e. they don't need to authorize access again). OPTIONAL
     #
     # See Readme.rdoc or readme_code.rb for an explication on the OAuth2 authorization process.
@@ -46,7 +46,7 @@ module Google
     private
 
     #
-    # Prepare the JSON 
+    # Prepare the JSON
     #
     def json_for_query(calendar_ids, start_time, end_time)
       {}.tap{ |obj|
@@ -62,10 +62,9 @@ module Google
       return nil unless query_result['calendars'].is_a? Hash
 
       query_result['calendars'].each_with_object({}) do |(calendar_id, value), result|
+        value['busy'].each { |date_times| date_times.transform_values! { |date_time| DateTime.parse(date_time) } }
         result[calendar_id] = value['busy'] || []
       end
     end
-
   end
-
 end

data/readme_code.rb

@@ -12,7 +12,7 @@ require 'google_calendar'
 cal = Google::Calendar.new(:client_id     => YOUR_CLIENT_ID,
                            :client_secret => YOUR_SECRET,
                            :calendar      => YOUR_CALENDAR_ID,
-                           :redirect_url  => "urn:ietf:wg:oauth:2.0:oob" # this is what Google uses for 'applications'
+                           :redirect_url  => YOUR_REDIRECT_URL # this is what Google uses for 'applications'
                            )
 
 puts "Do you already have a refresh token? (y/n)"
@@ -23,7 +23,7 @@ if has_token.downcase != 'y'
   # A user needs to approve access in order to work with their calendars.
   puts "Visit the following web page in your browser and approve access."
   puts cal.authorize_url
-  puts "\nCopy the code that Google returned and paste it here:"
+  puts "\nCopy the code out of the paramters after Google redirects you to your provided redirect_url"
 
   # Pass the ONE TIME USE access code here to login and get a refresh token that you can use for access from now on.
   refresh_token = cal.login_with_auth_code( $stdin.gets.chomp )

data/test/helper.rb

@@ -14,7 +14,7 @@ end
 require "minitest/autorun"
 require 'minitest/reporters'
 require 'shoulda/context'
-require 'mocha/setup'
+require 'mocha/minitest'
 require 'faraday'
 
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))

data/test/test_google_calendar.rb

@@ -13,16 +13,16 @@ class TestGoogleCalendar < Minitest::Test
       @refresh_token = ENV['REFRESH_TOKEN']
       @calendar_id = ENV['CALENDAR_ID']
       @access_token = ENV['ACCESS_TOKEN']
-      @redirect_url = "urn:ietf:wg:oauth:2.0:oob"
+      @redirect_url = ENV['REDIRECT_URL']
 
-      @calendar = Calendar.new(:client_id => @client_id, :client_secret => @client_secret, :redirect_url => ENV['REDIRECT_URL'], :refresh_token => @refresh_token, :calendar => @calendar_id)
+      @calendar = Calendar.new(:client_id => @client_id, :client_secret => @client_secret, :redirect_url => @redirect_url, :refresh_token => @refresh_token, :calendar => @calendar_id)
 
     end
 
     context "a calendar" do
 
       should "generate auth url" do
-        assert_equal @calendar.authorize_url.to_s, 'https://accounts.google.com/o/oauth2/auth?access_type=offline&client_id=671053090364-ntifn8rauvhib9h3vnsegi6dhfglk9ue.apps.googleusercontent.com&redirect_uri=urn:ietf:wg:oauth:2.0:oob&response_type=code&scope=https://www.googleapis.com/auth/calendar'
+        assert_equal @calendar.authorize_url.to_s, 'https://accounts.google.com/o/oauth2/auth?access_type=offline&client_id=671053090364-ntifn8rauvhib9h3vnsegi6dhfglk9ue.apps.googleusercontent.com&redirect_uri=https://mytesturl.com/&response_type=code&scope=https://www.googleapis.com/auth/calendar'
       end
 
       should "login with auth code" do
@@ -42,14 +42,14 @@ class TestGoogleCalendar < Minitest::Test
       end
 
       should "login with get method" do
-        cal = Calendar.get(:client_id => @client_id, :client_secret => @client_secret, :redirect_url => @redirect_url, 
+        cal = Calendar.get(:client_id => @client_id, :client_secret => @client_secret, :redirect_url => @redirect_url,
                            :calendar => @calendar_id, :refresh_token  => @refresh_token)
         @client_mock.stubs(:body).returns( get_mock_body("get_calendar.json") )
         assert_equal cal.id, @calendar_id
       end
 
       should "update calendar" do
-        cal = Calendar.get(:client_id => @client_id, :client_secret => @client_secret, :redirect_url => @redirect_url, 
+        cal = Calendar.get(:client_id => @client_id, :client_secret => @client_secret, :redirect_url => @redirect_url,
                            :calendar => @calendar_id, :refresh_token  => @refresh_token)
         @client_mock.stubs(:body).returns( get_mock_body("update_calendar.json") )
         cal.update(:summary => 'Our Company', :description => "Work event list")
@@ -57,16 +57,24 @@ class TestGoogleCalendar < Minitest::Test
       end
 
       should "create calendar" do
-        cal = Calendar.create(:client_id => @client_id, :client_secret => @client_secret, :redirect_url => @redirect_url, 
-                              :refresh_token  => @refresh_token, :summary => 'A New Calendar', :description => 'Our new calendar')        
+        cal = Calendar.create(:client_id => @client_id, :client_secret => @client_secret, :redirect_url => @redirect_url,
+                              :refresh_token  => @refresh_token, :summary => 'A New Calendar', :description => 'Our new calendar')
         assert_equal cal.summary, 'A New Calendar'
       end
 
+      should "destroy a calendar" do
+        reusable_connection = mock('Google::Connection')
+        reusable_connection.expects(:send).with("/calendars/#{@calendar_id}", :delete, '').returns(@client_mock)
+
+        calendar = Calendar.new({:calendar => @calendar_id}, reusable_connection)
+        calendar.destroy
+      end
+
       should "catch login with invalid credentials" do
         @client_mock.stubs(:status).returns(403)
         @client_mock.stubs(:body).returns( get_mock_body("403.json") )
         assert_raises(HTTPAuthorizationFailed) do
-          Calendar.new(:client_id => 'abadid', :client_secret => 'abadsecret', :redirect_url => @redirect_url, 
+          Calendar.new(:client_id => 'abadid', :client_secret => 'abadsecret', :redirect_url => @redirect_url,
                        :refresh_token => @refresh_token, :calendar => @calendar_id)
         end
       end
@@ -86,7 +94,7 @@ class TestGoogleCalendar < Minitest::Test
 
         calendar = Calendar.new({:calendar => @calendar_id}, reusable_connection)
         calendar.events
-      end 
+      end
 
       should "throw ForbiddenError if not logged in" do
         @client_mock.stubs(:status).returns(403)
@@ -95,7 +103,7 @@ class TestGoogleCalendar < Minitest::Test
         assert_raises(ForbiddenError) do
           @calendar.find_event_by_id('1234')
         end
-      end       
+      end
 
       should "throw ForbiddenError if unknown 403 response" do
         @client_mock.stubs(:status).returns(403)
@@ -104,7 +112,7 @@ class TestGoogleCalendar < Minitest::Test
         assert_raises(ForbiddenError) do
           @calendar.find_event_by_id('1234')
         end
-      end   
+      end
 
     end # login context
 
@@ -210,7 +218,7 @@ class TestGoogleCalendar < Minitest::Test
             e.description = "A new event with &"
             e.location = "Joe's House & Backyard"
           end
-        end        
+        end
       end
 
       should "throw DailyLimitExceededError when limit exceeded" do
@@ -220,7 +228,7 @@ class TestGoogleCalendar < Minitest::Test
         assert_raises(DailyLimitExceededError) do
           @calendar.find_event_by_id('1234')
         end
-      end   
+      end
 
       should "throw RateLimitExceededError when rate limit exceeded" do
         @client_mock.stubs(:status).returns(403)
@@ -229,7 +237,7 @@ class TestGoogleCalendar < Minitest::Test
         assert_raises(RateLimitExceededError) do
           @calendar.find_event_by_id('1234')
         end
-      end  
+      end
 
       should "throw UserRateLimitExceededError when user rate limit exceeded" do
         @client_mock.stubs(:status).returns(403)
@@ -399,6 +407,17 @@ class TestGoogleCalendar < Minitest::Test
         assert_equal event.title, 'New Event Update when id is nil'
       end
 
+      should "create an event with a specified id when none is found on the server" do
+        @client_mock.stubs(:body).returns( get_mock_body("empty_events.json") )
+
+        event = @calendar.find_or_create_event_by_id('fhru34kt6ikmr20knd2456l08n') do |e|
+          e.title = 'New Event With Predefined Id'
+        end
+
+        assert_equal event.title, 'New Event With Predefined Id'
+        assert_equal event.id, 'fhru34kt6ikmr20knd2456l08n'
+      end
+
       should "provide the calendar summary" do
         @client_mock.stubs(:body).returns( get_mock_body("events.json") )
         @calendar.events
@@ -502,15 +521,30 @@ class TestGoogleCalendar < Minitest::Test
     end
 
     context "transparency" do
-      should "be transparent" do
-        @event = Event.new(:transparency => true)
-        assert @event.transparent?
+      should "be opaque when nil" do
+        @event = Event.new
+        assert @event.opaque?
+      end
+
+      should "be opaque when transparency = opaque" do
+        @event = Event.new(:transparency => 'opaque')
+        assert @event.opaque?
       end
 
       should "be opaque?" do
         @event = Event.new(:transparency => false)
         assert @event.opaque?
       end
+
+      should "be transparent" do
+        @event = Event.new(:transparency => true)
+        assert @event.transparent?
+      end
+
+      should "be transparent when transparency = transparent" do
+        @event = Event.new(:transparency => 'transparent')
+        assert @event.transparent?
+      end
     end
 
     context "event json" do
@@ -640,6 +674,67 @@ class TestGoogleCalendar < Minitest::Test
         assert_equal correct_hash.inspect, Event.parse_recurrence_rule(rrule).inspect
       end
     end
+
+    context "visibility" do
+      should "default to 'default' when not specified" do
+        assert_equal Event.new.visibility, "default"
+      end
+
+      should "accept a valid visibility" do
+        assert_equal Event.new(:visibility => "private").visibility, "private"
+      end
+
+      should "raise an error on an invalid visibility" do
+        assert_raises(ArgumentError) { Event.new(:visibility => "bogus") }
+      end
+    end
+
+    context "default hashes" do
+      should "return an empty hash for recurrence when unset" do
+        assert_equal Event.new.recurrence, {}
+      end
+
+      should "return an empty hash for extended_properties when unset" do
+        assert_equal Event.new.extended_properties, {}
+      end
+    end
+
+    context "attribute JSON helpers" do
+      setup do
+        @event = Event.new(
+          :color_id => 5,
+          :attendees => [{'email' => 'a@example.com', 'displayName' => 'A', 'responseStatus' => 'accepted'}],
+          :reminders => { 'useDefault' => false, 'overrides' => [{'minutes' => 10, 'method' => 'popup'}] },
+          :recurrence => { freq: 'weekly' },
+          :extended_properties => { 'shared' => { 'key' => 'value' } }
+        )
+      end
+
+      should "expose colorId as a hash and as json" do
+        assert_equal @event.color_attributes, { "colorId" => "5" }
+        assert_equal JSON.parse(@event.color_json), { "colorId" => "5" }
+      end
+
+      should "expose attendees as json" do
+        assert_equal JSON.parse(@event.attendees_json)["attendees"].first["email"], 'a@example.com'
+      end
+
+      should "expose reminders as json" do
+        assert_equal JSON.parse(@event.reminders_json)["useDefault"], false
+      end
+
+      should "expose recurrence as json" do
+        assert_equal JSON.parse(@event.recurrence_json)["recurrence"], ["RRULE:FREQ=WEEKLY"]
+      end
+
+      should "expose extended properties as json" do
+        assert_equal JSON.parse(@event.extended_properties_json)["extendedProperties"]["shared"]["key"], 'value'
+      end
+
+      should "expose the local timezone as json" do
+        assert_equal JSON.parse(@event.local_timezone_json)["timeZone"], TimezoneParser::getTimezones(Time.now.getlocal.zone).last
+      end
+    end
   end
 
   context "a calendar list" do
@@ -650,7 +745,7 @@ class TestGoogleCalendar < Minitest::Test
       @client_id = "671053090364-ntifn8rauvhib9h3vnsegi6dhfglk9ue.apps.googleusercontent.com"
       @client_secret = "roBgdbfEmJwPgrgi2mRbbO-f"
       @refresh_token = "1/eiqBWx8aj-BsdhwvlzDMFOUN1IN_HyThvYTujyksO4c"
-      @redirect_url = "urn:ietf:wg:oauth:2.0:oob"
+      @redirect_url = "https://mytesturl.com/"
 
       @calendar_list = Google::CalendarList.new(
         :client_id => @client_id,
@@ -698,14 +793,13 @@ class TestGoogleCalendar < Minitest::Test
   end
 
   context "a freebusy query" do
-
     setup do
       @client_mock = setup_mock_client
 
       @client_id = "671053090364-ntifn8rauvhib9h3vnsegi6dhfglk9ue.apps.googleusercontent.com"
       @client_secret = "roBgdbfEmJwPgrgi2mRbbO-f"
       @refresh_token = "1/eiqBWx8aj-BsdhwvlzDMFOUN1IN_HyThvYTujyksO4c"
-      @redirect_url = "urn:ietf:wg:oauth:2.0:oob"
+      @redirect_url = "https://mytesturl.com/"
 
       @freebusy = Google::Freebusy.new(
         :client_id => @client_id,
@@ -728,12 +822,28 @@ class TestGoogleCalendar < Minitest::Test
     should "returns the busy times for each calendar supplied" do
       freebusy_result = @freebusy.query(@calendar_ids, @start_time, @end_time)
 
-      assert_equal ({'start' => '2015-03-06T10:00:00Z', 'end' => '2015-03-06T11:00:00Z' }), freebusy_result['busy-calendar-id'].first
-      assert_equal ({'start' => '2015-03-06T11:30:00Z', 'end' => '2015-03-06T11:30:00Z' }), freebusy_result['busy-calendar-id'].last
+      assert_equal ({'start' => DateTime.new(2015, 3, 6, 10, 0, 0, 0), 'end' => DateTime.new(2015, 3, 6, 11, 0, 0, 0) }), freebusy_result['busy-calendar-id'].first
+      assert_equal ({'start' => DateTime.new(2015, 3, 6, 11, 30, 0, 0), 'end' => DateTime.new(2015, 3, 6, 11, 30, 0, 0) }), freebusy_result['busy-calendar-id'].last
       assert_equal [], freebusy_result['not-busy-calendar-id']
     end
   end
 
+  context "with a service account" do
+    setup do
+      @client_mock = setup_mock_client
+    end
+
+    should "connect and obtain an access token" do
+      connection = Google::Connection.new_with_service_account(
+        :client_id   => "the-issuer@example.iam.gserviceaccount.com",
+        :signing_key => OpenSSL::PKey::RSA.new(2048),
+        :person      => "user@example.com"
+      )
+
+      assert_equal connection.access_token, ENV['ACCESS_TOKEN']
+    end
+  end
+
   protected
 
   def get_mock_body(name)

metadata

@@ -1,15 +1,28 @@
 --- !ruby/object:Gem::Specification
 name: google_calendar
 version: !ruby/object:Gem::Version
-  version: 0.6.4
+  version: 0.7.0
 platform: ruby
 authors:
 - Steve Zich
-autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-03-23 00:00:00.000000000 Z
+date: 2026-07-07 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: addressable
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">"
+      - !ruby/object:Gem::Version
+        version: 2.7.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">"
+      - !ruby/object:Gem::Version
+        version: 2.7.0
 - !ruby/object:Gem::Dependency
   name: signet
   requirement: !ruby/object:Gem::Requirement
@@ -40,18 +53,38 @@ dependencies:
         version: 1.8.3
 - !ruby/object:Gem::Dependency
   name: TimezoneParser
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0.3'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '1.1'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0.3'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '1.1'
+- !ruby/object:Gem::Dependency
+  name: sorted_set
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.3.0
+        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.3.0
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: terminal-notifier-guard
   requirement: !ruby/object:Gem::Requirement
@@ -114,14 +147,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: '2.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -142,14 +175,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.4'
+        version: '2.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.4'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -168,16 +201,16 @@ dependencies:
   name: rdoc
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ">"
       - !ruby/object:Gem::Version
-        version: '4.1'
+        version: 6.3.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ">"
       - !ruby/object:Gem::Version
-        version: '4.1'
+        version: 6.3.1
 - !ruby/object:Gem::Dependency
   name: dotenv
   requirement: !ruby/object:Gem::Requirement
@@ -192,6 +225,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.1'
+- !ruby/object:Gem::Dependency
+  name: simplecov
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.22'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.22'
 description: A minimal wrapper around the google calendar API
 email: steve.zich@gmail.com
 executables: []
@@ -203,8 +250,8 @@ files:
 - ".document"
 - ".env.default"
 - ".env.test"
+- ".github/workflows/ci.yml"
 - ".gitignore"
-- ".travis.yml"
 - Gemfile
 - Gemfile.lock
 - Guardfile
@@ -261,7 +308,6 @@ homepage: http://northworld.github.io/google_calendar/
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -269,16 +315,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '3.2'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.14
-signing_key: 
+rubygems_version: 3.7.1
 specification_version: 4
 summary: A lightweight Google Calendar API wrapper
 test_files:

data/.travis.yml

@@ -1,14 +0,0 @@
-language: ruby
-rvm:
-  - 2.1
-  - 2.2
-  - 2.3
-  - 2.4
-  - 2.5
-addons:
-  code_climate:
-    repo_token: 35bb9d218078742d37436a9c9a8b78199e8c7312d034081881de670e95b8dcad
-after_success:
-  - bundle exec codeclimate-test-reporter      
-# uncomment this line if your project needs to run something other than `rake`:
-# script: bundle exec rspec spec