google_calendar 0.4.2 → 0.4.3

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    google_calendar (0.4.1)
+    google_calendar (0.4.3)
       signet (~> 0.5)
 
 GEM
@@ -31,7 +31,7 @@ GEM
       minitest (>= 3.0)
     hitimes (1.2.2)
     json (1.8.1)
-    jwt (1.0.0)
+    jwt (1.2.0)
     listen (2.8.0)
       celluloid (>= 0.15.2)
       rb-fsevent (>= 0.9.3)

data/google_calendar.gemspec

@@ -2,8 +2,8 @@
 
 Gem::Specification.new do |s|
   s.name = "google_calendar"
-  s.version = "0.4.2"
-  s.date = "2014-11-23"
+  s.version = "0.4.3"
+  s.date = "2014-11-30"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
 

data/lib/google/calendar.rb

@@ -187,7 +187,11 @@ module Google
     # Works like the create_event method.
     #
     def find_or_create_event_by_id(id, &blk)
-      setup_event(find_event_by_id(id)[0] || Event.new, &blk)
+      if id.nil?
+        setup_event(Event.new, &blk)
+      else
+        setup_event(find_event_by_id(id)[0] || Event.new, &blk)
+      end
     end
 
     #

data/lib/google/event.rb

@@ -47,8 +47,7 @@ module Google
     #                   ]
     #
     def initialize(params = {})
-      [:id, :raw, :html_link, 
-       :title, :location, :calendar, :quickadd, :attendees, :description, :reminders, :start_time, :end_time,  ].each do |attribute|
+      [:id, :raw, :html_link, :title, :location, :calendar, :quickadd, :attendees, :description, :reminders, :start_time, :end_time,  ].each do |attribute|
         instance_variable_set("@#{attribute}", params[attribute])
       end
 
@@ -60,7 +59,7 @@ module Google
     # Sets the start time of the Event.  Must be a Time object or a parse-able string representation of a time.
     #
     def start_time=(time)
-      @start_time = parse_time(time)
+      @start_time = Event.parse_time(time)
     end
 
     #
@@ -87,7 +86,7 @@ module Google
     # Sets the end time of the Event.  Must be a Time object or a parse-able string representation of a time.
     #
     def end_time=(time)
-      @end_time = parse_time(time)
+      @end_time = Event.parse_time(time)
       raise ArgumentError, "End Time must be either Time or String" unless (time.is_a?(String) || time.is_a?(Time))
       @end_time = (time.is_a? String) ? Time.parse(time) : time.dup.utc
     end
@@ -279,8 +278,8 @@ module Google
                 :title        => e['summary'],
                 :description  => e['description'],
                 :location     => e['location'],
-                :start_time   => (e['start'] ? e['start']['dateTime'] : ''),
-                :end_time     => (e['end']   ? e['end']['dateTime'] : ''),
+                :start_time   => Event.parse_json_time(e['start']),
+                :end_time     => Event.parse_json_time(e['end']),
                 :transparency => e['transparency'],
                 :html_link    => e['htmlLink'],
                 :updated      => e['updated'],
@@ -299,10 +298,20 @@ module Google
       @html_link = @raw['htmlLink']
     end
 
+    def self.parse_json_time(time_hash)
+      if time_hash['date']
+        Time.parse(time_hash['date']).utc
+      elsif time_hash['dateTime']
+        Time.parse(time_hash['dateTime']).utc
+      else
+        Time.now.utc
+      end      
+    end
+
     #
     # A utility method used centralize time parsing.
     #
-    def parse_time(time) #:nodoc
+    def self.parse_time(time) #:nodoc
       raise ArgumentError, "Start Time must be either Time or String" unless (time.is_a?(String) || time.is_a?(Time))
       (time.is_a? String) ? Time.parse(time) : time.dup.utc
     end

data/test/mocks/find__all_day_event_by_id.json

@@ -0,0 +1,31 @@
+{
+  "status": "confirmed", 
+  "kind": "calendar#event", 
+  "end": {
+    "date": "2008-09-24T11:00:00-07:00"
+  }, 
+  "description": "Test Event", 
+  "created": "2008-09-18T21:17:11.000Z", 
+  "iCalUID": "fhru34kt6ikmr20knd2456l08n@google.com", 
+  "reminders": {
+    "useDefault": true
+  }, 
+  "htmlLink": "https://www.google.com/calendar/event?eid=hJo0SgXn9qMwOHJjYWJpNnBhNTQ5dHRqbGsgZ3FlYjBpNnY3MzdrZnU1bWQwZjNldWtqbGdAZw", 
+  "sequence": 1, 
+  "updated": "2008-10-24T23:08:09.010Z", 
+  "summary": "This is a test event", 
+  "start": {
+    "date": "2008-09-24T10:30:00-07:00"
+  }, 
+  "etag": "\"2449779378020000\"", 
+  "organizer": {
+    "self": true, 
+    "displayName": "Some Person", 
+    "email": "some.person@gmail.com"
+  }, 
+  "creator": {
+    "displayName": "Some Person", 
+    "email": "some.person@gmail.com"
+  }, 
+  "id": "fhru34kt6ikmr20knd2456l10n"
+}

data/test/mocks/missing_date.json

@@ -0,0 +1,31 @@
+{
+  "status": "confirmed", 
+  "kind": "calendar#event", 
+  "end": {
+    "dateTimes": "2008-09-24T11:00:00-07:00"
+  }, 
+  "description": "Test Event", 
+  "created": "2008-09-18T21:17:11.000Z", 
+  "iCalUID": "fhru34kt6ikmr20knd2456l08n@google.com", 
+  "reminders": {
+    "useDefault": true
+  }, 
+  "htmlLink": "https://www.google.com/calendar/event?eid=hJo0SgXn9qMwOHJjYWJpNnBhNTQ5dHRqbGsgZ3FlYjBpNnY3MzdrZnU1bWQwZjNldWtqbGdAZw", 
+  "sequence": 1, 
+  "updated": "2008-10-24T23:08:09.010Z", 
+  "summary": "This is a test event", 
+  "start": {
+    "dateTimes": "2008-09-24T10:30:00-07:00"
+  }, 
+  "etag": "\"2449779378020000\"", 
+  "organizer": {
+    "self": true, 
+    "displayName": "Some Person", 
+    "email": "some.person@gmail.com"
+  }, 
+  "creator": {
+    "displayName": "Some Person", 
+    "email": "some.person@gmail.com"
+  }, 
+  "id": "fhru34kt6ikmr20knd2456l12n"
+}

data/test/test_google_calendar.rb

@@ -79,9 +79,11 @@ class TestGoogleCalendar < Minitest::Test
       end
 
       should "find events in range" do
-        start_min = Time.new(2011, 2, 1, 11, 1, 1).utc
-        start_max = Time.new(2011, 2, 28, 23, 59, 59).utc
-        @calendar.expects(:event_lookup).with('?timeMin=2011-02-01T19:01:01Z&timeMax=2011-03-01T07:59:59Z&orderBy=startTime&maxResults=25&singleEvents=true')
+        now = Time.now.utc
+        Time.stubs(:now).returns(now)
+        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)
       end
 
@@ -139,6 +141,23 @@ class TestGoogleCalendar < Minitest::Test
         assert_equal event.id, "fhru34kt6ikmr20knd2456l08n"
       end
 
+      should "find properly parse all day event" do
+        @client_mock.stubs(:body).returns( get_mock_body("find__all_day_event_by_id.json") )
+        event = @calendar.find_event_by_id('fhru34kt6ikmr20knd2456l10n')
+        assert_equal event[0].id, 'fhru34kt6ikmr20knd2456l10n'
+        assert_equal event[0].start_time, "2008-09-24T17:30:00Z"
+      end
+
+      should "find properly parse missing date event" do
+        now = Time.now.utc
+        Time.stubs(:now).returns(now)
+        formatted_time = now.strftime("%FT%TZ")
+        @client_mock.stubs(:body).returns( get_mock_body("missing_date.json") )
+        event = @calendar.find_event_by_id('fhru34kt6ikmr20knd2456l12n')
+        assert_equal event[0].id, 'fhru34kt6ikmr20knd2456l12n'
+        assert_equal event[0].start_time, formatted_time
+      end
+
       should "create a quickadd event" do
         @client_mock.stubs(:body).returns( get_mock_body("create_quickadd_event.json") )
 
@@ -204,6 +223,16 @@ 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") )
+
+        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'
+      end
 
     end # Logged on context
 

metadata

@@ -1,18 +1,20 @@
 --- !ruby/object:Gem::Specification
 name: google_calendar
 version: !ruby/object:Gem::Version
-  version: 0.4.2
+  version: 0.4.3
+  prerelease: 
 platform: ruby
 authors:
 - Steve Zich
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-23 00:00:00.000000000 Z
+date: 2014-11-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: signet
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -20,6 +22,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -27,6 +30,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: terminal-notifier-guard
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -34,6 +38,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -41,6 +46,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rb-fsevent
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -48,6 +54,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -55,6 +62,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: guard-minitest
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -62,6 +70,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -69,6 +78,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -76,6 +86,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -83,6 +94,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest-reporters
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -90,6 +102,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -97,6 +110,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: shoulda-context
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -104,6 +118,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -111,20 +126,23 @@ dependencies:
 - !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
@@ -132,6 +150,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -139,6 +158,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -146,6 +166,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -153,6 +174,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rdoc
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -160,6 +182,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -197,10 +220,12 @@ files:
 - test/mocks/create_quickadd_event.json
 - test/mocks/empty_events.json
 - test/mocks/events.json
+- test/mocks/find__all_day_event_by_id.json
 - test/mocks/find_event_by_id.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
+- test/mocks/missing_date.json
 - test/mocks/query_events.json
 - test/mocks/repeating_events.json
 - test/mocks/successful_login.json
@@ -208,26 +233,27 @@ 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: 2.0.3
+rubygems_version: 1.8.24
 signing_key: 
-specification_version: 4
+specification_version: 3
 summary: A lightweight Google Calendar API wrapper
 test_files:
 - test/helper.rb
@@ -238,10 +264,12 @@ test_files:
 - test/mocks/create_quickadd_event.json
 - test/mocks/empty_events.json
 - test/mocks/events.json
+- test/mocks/find__all_day_event_by_id.json
 - test/mocks/find_event_by_id.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
+- test/mocks/missing_date.json
 - test/mocks/query_events.json
 - test/mocks/repeating_events.json
 - test/mocks/successful_login.json

checksums.yaml

@@ -1,7 +0,0 @@
----
-SHA1:
-  metadata.gz: c297b3a72681304aedd3ab416624ad08cf0a81a0
-  data.tar.gz: e442a228ba475e8aaffc59450146ba5f1ebe0fec
-SHA512:
-  metadata.gz: 6e9f87759fb2caaecc84a997afef82fcced67b8551d5c71da44d4043106f192bed69c520951dde71c9b1d870f681433ab1b52b0255fc5d9cffa1035012900f7e
-  data.tar.gz: 5fcd845f10346f292710c16c5cba98c35aae2a0889fc1affb3ea623bf02b89877998c8c734baef722b63d648364cbe0f802c8147f11df88779260c22961a69ca