google_calendar 0.6.0 → 0.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8db07fd559abd732624c1e225ba002a2c3a4f679
-  data.tar.gz: 1471f5e7c39a8b599dab84d8bc42a66f340115e1
+  metadata.gz: 2c17b12f3368a1500b481e98511d25a58e8822c5
+  data.tar.gz: 1deb46615f678e7e445765895cca36af94f284f4
 SHA512:
-  metadata.gz: 7257873946c722bb4edfa3f937bb03e5fbe12ca58ac62a15f947f2134bafac2a8e1e08bedf445dc52c25705ae3dc00e95acecb10e8775f118ef59d6d06b1d53b
-  data.tar.gz: 42c07bb8b693b51da005df9fd66e754e0d7ff7d72f37b47e63f4ad636932d7942c6415c440373fd25fc4c35297a60d55e7fd6e8bbef82cf282ec4d62bc491757
+  metadata.gz: de0d7043457f15f227a5ce37e5394fa26ca494329c9da4e83e9ddd4d6d314ab5a7a2c38adbe95b75e34b98ff6cc6bac06520ee5264db98ed4da26aa8b7662460
+  data.tar.gz: 3034d06715304ca240b9849565231ce08ca263443cb8ada17546a2a3ea2b4ffecb3f7995e656a7e6de5db10f1986c3adf840eaba68f9d506d10734b69ae2170d

data/Gemfile.lock

@@ -1,9 +1,9 @@
 PATH
   remote: .
   specs:
-    google_calendar (0.6.0)
+    google_calendar (0.6.1)
       TimezoneParser (~> 0.2.0)
-      json (~> 2.0)
+      json (>= 1.8.3, < 2.1)
       signet (~> 0.7)
 
 GEM
@@ -21,11 +21,11 @@ GEM
     faraday (0.9.2)
       multipart-post (>= 1.2, < 3)
     insensitive_hash (0.3.3)
-    json (2.0.1)
-    jwt (1.5.4)
+    json (1.8.3)
+    jwt (1.5.6)
     metaclass (0.0.4)
-    minitest (5.9.0)
-    minitest-reporters (1.1.10)
+    minitest (5.9.1)
+    minitest-reporters (1.1.11)
       ansi
       builder
       minitest (>= 5.0)
@@ -34,9 +34,10 @@ GEM
       metaclass (~> 0.0.1)
     multi_json (1.12.1)
     multipart-post (2.0.0)
-    rake (11.2.2)
+    rake (11.3.0)
     rb-fsevent (0.9.7)
-    rdoc (4.1.0)
+    rdoc (4.2.2)
+      json (~> 1.4)
     ruby-progressbar (1.8.1)
     shoulda-context (1.2.1)
     signet (0.7.3)
@@ -71,4 +72,4 @@ DEPENDENCIES
   terminal-notifier-guard (~> 1.6)
 
 BUNDLED WITH
-   1.12.4
+   1.13.2

data/VERSION

@@ -1 +1 @@
-0.5.1
+0.6.1

data/google_calendar.gemspec

@@ -2,8 +2,8 @@
 
 Gem::Specification.new do |s|
   s.name = "google_calendar"
-  s.version = "0.6.0"
-  s.date = "2016-07-15"
+  s.version = "0.6.1"
+  s.date = "2016-09-30"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
 
@@ -27,7 +27,7 @@ Gem::Specification.new do |s|
   s.rubygems_version = "2.2.2"
 
   s.add_runtime_dependency(%q<signet>, ["~> 0.7"])
-  s.add_runtime_dependency(%q<json>, ["~> 2.0"])
+  s.add_runtime_dependency(%q<json>, [">= 1.8.3", "< 2.1"])
   s.add_runtime_dependency(%q<TimezoneParser>, ["~> 0.2.0"])
 
   s.add_development_dependency(%q<terminal-notifier-guard>, ["~> 1.6"])

data/lib/google/event.rb

@@ -259,69 +259,92 @@ module Google
     # Google JSON representation of an event object.
     #
     def to_json
-      "{
-        \"summary\": \"#{title}\",
-        \"visibility\": \"#{visibility}\",
-        \"description\": \"#{description}\",
-        \"location\": \"#{location}\",
-        \"start\": {
-          \"dateTime\": \"#{start_time}\"
-          #{timezone_needed? ? local_timezone_json : ''}
-        },
-        \"end\": {
-          \"dateTime\": \"#{end_time}\"
-          #{timezone_needed? ? local_timezone_json : ''}
+
+      attributes = {
+        "summary" => title,
+        "visibility" => visibility,
+        "transparency" => transparency,
+        "description" => description,
+        "location" => location,
+        "start" => {
+          "dateTime" => start_time
         },
-        #{recurrence_json}
-        #{color_json}
-        #{attendees_json}
-        #{extended_properties_json}
-        \"reminders\": {
-          #{reminders_json}
+        "end" => {
+          "dateTime" => end_time
         },
-        \"guestsCanInviteOthers\": #{guests_can_invite_others.to_json},
-        \"guestsCanSeeOtherGuests\": #{guests_can_see_other_guests.to_json}
-      }"
+        "reminders" => reminders_attributes,
+        "guestsCanInviteOthers" => guests_can_invite_others,
+        "guestsCanSeeOtherGuests" => guests_can_see_other_guests
+      }
+
+      if timezone_needed?
+        attributes['start'].merge!(local_timezone_attributes)
+        attributes['end'].merge!(local_timezone_attributes)
+      end
+
+
+      attributes.merge!(recurrence_attributes)
+      attributes.merge!(color_attributes)
+      attributes.merge!(attendees_attributes)
+      attributes.merge!(extended_properties_attributes)
+
+      JSON.generate attributes
+    end
+
+    #
+    # Hash representation of colors
+    #
+    def color_attributes
+      return {} unless color_id
+      { "colorId" => "#{color_id}" }
     end
 
+    #
+    # JSON representation of colors
+    #
     def color_json
-      return unless color_id
-      "\"colorId\": \"#{color_id}\","
+      color_attributes.to_json
     end
+
     #
-    # JSON representation of attendees
+    # Hash representation of attendees
     #
-    def attendees_json
-      return unless @attendees
+    def attendees_attributes
+      return {} unless @attendees
 
       attendees = @attendees.map do |attendee|
-        "{
-          \"displayName\": \"#{attendee['displayName']}\",
-          \"email\": \"#{attendee['email']}\",
-          \"responseStatus\": \"#{attendee['responseStatus']}\"
-        }"
-      end.join(",\n")
+        attendee.select { |k,v| ['displayName', 'email', 'responseStatus'].include?(k) }
+      end
 
-      "\"attendees\": [\n#{attendees}],"
+      { "attendees" => attendees }
     end
 
     #
-    # JSON representation of a reminder
+    # JSON representation of attendees
     #
-    def reminders_json
+    def attendees_json
+      attendees_attributes.to_json
+    end
+
+    #
+    # Hash representation of a reminder
+    #
+    def reminders_attributes
       if reminders && reminders.is_a?(Hash) && reminders['overrides']
-        overrides = reminders['overrides'].map do |reminder|
-          "{
-            \"method\": \"#{reminder['method']}\",
-            \"minutes\": #{reminder['minutes']}
-          }"
-        end.join(",\n")
-        "\n\"useDefault\": false,\n\"overrides\": [\n#{overrides}]"
+
+        { "useDefault" => false, "overrides" => reminders['overrides'] }
       else
-        "\"useDefault\": true"
+        { "useDefault" => true}
       end
     end
 
+    #
+    # JSON representation of a reminder
+    #
+    def reminders_json
+      reminders_attributes.to_json
+    end
+
     #
     # Timezone info is needed only at recurring events
     #
@@ -330,25 +353,49 @@ module Google
     end
 
     #
-    # JSON representation of local timezone
+    # Hash representation of local timezone
     #
-    def local_timezone_json
+    def local_timezone_attributes
       tz = Time.now.getlocal.zone
       tz_name = TimezoneParser::getTimezones(tz).last
-      ",\"timeZone\" : \"#{tz_name}\""
+      { "timeZone" => tz_name }
     end
 
     #
-    # JSON representation of recurrence rules for repeating events
+    # JSON representation of local timezone
     #
-    def recurrence_json
-      return unless is_recurring_event?
+    def local_timezone_json
+      local_timezone_attributes.to_json
+    end
+
+    #
+    # Hash representation of recurrence rules for repeating events
+    #
+    def recurrence_attributes
+      return {} unless is_recurring_event?
 
       @recurrence[:until] = @recurrence[:until].strftime('%Y%m%dT%H%M%SZ') if @recurrence[:until]
       rrule = "RRULE:" + @recurrence.collect { |k,v| "#{k}=#{v}" }.join(';').upcase
       @recurrence[:until] = Time.parse(@recurrence[:until]) if @recurrence[:until]
 
-      "\"recurrence\": [\n\"#{rrule}\"],"
+      { "recurrence" => [rrule] }
+    end
+
+    #
+    # JSON representation of recurrence rules for repeating events
+    #
+    def recurrence_json
+      recurrence_attributes.to_json
+    end
+
+    #
+    # Hash representation of extended properties
+    # shared : whether this should handle shared or public properties
+    #
+    def extended_properties_attributes
+      return {} unless @extended_properties && (@extended_properties['shared'] || @extended_properties['private'])
+
+      { "extendedProperties" => @extended_properties.select {|k,v| ['shared', 'private'].include?(k) } }
     end
 
     #
@@ -356,21 +403,7 @@ module Google
     # shared : whether this should handle shared or public properties
     #
     def extended_properties_json
-      return unless @extended_properties && (@extended_properties['shared'] || @extended_properties['private'])
-      json_extended_properties = []
-      ['shared', 'private'].each do |prop_type|
-        if @extended_properties[prop_type]
-          props_json = @extended_properties[prop_type].map do |key, value|
-            "\"#{key}\": \"#{value}\""
-          end.join(",\n")
-          json_extended_properties << "\"#{prop_type}\": {\n
-                                          #{props_json}
-                                      }\n"
-        end
-      end
-      "\n\"extendedProperties\": {\n
-        #{json_extended_properties.join(',')}\n
-      },\n"
+      extended_properties_attributes.to_json
     end
 
     #
@@ -419,7 +452,7 @@ module Google
     #
     def self.new_from_feed(e, calendar) #:nodoc:
       params = {}
-      %w(id status description location creator transparency updated reminders attendees visibility).each do |p| 
+      %w(id status description location creator transparency updated reminders attendees visibility).each do |p|
         params[p.to_sym] = e[p]
       end
 
@@ -431,7 +464,7 @@ module Google
       params[:guests_can_invite_others] = e['guestsCanInviteOthers']
       params[:guests_can_see_other_guests] = e['guestsCanSeeOtherGuests']
       params[:html_link] = e['htmlLink']
-      params[:start_time] = Event.parse_json_time(e['start']) 
+      params[:start_time] = Event.parse_json_time(e['start'])
       params[:end_time] = Event.parse_json_time(e['end'])
       params[:recurrence] = Event.parse_recurrence_rule(e['recurrence'])
 

data/test/test_google_calendar.rb

@@ -365,6 +365,7 @@ class TestGoogleCalendar < Minitest::Test
         expected_structure = {
           "summary" => "Go Swimming",
           "visibility"=>"default",
+          "transparency"=>"opaque",
           "description" => "The polar bear plunge",
           "location" => "In the arctic ocean",
           "start" => {"dateTime" => "#{@event.start_time}"},
@@ -424,7 +425,8 @@ class TestGoogleCalendar < Minitest::Test
         require 'timezone_parser'
         expected_structure = {
           "summary" => "Go Swimming",
-          "visibility"=>"default",
+          "visibility"=>"default",          
+          "transparency"=>"opaque",
           "description" => "The polar bear plunge",
           "location" => "In the arctic ocean",
           "start" => {"dateTime" => "#{@event.start_time}", "timeZone" => "#{TimezoneParser::getTimezones(Time.now.getlocal.zone).last}"},

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: google_calendar
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.6.1
 platform: ruby
 authors:
 - Steve Zich
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-15 00:00:00.000000000 Z
+date: 2016-09-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: signet
@@ -28,16 +28,22 @@ dependencies:
   name: json
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.8.3
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '2.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.8.3
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '2.1'
 - !ruby/object:Gem::Dependency
   name: TimezoneParser
   requirement: !ruby/object:Gem::Requirement
@@ -247,7 +253,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.4
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: A lightweight Google Calendar API wrapper