google_calendar 0.3.1 → 0.4.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: c0abc20ca5bb465a9042cad4e9941fbaa0397888
+  data.tar.gz: 21d702bee56ff9ae28582efc993f9765015b6ee7
+SHA512:
+  metadata.gz: 1c881f0d97bab2f853c863f7e58b1d1385001b2b1b2bd101cb91f113d3ef5d599dc80b5bc53fd453b566e147ba24b14681364c405fe9a927e3fa25cc052dac68
+  data.tar.gz: 4c56297fdd70294df8b274651ad3bc28b3cf9e1025ccbb5fab8dfd3a046f7707797a44a94be0ef08fad496c2ebc3da80490d841a208057f80b0d2ed1e93a01c1

data/.gitignore

@@ -1,19 +1,14 @@
 # rcov generated
 coverage
-
 # rdoc generated
 rdoc
-
 # yard generated
 doc
 .yardoc
-
 # bundler
 .bundle
-
 # jeweler generated
 pkg
-
 # Have editor/IDE/OS specific files you need to ignore? Consider using a global gitignore:
 #
 # * Create a file at ~/.gitignore
@@ -25,17 +20,12 @@ pkg
 #
 # Not sure what to needs to be ignored for particular editors/OSes? Here's some ideas to get you started. (Remember, remove the leading # of the line)
 #
-
 # For MacOS:
 #
 .DS_Store
-
-
 # For TextMate
 *.tmproj
 tmtags
-
-
 # For emacs:
 #*~
 #\#*
@@ -43,3 +33,5 @@ tmtags
 #
 # For vim:
 #*.swp
+notes.md
+test_harness.rb

data/.travis.yml

@@ -1,7 +1,7 @@
 language: ruby
 rvm:
-  - "1.9.2"
   - "1.9.3"
   - "2.0.0"
+  - "2.1.1"
 # uncomment this line if your project needs to run something other than `rake`:
 # script: bundle exec rspec spec

data/Gemfile

@@ -1,14 +1,4 @@
 source "http://rubygems.org"
 
-# Gems required to use google_calendar.
-gem "nokogiri", ">= 1.4.4"
-gem "addressable", ">= 2.2.2"
-
-# Gem development dependencies.
-group :development do
-  gem "shoulda", ">= 0"
-  gem "bundler", ">= 1.0.0"
-  gem "mocha", ">= 0"
-  gem "rake", "> 10"
-  gem "rdoc", "> 3"
-end
+# Using google_calendar to manage dependencies
+gemspec 

data/Gemfile.lock

@@ -1,37 +1,94 @@
+PATH
+  remote: .
+  specs:
+    google_calendar (0.4.0)
+      addressable (>= 2.2.2)
+      signet (>= 0.5.1)
+
 GEM
   remote: http://rubygems.org/
   specs:
-    activesupport (3.2.13)
-      i18n (= 0.6.1)
-      multi_json (~> 1.0)
-    addressable (2.3.4)
-    i18n (0.6.1)
-    json (1.8.0)
-    metaclass (0.0.1)
-    mini_portile (0.5.0)
-    mocha (0.14.0)
+    addressable (2.3.6)
+    ansi (1.4.3)
+    builder (3.2.2)
+    celluloid (0.16.0)
+      timers (~> 4.0.0)
+    coderay (1.1.0)
+    docile (1.1.5)
+    faraday (0.9.0)
+      multipart-post (>= 1.2, < 3)
+    ffi (1.9.6)
+    formatador (0.2.5)
+    guard (2.8.2)
+      formatador (>= 0.2.4)
+      listen (~> 2.7)
+      lumberjack (~> 1.0)
+      pry (>= 0.9.12)
+      thor (>= 0.18.1)
+    guard-minitest (2.3.2)
+      guard (~> 2.0)
+      minitest (>= 3.0)
+    hitimes (1.2.2)
+    json (1.8.1)
+    jwt (1.0.0)
+    listen (2.8.0)
+      celluloid (>= 0.15.2)
+      rb-fsevent (>= 0.9.3)
+      rb-inotify (>= 0.9)
+    lumberjack (1.0.9)
+    metaclass (0.0.4)
+    method_source (0.8.2)
+    minitest (5.4.3)
+    minitest-reporters (1.0.7)
+      ansi
+      builder
+      minitest (>= 5.0)
+      ruby-progressbar
+    mocha (1.1.0)
       metaclass (~> 0.0.1)
-    multi_json (1.7.7)
-    nokogiri (1.6.0)
-      mini_portile (~> 0.5.0)
-    rake (10.0.4)
-    rdoc (4.0.1)
+    multi_json (1.10.1)
+    multipart-post (2.0.0)
+    pry (0.10.1)
+      coderay (~> 1.1.0)
+      method_source (~> 0.8.1)
+      slop (~> 3.4)
+    rake (10.3.2)
+    rb-fsevent (0.9.4)
+    rb-inotify (0.9.5)
+      ffi (>= 0.5.0)
+    rdoc (4.1.2)
       json (~> 1.4)
-    shoulda (3.5.0)
-      shoulda-context (~> 1.0, >= 1.0.1)
-      shoulda-matchers (>= 1.4.1, < 3.0)
-    shoulda-context (1.1.2)
-    shoulda-matchers (2.2.0)
-      activesupport (>= 3.0.0)
+    ruby-progressbar (1.7.0)
+    shoulda-context (1.2.1)
+    signet (0.5.1)
+      addressable (>= 2.2.3)
+      faraday (>= 0.9.0.rc5)
+      jwt (>= 0.1.5)
+      multi_json (>= 1.0.0)
+    simplecov (0.9.1)
+      docile (~> 1.1.0)
+      multi_json (~> 1.0)
+      simplecov-html (~> 0.8.0)
+    simplecov-html (0.8.0)
+    slop (3.6.0)
+    terminal-notifier-guard (1.6.4)
+    thor (0.19.1)
+    timers (4.0.1)
+      hitimes
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  addressable (>= 2.2.2)
   bundler (>= 1.0.0)
+  google_calendar!
+  guard-minitest
+  minitest (~> 5.1)
+  minitest-reporters
   mocha
-  nokogiri (>= 1.4.4)
   rake (> 10)
-  rdoc (> 3)
-  shoulda
+  rb-fsevent
+  rdoc (>= 3)
+  shoulda-context
+  simplecov (~> 0.9.0)
+  terminal-notifier-guard

data/Guardfile

@@ -0,0 +1,7 @@
+guard 'minitest' do
+  # with Minitest::Unit
+  watch(%r|^test/(.*)\/?test_(.*)\.rb|)
+  watch(%r|^lib/(.*)([^/]+)\.rb|)  { 'test' }
+  watch(%r|^test/mocks(.*)([^/]+)\.json|)  { 'test' }
+  watch(%r|^test/helper\.rb|)      { 'test' }
+end

data/README.rdoc

@@ -3,20 +3,71 @@
 
 A fast lightweight and minimalist wrapper around the google calendar api.
 
-{<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.png" />}[https://codeclimate.com/github/northworld/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]
 == Install
   [sudo] gem install 'google_calendar'
 
-Note: Google requests that you set the name of your application so they can better monitor the use of their services.
+== Setup 
+
+  Obtain a Client ID and Secret from Google
+
+  Go to the {Google Developers Console}[https://console.developers.google.com/].
+  Select a project, or create a new one.
+  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.
+  In the sidebar on the left, select Credentials.
+  In either case, you end up on the Credentials page and can create your project's credentials from here.
+
+  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.
+
+  Take note of the Client ID as you'll need to add it to your code later.
+
+=== How to find your calendar ID
+  Visit Google calendar in your web browser.
+  In the calendar list on the left, click the down-arrow button next to the appropriate calendar, then select Calendar settings.
+  In the Calendar Address section, locate the Calendar ID listed next to the XML, ICAL and HTML buttons.
+  Copy the Calendar ID.
 
 == Usage
   require 'rubygems'
   require 'google_calendar'
 
-  cal = Google::Calendar.new(:username => 'some.person@gmail.com',
-                             :password => 'super-secret',
-                             :app_name => 'mycompany.com-googlecalendar-integration')
+  YOUR_CLIENT_ID    = ""
+  YOUR_SECRET       = ""
+  YOUR_CALENDAR_ID  = ""
+
+  # Create an instance of the 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'
+                             )
+
+  puts "Do you already have a refresh token? (y/n)"
+  has_token = $stdin.gets.chomp
+
+  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:"
+
+    # 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 )
+
+    puts "\nMake sure you SAVE YOUR REFRESH TOKEN so you don't have to prompt the user to approve access again."
+    puts "your refresh token is:\n\t#{refresh_token}\n"
+    puts "Press return to continue"
+    $stdin.gets.chomp
+
+  else
+    puts "Enter your refresh token"
+    refresh_token = $stdin.gets.chomp
+    cal.login_with_refresh_token(refresh_token)
+
+    # Note: You can also pass your refresh_token to the constructor and it will login at that time.
+
+  end
 
   event = cal.create_event do |e|
     e.title = 'A Cool Event'
@@ -37,8 +88,9 @@ Note: Google requests that you set the name of your application so they can bett
   puts cal.events
 
   # Query events
-  puts cal.find_events('my search string')
+  puts cal.find_events('your search string')
 
+This sample code is located in readme_code.rb in the root folder.
 
 Note: This is not a complete implementation of the calendar api, it just includes the features we needed to support our internal calendar integration.
 
@@ -54,4 +106,4 @@ Note: This is not a complete implementation of the calendar api, it just include
 
 == Copyright
 
-Copyright (c) 2010 Steve Zich. See LICENSE.txt for further details.
+Copyright (c) 2010 Steve Zich. See LICENSE.txt for further details.

data/VERSION

@@ -1 +1 @@
-0.3.1
+0.4.0

data/google_calendar.gemspec

@@ -2,8 +2,8 @@
 
 Gem::Specification.new do |s|
   s.name = "google_calendar"
-  s.version = "0.3.1"
-  s.date = "2013-08-23"
+  s.version = "0.4.0"
+  s.date = "2014-11-17"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
 
@@ -11,7 +11,7 @@ Gem::Specification.new do |s|
   s.email = "steve.zich@gmail.com"
 
   s.summary = "A lightweight google calendar API wrapper"
-  s.description = "A minimal wrapper around the google calendar API, which uses nokogiri for fast parsing."
+  s.description = "A minimal wrapper around the google calendar API"
   s.homepage = "http://github.com/northworld/google_calendar"
   s.licenses = ["MIT"]  
   
@@ -26,29 +26,19 @@ Gem::Specification.new do |s|
   s.require_paths = ["lib"]
   s.rubygems_version = "1.8.24"
 
-
-  if s.respond_to? :specification_version then
-    s.specification_version = 3
-
-    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<nokogiri>, [">= 1.4.4"])
-      s.add_runtime_dependency(%q<addressable>, [">= 2.2.2"])
-      s.add_development_dependency(%q<shoulda>, [">= 0"])
-      s.add_development_dependency(%q<bundler>, [">= 1.0.0"])
-      s.add_development_dependency(%q<mocha>, [">= 0"])
-    else
-      s.add_dependency(%q<nokogiri>, [">= 1.4.4"])
-      s.add_dependency(%q<addressable>, [">= 2.2.2"])
-      s.add_dependency(%q<shoulda>, [">= 0"])
-      s.add_dependency(%q<bundler>, [">= 1.0.0"])
-      s.add_dependency(%q<mocha>, [">= 0"])
-    end
-  else
-    s.add_dependency(%q<nokogiri>, [">= 1.4.4"])
-    s.add_dependency(%q<addressable>, [">= 2.2.2"])
-    s.add_dependency(%q<shoulda>, [">= 0"])
-    s.add_dependency(%q<bundler>, [">= 1.0.0"])
-    s.add_dependency(%q<mocha>, [">= 0"])
-  end
-end
-
+  s.add_runtime_dependency(%q<signet>, [">= 0.5.1"])
+  s.add_runtime_dependency(%q<addressable>, [">= 2.2.2"])
+
+  s.add_development_dependency(%q<terminal-notifier-guard>, [">= 0"])
+  s.add_development_dependency(%q<rb-fsevent>, [">= 0"])
+  s.add_development_dependency(%q<guard-minitest>, [">= 0"])
+  s.add_development_dependency(%q<minitest>, ["~> 5.1"])
+  s.add_development_dependency(%q<minitest-reporters>, [">=0"])
+  s.add_development_dependency(%q<shoulda-context>, [">= 0"])
+  s.add_development_dependency(%q<bundler>, [">= 1.0.0"])
+  s.add_development_dependency(%q<mocha>, [">= 0"])
+  s.add_development_dependency(%q<rake>, ["> 10"])
+  s.add_development_dependency(%q<rdoc>, [">= 3"])
+  s.add_development_dependency(%q<simplecov>, ["~> 0.9.0"])
+  
+end

data/lib/google/calendar.rb

@@ -1,102 +1,157 @@
-require 'nokogiri'
-
 module Google
 
+  #
   # Calendar is the main object you use to interact with events.
   # use it to find, create, update and delete them.
   #
   class Calendar
 
-    # Setup and connect to the specified google calendar.
+    attr_reader :connection
+
+    #
+    # Setup and connect to the specified Google Calendar.
     #  the +params+ paramater accepts
-    # * :username => the username of the specified calendar (i.e. some.guy@gmail.com)
-    # * :password => the password for the specified user (i.e. super-secret)
-    # * :calendar => the name of the calendar you would like to work with (optional, defaults to the calendar the user setup as their default one.)
-    # * :app_name => the name of your application (defaults to 'northworld.com-googlecalendar-integration')
-    # * :auth_url => the base url that is used to connect to google (defaults to 'https://www.google.com/accounts/ClientLogin')
+    # * :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)
+    # * :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
     #
-    # After creating an instace you are immediatly logged on and ready to go.
+    # See Readme.rdoc or readme_code.rb for an explication on the OAuth2 authorization process.
     #
-    # ==== Examples
-    #   # Use the default calendar
-    #   Calendar.new(:username => 'some.guy@gmail.com', :password => 'ilovepie!')
+    # ==== Example
+    # 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' 
+    #                     )
     #
-    #   # Specify the calendar
-    #   Calendar.new(:username => 'some.guy@gmail.com', :password => 'ilovepie!', :calendar => 'my.company@gmail.com')
+    def initialize(params={})
+      options = {
+        :client_id => params[:client_id],
+        :client_secret => params[:client_secret],
+        :refresh_token => params[:refresh_token],
+        :redirect_url => params[:redirect_url],
+        :calendar_id => params[:calendar]
+      }
+
+      @connection = Connection.new options
+    end
+
     #
-    #   # Specify the app_name
-    #   Calendar.new(:username => 'some.guy@gmail.com', :password => 'ilovepie!', :app_name => 'mycompany.com-googlecalendar-integration')
+    # The URL you need to send a user in order to let them grant you access to their calendars.
     #
+    def authorize_url
+      @connection.authorize_url
+    end
 
-    # Calendar attributes
-    attr_accessor :username, :password, :app_name, :auth_url, :connection, :calendar
+    #
+    # The single use auth code that google uses during the auth process.
+    #
+    def auth_code
+      @connection.auth_code
+    end
 
-    def initialize(params)
-      self.username = params[:username]
-      self.password = params[:password]
-      self.calendar = params[:calendar]
-      self.app_name = params[:app_name]
-      self.auth_url = params[:auth_url]
+    #
+    # The current access token.  Used during a session, typically expires in a hour.
+    #
+    def access_token
+      @connection.access_token
+    end
 
-      self.connection = Connection.new(:username => username,
-                                   :password => password,
-                                   :app_name => app_name,
-                                   :auth_url => auth_url)
+    #
+    # The refresh token is used to obtain a new access token.  It remains valid until a user revokes access.
+    #
+    def refresh_token
+      @connection.refresh_token
     end
 
+    #
+    # Convenience method used to streamline the process of logging in with a auth code.
+    #
+    def login_with_auth_code(auth_code)
+      @connection.login_with_auth_code(auth_code)
+    end
+
+    #
+    # Convenience method used to streamline the process of logging in with a refresh token.
+    #
+    def login_with_refresh_token(refresh_token)
+      @connection.login_with_refresh_token(refresh_token)
+    end
+
+    #
     # Find all of the events associated with this calendar.
     #  Returns:
-    #   nil if nothing found.
-    #   a single event if only one found.
+    #   an empty array if nothing found.
+    #   an array with one element if only one found.
     #   an array of events if many found.
     #
     def events
       event_lookup()
     end
 
-    # This is equivalnt to running a search in
-    # the google calendar web application.  Google does not provide a way to easily specify
-    # what attributes you would like to search (i.e. title), by default it searches everything.
+    #
+    # This is equivalent to running a search in the Google calendar web application.  
+    # Google does not provide a way to specify what attributes you would like to 
+    # search (i.e. title), by default it searches everything.
     # If you would like to find specific attribute value (i.e. title=Picnic), run a query
     # and parse the results.
     #  Returns:
-    #   nil if nothing found.
-    #   a single event if only one found.
+    #   an empty array if nothing found.
+    #   an array with one element if only one found.
     #   an array of events if many found.
     #
     def find_events(query)
       event_lookup("?q=#{query}")
     end
 
+    #
     # Find all of the events associated with this calendar that start in the given time frame.
     # The lower bound is inclusive, whereas the upper bound is exclusive.
     # Events that overlap the range are included.
+    #
+    # the +options+ parameter accepts
+    # :max_results => the maximum number of results to return defaults to 25 the largest number Google accepts is 2500
+    # :order_by => how you would like the results ordered, can be either 'startTime' or 'updated'. Defaults to 'startTime'. Note: it must be 'updated' if expand_recurring_events is set to false.
+    # :expand_recurring_events => When set to true each instance of a recurring event is returned. Defaults to true.
+    #
     #  Returns:
-    #   nil if nothing found.
-    #   a single event if only one found.
+    #   an empty array if nothing found.
+    #   an array with one element if only one found.
     #   an array of events if many found.
     #
-    def find_events_in_range(start_min, start_max,options = {})
-      options[:max_results] ||=  25
-      options[:order_by] ||= 'lastmodified' # other option is 'starttime'
-      formatted_start_min = start_min.strftime("%Y-%m-%dT%H:%M:%S")
-      formatted_start_max = start_max.strftime("%Y-%m-%dT%H:%M:%S")
-      query = "?start-min=#{formatted_start_min}&start-max=#{formatted_start_max}&recurrence-expansion-start=#{formatted_start_min}&recurrence-expansion-end=#{formatted_start_max}"
-      query = "#{query}&orderby=#{options[:order_by]}&max-results=#{options[:max_results]}"
+    def find_events_in_range(start_min, start_max, options = {})     
+      formatted_start_min = encode_time(start_min)
+      formatted_start_max = encode_time(start_max)
+      query = "?timeMin=#{formatted_start_min}&timeMax=#{formatted_start_max}#{parse_options(options)}"
       event_lookup(query)
     end
 
+    #
+    # Find all events that are occurring at the time the method is run or later.
+    #
+    # the +options+ parameter accepts
+    # :max_results => the maximum number of results to return defaults to 25 the largest number Google accepts is 2500
+    # :order_by => how you would like the results ordered, can be either 'startTime' or 'updated'. Defaults to 'startTime'. Note: it must be 'updated' if expand_recurring_events is set to false.
+    # :expand_recurring_events => When set to true each instance of a recurring event is returned. Defaults to true.
+    #
+    #  Returns:
+    #   an empty array if nothing found.
+    #   an array with one element if only one found.
+    #   an array of events if many found.
+    #
     def find_future_events(options={})
-      options[:max_results] ||=  25
-      options[:order_by] ||= 'lastmodified' # other option is 'starttime'
-      query = "?futureevents=true&orderby=#{options[:order_by]}&max-results=#{options[:max_results]}"
+      formatted_start_min = encode_time(DateTime.now)
+      query = "?timeMin=#{formatted_start_min}#{parse_options(options)}"
       event_lookup(query)
     end
 
+    #
     # Attempts to find the event specified by the id
     #  Returns:
-    #   nil if nothing found.
-    #   a single event if only one found.
+    #   an empty array if nothing found.
+    #   an array with one element if only one found.
     #   an array of events if many found.
     #
     def find_event_by_id(id)
@@ -104,8 +159,9 @@ module Google
       event_lookup("/#{id}")
     end
 
-    # Creates a new event and immediatly saves it.
-    # returns the event
+    #
+    # Creates a new event and immediately saves it.
+    # Returns the event
     #
     # ==== Examples
     #   # Use a block
@@ -114,7 +170,7 @@ module Google
     #     e.where = "Room 101"
     #   end
     #
-    #   # Don't use a block (need to call save maunally)
+    #   # Don't use a block (need to call save manually)
     #   event  = cal.create_event
     #   event.title = "A New Event"
     #   event.where = "Room 101"
@@ -124,108 +180,83 @@ module Google
       setup_event(Event.new, &blk)
     end
 
-    # looks for the spedified event id.
+    #
+    # Looks for the specified event id.
     # If it is found it, updates it's vales and returns it.
     # 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)
-      setup_event(find_event_by_id(id) || Event.new, &blk)
+      setup_event(find_event_by_id(id)[0] || Event.new, &blk)
     end
 
+    #
     # Saves the specified event.
     # This is a callback used by the Event class.
     #
     def save_event(event)
-      method = (event.id == nil || event.id == '') ? :post : :put
-      query_string = (method == :put) ? "/#{event.id}" : ''
-      @connection.send(Addressable::URI.parse(events_url + query_string), method, event.to_xml)
+      method = event.new_event? ? :post : :put
+      body = event.use_quickadd? ? nil : event.to_json
+
+      query_string =  if event.use_quickadd?
+        "/quickAdd?text=#{ Addressable::URI.encode_component(event.quickadd)}"
+      elsif event.new_event?
+        ''
+      else # update existing event.
+        "/#{event.id}"
+      end
+
+      @connection.send_events_request(query_string, method, body)
     end
 
+    #
     # Deletes the specified event.
     # This is a callback used by the Event class.
     #
     def delete_event(event)
-      @connection.send(Addressable::URI.parse(events_url + "/#{event.id}"), :delete)
+      @connection.send_events_request("/#{event.id}", :delete)
     end
 
-    # Explicitly reload the connection to google calendar
+    protected
+
     #
-    # Examples
-    # class User
-    #   def calendar
-    #     @calendar ||= Google::Calendar.new :username => "foo@gmail.com", :password => "bar"
-    #   end
-    # end
-    # user = User.new
-    # 2.times { user.calendar }     #only one HTTP authentication request to google
-    # user.calendar.reload          #new HTTP authentication request to google
+    # Utility method used to centralize the parsing of common query parameters.
     #
-    # Returns Google::Calendar instance
-    def reload
-      self.connection = Connection.new(:username => username,
-                                   :password => password,
-                                   :app_name => app_name,
-                                   :auth_url => auth_url)
-      self
-    end
-    
-    def display_color
-      calendar_data.xpath("//entry[title='#{@calendar}']/color/@value").first.value
+    def parse_options(options) # :nodoc
+      options[:max_results] ||=  25
+      options[:order_by] ||= 'startTime' # other option is 'updated'
+      options[:expand_recurring_events] ||= true
+      "&orderBy=#{options[:order_by]}&maxResults=#{options[:max_results]}&singleEvents=#{options[:expand_recurring_events]}"
     end
 
-    protected
+    #
+    # Utility method to centralize time encoding.
+    #
+    def encode_time(time) #:nodoc:
+      Addressable::URI.encode_component(time.strftime("%FT%T%:z"), Addressable::URI::CharacterClasses::UNRESERVED)
+    end
 
+    #
+    # Utility method used to centralize event lookup.
+    #
     def event_lookup(query_string = '') #:nodoc:
       begin
-      response = @connection.send(Addressable::URI.parse(events_url + query_string), :get)
-      events = Event.build_from_google_feed(response.body, self)
-      events.length > 1 ? events : events[0]
+        response = @connection.send_events_request(query_string, :get)
+        events = Event.build_from_google_feed( JSON.parse(response.body) , self) || []
+        return events if events.empty?
+        events.length > 1 ? events : [events[0]]
       rescue Google::HTTPNotFound
         return nil
       end
     end
 
-    def calendar_id #:nodoc:
-      @calendar || "default"
-    end
-
-    # Initialize the events URL given String attribute @calendar value :
     #
-    # contains a '@'        : construct the feed url with @calendar.
-    # does not contain '@'  : fetch user's all calendars (http://code.google.com/apis/calendar/data/2.0/developers_guide_protocol.html#RetrievingAllCalendars)
-    #                         and return feed url matching @calendar.
-    # nil                   : default feed url.
+    # Utility method used to centralize event setup
     #
-    # Returns:
-    #  a String url for a calendar feeds.
-    #  raise a Google::InvalidCalendar error if @calendar is invalid.
-    #
-    def events_url
-      if @calendar and !@calendar.include?("@")
-         link = calendar_data.xpath("//entry[title='#{@calendar}']/link[contains(@rel, '#eventFeed')]/@href").to_s
-         link.empty? ? raise(Google::InvalidCalendar) : link
-       else
-         "https://www.google.com/calendar/feeds/#{calendar_id}/private/full"
-      end
-    end
-    
-    def calendar_data
-      unless @calendar_data
-        xml = @connection.send(Addressable::URI.parse("https://www.google.com/calendar/feeds/default/allcalendars/full"), :get)
-        @calendar_data = Nokogiri::XML(xml.body)
-        @calendar_data.remove_namespaces!
-      end
-      @calendar_data
-    end
-
     def setup_event(event) #:nodoc:
       event.calendar = self
       if block_given?
-      	yield(event)
-	event.title = event.title.encode(:xml => :text) if event.title
-	event.content = event.content.encode(:xml => :text) if event.content
-	event.where = event.where.encode(:xml => :text) if event.where
+        yield(event)
       end
       event.save
       event