facebook-google-calendar-sync 0.0.2 → 0.1.0

data/README.md

@@ -30,7 +30,7 @@ Create a Goggle permissions file to allow the gem to access your Google Calendar
 
     $ bundle exec google-api oauth-2-login --scope=https://www.googleapis.com/auth/calendar --client-id=436161995365.apps.googleusercontent.com --client-secret=WgTEjg-b8rXCRL28hweLcSuV
 
-You will now have a .google-api.yaml file in your home directory.
+You will now have a .google-api.yaml file in your home directory. Note: the gem can only access your calendar data if it has this file. The synchronisation process will run locally on your computer - no external service will have access to your Google Calendar.
 
 For more information on the last step see https://developers.google.com/google-apps/calendar/firstapp#register and the Ruby tab on https://developers.google.com/google-apps/calendar/instantiate
 

data/lib/facebook_google_calendar_sync/event_converter.rb

@@ -0,0 +1,81 @@
+module FacebookGoogleCalendarSync
+
+  class EventConverter
+
+    attr_accessor :facebook_event, :google_calendar_id, :timezone
+    STATUS_MAPPINGS = {'NEEDS-ACTION' => 'needsAction', 'ACCEPTED' => 'accepted'}
+
+    def initialize facebook_event, google_calendar_id, timezone
+      @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,
+         'description' => description,
+         'location' => facebook_event.location,
+         'organizer' => organiser,
+         'attendees' => attendees,
+         'transparency' => transparency
+      }
+    end
+
+    def attendees
+      [{"email"=>google_calendar_id, 'responseStatus' => partstat}]
+    end
+
+    def description
+      "#{facebook_event.description}\n\nOrganiser: #{organiser_name}"
+    end
+
+    def partstat
+      STATUS_MAPPINGS[facebook_event.to_s.scan(/PARTSTAT::(.*)/).flatten.first()]
+    end
+
+    def transparency
+      partstat == 'accepted' ? 'opaque' : 'transparent'
+    end
+
+    def organiser_name
+      matches = facebook_event.organizer_property.to_s.scan(/CN=(.*):MAILTO:(.*)/).flatten
+      matches[0]
+    end
+
+    def organiser
+      {
+        'email' => 'noreply@facebook.com',
+      }
+    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')}
+      end
+    end
+  end
+end

data/lib/facebook_google_calendar_sync/google_calendar_client.rb

@@ -2,6 +2,7 @@ require 'yaml'
 require 'pathname'
 require 'google/api_client'
 require 'ostruct'
+require 'facebook_google_calendar_sync/version'
 
 module FacebookGoogleCalendarSync
 
@@ -14,7 +15,7 @@ end
       yield @@config
 
       oauth_yaml = YAML.load_file(@@config.google_api_config_file)
-      @@client = Google::APIClient.new({:application_name => "Facebook to Google Calendar Sync", :application_version => "0.1.0"})
+      @@client = Google::APIClient.new({:application_name => "Facebook to Google Calendar Sync", :application_version => FacebookGoogleCalendarSync::VERSION})
       @@client.authorization.client_id = oauth_yaml["client_id"]
       @@client.authorization.client_secret = oauth_yaml["client_secret"]
       @@client.authorization.scope = oauth_yaml["scope"]
@@ -28,6 +29,10 @@ end
       @@calendar_service = @@client.discovered_api('calendar', 'v3')
     end
 
+    def get_calendar_metadata calendar_id
+      make_call :api_method => calendar_service.calendars.get, :parameters => {'calendarId' => calendar_id}
+    end
+
     def find_calendar_details_by_summary calendar_summary
       get_calendar_list.items.find { | calendar | calendar.summary == calendar_summary && calendar.accessRole == 'owner'}
     end
@@ -45,7 +50,7 @@ end
     end
 
     def add_event calendar_id, event
-      make_call :api_method => calendar_service.events.insert,
+      make_call :api_method => calendar_service.events.import,
         :parameters => {'calendarId' => calendar_id},
         :body_object => event
     end

data/lib/facebook_google_calendar_sync/synchroniser.rb

@@ -1,11 +1,10 @@
-require 'facebook_google_calendar_sync/event'
 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'
 
 module FacebookGoogleCalendarSync
   class Synchroniser
-    include Event
     include Logging
     include GoogleCalendarDescription
     include GoogleCalendarClient
@@ -31,11 +30,12 @@ module FacebookGoogleCalendarSync
     def synchronise_events
       facebook_calendar.events.each do | facebook_event |
         begin
-          synchronise_event facebook_event
+          synchronise_event EventConverter.new(facebook_event, google_calendar.id, google_calendar.timezone)
         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 convert_event_to_hash(facebook_event)
+          logger.error facebook_event.summary
+          raise e
         end
       end
     end
@@ -52,7 +52,7 @@ module FacebookGoogleCalendarSync
     def handle_google_event_not_found facebook_event
       if event_created_since_calendar_last_modified facebook_event
         logger.info "Adding '#{facebook_event.summary}' to #{google_calendar.summary}"
-        add_event google_calendar.id, convert_event_to_hash(facebook_event)
+        add_event google_calendar.id, facebook_event.to_hash
       else
         logger.info "Not updating '#{facebook_event.summary}' as it has been deleted from the target calendar since #{google_calendar.last_known_event_update}."
       end
@@ -61,9 +61,9 @@ module FacebookGoogleCalendarSync
     def handle_google_event_found facebook_event, google_event
       if event_updated_since_calendar_last_modified facebook_event
         logger.info "Updating '#{facebook_event.summary}' in #{google_calendar.summary}"
-        update_event google_calendar.id, google_event.id, merge_events(google_event, facebook_event)
+        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 #{to_local(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 #{to_local(google_event.updated)}"
       end
     end
 
@@ -75,10 +75,6 @@ module FacebookGoogleCalendarSync
       facebook_event.created > google_calendar.last_known_event_update
     end
 
-    def date_of_most_recent_event_update
-      to_local(date_of_most_recent_update(facebook_calendar.events))
-    end
-
     def update_last_known_event_update
       last_modified = date_of_most_recent_event_update
       if last_modified != google_calendar.last_known_event_update
@@ -86,7 +82,7 @@ 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 #{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 #{to_local(google_calendar.last_known_event_update)}."
       end
     end
 
@@ -97,5 +93,10 @@ module FacebookGoogleCalendarSync
     def to_local date_or_time
       date_or_time.convert_time_zone(google_calendar.timezone)
     end
+
+    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
+    end
   end
 end

data/lib/facebook_google_calendar_sync/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: facebook-google-calendar-sync
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-15 00:00:00.000000000 Z
+date: 2013-04-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: google-api-client
@@ -159,7 +159,7 @@ files:
 - facebook-google-calendar-sync.gemspec
 - lib/facebook_google_calendar_sync.rb
 - lib/facebook_google_calendar_sync/cli.rb
-- lib/facebook_google_calendar_sync/event.rb
+- lib/facebook_google_calendar_sync/event_converter.rb
 - lib/facebook_google_calendar_sync/google_calendar.rb
 - lib/facebook_google_calendar_sync/google_calendar_client.rb
 - lib/facebook_google_calendar_sync/google_calendar_description.rb
@@ -183,21 +183,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -611403339403696087
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -611403339403696087
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.25
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: Syncs Facebook calendar to Google calendar

data/lib/facebook_google_calendar_sync/event.rb

@@ -1,36 +0,0 @@
-require 'date'
-
-module FacebookGoogleCalendarSync
-  module Event
-
-    def convert_event_to_hash ical_event
-      {
-         'summary' => ical_event.summary,
-         'start' => date_hash(ical_event.dtstart),
-         'end' => date_hash(ical_event.dtend),
-         'iCalUID' => ical_event.uid,
-         'description' => ical_event.description,
-         'location' => ical_event.location
-      }
-    end
-
-    def merge_events google_event, facebook_event
-      google_event.to_hash.merge(convert_event_to_hash(facebook_event))
-    end
-
-    def date_of_most_recent_update facebook_events
-      most_recently_modified_event = facebook_events.max{ | event_a, event_b | event_a.last_modified <=> event_b.last_modified }
-      most_recently_modified_event.last_modified
-    end
-
-    private
-
-    def date_hash date_time
-      if date_time.instance_of? Date
-        {'date' => date_time.strftime('%Y-%m-%d')}
-      else
-        {'dateTime' => date_time.strftime('%Y-%m-%dT%H:%M:%S.000%:z')}
-      end
-    end
-  end
-end