google_apps_api 0.3.0 → 0.3.1

data/VERSION

@@ -1 +1 @@
-0.3.0
+0.3.1

data/google_apps_api.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{google_apps_api}
-  s.version = "0.3.0"
+  s.version = "0.3.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["James Stuart"]
-  s.date = %q{2010-05-25}
+  s.date = %q{2010-05-26}
   s.description = %q{APIs for Google Apps (currently Provisioning, Calendar, Calendar Resources)}
   s.email = %q{tastyhat@jamesstuart.org}
   s.extra_rdoc_files = [
@@ -51,7 +51,7 @@ Gem::Specification.new do |s|
   s.homepage = %q{http://github.com/tastyhat/google_apps_api}
   s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.5}
+  s.rubygems_version = %q{1.3.7}
   s.summary = %q{Various APIs for Google Apps}
   s.test_files = [
     "test/google_apps_api-calendar_resources_test.rb",
@@ -69,7 +69,7 @@ Gem::Specification.new do |s|
     current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
-    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
+    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<httpclient>, [">= 0"])
       s.add_runtime_dependency(%q<nokogiri>, [">= 0"])
       s.add_runtime_dependency(%q<activesupport>, [">= 0"])

data/lib/google_apps_api/calendar.rb

@@ -21,11 +21,11 @@ module GoogleAppsApi #:nodoc:
         existing_acl = "none"
         need_to_create = false
         
-        cal = retrieve_calendar_for_user(calendar, user)
-        if cal
-          existing_acl = cal.details[:accesslevel]
+        existing_cal = retrieve_calendar_for_user(calendar, user)
+        if existing_cal
+          existing_acl = existing_cal.details[:accesslevel]
         else
-          need_to_create = true
+          need_to_create = true unless do_not_subscribe
         end
         
         existing_acl_rank = acl_ranking.index(existing_acl) || raise("invalid existing acl")        
@@ -33,12 +33,11 @@ module GoogleAppsApi #:nodoc:
         acl = options.delete(:accesslevel) || existing_acl
         acl_rank = acl_ranking.index(acl) || raise("new acl invalid")
         
-        if need_to_create
+        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) unless do_not_subscribe
-          
+          add_calendar_to_user(calendar, user)
         end
         
         if acl == "none" 
@@ -56,9 +55,10 @@ module GoogleAppsApi #:nodoc:
 
 
           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
-          
+          if !options.empty? && (existing_cal || need_to_create)
+            
+            update_calendar_for_user(calendar, user, options) 
+          end
         end
       end
 

metadata

@@ -1,7 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: google_apps_api
 version: !ruby/object:Gem::Version 
-  version: 0.3.0
+  hash: 17
+  prerelease: false
+  segments: 
+  - 0
+  - 3
+  - 1
+  version: 0.3.1
 platform: ruby
 authors: 
 - James Stuart
@@ -9,49 +15,65 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-05-25 00:00:00 -04:00
+date: 2010-05-26 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: httpclient
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
         version: "0"
-    version: 
+  type: :runtime
+  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   name: nokogiri
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
         version: "0"
-    version: 
+  type: :runtime
+  version_requirements: *id002
 - !ruby/object:Gem::Dependency 
   name: activesupport
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
         version: "0"
-    version: 
+  type: :runtime
+  version_requirements: *id003
 - !ruby/object:Gem::Dependency 
   name: shoulda
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
         version: "0"
-    version: 
+  type: :development
+  version_requirements: *id004
 description: APIs for Google Apps (currently Provisioning, Calendar, Calendar Resources)
 email: tastyhat@jamesstuart.org
 executables: []
@@ -102,21 +124,27 @@ rdoc_options:
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.5
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Various APIs for Google Apps