gcal4ruby 0.5.1 → 0.5.2

data/CHANGELOG

@@ -1,4 +1,7 @@
 #=CHANGELOG
+#==version 0.5.2
+#* Fixed calendar.public functionality for making calendars publicly viewable.
+#* Fixed to_iframe output methods
 #==version 0.5.1
 #* Minor fixes to to_iframe methods
 #==version 0.5.0 - MAJOR CHANGES

data/lib/gcal4ruby/calendar.rb

@@ -93,7 +93,6 @@ module GCal4Ruby
       @timezone ||= "America/Los_Angeles"
       @color ||= "#2952A3"
       @where ||= ""
-      @permissions = ''
       attributes.each do |key, value|
         self.send("#{key}=", value)
       end
@@ -125,15 +124,29 @@ module GCal4Ruby
       return events
     end
     
+    
+    #Saves the calendar.
+    def save
+      public = @public
+      ret = super
+      return ret if public == @public
+      if public
+        puts 'setting calendar to public' if service.debug
+        rule = GData4Ruby::ACL::AccessRule.new(service, self)
+        rule.role = 'http://schemas.google.com/gCal/2005#read'
+        rule.save
+      else
+        rule = GData4Ruby::ACL::AccessRule.find(service, self, {:user => 'default'})
+        rule.delete if rule
+      end
+      reload
+    end
+    
     #Set the calendar to public (p = true) or private (p = false).  Publically viewable
     #calendars can be accessed by anyone without having to log in to google calendar.  See
     #Calendar#to_iframe on how to display a public calendar in a webpage.
     def public=(p)
-      if p
-        @permissions = 'http://schemas.google.com/gCal/2005#read' 
-      else
-        @permissions = 'none'
-      end
+      @public = p
     end
     
     #Creates a new instance of the object
@@ -184,7 +197,7 @@ module GCal4Ruby
     #if successful, otherwise returns false.  Any information not saved will be overwritten.
     def reload
       return false if not @exists
-      t = self.find(service, @id)
+      t = Calendar.find(service, {:id => @id})
       if t
         load(t.to_xml)
       else
@@ -207,8 +220,6 @@ module GCal4Ruby
           ele.attributes["value"] = @color
         when "selected"
           ele.attributes["value"] = @selected.to_s
-        when 'role'
-          ele.attributes['value'] = @permissions
         end
       end
       xml.to_s
@@ -259,7 +270,9 @@ module GCal4Ruby
           e = GData4Ruby::ACL::AccessRule.new(service, self)
           ele = GData4Ruby::Utils.add_namespaces(ele)
           e.load(ele.to_s)
-          @public == (e.role.include? 'read' and e.user == 'default')
+          puts 'acl rule = '+e.inspect if service.debug
+          @public = (e.role.include? 'read' and e.user == 'default')
+          puts 'public = '+@public.to_s if service.debug
           break if @public
         end
       else
@@ -293,13 +306,12 @@ module GCal4Ruby
       params[:bgcolor] ||= "#FFFFFF"
       params[:color] ||= "#2952A3"
       params[:border] ||= "0"
-      puts "params = #{params.inspect}" if service.debug
-      output = "?#{params.to_a.collect{|a| a.join("=")}.join("&")}&"
-      puts "param_string = #{output}" if service.debug
+      params.each{|key, value| params[key] = CGI::escape(value)}
+      output = "#{params.to_a.collect{|a| a.join("=")}.join("&")}"
     
-      output += "src=#{@id}&color=#{params[:color]}"
+      output += "&src=#{id}"
           
-      "<iframe src='http://www.google.com/calendar/embed?#{CGI.escape(output)}' style='#{params[:border]} px solid;' width='#{params[:width]}' height='#{params[:height]}' frameborder='#{params[:border]}' scrolling='no'></iframe>"  
+      "<iframe src='http://www.google.com/calendar/embed?#{output}' style='#{params[:border]} px solid;' width='#{params[:width]}' height='#{params[:height]}' frameborder='#{params[:border]}' scrolling='no'></iframe>"  
     end
     
     #Helper function to return a specified calendar id as a formatted iframe embedded google calendar.  This function does not require loading the calendar information from the Google calendar
@@ -327,11 +339,12 @@ module GCal4Ruby
       params[:bgcolor] ||= "#FFFFFF"
       params[:color] ||= "#2952A3"
       params[:border] ||= "0"
-      output = "?#{params.to_a.collect{|a| a.join("=")}.join("&")}&"
+      params.each{|key, value| params[key] = CGI::escape(value)}
+      output = "#{params.to_a.collect{|a| a.join("=")}.join("&")}"
     
-      output += "src=#{id}&color=#{params[:color]}"
+      output += "&src=#{id}"
           
-      "<iframe src='http://www.google.com/calendar/embed?#{CGI.escape(output)}' style='#{params[:border]} px solid;' width='#{params[:width]}' height='#{params[:height]}' frameborder='#{params[:border]}' scrolling='no'></iframe>"  
+      "<iframe src='http://www.google.com/calendar/embed?#{output}' style='#{params[:border]} px solid;' width='#{params[:width]}' height='#{params[:height]}' frameborder='#{params[:border]}' scrolling='no'></iframe>"  
     end
   
     private

data/lib/gcal4ruby/event.rb

@@ -125,8 +125,8 @@ module GCal4Ruby
         self.send("#{key}=", value)
       end
       @xml = EVENT_XML
-      @transparency ||= "http://schemas.google.com/g/2005#event.opaque"
-      @status ||= "http://schemas.google.com/g/2005#event.confirmed"
+      @transparency ||= :busy
+      @status ||= :confirmed
       @attendees ||= []
       @all_day ||= false
       @reminder = []

data/lib/gcal4ruby/service.rb

@@ -116,7 +116,6 @@ module GCal4Ruby
     #   width:: the width of the embedded calendar in pixels
     #   title:: the title to display
     #   bgcolor:: the background color.  Limited choices, see google docs for allowable values.
-    #   color:: the color of the calendar elements.  Limited choices, see google docs for allowable values.
     #   showTitle:: set to '0' to hide the title
     #   showDate:: set to '0' to hide the current date
     #   showNav:: set to '0 to hide the navigation tools
@@ -134,11 +133,9 @@ module GCal4Ruby
       params[:width] ||= "600"
       params[:title] ||= (self.account ? self.account : '')
       params[:bgcolor] ||= "#FFFFFF"
-      params[:color] ||= "#2952A3"
       params[:border] ||= "0"
-      puts "params = #{params.inspect}" if self.debug
-      output = "?#{params.to_a.collect{|a| a.join("=")}.join("&")}&"
-      puts "param_string = #{output}" if self.debug
+      params.each{|key, value| params[key] = CGI::escape(value)}
+      output = "#{params.to_a.collect{|a| a.join("=")}.join("&")}"
       
       if cals.is_a?(Array)
         for c in cals
@@ -157,7 +154,7 @@ module GCal4Ruby
         output += "src=#{cal_list[0].id}&"
       end
           
-      "<iframe src='http://www.google.com/calendar/embed?#{CGI::escape(output)}' style='#{params[:border]} px solid;' width='#{params[:width]}' height='#{params[:height]}' frameborder='#{params[:border]}' scrolling='no'></iframe>"
+      "<iframe src='http://www.google.com/calendar/embed?#{output}' style='#{params[:border]} px solid;' width='#{params[:width]}' height='#{params[:height]}' frameborder='#{params[:border]}' scrolling='no'></iframe>"
     end
   end
 end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 5
-  - 1
-  version: 0.5.1
+  - 2
+  version: 0.5.2
 platform: ruby
 authors: 
 - Mike Reich
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-04-29 00:00:00 +10:00
+date: 2010-05-13 00:00:00 +10:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -27,11 +27,11 @@ dependencies:
         segments: 
         - 0
         - 1
-        - 0
-        version: 0.1.0
+        - 2
+        version: 0.1.2
   type: :runtime
   version_requirements: *id001
-description: GCal4Ruby is a Ruby Gem that can be used to interact with the current version of the Google Calendar API. GCal4Ruby provides the following features:<br>* Create and edit calendar events<br>* Add and invite users to events<br>* Set reminders<br>* Make recurring events
+description: "GCal4Ruby is a Ruby Gem that can be used to interact with the current version of the Google Calendar API. GCal4Ruby provides the following features: Create and edit calendar events, Add and invite users to events, Set reminders, Make recurring events."
 email: mike@seabourneconsulting.com
 executables: []