facebook-google-calendar-sync 0.1.0 → 0.2.0

data/lib/facebook_google_calendar_sync.rb

@@ -7,6 +7,7 @@ require 'facebook_google_calendar_sync/google_calendar'
 require 'facebook_google_calendar_sync/google_calendar_client'
 require 'active_support/core_ext/hash/indifferent_access'
 
+
 module FacebookGoogleCalendarSync
 
   extend Logging

data/lib/facebook_google_calendar_sync/event_converter.rb

@@ -2,39 +2,22 @@ module FacebookGoogleCalendarSync
 
   class EventConverter
 
-    attr_accessor :facebook_event, :google_calendar_id, :timezone
+    attr_accessor :facebook_event, :google_calendar_id
     STATUS_MAPPINGS = {'NEEDS-ACTION' => 'needsAction', 'ACCEPTED' => 'accepted'}
 
-    def initialize facebook_event, google_calendar_id, timezone
+    def initialize facebook_event, google_calendar_id
       @facebook_event = facebook_event
       @google_calendar_id = google_calendar_id
-      @timezone = timezone
-    end
-
-    def uid
-      facebook_event.uid
-    end
-
-    def last_modified
-      facebook_event.last_modified.convert_time_zone(timezone)
-    end
-
-    def summary
-      facebook_event.summary
-    end
-
-    def created
-      facebook_event.created
     end
 
     def to_hash
       {
-         'summary' => facebook_event.summary,
-         'start' => date_hash(facebook_event.dtstart),
-         'end' => date_hash(facebook_event.dtend),
-         'iCalUID' => facebook_event.uid,
+         'summary' => summary,
+         'start' => date_hash(dtstart),
+         'end' => date_hash(dtend),
+         'iCalUID' => uid,
          'description' => description,
-         'location' => facebook_event.location,
+         'location' => location,
          'organizer' => organiser,
          'attendees' => attendees,
          'transparency' => transparency
@@ -58,7 +41,7 @@ module FacebookGoogleCalendarSync
     end
 
     def organiser_name
-      matches = facebook_event.organizer_property.to_s.scan(/CN=(.*):MAILTO:(.*)/).flatten
+      matches = organizer_property.to_s.scan(/CN=(.*):MAILTO:(.*)/).flatten
       matches[0]
     end
 
@@ -68,13 +51,21 @@ module FacebookGoogleCalendarSync
       }
     end
 
+    def method_missing(method, *args, &block)
+      if facebook_event.respond_to?(method)
+        facebook_event.send(method, *args, &block)
+      else
+        super
+      end
+    end
+
     private
 
     def date_hash date_time
       if date_time.instance_of? Date
         {'date' => date_time.strftime('%Y-%m-%d')}
       else
-        {'dateTime' => date_time.convert_time_zone(timezone).strftime('%Y-%m-%dT%H:%M:%S.000%:z')}
+        {'dateTime' => date_time.strftime('%Y-%m-%dT%H:%M:%S.000%:z')}
       end
     end
   end

data/lib/facebook_google_calendar_sync/google_calendar_client.rb

@@ -77,7 +77,7 @@ end
 
     def make_call params
       result = client.execute(params.merge(:headers => {'Content-Type' => 'application/json'}))
-      check_for_success result
+      check_for_success result, params
       result.data
     end
 
@@ -89,8 +89,8 @@ end
       @@calendar_service
     end
 
-    def check_for_success result
-      raise SyncException.new(result.status.to_s + " " + result.body) unless result.status == 200
+    def check_for_success result, params
+      raise SyncException.new(result.status.to_s + "\nResponse:" + result.body + "\nRequest: #{params}") unless result.status == 200
     end
 
   end

data/lib/facebook_google_calendar_sync/synchroniser.rb

@@ -1,21 +1,23 @@
+require 'time_zone_hack'
 require 'facebook_google_calendar_sync/google_calendar_client'
 require 'facebook_google_calendar_sync/google_calendar_description'
-require 'time_zone_hack'
 require 'facebook_google_calendar_sync/event_converter'
+require 'facebook_google_calendar_sync/timezone'
 
 module FacebookGoogleCalendarSync
   class Synchroniser
     include Logging
     include GoogleCalendarDescription
     include GoogleCalendarClient
+    include Timezone
 
     def initialize(facebook_calendar, google_calendar)
-      @facebook_calendar = facebook_calendar
-      @google_calendar = google_calendar
+      @google_calendar = with_timezone(google_calendar, google_calendar.timezone)
+      @events = facebook_calendar.events.collect{ | facebook_event | with_google_calendar_timezone(facebook_event) }
     end
 
-    def facebook_calendar
-      @facebook_calendar
+    def events
+      @events
     end
 
     def google_calendar
@@ -27,17 +29,29 @@ module FacebookGoogleCalendarSync
       update_last_known_event_update
     end
 
+    def convert facebook_event
+      EventConverter.new(facebook_event, google_calendar.id)
+    end
+
+    def with_google_calendar_timezone target
+      with_timezone(target, google_calendar.timezone)
+    end
+
+    #TODO: Fix this method!
     def synchronise_events
-      facebook_calendar.events.each do | facebook_event |
+      errors = []
+      events.each do | facebook_event |
+        converted_event = nil
         begin
-          synchronise_event EventConverter.new(facebook_event, google_calendar.id, google_calendar.timezone)
+          converted_event = convert(facebook_event)
+          synchronise_event converted_event
         rescue StandardError => e
           logger.error e
-          logger.error "Error synchronising event. Please note that if this was a new event, it will not have been added to your calendar."
-          logger.error facebook_event.summary
-          raise e
+          logger.error "Error synchronising event. #{converted_event.to_hash}" rescue nil
+          errors << e
         end
       end
+      raise "Errors synchronising calendar" if errors.any?
     end
 
     def synchronise_event facebook_event
@@ -45,7 +59,7 @@ module FacebookGoogleCalendarSync
       if google_event == nil
         handle_google_event_not_found facebook_event
       else
-        handle_google_event_found facebook_event, google_event
+        handle_google_event_found facebook_event, with_google_calendar_timezone(google_event)
       end
     end
 
@@ -63,7 +77,7 @@ module FacebookGoogleCalendarSync
         logger.info "Updating '#{facebook_event.summary}' in #{google_calendar.summary}"
         update_event google_calendar.id, google_event.id, facebook_event.to_hash.merge(google_event)
       else
-        logger.info "Not updating '#{facebook_event.summary}' in #{google_calendar.summary} as #{facebook_event.last_modified} is not later than #{to_local(google_event.updated)}"
+        logger.info "Not updating '#{facebook_event.summary}' in #{google_calendar.summary} as #{facebook_event.last_modified} is not later than #{google_event.updated}"
       end
     end
 
@@ -82,21 +96,19 @@ module FacebookGoogleCalendarSync
         details = google_calendar.details.to_hash.merge({'description' => create_description(date_of_most_recent_event_update, current_time_in_google_calendar_timezone)})
         update_calendar google_calendar.id, details
       else
-        logger.info "Not updating description of '#{google_calendar.summary}' as the date of the most recent update has not changed from #{to_local(google_calendar.last_known_event_update)}."
+        logger.info "Not updating description of '#{google_calendar.summary}' as the date of the most recent update has not changed from #{google_calendar.last_known_event_update}."
       end
     end
 
     def current_time_in_google_calendar_timezone
-      to_local(DateTime.now)
-    end
-
-    def to_local date_or_time
-      date_or_time.convert_time_zone(google_calendar.timezone)
+      DateTime.now.convert_time_zone(google_calendar.timezone)
     end
 
+    #Use the date of the most recent event update as our 'line in the sand' rather than the Google calendar's updated
+    #property, because of the slight differences in the clocks between Facebook and Google calendar and the fact that
+    #this script takes a non-zero amount of time to run, which could lead to inconsitencies in the synchronisation logic.
     def date_of_most_recent_event_update
-      most_recently_modified_event = facebook_calendar.events.max{ | event_a, event_b | event_a.last_modified <=> event_b.last_modified }
-      most_recently_modified_event.last_modified
+      events.max{ | event_a, event_b | event_a.last_modified <=> event_b.last_modified }.last_modified
     end
   end
 end

data/lib/facebook_google_calendar_sync/timezone.rb

@@ -0,0 +1,32 @@
+require 'time_zone_hack'
+
+module FacebookGoogleCalendarSync
+
+  module Timezone
+
+    def with_timezone target, timezone
+      TimeZoneProxy.new(target, timezone)
+    end
+
+    class TimeZoneProxy < BasicObject
+      def initialize target, timezone
+        @target = target
+        @timezone = timezone
+      end
+
+      def method_missing(method, *args, &block)
+        result = @target.send(method, *args, &block)
+        convert_timezone_if_date(result)
+      end
+
+      def convert_timezone_if_date result
+        if result.respond_to?(:convert_time_zone)
+          result.convert_time_zone(@timezone)
+        else
+          result
+        end
+      end
+    end
+  end
+
+end

data/lib/facebook_google_calendar_sync/version.rb

@@ -1,3 +1,3 @@
 module FacebookGoogleCalendarSync
-  VERSION = "0.1.0"
+  VERSION = "0.2.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: facebook-google-calendar-sync
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -165,6 +165,7 @@ files:
 - lib/facebook_google_calendar_sync/google_calendar_description.rb
 - lib/facebook_google_calendar_sync/logging.rb
 - lib/facebook_google_calendar_sync/synchroniser.rb
+- lib/facebook_google_calendar_sync/timezone.rb
 - lib/facebook_google_calendar_sync/version.rb
 - lib/time_zone_hack.rb
 - spec/facebook-google-calendar-sync_spec.rb