gcal4ruby 0.2.1 → 0.2.2

data/CHANGELOG

@@ -1,4 +1,9 @@
 #=CHANGELOG
+#==version 0.2.2
+#* Fixed URL encoding problem in Event.find method.
+#* cleaned up Event.find method to allow for finding events by id
+#* updated Calendar.find method to add params hash
+#* added 'published', 'updated', and 'edited' attributes
 #==version 0.2.1
 #* fixed Event.find calendar specification
 #==version 0.2.0

data/lib/gcal4ruby/calendar.rb

@@ -179,7 +179,7 @@ class Calendar
   #should be an appropriately authenticated Service. The term parameter can be any string.  The
   #scope parameter may be either :all to return an array of matches, or :first to return 
   #the first match as a Calendar object.
-  def self.find(service, query_term, scope = :all)
+  def self.find(service, query_term=nil, params = {})
     t = query_term.downcase
     cals = service.calendars
     ret = []
@@ -187,10 +187,13 @@ class Calendar
       title = cal.title || ""
       summary = cal.summary || ""
       id = cal.id || ""
-      if title.downcase.match(t) or summary.downcase.match(t) or id.downcase.match(t)
-        if scope == :first
+      if id == query_term
+        return cal
+      end
+      if title.downcase.match(t) or summary.downcase.match(t)
+        if params[:scope] == :first
           return cal
-        elsif scope == :all
+        else
           ret << cal
         end
       end

data/lib/gcal4ruby/event.rb

@@ -73,6 +73,12 @@ module GCal4Ruby
     attr_reader :end
     #The reminder settings for the event, returned as a hash
     attr_reader :reminder
+    #The date the event was created
+    attr_reader :published
+    #The date the event was last updated
+    attr_reader :updated
+    #The date the event was last edited
+    attr_reader :edited
     
     #Sets the reminder options for the event.  Parameter must be a hash containing one of 
     #:hours, :minutes and :days, which are simply the number of each before the event start date you'd like to 
@@ -210,6 +216,7 @@ module GCal4Ruby
           raise EventSaveFailed
         end
       end
+      reload
       return true
     end
     
@@ -279,6 +286,12 @@ module GCal4Ruby
       @etag = xml.root.attributes['etag']
       xml.root.elements.each(){}.map do |ele|
           case ele.name
+             when 'updated'
+                @updated = ele.text
+             when 'published'
+                @published = ele.text
+             when 'edited'
+                @edited = ele.text
              when 'id'
                 @id, @edit_feed = ele.text
              when 'title'
@@ -333,9 +346,9 @@ module GCal4Ruby
     #Reloads the event data from the Google Calendar Service.  Returns true if successful,
     #false otherwise.
     def reload
-      t = Event.find(@calendar, @id, :first)
+      t = Event.find(@calendar, @id)
       if t
-        if load(t.xml)
+        if load(t.to_xml)
          return true
         else
          return false
@@ -345,8 +358,10 @@ module GCal4Ruby
       end
     end
     
-    #Finds the event that matches a query term in the event title or description.  
-    #'query' is a string to perform the search on.
+    #Finds the event that matches a query term in the event title or description.
+    #  
+    #'query' is a string to perform the search on or an event id.
+    # 
     #The params hash can contain the following hash values
     #* *scope*: may be :all or :first, indicating whether to return the first record found or an array of all records that match the query.  Default is :all.
     #* *range*: a hash including a :start and :end time to constrain the search by
@@ -357,6 +372,32 @@ module GCal4Ruby
     def self.find(calendar, query = '', params = {})
       query_string = ''
       
+      begin 
+        test = URI.parse(query).scheme
+      rescue Exception => e
+        test = nil
+      end
+      
+      if test
+        puts "id passed, finding event by id" if calendar.service.debug
+        es = calendar.service.send_get("http://www.google.com/calendar/feeds/#{calendar.id}/private/full")
+        REXML::Document.new(es.read_body).root.elements.each("entry"){}.map do |entry|
+          puts "element  = "+entry.name if calendar.service.debug
+          id = ''
+          entry.elements.each("id") {|v| id = v.text}
+          puts "id = #{id}" if calendar.service.debug
+          if id == query
+            entry.attributes["xmlns:gCal"] = "http://schemas.google.com/gCal/2005"
+            entry.attributes["xmlns:gd"] = "http://schemas.google.com/g/2005"
+            entry.attributes["xmlns"] = "http://www.w3.org/2005/Atom"
+            event = Event.new(calendar)
+            event.load("<?xml version='1.0' encoding='UTF-8'?>#{entry.to_s}")
+            return event
+          end
+        end
+      end
+
+  
       #parse params hash for values
       range = params[:range] || nil
       max_results = params[:max_results] || nil
@@ -365,7 +406,7 @@ module GCal4Ruby
       timezone = params[:ctz] || nil
       
       #set up query string
-      query_string += "q=#{query}" if query
+      query_string += "q=#{CGI.escape(query)}" if query
       if range
         if not range.is_a? Hash or (range.size > 0 and (not range[:start].is_a? Time or not range[:end].is_a? Time))
           raise "The date range must be a hash including the :start and :end date values as Times"

data/test/unit.rb

@@ -67,7 +67,15 @@ def calendar_test
     puts "Test 2 Failed"
   end
   
-  puts "3. Delete Calendar"
+  puts "3. Find Calendar by ID"
+  c = Calendar.find(@service, cal.id)
+  if c.title == cal.title
+    successful
+  else
+    failed "#{c.title} not equal to #{cal.title}"
+  end
+  
+  puts "4. Delete Calendar"
   if cal.delete and not cal.title
     successful
   else
@@ -98,7 +106,20 @@ def event_test
     failed
   end
   
-  puts "3. Delete Event"
+  puts "3. Reload Event"
+  if event.reload
+    successful
+  end
+  
+  puts "4. Find Event by id"
+  e = Event.find(@service.calendars[0], event.id)
+  if e.title == event.title
+    successful
+  else
+    failed "Found event doesn't match existing event"
+  end
+  
+  puts "5. Delete Event"
   if event.delete
     successful 
   else

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: gcal4ruby
 version: !ruby/object:Gem::Version 
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors: 
 - Mike Reich
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-06-09 00:00:00 -07:00
+date: 2009-07-16 00:00:00 -07:00
 default_executable: 
 dependencies: []