google_calendar 0.6.2 → 0.6.4

checksums.yaml

@@ -1,4 +1,7 @@
 ---
+SHA1:
+  metadata.gz: 7566afbd7d0c1b5157f8e015004b178fed446e88
+  data.tar.gz: 9101a5db3d4daf55e78ae1aa38e56a336b372f66
 SHA512:
-  metadata.gz: 37b7d1c2914d9c4975ff8477a94a5c5ae18d5cb8dacf089bbadb1a16414984adc4b606a97a08f52b9baae9beb018344c6cf6616f65d1064d4c5499d7ddc494a9
-  data.tar.gz: be2f3af778d82be79cebfac47135c2441363eeeffeed43d7eab04a3935f192b287fcc79b9b55b3bd02ccb6beac58eaf33c75db9d2a947efe42aadf64e106a25b
+  metadata.gz: 75e132c4aabfc403960480fde10ed08a5534be9ddbdb4bfc4a026b89f59441cf10e76c5b44db5f389715348a5fdcf6140ebbe7a068536bdd521b7e52e01ec702
+  data.tar.gz: 977c123de8e964c0bce1d8ac390f23e2f95b39241b23144606b053215bbbf8ee38ed01e61c1d382f4c487b5fe35db8b940f629c2d8f84dffe68994a7dc03ffea

data/.travis.yml

@@ -1,15 +1,14 @@
 language: ruby
 rvm:
-  - "2.1"
-  - "2.2"
-  - "2.3"
-  - "2.4"
-before_install:
-  - gem install bundler
+  - 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
+# script: bundle exec rspec spec

data/Gemfile

@@ -1,4 +1,4 @@
-source "http://rubygems.org"
+source "https://rubygems.org"
 
 # Using google_calendar to manage dependencies
 gemspec 

data/Gemfile.lock

@@ -1,60 +1,60 @@
 PATH
   remote: .
   specs:
-    google_calendar (0.6.1)
-      TimezoneParser (~> 0.2.0)
-      json (>= 1.8.3, < 2.1)
+    google_calendar (0.6.2)
+      TimezoneParser (~> 0.3.0)
+      json (>= 1.8.3)
       signet (~> 0.7)
 
 GEM
-  remote: http://rubygems.org/
+  remote: https://rubygems.org/
   specs:
-    TimezoneParser (0.2.0)
+    TimezoneParser (0.3.2)
       insensitive_hash
       tzinfo
-    addressable (2.5.0)
-      public_suffix (~> 2.0, >= 2.0.2)
+    addressable (2.5.2)
+      public_suffix (>= 2.0.2, < 4.0)
     ansi (1.5.0)
     builder (3.2.3)
-    codeclimate-test-reporter (1.0.5)
-      simplecov
+    codeclimate-test-reporter (1.0.8)
+      simplecov (<= 0.13)
     docile (1.1.5)
-    dotenv (2.2.0)
-    faraday (0.11.0)
+    dotenv (2.2.1)
+    faraday (0.14.0)
       multipart-post (>= 1.2, < 3)
     insensitive_hash (0.3.3)
-    json (2.0.3)
-    jwt (1.5.6)
+    json (2.1.0)
+    jwt (2.1.0)
     metaclass (0.0.4)
-    minitest (5.10.1)
-    minitest-reporters (1.1.14)
+    minitest (5.11.3)
+    minitest-reporters (1.2.0)
       ansi
       builder
       minitest (>= 5.0)
       ruby-progressbar
-    mocha (1.2.1)
+    mocha (1.4.0)
       metaclass (~> 0.0.1)
-    multi_json (1.12.1)
+    multi_json (1.13.1)
     multipart-post (2.0.0)
-    public_suffix (2.0.5)
-    rake (11.3.0)
-    rb-fsevent (0.9.8)
-    rdoc (4.3.0)
-    ruby-progressbar (1.8.1)
+    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.7.3)
+    signet (0.8.1)
       addressable (~> 2.3)
       faraday (~> 0.9)
-      jwt (~> 1.5)
+      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.0)
+    simplecov-html (0.10.2)
     terminal-notifier-guard (1.7.0)
-    thread_safe (0.3.5)
-    tzinfo (1.2.2)
+    thread_safe (0.3.6)
+    tzinfo (1.2.5)
       thread_safe (~> 0.1)
 
 PLATFORMS
@@ -66,13 +66,13 @@ DEPENDENCIES
   dotenv (~> 2.1)
   google_calendar!
   minitest (~> 5.1)
-  minitest-reporters (~> 1.0)
-  mocha (~> 1.1)
-  rake (~> 11)
+  minitest-reporters (~> 1.2)
+  mocha (~> 1.4)
+  rake (>= 11)
   rb-fsevent (~> 0.9)
-  rdoc (~> 4.1)
+  rdoc (>= 4.1)
   shoulda-context (~> 1.2)
   terminal-notifier-guard (~> 1.6)
 
 BUNDLED WITH
-   1.14.4
+   1.16.1

data/README.rdoc

@@ -11,13 +11,15 @@ A fast lightweight and minimalist wrapper around the {Google Calendar}[https://w
 <b>Obtain a Client ID and Secret</b>
 
 1. Go to the {Google Developers Console}[https://console.developers.google.com/].
-1. Select a project, or create a new one.
-1. In the sidebar on the left, expand APIs & auth. Next, click APIs. In the list of APIs, make sure the status is ON for the Calendar API.
+1. Select a project, or create a new one (at the top of the page).
+1. In the sidebar on the left, select Library.
+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. In either case, you end up on the Credentials page and can create your project's credentials from here.
-1. If you haven't done so already, create your OAuth 2.0 credentials by clicking Create new Client ID under the OAuth heading. Next, look for your application's client ID and client secret in the relevant table. You may also create and edit redirect URIs from this page.
+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 as you'll need to add it to your code later.</em>
+<em>Take note of the Client ID and Client Secret as you'll need to add it to your code later.</em>
 
 <b>Find your calendar ID</b>
 
@@ -111,7 +113,7 @@ to +.env+ for use by Dotenv.  You can also use +.env.default+ as your
 own starting point, just remember to copy it over to +.env+ before
 running tests.
 
-You can modify +.env+ with your own credentials and not worry about
+You can modify +.env+ with your own credentials and don't worry about
 accidentally committing to the repo as +.env+ is in the +.gitignore+.
 
 == Copyright

data/google_calendar.gemspec

@@ -2,8 +2,8 @@
 
 Gem::Specification.new do |s|
   s.name = "google_calendar"
-  s.version = "0.6.2"
-  s.date = "2017-02-17"
+  s.version = "0.6.4"
+  s.date = "2018-03-23"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
 
@@ -24,21 +24,21 @@ 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.10"
+  s.rubygems_version = "2.6.14"
 
   s.add_runtime_dependency(%q<signet>, ["~> 0.7"])
-  s.add_runtime_dependency(%q<json>, [">= 1.8.3", "< 2.1"])
-  s.add_runtime_dependency(%q<TimezoneParser>, ["~> 0.2.0"])
+  s.add_runtime_dependency(%q<json>, [">= 1.8.3"])
+  s.add_runtime_dependency(%q<TimezoneParser>, ["~> 0.3.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.0"])
+  s.add_development_dependency(%q<minitest-reporters>, ["~> 1.2"])
   s.add_development_dependency(%q<shoulda-context>, ["~> 1.2"])
   s.add_development_dependency(%q<bundler>, [">= 1.2"])
-  s.add_development_dependency(%q<mocha>, ["~> 1.1"])
-  s.add_development_dependency(%q<rake>, ["~> 11"])
-  s.add_development_dependency(%q<rdoc>, ["~> 4.1"])
+  s.add_development_dependency(%q<mocha>, ["~> 1.4"])
+  s.add_development_dependency(%q<rake>, [">= 11"])
+  s.add_development_dependency(%q<rdoc>, [">= 4.1"])
   s.add_development_dependency(%q<dotenv>, ["~> 2.1"])
 
 end

data/lib/google/calendar.rb

@@ -6,7 +6,7 @@ module Google
   #
   class Calendar
 
-    attr_reader :id, :connection, :summary
+    attr_reader :id, :connection, :summary, :location, :description, :time_zone
 
     #
     # Setup and connect to the specified Google Calendar.
@@ -14,7 +14,7 @@ module Google
     # * :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
-    # * :calendar_id => the id of the calendar you would like to work with (see Readme.rdoc for instructions on how to find yours)
+    # * :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
     #
     # See Readme.rdoc or readme_code.rb for an explication on the OAuth2 authorization process.
@@ -37,7 +37,10 @@ module Google
     # * :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
-    # * :summary => title of the calendar being created.
+    # * :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
+    # * :description => description of the calendar. OPTIONAL
     # * :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.
@@ -47,16 +50,98 @@ module Google
     #                         :client_id => YOUR_CLIENT_ID,
     #                         :client_secret => YOUR_SECRET,
     #                         :summary => 'Test Calendar',
+    #                         :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'
     #                        )
     #
     def self.create(params={}, connection=nil)
       cal = new(params, connection)
       cal.instance_variable_set(:@summary, params[:summary])
+      cal.instance_variable_set(:@location, params[:location])
+      cal.instance_variable_set(:@description, params[:description])
+      cal.instance_variable_set(:@time_zone, params[:time_zone])
 
       cal.save
     end
 
+    #
+    # Connect and retrieve a Google Calendar.
+    #  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
+    # * :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
+    #
+    # See Readme.rdoc or readme_code.rb for an explication on the OAuth2 authorization process.
+    #
+    # ==== Example
+    # Google::Calendar.get(
+    #                      :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'
+    #                     )
+    #
+    def self.get(params={}, connection=nil)
+      cal = new(params, connection)
+      cal.retrieve_calendar
+    end
+
+    #
+    # Connect and update a Google Calendar.
+    #  the +params+ paramater accepts
+    # * :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
+    # * :description => description of the calendar. OPTIONAL
+    # * :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.
+    #
+    # ==== Example
+    # google_calendar_object.update(
+    #                               :summary => 'Test Calendar',
+    #                               :location => 'Somewhere',
+    #                               :description => 'Test Calendar Description',
+    #                               :time_zone => 'Europe/Zurich',
+    #                              )
+    #
+    def update(params={})
+      instance_variable_set(:@summary, params[:summary])
+      instance_variable_set(:@location, params[:location])
+      instance_variable_set(:@description, params[:description])
+      instance_variable_set(:@time_zone, params[:time_zone])
+
+      response =
+        send_calendar_request(
+                              "/#{@id}", 
+                              :put, 
+                              {
+                               summary: @summary,
+                               location: @location,
+                               description: @description,
+                               timeZone: @time_zone,
+                              }.to_json
+                             )
+      @raw = JSON.parse(response.body)
+      self
+    end
+
+    #
+    # Destroy a Google Calendar.
+    #
+    # See Readme.rdoc or readme_code.rb for an explication on the OAuth2 authorization process.
+    #
+    # ==== Example
+    # google_calendar_object.destroy
+    #
+    def destroy
+      send_calendar_request("/#{@id}", :delete)
+    end
+
     #
     # The URL you need to send a user in order to let them grant you access to their calendars.
     #
@@ -105,10 +190,27 @@ module Google
     #   the calendar that was saved.
     #
     def save
-      response = send_calendar_request("/", :post, {:summary => @summary}.to_json)
+      response = send_calendar_request("/", :post, {:summary => @summary}.to_json)     
       update_after_save(response)
     end
 
+    #
+    # Get an existing calender.
+    #  Returns:
+    #   the calendar that was requested.
+    #
+    def retrieve_calendar
+      response = send_calendar_request("/#{@id}", :get)
+      @raw = JSON.parse(response.body)
+      instance_variable_set(:@summary, @raw['summary'])
+      instance_variable_set(:@location, @raw['location'])
+      instance_variable_set(:@description, @raw['description'])
+      instance_variable_set(:@time_zone, @raw['timeZone'])
+      @html_link = @raw['htmlLink']
+
+      self
+    end
+
     #
     # Find all of the events associated with this calendar.
     #  Returns:
@@ -269,8 +371,10 @@ module Google
     # If the event is no longer on the server it creates a new one with the specified values.
     # Works like the create_event method.
     #
-    def find_or_create_event_by_id(id, &blk)
-      if id && event = find_event_by_id(id)[0]
+    def find_or_create_event_by_id(id, &blk)      
+      event = id ? find_event_by_id(id)[0] : nil
+
+      if event
         setup_event(event, &blk)
       elsif id
         event = Event.new(id: id, new_event_with_id_specified: true)
@@ -290,12 +394,12 @@ module Google
       body = event.use_quickadd? ? nil : event.to_json
       notifications = "sendNotifications=#{event.send_notifications?}"
       query_string =  if event.use_quickadd?
-        "/quickAdd?#{notifications}&text=#{event.title}"
-      elsif event.new_event?
-        "?#{notifications}"
-      else # update existing event.
-        "/#{event.id}?#{notifications}"
-      end
+                        "/quickAdd?#{notifications}&text=#{event.title}"
+                      elsif event.new_event?
+                        "?#{notifications}"
+                      else # update existing event.
+                        "/#{event.id}?#{notifications}"
+                      end
 
       send_events_request(query_string, method, body)
     end

data/lib/google/connection.rb

@@ -153,15 +153,33 @@ module Google
 
     #
     # Check for common HTTP Errors and raise the appropriate response.
+    # Note: error 401 (InvalidCredentialsError) is handled by Signet.
     #
     def check_for_errors(response) #:nodoc
       case response.status
         when 400 then raise HTTPRequestFailed, response.body
+        when 403 then parse_403_error(response)
         when 404 then raise HTTPNotFound, response.body
+        when 409 then raise RequestedIdentifierAlreadyExistsError, response.body
+        when 410 then raise GoneError, response.body
+        when 412 then raise PreconditionFailedError, response.body
+        when 500 then raise BackendError, response.body
       end
     end
 
-    private
+    #
+    # Utility method to centralize handling of 403 errors.
+    #
+    def parse_403_error(response)
+      case JSON.parse(response.body)["error"]["message"]
+        when "Forbidden"                        then raise ForbiddenError, response.body
+        when "Daily Limit Exceeded"             then raise DailyLimitExceededError, response.body
+        when "User Rate Limit Exceeded"         then raise UserRateLimitExceededError, response.body
+        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
 
     #
     # Utility method to centralize credential validation.

data/lib/google/errors.rb

@@ -1,8 +1,78 @@
 module Google
-  class HTTPRequestFailed < StandardError; end
+  # Signet::AuthorizationError
+  # Not part of Google Calendar API Errors
   class HTTPAuthorizationFailed < StandardError; end
+
+  # Google Calendar API Errors per documentation
+  # https://developers.google.com/google-apps/calendar/v3/errors
+  
+  # 400: Bad Request
+  #
+  # User error. This can mean that a required field or parameter has not been
+  # provided, the value supplied is invalid, or the combination of provided
+  # fields is invalid.
+  class HTTPRequestFailed < StandardError; end
+
+  # 401: Invalid Credentials
+  #
+  # Invalid authorization header. The access token you're using is either
+  # expired or invalid.
+  class InvalidCredentialsError < StandardError; end
+
+  # 403: Daily Limit Exceeded
+  #
+  # The Courtesy API limit for your project has been reached.
+  class DailyLimitExceededError < StandardError; end
+
+  # 403: User Rate Limit Exceeded
+  #
+  # The per-user limit from the Developer Console has been reached.
+  class UserRateLimitExceededError < StandardError; end
+  
+  # 403: Rate Limit Exceeded
+  #
+  # The user has reached Google Calendar API's maximum request rate per
+  # calendar or per authenticated user.
+  class RateLimitExceededError < StandardError; end
+
+  # 403: Calendar usage limits exceeded
+  #
+  # The user reached one of the Google Calendar limits in place to protect
+  # Google users and infrastructure from abusive behavior.
+  class CalendarUsageLimitExceededError < StandardError; end
+
+  # 404: Not Found
+  #
+  # The specified resource was not found.
   class HTTPNotFound < StandardError; end
-  class HTTPTooManyRedirections < StandardError; end
-  class InvalidCalendar < StandardError; end
-  class CalenarIDMissing < StandardError; end
+
+  # 409: The requested identifier already exists
+  #
+  # An instance with the given ID already exists in the storage.
+  class RequestedIdentifierAlreadyExistsError < StandardError; end
+
+  # 410: Gone
+  #
+  # SyncToken or updatedMin parameters are no longer valid. This error can also
+  # occur if a request attempts to delete an event that has already been
+  # deleted.
+  class GoneError < StandardError; end
+
+  # 412: Precondition Failed
+  #
+  # The etag supplied in the If-match header no longer corresponds to the
+  # current etag of the resource.
+  class PreconditionFailedError < StandardError; end
+
+  # 500: Backend Error
+  #
+  # An unexpected error occurred while processing the request.
+  class BackendError < StandardError; end
+
+  #
+  # 403: Forbidden Error
+  #
+  # User has no authority to conduct the requested operation on the resource.
+  # This is not a part of official Google Calendar API Errors documentation.
+  class ForbiddenError < StandardError; end
 end

data/lib/google/event.rb

@@ -120,7 +120,7 @@ module Google
     # Returns whether the Event is an all-day event, based on whether the event starts at the beginning and ends at the end of the day.
     #
     def all_day?
-      time = (@start_time.is_a?  String) ? Time.parse(@start_time) : @start_time.dup.utc
+      time = (@start_time.is_a? String) ? Time.parse(@start_time) : @start_time.dup.utc
       duration % (24 * 60 * 60) == 0 && time == Time.local(time.year,time.month,time.day)
     end
 
@@ -314,7 +314,7 @@ module Google
       return {} unless @attendees
 
       attendees = @attendees.map do |attendee|
-        attendee.select { |k,v| ['displayName', 'email', 'responseStatus'].include?(k) }
+        attendee.select { |k,_v| ['displayName', 'email', 'responseStatus'].include?(k) }
       end
 
       { "attendees" => attendees }
@@ -396,7 +396,7 @@ module Google
     def extended_properties_attributes
       return {} unless @extended_properties && (@extended_properties['shared'] || @extended_properties['private'])
 
-      { "extendedProperties" => @extended_properties.select {|k,v| ['shared', 'private'].include?(k) } }
+      { "extendedProperties" => @extended_properties.select {|k,_v| ['shared', 'private'].include?(k) } }
     end
 
     #

data/test/mocks/400.json

@@ -0,0 +1,15 @@
+{
+ "error": {
+  "errors": [
+   {
+    "domain": "calendar",
+    "reason": "timeRangeEmpty",
+    "message": "The specified time range is empty.",
+    "locationType": "parameter",
+    "location": "timeMax",
+   }
+  ],
+  "code": 400,
+  "message": "The specified time range is empty."
+ }
+}

data/test/mocks/401.json

@@ -1,15 +1,15 @@
 {
-  "error": {
-    "code": 401, 
-    "message": "Invalid Credentials", 
-    "errors": [
-      {
-        "locationType": "header", 
-        "domain": "global", 
-        "message": "Invalid Credentials", 
-        "reason": "authError", 
-        "location": "Authorization"
-      }
-    ]
-  }
+ "error": {
+  "errors": [
+   {
+    "domain": "global",
+    "reason": "authError",
+    "message": "Invalid Credentials",
+    "locationType": "header",
+    "location": "Authorization",
+   }
+  ],
+  "code": 401,
+  "message": "Invalid Credentials"
+ }
 }

data/test/mocks/403_calendar_rate_limit.json

@@ -0,0 +1,13 @@
+{
+ "error": {
+  "errors": [
+   {
+    "domain": "usageLimits",
+    "message": "Calendar usage limits exceeded.",
+    "reason": "quotaExceeded"
+   }
+  ],
+  "code": 403,
+  "message": "Calendar usage limits exceeded."
+ }
+}

data/test/mocks/403_daily_limit.json

@@ -0,0 +1,13 @@
+{
+ "error": {
+  "errors": [
+   {
+    "domain": "usageLimits",
+    "reason": "dailyLimitExceeded",
+    "message": "Daily Limit Exceeded"
+   }
+  ],
+  "code": 403,
+  "message": "Daily Limit Exceeded"
+ }
+}

data/test/mocks/403_forbidden.json

@@ -0,0 +1,13 @@
+{
+ "error": {
+  "errors": [
+   {
+    "domain": "usageLimits",
+    "reason": "ForbiddenError",
+    "message": "Forbidden"
+   }
+  ],
+  "code": 403,
+  "message": "Forbidden"
+ }
+}

data/test/mocks/403_rate_limit.json

@@ -0,0 +1,13 @@
+{
+ "error": {
+  "errors": [
+   {
+    "domain": "usageLimits",
+    "reason": "rateLimitExceeded",
+    "message": "Rate Limit Exceeded"
+   }
+  ],
+  "code": 403,
+  "message": "Rate Limit Exceeded"
+ }
+}

data/test/mocks/403_unknown.json

@@ -0,0 +1,13 @@
+{
+ "error": {
+  "errors": [
+   {
+    "domain": "usageLimits",
+    "reason": "SomeRandomError",
+    "message": "RandomError"
+   }
+  ],
+  "code": 403,
+  "message": "RandomError"
+ }
+}

data/test/mocks/403_user_rate_limit.json

@@ -0,0 +1,13 @@
+{
+ "error": {
+  "errors": [
+   {
+    "domain": "usageLimits",
+    "reason": "userRateLimitExceeded",
+    "message": "User Rate Limit Exceeded"
+   }
+  ],
+  "code": 403,
+  "message": "User Rate Limit Exceeded"
+ }
+}

data/test/mocks/409.json

@@ -0,0 +1,13 @@
+{
+ "error": {
+  "errors": [
+   {
+    "domain": "global",
+    "reason": "duplicate",
+    "message": "The requested identifier already exists."
+   }
+  ],
+  "code": 409,
+  "message": "The requested identifier already exists."
+ }
+}

data/test/mocks/410.json

@@ -0,0 +1,13 @@
+{
+ "error": {
+  "errors": [
+   {
+    "domain": "global",
+    "reason": "deleted",
+    "message": "Resource has been deleted"
+   }
+  ],
+  "code": 410,
+  "message": "Resource has been deleted"
+ }
+}

data/test/mocks/412.json

@@ -0,0 +1,15 @@
+{
+ "error": {
+  "errors": [
+   {
+    "domain": "global",
+    "reason": "conditionNotMet",
+    "message": "Precondition Failed",
+    "locationType": "header",
+    "location": "If-Match",
+    }
+  ],
+  "code": 412,
+  "message": "Precondition Failed"
+ }
+}

data/test/mocks/500.json

@@ -0,0 +1,13 @@
+{
+ "error": {
+  "errors": [
+   {
+    "domain": "global",
+    "reason": "backendError",
+    "message": "Backend Error",
+   }
+  ],
+  "code": 500,
+  "message": "Backend Error"
+ }
+}

data/test/mocks/create_calendar.json

@@ -0,0 +1,6 @@
+{
+ "kind": "calendar#calendar",
+ "etag": "\"W8S50vTLOjlc76YTrehSZVQwSEE/ai1KY6CkM6KpTpfYTn2jy_Z5fsc\"",
+ "id": "djg1ts9g20ih03ccb0fgsegkio@group.calendar.google.com",
+ "summary": "A New Calendar"
+}

data/test/mocks/get_calendar.json

@@ -0,0 +1,9 @@
+{
+ "kind": "calendar#calendar",
+ "etag": "\"W8S50vTLOjlc76YTghtSZVQwSEE/cpIguMlgGWrAb4L_lleRpa2ALCA\"",
+ "id": "gqeb0i6v737kfu5md0f35htjlg@group.calendar.google.com",
+ "summary": "Some Calendar",
+ "description": "Our work events",
+ "location": "Portland",
+ "timeZone": "America/Los_Angeles"
+}

data/test/mocks/update_calendar.json

@@ -0,0 +1,7 @@
+{
+ "kind": "calendar#calendar",
+ "etag": "\"W8S50vTLOjlc76YTghtSZVQwSEE/cpIguMlgGWrAb4L_lleRpa2ALCA\"",
+ "id": "gqeb0i6v737kfu5md0f35htjlg@group.calendar.google.com",
+ "summary": "Our Company",
+ "description": "Work event list"
+}

data/test/test_google_calendar.rb

@@ -13,6 +13,7 @@ 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"
 
       @calendar = Calendar.new(:client_id => @client_id, :client_secret => @client_secret, :redirect_url => ENV['REDIRECT_URL'], :refresh_token => @refresh_token, :calendar => @calendar_id)
 
@@ -27,24 +28,46 @@ class TestGoogleCalendar < Minitest::Test
       should "login with auth code" do
         @client_mock.stubs(:body).returns( get_mock_body("login_with_auth_code_success.json") )
         @calendar.login_with_auth_code('4/QzBU-n6GXnHUkorG0fiu6AhoZtIjW53qKLOREiJWFpQ.wn0UfiyaDlEfEnp6UAPFm0EazsV1kwI')
-        assert_equal @calendar.auth_code, nil # the auth_code is discarded after it is used.
+        assert_nil @calendar.auth_code # the auth_code is discarded after it is used.
         assert_equal @calendar.access_token, @access_token
         assert_equal @calendar.refresh_token, '1/aJUy7pQzc4fUMX89BMMLeAfKcYteBKRMpQvf4fQFX0'
       end
 
       should "login with refresh token" do
         # no refresh_token specified
-        cal = Calendar.new(:client_id => @client_id, :client_secret => @client_secret, :redirect_url => "urn:ietf:wg:oauth:2.0:oob", :calendar => @calendar_id)
+        cal = Calendar.new(:client_id => @client_id, :client_secret => @client_secret, :redirect_url => @redirect_url, :calendar => @calendar_id)
         @client_mock.stubs(:body).returns( get_mock_body("login_with_refresh_token_success.json") )
         cal.login_with_refresh_token(@refresh_token)
         assert_equal @calendar.access_token, @access_token
       end
 
+      should "login with get method" do
+        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, 
+                           :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")
+        assert_equal @calendar.id, @calendar_id
+      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')        
+        assert_equal cal.summary, 'A New Calendar'
+      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 => "urn:ietf:wg:oauth:2.0:oob", :refresh_token => @refresh_token, :calendar => @calendar_id)
+          Calendar.new(:client_id => 'abadid', :client_secret => 'abadsecret', :redirect_url => @redirect_url, 
+                       :refresh_token => @refresh_token, :calendar => @calendar_id)
         end
       end
 
@@ -63,13 +86,31 @@ 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)
+        @client_mock.stubs(:body).returns( get_mock_body("403_forbidden.json") )
+
+        assert_raises(ForbiddenError) do
+          @calendar.find_event_by_id('1234')
+        end
+      end       
+
+      should "throw ForbiddenError if unknown 403 response" do
+        @client_mock.stubs(:status).returns(403)
+        @client_mock.stubs(:body).returns( get_mock_body("403_unknown.json") )
+
+        assert_raises(ForbiddenError) do
+          @calendar.find_event_by_id('1234')
+        end
+      end   
 
     end # login context
 
     context "and logged in" do
       setup do
-        @calendar = Calendar.new(:client_id => @client_id, :client_secret => @client_secret, :redirect_url => "urn:ietf:wg:oauth:2.0:oob", :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
 
       should "find all events" do
@@ -159,6 +200,96 @@ class TestGoogleCalendar < Minitest::Test
         assert_equal @calendar.find_event_by_id('1234'), []
       end
 
+      should "throw Request Failed with 400 error" do
+        @client_mock.stubs(:status).returns(400)
+        @client_mock.stubs(:body).returns( get_mock_body("400.json") )
+
+        assert_raises(HTTPRequestFailed) do
+          @calendar.create_event do |e|
+            e.title = 'New Event with no time'
+            e.description = "A new event with &"
+            e.location = "Joe's House & Backyard"
+          end
+        end        
+      end
+
+      should "throw DailyLimitExceededError when limit exceeded" do
+        @client_mock.stubs(:status).returns(403)
+        @client_mock.stubs(:body).returns( get_mock_body("403_daily_limit.json") )
+
+        assert_raises(DailyLimitExceededError) do
+          @calendar.find_event_by_id('1234')
+        end
+      end   
+
+      should "throw RateLimitExceededError when rate limit exceeded" do
+        @client_mock.stubs(:status).returns(403)
+        @client_mock.stubs(:body).returns( get_mock_body("403_rate_limit.json") )
+
+        assert_raises(RateLimitExceededError) do
+          @calendar.find_event_by_id('1234')
+        end
+      end  
+
+      should "throw UserRateLimitExceededError when user rate limit exceeded" do
+        @client_mock.stubs(:status).returns(403)
+        @client_mock.stubs(:body).returns( get_mock_body("403_user_rate_limit.json") )
+
+        assert_raises(UserRateLimitExceededError) do
+          @calendar.find_event_by_id('1234')
+        end
+      end
+
+      should "throw CalendarUsageLimitExceededError when calendar rate limit exceeded" do
+        @client_mock.stubs(:status).returns(403)
+        @client_mock.stubs(:body).returns( get_mock_body("403_calendar_rate_limit.json") )
+
+        assert_raises(CalendarUsageLimitExceededError) do
+          @calendar.find_event_by_id('1234')
+        end
+      end
+
+      should "throw RequestedIdentifierAlreadyExistsError if bad eTag" do
+        @client_mock.stubs(:status).returns(409)
+        @client_mock.stubs(:body).returns( get_mock_body("409.json") )
+
+        assert_raises(RequestedIdentifierAlreadyExistsError) do
+          @calendar.create_event do |e|
+            e.id = 'duplicate'
+            e.title = 'New Event'
+            e.start_time = Time.now + (60 * 60)
+            e.end_time = Time.now + (60 * 60 * 2)
+          end
+        end
+      end
+
+      should "throw GoneError if bad eTag" do
+        @client_mock.stubs(:status).returns(410)
+        @client_mock.stubs(:body).returns( get_mock_body("410.json") )
+
+        assert_raises(GoneError) do
+          @calendar.find_event_by_id('deleted')
+        end
+      end
+
+      should "throw PreconditionFailedError if bad eTag" do
+        @client_mock.stubs(:status).returns(412)
+        @client_mock.stubs(:body).returns( get_mock_body("412.json") )
+
+        assert_raises(PreconditionFailedError) do
+          @calendar.find_event_by_id('1234')
+        end
+      end
+
+      should "throw BackendError if Google is having issues" do
+        @client_mock.stubs(:status).returns(500)
+        @client_mock.stubs(:body).returns( get_mock_body("500.json") )
+
+        assert_raises(BackendError) do
+          @calendar.find_event_by_id('1234')
+        end
+      end
+
       should "create an event with block" do
         @client_mock.stubs(:body).returns( get_mock_body("create_event.json") )
 
@@ -248,7 +379,7 @@ class TestGoogleCalendar < Minitest::Test
 
         @client_mock.stubs(:body).returns('')
         event.delete
-        assert_equal event.id, nil
+        assert_nil event.id
       end
 
       should "throw exception on bad request" do
@@ -258,14 +389,14 @@ class TestGoogleCalendar < Minitest::Test
         end
       end
 
-      should "create event when id is NIL" do
+      should "create event when id is nil" do
         @client_mock.stubs(:body).returns( get_mock_body("find_event_by_id.json") )
 
-        event = @calendar.find_or_create_event_by_id(NIL) do |e|
-          e.title = 'New Event Update when id is NIL'
+        event = @calendar.find_or_create_event_by_id(nil) do |e|
+          e.title = 'New Event Update when id is nil'
         end
 
-        assert_equal event.title, 'New Event Update when id is NIL'
+        assert_equal event.title, 'New Event Update when id is nil'
       end
 
       should "provide the calendar summary" do
@@ -285,10 +416,10 @@ class TestGoogleCalendar < Minitest::Test
         event.id = '8os94knodtv84h0jh4pqq4ut35'
         assert_equal event.id, '8os94knodtv84h0jh4pqq4ut35'
       end
-      should "work with a passed-in NIL id" do
+      should "work with a passed-in nil id" do
         event = Event.new
         event.id = nil
-        assert_equal event.id, nil
+        assert_nil event.id
       end
       should "raise an error with an invalid ID" do
         event = Event.new
@@ -519,11 +650,12 @@ 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"
 
       @calendar_list = Google::CalendarList.new(
         :client_id => @client_id,
         :client_secret => @client_secret,
-        :redirect_url => "urn:ietf:wg:oauth:2.0:oob",
+        :redirect_url => @redirect_url,
         :refresh_token => @refresh_token
       )
 
@@ -573,11 +705,12 @@ 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"
 
       @freebusy = Google::Freebusy.new(
         :client_id => @client_id,
         :client_secret => @client_secret,
-        :redirect_url => "urn:ietf:wg:oauth:2.0:oob",
+        :redirect_url => @redirect_url,
         :refresh_token => @refresh_token
       )
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: google_calendar
 version: !ruby/object:Gem::Version
-  version: 0.6.2
+  version: 0.6.4
 platform: ruby
 authors:
 - Steve Zich
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-02-17 00:00:00.000000000 Z
+date: 2018-03-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: signet
@@ -31,9 +31,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 1.8.3
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '2.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -41,23 +38,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 1.8.3
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '2.1'
 - !ruby/object:Gem::Dependency
   name: TimezoneParser
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.0
+        version: 0.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.0
+        version: 0.3.0
 - !ruby/object:Gem::Dependency
   name: terminal-notifier-guard
   requirement: !ruby/object:Gem::Requirement
@@ -106,14 +100,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '1.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '1.2'
 - !ruby/object:Gem::Dependency
   name: shoulda-context
   requirement: !ruby/object:Gem::Requirement
@@ -148,40 +142,40 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '1.4'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '1.4'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '11'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '11'
 - !ruby/object:Gem::Dependency
   name: rdoc
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '4.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '4.1'
 - !ruby/object:Gem::Dependency
@@ -229,10 +223,22 @@ files:
 - lib/google_calendar.rb
 - readme_code.rb
 - test/helper.rb
+- test/mocks/400.json
 - test/mocks/401.json
 - test/mocks/403.json
+- test/mocks/403_calendar_rate_limit.json
+- test/mocks/403_daily_limit.json
+- test/mocks/403_forbidden.json
+- test/mocks/403_rate_limit.json
+- test/mocks/403_unknown.json
+- test/mocks/403_user_rate_limit.json
 - test/mocks/404.json
+- test/mocks/409.json
+- test/mocks/410.json
+- test/mocks/412.json
+- test/mocks/500.json
 - test/mocks/cancelled_events.json
+- test/mocks/create_calendar.json
 - test/mocks/create_event.json
 - test/mocks/create_quickadd_event.json
 - test/mocks/empty_events.json
@@ -241,6 +247,7 @@ files:
 - test/mocks/find_calendar_list.json
 - test/mocks/find_event_by_id.json
 - test/mocks/freebusy_query.json
+- test/mocks/get_calendar.json
 - test/mocks/login_with_auth_code_fail.json
 - test/mocks/login_with_auth_code_success.json
 - test/mocks/login_with_refresh_token_success.json
@@ -248,6 +255,7 @@ files:
 - test/mocks/query_events.json
 - test/mocks/repeating_events.json
 - test/mocks/successful_login.json
+- test/mocks/update_calendar.json
 - test/test_google_calendar.rb
 homepage: http://northworld.github.io/google_calendar/
 licenses:
@@ -269,16 +277,28 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.10
+rubygems_version: 2.6.14
 signing_key: 
 specification_version: 4
 summary: A lightweight Google Calendar API wrapper
 test_files:
 - test/helper.rb
+- test/mocks/400.json
 - test/mocks/401.json
 - test/mocks/403.json
+- test/mocks/403_calendar_rate_limit.json
+- test/mocks/403_daily_limit.json
+- test/mocks/403_forbidden.json
+- test/mocks/403_rate_limit.json
+- test/mocks/403_unknown.json
+- test/mocks/403_user_rate_limit.json
 - test/mocks/404.json
+- test/mocks/409.json
+- test/mocks/410.json
+- test/mocks/412.json
+- test/mocks/500.json
 - test/mocks/cancelled_events.json
+- test/mocks/create_calendar.json
 - test/mocks/create_event.json
 - test/mocks/create_quickadd_event.json
 - test/mocks/empty_events.json
@@ -287,6 +307,7 @@ test_files:
 - test/mocks/find_calendar_list.json
 - test/mocks/find_event_by_id.json
 - test/mocks/freebusy_query.json
+- test/mocks/get_calendar.json
 - test/mocks/login_with_auth_code_fail.json
 - test/mocks/login_with_auth_code_success.json
 - test/mocks/login_with_refresh_token_success.json
@@ -294,4 +315,5 @@ test_files:
 - test/mocks/query_events.json
 - test/mocks/repeating_events.json
 - test/mocks/successful_login.json
+- test/mocks/update_calendar.json
 - test/test_google_calendar.rb