google_calendar 0.4.4 → 0.5

data/test/mocks/freebusy_query.json

@@ -0,0 +1,22 @@
+{
+ "timeMin": "2015-03-06T00:00:00.000Z",
+ "timeMax": "2015-03-06T23:59:59.000Z",
+ "calendars": {
+  "busy-calendar-id": {
+   "busy": [
+    {
+     "start": "2015-03-06T10:00:00Z",
+     "end": "2015-03-06T11:00:00Z"
+    },
+    {
+     "start": "2015-03-06T11:30:00Z",
+     "end": "2015-03-06T11:30:00Z"
+    }
+   ]
+  },
+  "not-busy-calendar-id": {
+   "busy": [
+   ]
+  }
+ }
+}

data/test/mocks/query_events.json

@@ -18,7 +18,8 @@
       "htmlLink": "https://www.google.com/calendar/event?eid=dDAwam5wcWMwOHJjYWJpNnBhNTQ5dHRqbGsgZ3FlYjBpNnY3MzdrZnU1bWQwZjNldWtqbGdAZw", 
       "sequence": 1, 
       "updated": "2008-10-24T23:08:09.010Z", 
-      "summary": "Test Event", 
+      "summary": "Test Event",
+      "colorId": "3",
       "start": {
         "dateTime": "2008-09-24T10:30:00-07:00"
       }, 

data/test/test_google_calendar.rb

@@ -6,11 +6,7 @@ class TestGoogleCalendar < Minitest::Test
   context "When connected" do
 
     setup do
-      @client_mock = mock('Faraday::Response')
-      @client_mock.stubs(:body).returns(get_mock_body('successful_login.json'))
-      @client_mock.stubs(:finish).returns('')
-      @client_mock.stubs(:status).returns(200)
-      Faraday::Response.stubs(:new).returns(@client_mock)
+      @client_mock = setup_mock_client
 
       @client_id = "671053090364-ntifn8rauvhib9h3vnsegi6dhfglk9ue.apps.googleusercontent.com"
       @client_secret = "roBgdbfEmJwPgrgi2mRbbO-f"
@@ -60,6 +56,15 @@ class TestGoogleCalendar < Minitest::Test
         end
       end
 
+      should "accept a connection to re-use" do
+        @client_mock.stubs(:body).returns( get_mock_body("events.json") )
+        reusable_connection = mock('Google::Connection')
+        reusable_connection.expects(:send).returns(@client_mock)
+
+        calendar = Calendar.new({:calendar => @calendar_id}, reusable_connection)
+        calendar.events
+      end
+
     end # login context
 
     context "and logged in" do
@@ -84,7 +89,7 @@ class TestGoogleCalendar < Minitest::Test
         start_min = now
         start_max = (now + 60*60*24)
         @calendar.expects(:event_lookup).with("?timeMin=#{start_min.strftime("%FT%TZ")}&timeMax=#{start_max.strftime("%FT%TZ")}&orderBy=startTime&maxResults=25&singleEvents=true")
-        events = @calendar.find_events_in_range(start_min, start_max)
+        @calendar.find_events_in_range(start_min, start_max)
       end
 
       should "find future events" do
@@ -92,7 +97,7 @@ class TestGoogleCalendar < Minitest::Test
         Time.stubs(:now).returns(now)
         formatted_time = now.strftime("%FT%TZ")
         @calendar.expects(:event_lookup).with("?timeMin=#{formatted_time}&orderBy=startTime&maxResults=25&singleEvents=true")
-        events = @calendar.find_future_events()
+        @calendar.find_future_events()
       end
 
       should "return multiple events in range as array" do
@@ -100,13 +105,13 @@ class TestGoogleCalendar < Minitest::Test
         events = @calendar.events
         assert_equal events.class.to_s, "Array"
       end
-      
+
       should "return one event in range as array" do
         @client_mock.stubs(:body).returns( get_mock_body("query_events.json") )
         events = @calendar.events
         assert_equal events.class.to_s, "Array"
       end
-      
+
       should "return response of no events in range as array" do
         @client_mock.stubs(:body).returns( get_mock_body("empty_events.json") )
         events = @calendar.events
@@ -190,7 +195,7 @@ class TestGoogleCalendar < Minitest::Test
         @client_mock.stubs(:body).returns( get_mock_body("query_events.json") )
         event = @calendar.find_events('Test')
         e = event[0]
-        assert_equal e.to_s, "Event Id '#{e.id}'\n\tStatus: #{e.status}\n\tTitle: #{e.title}\n\tStarts: #{e.start_time}\n\tEnds: #{e.end_time}\n\tLocation: #{e.location}\n\tDescription: #{e.description}\n\n"
+        assert_equal e.to_s, "Event Id '#{e.id}'\n\tStatus: #{e.status}\n\tTitle: #{e.title}\n\tStarts: #{e.start_time}\n\tEnds: #{e.end_time}\n\tLocation: #{e.location}\n\tDescription: #{e.description}\n\tColor: #{e.color_id}\n\n"
       end
 
       should "update an event by id" do
@@ -223,7 +228,7 @@ class TestGoogleCalendar < Minitest::Test
           @calendar.events
         end
       end
-      
+
       should "create event when id is NIL" do
         @client_mock.stubs(:body).returns( get_mock_body("find_event_by_id.json") )
 
@@ -234,6 +239,12 @@ class TestGoogleCalendar < Minitest::Test
         assert_equal event.title, 'New Event Update when id is NIL'
       end
 
+      should "provide the calendar summary" do
+        @client_mock.stubs(:body).returns( get_mock_body("events.json") )
+        @calendar.events
+        assert_equal 'My Events Calendar', @calendar.summary
+      end
+
     end # Logged on context
 
   end # Connected context
@@ -284,6 +295,13 @@ class TestGoogleCalendar < Minitest::Test
       end
     end
 
+    context "#creator_name" do
+      should "include name" do
+        event = Event.new :creator => {'displayName' => 'Someone', 'email' => 'someone@example.com'}
+        assert_equal 'Someone', event.creator_name
+      end
+    end
+
     context "transparency" do
       should "be transparent" do
         @event = Event.new(:transparency => true)
@@ -312,8 +330,20 @@ class TestGoogleCalendar < Minitest::Test
                             {'email' => 'some.b.one@gmail.com', 'displayName' => 'Some B One', 'responseStatus' => 'tentative'}
                           ]
 
-        correct_json = "{ \"summary\": \"Go Swimming\", \"description\": \"The polar bear plunge\", \"location\": \"In the arctic ocean\", \"start\": { \"dateTime\": \"#{@event.start_time}\" }, \"end\": { \"dateTime\": \"#{@event.end_time}\" }, \"attendees\": [{ \"displayName\": \"Some A One\", \"email\": \"some.a.one@gmail.com\", \"responseStatus\": \"tentative\" },{ \"displayName\": \"Some B One\", \"email\": \"some.b.one@gmail.com\", \"responseStatus\": \"tentative\" }], \"reminders\": { \"useDefault\": false,\"overrides\": [{ \"method\": \"popup\", \"minutes\": 10 }] } }"
-        assert_equal @event.to_json.gsub("\n", "").gsub(/\s+/, ' '), correct_json
+        expected_structure = {
+          "summary" => "Go Swimming",
+          "visibility"=>"default",
+          "description" => "The polar bear plunge",
+          "location" => "In the arctic ocean",
+          "start" => {"dateTime" => "#{@event.start_time}"},
+          "end" => {"dateTime" => "#{@event.end_time}"},
+          "attendees" => [
+            {"displayName" => "Some A One", "email" => "some.a.one@gmail.com", "responseStatus" => "tentative"},
+            {"displayName" => "Some B One", "email" => "some.b.one@gmail.com", "responseStatus" => "tentative"}
+          ],
+          "reminders" => {"useDefault" => false, "overrides" => [{"method" => "popup", "minutes" => 10}]}
+        }
+        assert_equal JSON.parse(@event.to_json), expected_structure
       end
     end
 
@@ -336,6 +366,144 @@ class TestGoogleCalendar < Minitest::Test
         end
       end
     end
+
+    context "at recurring events" do
+      should "create json in correct format" do
+        now = Time.now
+        @event = Event.new
+        @event.start_time = now
+        @event.end_time = now + (60 * 60)
+        @event.title = "Go Swimming"
+        @event.description = "The polar bear plunge"
+        @event.location = "In the arctic ocean"
+        @event.transparency = "opaque"
+        @event.reminders = { 'useDefault'  => false, 'overrides' => ['minutes' => 10, 'method' => "popup"]}
+        @event.attendees = [
+                            {'email' => 'some.a.one@gmail.com', 'displayName' => 'Some A One', 'responseStatus' => 'tentative'},
+                            {'email' => 'some.b.one@gmail.com', 'displayName' => 'Some B One', 'responseStatus' => 'tentative'}
+                          ]
+        @event.recurrence = {freq: "monthly", count: "5", interval: "2"}
+        expected_structure = {
+          "summary" => "Go Swimming",
+          "visibility"=>"default",
+          "description" => "The polar bear plunge",
+          "location" => "In the arctic ocean",
+          "start" => {"dateTime" => "#{@event.start_time}", "timeZone" => "#{Time.now.getlocal.zone}"},
+          "end" => {"dateTime" => "#{@event.end_time}", "timeZone" => "#{Time.now.getlocal.zone}"},
+          "recurrence" => ["RRULE:FREQ=MONTHLY;COUNT=5;INTERVAL=2"],
+          "attendees" => [
+            {"displayName" => "Some A One", "email" => "some.a.one@gmail.com", "responseStatus" => "tentative"},
+            {"displayName" => "Some B One", "email" => "some.b.one@gmail.com", "responseStatus" => "tentative"}
+          ],
+          "reminders" => {"useDefault" => false, "overrides" => [{"method" => "popup", "minutes"=>10}]}
+        }
+        assert_equal JSON.parse(@event.to_json), expected_structure
+      end
+
+      should "parse recurrence rule strings corectly" do
+        rrule = ["RRULE:FREQ=MONTHLY;INTERVAL=2;BYDAY=-1MO"]
+        correct_hash = {"freq" => "monthly", "interval" => "2", "byday" => "-1mo"}
+        assert_equal correct_hash.inspect, Event.parse_recurrence_rule(rrule).inspect
+
+        rrule = ["RRULE:FREQ=MONTHLY;UNTIL=20170629T080000Z;INTERVAL=6"]
+        correct_hash = {"freq" =>  "monthly", "until" => "20170629t080000z", "interval" => "6"}
+        assert_equal correct_hash.inspect, Event.parse_recurrence_rule(rrule).inspect
+
+        rrule = ["RRULE:FREQ=WEEKLY;BYDAY=MO,TH"]
+        correct_hash = {"freq" => "weekly", "byday" => "mo,th"}
+        assert_equal correct_hash.inspect, Event.parse_recurrence_rule(rrule).inspect
+      end
+    end
+  end
+
+  context "a calendar list" 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"
+
+      @calendar_list = Google::CalendarList.new(
+        :client_id => @client_id,
+        :client_secret => @client_secret,
+        :redirect_url => "urn:ietf:wg:oauth:2.0:oob",
+        :refresh_token => @refresh_token
+      )
+
+      @client_mock.stubs(:body).returns(get_mock_body("find_calendar_list.json"))
+    end
+
+    should "find all calendars" do
+      entries = @calendar_list.fetch_entries
+      assert_equal entries.length, 3
+      assert_equal entries.map(&:class).uniq, [CalendarListEntry]
+      assert_equal entries.map(&:id), ["initech.com_ed493d0a9b46ea46c3a0d48611ce@resource.calendar.google.com", "initech.com_db18a4e59c230a5cc5d2b069a30f@resource.calendar.google.com", "bob@initech.com"]
+    end
+
+    should "set the calendar list entry parameters" do
+      entry = @calendar_list.fetch_entries.find {|list_entry| list_entry.id == "bob@initech.com" }
+
+      assert_equal entry.summary, "Bob's Calendar"
+      assert_equal entry.time_zone, "Europe/London"
+      assert_equal entry.access_role, "owner"
+      assert_equal entry.primary?, true
+    end
+
+    should "accept a connection to re-use" do
+      reusable_connection = mock('Google::Connection')
+      reusable_connection.expects(:send).returns(@client_mock)
+
+      calendar_list = CalendarList.new({}, reusable_connection)
+      calendar_list.fetch_entries
+    end
+
+    should "return entries which can create calendars" do
+      entry = @calendar_list.fetch_entries.first
+      calendar = entry.to_calendar
+
+      assert_equal calendar.class, Calendar
+      assert_equal calendar.id, entry.id
+      assert_equal calendar.connection, @calendar_list.connection
+    end
+
+  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"
+
+      @freebusy = Google::Freebusy.new(
+        :client_id => @client_id,
+        :client_secret => @client_secret,
+        :redirect_url => "urn:ietf:wg:oauth:2.0:oob",
+        :refresh_token => @refresh_token
+      )
+
+      @client_mock.stubs(:body).returns(get_mock_body("freebusy_query.json"))
+
+      @calendar_ids = ['busy-calendar-id', 'not-busy-calendar-id']
+      @start_time = Time.new(2015, 3, 6, 0, 0, 0)
+      @end_time = Time.new(2015, 3, 6, 23, 59, 59)
+    end
+
+    should "return a hash with keys of the supplied calendar ids" do
+      assert_equal ['busy-calendar-id', 'not-busy-calendar-id'], @freebusy.query(@calendar_ids, @start_time, @end_time).keys
+    end
+
+    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 [], freebusy_result['not-busy-calendar-id']
+    end
   end
 
   protected
@@ -344,4 +512,14 @@ class TestGoogleCalendar < Minitest::Test
     File.open(@@mock_path + '/' + name).read
   end
 
+  def setup_mock_client
+    client = mock('Faraday::Response')
+    client.stubs(:finish).returns('')
+    client.stubs(:status).returns(200)
+    client.stubs(:headers).returns({'content-type' => 'application/json; charset=utf-8'})
+    client.stubs(:body).returns(get_mock_body('successful_login.json'))
+    Faraday::Response.stubs(:new).returns(client)
+    client
+  end
+
 end

metadata

@@ -1,8 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: google_calendar
 version: !ruby/object:Gem::Version
-  version: 0.4.4
-  prerelease: 
+  version: '0.5'
 platform: ruby
 authors:
 - Steve Zich
@@ -14,193 +13,155 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: signet
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.5'
+        version: '0.6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.5'
+        version: '0.6'
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.8'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.8'
 - !ruby/object:Gem::Dependency
   name: terminal-notifier-guard
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.6'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.6'
 - !ruby/object:Gem::Dependency
   name: rb-fsevent
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.9'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.9'
-- !ruby/object:Gem::Dependency
-  name: guard-minitest
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '2.3'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '2.3'
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '5.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '5.1'
 - !ruby/object:Gem::Dependency
   name: minitest-reporters
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
 - !ruby/object:Gem::Dependency
   name: shoulda-context
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.2'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.2'
 - !ruby/object:Gem::Dependency
   name: mocha
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.1'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '10'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '10'
 - !ruby/object:Gem::Dependency
   name: rdoc
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '4.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '4.1'
 description: A minimal wrapper around the google calendar API
@@ -211,9 +172,9 @@ extra_rdoc_files:
 - LICENSE.txt
 - README.rdoc
 files:
-- .document
-- .gitignore
-- .travis.yml
+- ".document"
+- ".gitignore"
+- ".travis.yml"
 - Gemfile
 - Gemfile.lock
 - Guardfile
@@ -223,9 +184,12 @@ files:
 - VERSION
 - google_calendar.gemspec
 - lib/google/calendar.rb
+- lib/google/calendar_list.rb
+- lib/google/calendar_list_entry.rb
 - lib/google/connection.rb
 - lib/google/errors.rb
 - lib/google/event.rb
+- lib/google/freebusy.rb
 - lib/google_calendar.rb
 - readme_code.rb
 - test/helper.rb
@@ -237,7 +201,9 @@ files:
 - test/mocks/empty_events.json
 - test/mocks/events.json
 - test/mocks/find__all_day_event_by_id.json
+- test/mocks/find_calendar_list.json
 - test/mocks/find_event_by_id.json
+- test/mocks/freebusy_query.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
@@ -249,27 +215,26 @@ files:
 homepage: http://northworld.github.io/google_calendar/
 licenses:
 - MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 2.4.3
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: A lightweight Google Calendar API wrapper
 test_files:
 - test/helper.rb
@@ -281,7 +246,9 @@ test_files:
 - test/mocks/empty_events.json
 - test/mocks/events.json
 - test/mocks/find__all_day_event_by_id.json
+- test/mocks/find_calendar_list.json
 - test/mocks/find_event_by_id.json
+- test/mocks/freebusy_query.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