gcal4ruby 0.5.4 → 0.5.5

data/CHANGELOG

@@ -1,4 +1,9 @@
 #=CHANGELOG
+#==version 0.5.5 
+#* Fixed calendar::find method.  Thanks to AB <a.berezovskiy@gmail.com>.
+#* Improved recurrence handling.  Thanks to John Paul Narowski <jnarowski@gmail.com>.
+#* Fixed documentation bug for event reminders.
+#* Changed license to LGPLv3.
 #==version 0.5.4
 #* Fixed Service#to_iframe bgcolor bug
 #==version 0.5.3

data/README

@@ -7,8 +7,10 @@
 #
 #==Author and Contact Information
 #GCal4Ruby was created and is maintained by {Mike Reich}[mailto:mike@seabourneconsulting.com] 
-#and is licenses under the GPL v2.  Feel free to use and update, but be sure to contribute your
-#code back to the project and attribute as required by the license.
+#and is licenses under the LGPL v3.  Feel free to use and update, but be sure to contribute your
+#code back to the project and attribute as required by the license.  You can find the text of the LGPL 
+#here: http://www.gnu.org/licenses/lgpl.html.
+#
 #===Website
 #http://cookingandcoding.com/gcal4ruby/
 #

data/lib/gcal4ruby/calendar.rb

@@ -182,7 +182,7 @@ module GCal4Ruby
         cals.each do |cal|
           if query.is_a?(Hash)
             results << cal if query[:query] and cal.title.downcase.include? query[:query].downcase
-            results << cal if query[:title] and cal.title == query[:query]
+            results << cal if query[:title] and cal.title == query[:title]
           else
             results << cal if cal.title.downcase.include? query.downcase
           end
@@ -210,21 +210,21 @@ module GCal4Ruby
       xml = REXML::Document.new(super)
       xml.root.elements.each(){}.map do |ele|
         case ele.name
-        when "summary"
+          when "summary"
           ele.text = @summary
-        when "timezone"
+          when "timezone"
           ele.attributes["value"] = @timezone
-        when "hidden"
+          when "hidden"
           ele.attributes["value"] = @hidden.to_s
-        when "color"
+          when "color"
           ele.attributes["value"] = @color
-        when "selected"
+          when "selected"
           ele.attributes["value"] = @selected.to_s
         end
       end
       xml.to_s
     end
-  
+    
     #Loads the Calendar with returned data from Google Calendar feed.  Returns true if successful.
     def load(string)
       super(string)
@@ -234,23 +234,23 @@ module GCal4Ruby
       xml.root.elements.each(){}.map do |ele|
         case ele.name
           when "id"
-            @id = ele.text.gsub("http://www.google.com/calendar/feeds/default/calendars/", "")
+          @id = ele.text.gsub("http://www.google.com/calendar/feeds/default/calendars/", "")
           when 'summary'
-            @summary = ele.text
+          @summary = ele.text
           when "color"
-            @color = ele.attributes['value']
+          @color = ele.attributes['value']
           when 'hidden'
-            @hidden = ele.attributes["value"] == "true" ? true : false
+          @hidden = ele.attributes["value"] == "true" ? true : false
           when 'timezone'
-            @timezone = ele.attributes["value"]
+          @timezone = ele.attributes["value"]
           when "selected"
-            @selected = ele.attributes["value"] == "true" ? true : false
+          @selected = ele.attributes["value"] == "true" ? true : false
           when "link"
-            if ele.attributes['rel'] == 'edit'
-              @edit_feed = ele.attributes['href']
-            end
+          if ele.attributes['rel'] == 'edit'
+            @edit_feed = ele.attributes['href']
+          end
           when 'accesslevel'
-            @editable = (ele.attributes["value"] == 'editor' or ele.attributes["value"] == 'owner' or ele.attributes["value"] == 'root')
+          @editable = (ele.attributes["value"] == 'editor' or ele.attributes["value"] == 'owner' or ele.attributes["value"] == 'root')
         end
       end
       
@@ -308,9 +308,9 @@ module GCal4Ruby
       params[:border] ||= "0"
       params.each{|key, value| params[key] = CGI::escape(value)}
       output = "#{params.to_a.collect{|a| a.join("=")}.join("&")}"
-    
+      
       output += "&src=#{id}"
-          
+      
       "<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
     
@@ -341,12 +341,12 @@ module GCal4Ruby
       params[:border] ||= "0"
       params.each{|key, value| params[key] = CGI::escape(value)}
       output = "#{params.to_a.collect{|a| a.join("=")}.join("&")}"
-    
+      
       output += "&src=#{id}"
-          
+      
       "<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
     def self.get_instance(service, d)
       if d.is_a? Net::HTTPOK

data/lib/gcal4ruby/event.rb

@@ -60,7 +60,7 @@ module GCal4Ruby
   #    event.start_time = Time.parse("06/20/2009 at 5 pm")
   #    event.end_time = Time.parse("06/20/2009 at 8 pm")
   #    event.where = "Luigi's"
-  #    event.reminder = {:minutes => 15, :method => 'email'}
+  #    event.reminder = [{:minutes => 15, :method => 'email'}]
   #    event.save
   #
   #9. Create an event with attendees
@@ -111,7 +111,7 @@ module GCal4Ruby
     attr_accessor :status
     #Flag indicating whether it is an all day event
     attr_reader :all_day    
-    #The reminder settings for the event, returned as a hash
+    #An array of reminders. Each item in the array is a hash representing the event reminder.
     attr_reader :reminder
     #The date the event was last edited
     attr_reader :edited
@@ -132,7 +132,7 @@ module GCal4Ruby
       end
     end
     
-    #Sets the reminder options for the event.  Parameter must be a hash a :minutes key with a value of 5 up to 40320 (4 weeks)
+    #Sets the reminder options for the event.  Parameter must be an array of hashes containing a :minutes key with a value of 5 up to 40320 (4 weeks)
     #and a :method key of with a value of one the following:
     #alert:: causes an alert to appear when a user is viewing the calendar in a browser
     #email:: sends the user an email message

data/lib/gcal4ruby/recurrence.rb

@@ -57,45 +57,36 @@ module GCal4Ruby
       @all_day ||= false
     end
     
-    #Accepts a string containing a properly formatted ISO 8601 recurrence rule and loads it into the recurrence object
+    #Accepts a string containing a properly formatted ISO 8601 recurrence rule and loads it into the recurrence object.  
+    #Contributed by John Paul Narowski.
     def load(rec)
+      @frequency = {}
       attrs = rec.split("\n")
       attrs.each do |val|
         key, value = val.split(":")
-        case key
-          when 'DTSTART'
-            @start_time = Time.parse_complete(value)
-          when 'DTSTART;VALUE=DATE'
-            @start_time = Time.parse(value)
-            @all_day = true
-          when 'DTSTART;VALUE=DATE-TIME'
-            @start_time = Time.parse_complete(value)
-          when 'DTEND'
-            @end_time = Time.parse_complete(value)
-          when 'DTEND;VALUE=DATE'
-            @end_time = Time.parse(value)
-          when 'DTEND;VALUE=DATE-TIME'
-            @end_time = Time.parse_complete(value)
-          when 'RRULE'
-            vals = value.split(";")
-            key = ''
-            by = ''
-            int = nil
-            vals.each do |rr|
-              a, h = rr.split("=")
-              case a 
-                when 'FREQ'
-                  key = h.downcase.capitalize
-                when 'INTERVAL'
-                  int = h
-                when 'UNTIL'
-                  @repeat_until = Time.parse(value)
-                else
-                  by = h.split(",")
+        if key == 'RRULE'
+          value.split(";").each do |rr| 
+            rr_key, rr_value = rr.split("=")
+            rr_key = rr_key.downcase.to_sym
+            unless @frequency.has_key?(rr_key)
+              if rr_key == :until
+                @repeat_until = Time.parse_complete(rr_value)
+              else
+                @frequency[rr_key] = rr_value 
               end
             end
-            @frequency = {key => by}
-            @frequency.merge({'interval' => int}) if int
+          end
+        elsif key == 'INTERVAL'
+          @frequency[:inverval] = value.to_i
+        elsif key.include?("DTSTART;TZID") or key.include?("DTSTART") or key.include?('DTSTART;VALUE=DATE-TIME')
+          @start_time = Time.parse_complete(value)
+        elsif key.include?('DTSTART;VALUE=DATE')
+          @start_time = Time.parse(value)
+          @all_day = true
+        elsif key.include?("DTEND;TZID") or key.include?("DTEND") or key.include?('DTEND;VALUE=DATE-TIME')
+          @end_time = Time.parse_complete(value)
+        elsif key.include?('DTEND;VALUE=DATE')
+          @end_time = Time.parse(value)
         end
       end
     end
@@ -119,19 +110,19 @@ module GCal4Ruby
           f += "#{key.downcase} " if key != 'interval'
           case key.downcase
             when "secondly"
-              by += "every #{value} second"
+            by += "every #{value} second"
             when "minutely"
-              by += "every #{value} minute"
+            by += "every #{value} minute"
             when "hourly"
-              by += "every #{value} hour"
+            by += "every #{value} hour"
             when "weekly"
-              by += "on #{value}" if value
+            by += "on #{value}" if value
             when "monthly"
-              by += "on #{value}"
+            by += "on #{value}"
             when "yearly"
-              by += "on the #{value} day of the year"
+            by += "on the #{value} day of the year"
             when 'interval'
-              i += "for #{value} times"
+            i += "for #{value} times"
           end
         end
         output += f+i+by
@@ -144,7 +135,6 @@ module GCal4Ruby
     
     #Returns a string with the correctly formatted ISO 8601 recurrence rule
     def to_recurrence_string
-      
       output = ''
       if @all_day
         output += "DTSTART;VALUE=DATE:#{@start_time.utc.strftime("%Y%m%d")}\n"
@@ -171,22 +161,22 @@ module GCal4Ruby
           else
             value = v
           end
-          f += "#{key.upcase};" if key != 'interval'
-          case key.downcase
+          f += "#{key.to_s.upcase};" if key != 'interval'
+          case key.to_s.downcase
             when "secondly"
-              by += "BYSECOND=#{value};"
+            by += "BYSECOND=#{value};"
             when "minutely"
-              by += "BYMINUTE=#{value};"
+            by += "BYMINUTE=#{value};"
             when "hourly"
-              by += "BYHOUR=#{value};"
+            by += "BYHOUR=#{value};"
             when "weekly"
-              by += "BYDAY=#{value};" if value
+            by += "BYDAY=#{value};" if value
             when "monthly"
-              by += "BYDAY=#{value};"
+            by += "BYDAY=#{value};"
             when "yearly"
-              by += "BYYEARDAY=#{value};"
+            by += "BYYEARDAY=#{value};"
             when 'interval'
-              i += "INTERVAL=#{value};"
+            i += "INTERVAL=#{value};"
           end
         end
         output += f+i+by

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 5
-  - 4
-  version: 0.5.4
+  - 5
+  version: 0.5.5
 platform: ruby
 authors: 
 - Mike Reich
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-05-24 00:00:00 +10:00
+date: 2010-08-15 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -27,8 +27,8 @@ dependencies:
         segments: 
         - 0
         - 1
-        - 2
-        version: 0.1.2
+        - 5
+        version: 0.1.5
   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: Create and edit calendar events, Add and invite users to events, Set reminders, Make recurring events."