facebook-google-calendar-sync 0.2.0 → 0.2.1

data/bin/facebook-google-calendar-sync

@@ -1,4 +1,5 @@
 #!/usr/bin/env ruby
+$: << File.expand_path('../lib', File.dirname(__FILE__)) ##Delete before checkin
 require 'facebook_google_calendar_sync/cli'
 require 'facebook_google_calendar_sync'
 require 'optparse'
@@ -23,6 +24,12 @@ OptionParser.new do |opts|
     options[:google_calendar_name] = name
   end
 
+  v_help = "Verbose logging"
+  opts.on("-v", "--verbose", v_help) do | verbose |
+    options[:log_level] = :debug
+  end
+
+
   opts.on( '-h', '--help', 'Display this screen' ) do
     puts opts
     exit

data/lib/facebook_google_calendar_sync.rb

@@ -12,11 +12,16 @@ module FacebookGoogleCalendarSync
 
   extend Logging
 
-  DEFAULT_CONFIG = {:google_api_config_file => Pathname.new(ENV['HOME']) + '.google-api.yaml', :google_calendar_name => "My Facebook Events"}
+  DEFAULT_CONFIG = {
+    :google_api_config_file => Pathname.new(ENV['HOME']) + '.google-api.yaml', 
+    :google_calendar_name => "My Facebook Events",
+    :log_level => :info
+  }
 
   def self.sync config
     config = DEFAULT_CONFIG.merge(config).with_indifferent_access
     configure_client config[:google_api_config_file]
+    configure_logger config[:log_level]
     facebook_calendar = retrieve_facebook_calendar config[:facebook_calendar_url]
     google_calendar = GoogleCalendar.find_or_create_calendar config[:google_calendar_name]
     logger.info "Last known Facebook event update occurred at #{google_calendar.last_known_event_update}"
@@ -25,6 +30,10 @@ module FacebookGoogleCalendarSync
 
   private
 
+  def self.configure_logger log_level
+    logger.level = Logger.const_get(log_level.to_s.upcase)
+  end
+
   def self.configure_client google_api_config_file
     GoogleCalendarClient.configure do | conf |
       conf.google_api_config_file = google_api_config_file

data/lib/facebook_google_calendar_sync/event_converter.rb

@@ -1,5 +1,6 @@
 module FacebookGoogleCalendarSync
 
+  # Converts Facebook event into Google event hash
   class EventConverter
 
     attr_accessor :facebook_event, :google_calendar_id

data/lib/facebook_google_calendar_sync/google_calendar_client.rb

@@ -3,6 +3,7 @@ require 'pathname'
 require 'google/api_client'
 require 'ostruct'
 require 'facebook_google_calendar_sync/version'
+require 'facebook_google_calendar_sync/logging'
 
 module FacebookGoogleCalendarSync
 
@@ -10,6 +11,9 @@ class SyncException < StandardError
 end
 
  module GoogleCalendarClient
+
+    include Logging
+
     def self.configure
       @@config = OpenStruct.new
       yield @@config
@@ -76,7 +80,9 @@ end
     private
 
     def make_call params
-      result = client.execute(params.merge(:headers => {'Content-Type' => 'application/json'}))
+      request = params.merge(:headers => {'Content-Type' => 'application/json'})
+      logger.debug("Calling Google Calendar API with request #{request}")
+      result = client.execute(request)
       check_for_success result, params
       result.data
     end

data/lib/facebook_google_calendar_sync/synchroniser.rb

@@ -66,7 +66,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, facebook_event.to_hash
+        add_new_event facebook_event
       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
@@ -75,12 +75,24 @@ 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, facebook_event.to_hash.merge(google_event)
+        update_existing_event facebook_event, google_event
       else
         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
 
+    def add_new_event facebook_event
+      add_event google_calendar.id, facebook_event.to_hash
+    end
+
+    def update_existing_event facebook_event, google_event
+      update_event google_calendar.id, google_event.id, merge_events(facebook_event, google_event)
+    end
+
+    def merge_events facebook_event, google_event
+      google_event.to_hash.merge(facebook_event.to_hash)
+    end
+
     def event_updated_since_calendar_last_modified facebook_event
       facebook_event.last_modified > google_calendar.last_known_event_update
     end

data/lib/facebook_google_calendar_sync/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: facebook-google-calendar-sync
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-18 00:00:00.000000000 Z
+date: 2013-09-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: google-api-client
@@ -184,12 +184,18 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 2896404305834103829
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 2896404305834103829
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23