google_apps_api 0.2.2 → 0.3.0

data/VERSION

@@ -1 +1 @@
-0.2.2
+0.3.0

data/google_apps_api.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{google_apps_api}
-  s.version = "0.2.2"
+  s.version = "0.3.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["James Stuart"]

data/lib/google_apps_api/calendar.rb

@@ -13,6 +13,11 @@ module GoogleAppsApi #:nodoc:
       def set_calendar_for_user(calendar, user, *args)
         options = args.extract_options!
         
+        acl_ranking = ["none", "freebusy", "read", "editor", "owner", "root"]
+        acl_comparison = options.delete(:acl_comparison) || :set
+        
+        do_not_subscribe = options.delete(:do_not_subscribe) || false
+        
         existing_acl = "none"
         need_to_create = false
         
@@ -23,13 +28,16 @@ module GoogleAppsApi #:nodoc:
           need_to_create = true
         end
         
+        existing_acl_rank = acl_ranking.index(existing_acl) || raise("invalid existing acl")        
+        
         acl = options.delete(:accesslevel) || existing_acl
-
+        acl_rank = acl_ranking.index(acl) || raise("new acl invalid")
+        
         if need_to_create
           raise "Must set accesslevel for a newly added calendar" unless acl
           owner_acl = CalendarAcl.new(:calendar => calendar, :scope => user, :role => "owner")
           set_calendar_acl(owner_acl)
-          add_calendar_to_user(calendar, user)
+          add_calendar_to_user(calendar, user) unless do_not_subscribe
           
         end
         
@@ -37,10 +45,19 @@ module GoogleAppsApi #:nodoc:
           remove_calendar_from_user(calendar, user) unless existing_acl == "none"
         else
 
-          if acl != existing_acl
-            set_calendar_acl(CalendarAcl.new(:calendar => calendar, :scope => user, :role => acl))
+          set_acl = case acl_comparison
+          when :set
+            true
+          when :set_if_higher
+            acl_rank > existing_acl_rank
+          when :set_if_lower
+            acl_rank < existing_acl_rank
           end
-          update_calendar_for_user(calendar, user, options) unless options.empty?
+
+
+          set_calendar_acl(CalendarAcl.new(:calendar => calendar, :scope => user, :role => acl)) if set_acl
+          
+          update_calendar_for_user(calendar, user, options) unless options.empty? unless do_not_subscribe && need_to_create
           
         end
       end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: google_apps_api
 version: !ruby/object:Gem::Version 
-  version: 0.2.2
+  version: 0.3.0
 platform: ruby
 authors: 
 - James Stuart