edave-gcal4ruby 0.6.0 → 0.7.0

data/{README → README.md}

@@ -1,40 +1,46 @@
-=GCal4Ruby
+# edave-GCal4Ruby
 
-==Introduction
+## Introduction
 GCal4Ruby is a full featured wrapper for the google calendar API.  GCal4Ruby implements
-all of the functionality available through the Google Calnedar API, including permissions,
+all of the functionality available through the Google Calendar API, including permissions,
 attendees, reminders and event recurrence.  
 
-==Author and Contact Information
+## Author and Contact Information
 GCal4Ruby was created and is maintained by {Mike Reich}[mailto:mike@seabourneconsulting.com] 
 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/
+### Website
+http://cookingandcoding.com/gcal4ruby/ (original GCal4Ruby plugin)
+
+### Description
 
-==Description
 GCal4Ruby has three major components: the service, calendar and event objects.  Each service
 has many calendars, which in turn have many events.  Each service is the representation of a
 google account, and thus must be successfully authenticated using valid Google Calendar
 account credentials.  
 
-==Examples
+## Examples
+
 Below are some common usage examples.  For more examples, check the documentation.
-===Service
-# Authenticate with the AuthSub service (quickest, dirtiest)
+
+####Service
+
+##### Authenticate with the AuthSub service (quickest, dirtiest)
     service = Service.new
     service.authenticate({:username => "user@gmail.com", :password => "password"})
 
-# Authenticate using OAuth (more setup, easier for an app)
+##### Authenticate using OAuth (more setup, easier for an app)
 	service = Service.new({:GData4RubyService => :OAuthService})
-	service.authenticate(my_oauth_accesstoken)
+	service.authenticate({:access_token=>my_oauth_accesstoken})
+
+See [edave-GData4Ruby](https://github.com/edave/GData4Ruby) for more details
 
 # Get Calendar List
     calendars = service.calendars
 
-===Calendar
+### Calendar
 All usages assume a successfully authenticated Service.
 1. Create a new Calendar
     cal = Calendar.new(service)
@@ -51,7 +57,9 @@ All usages assume a successfully authenticated Service.
 
 5. Find all calendars containing a search term
     cal = Calendar.find(service, "Soccer Team")
-===Event
+
+### Event
+
 All usages assume a successfully authenticated Service and valid Calendar.
 1. Create a new Event
     event = Event.new(service, {:calendar => cal, :title => "Soccer Game", :start => Time.parse("12-06-2009 at 12:30 PM"), :end => Time.parse("12-06-2009 at 1:30 PM"), :where => "Merry Playfields"})

data/lib/gcal4ruby/calendar.rb

@@ -264,6 +264,7 @@ module GCal4Ruby
         
         # If the ACL URI doesn't exist, then its definitely not public
         if (@acl_uri == nil)
+          log("Not Public")
           @public = false
           return true
         end

data/lib/gcal4ruby/event.rb

@@ -392,6 +392,9 @@ module GCal4Ruby
           end
         else
           service.calendars.each do |cal|
+            puts "Event.find() searching calendar: " if service.debug
+            puts cal.content_uri if service.debug
+            puts args.inspect if service.debug
             ret = service.send_request(GData4Ruby::Request.new(:get, cal.content_uri, nil, nil, args))
             xml = REXML::Document.new(ret.body).root
             xml.elements.each("entry") do |e|

data/lib/gcal4ruby/recurrence.rb

@@ -27,7 +27,7 @@ class Time
     unless value.nil? || value.empty?
       if value.include?("T")
         d, h = value.split("T")
-        return Time.parse(d+" "+h.gsub("Z", ""))
+        return Time.parse(d+" "+(h || "").gsub("Z", ""))
       else
         value = value.to_s
         return Time.parse("#{value[0..3]}-#{value[4..5]}-#{value[6..7]}")

data/lib/gcal4ruby/service.rb

@@ -53,10 +53,10 @@ module GCal4Ruby
     attr_accessor :check_public
     
     #Accepts an optional attributes hash for initialization values
-    def initialize(attributes = {}, service = nil)
+    def initialize(attributes = {})
       # If the user has specified the type of GData4Ruby class they want, instantiate it
-      if(service != nil)
-        @gdata_service = GData4Ruby.const_get(service).new(attributes)
+      if(attributes.has_key?(:GData4RubyService))
+        @gdata_service = GData4Ruby.const_get(attributes[:GData4RubyService]).new(attributes)
       end
       # Otherwise use the default service
       @gdata_service ||= GData4Ruby::Service.new(attributes)
@@ -112,20 +112,29 @@ module GCal4Ruby
       end
       @gdata_service.send_request(request)
     end
-  
+    
+    
     #Returns an array of Calendar objects for each calendar associated with 
     #the authenticated account.
-    def calendars
-      ret = send_request(GData4Ruby::Request.new(:get, create_url(@@calendar_list_feed + "?fields=entry(@gd:*,id,title)"), nil, {"max-results" => "10000"}))
+    # If you want to only load some attributes, you can pass in an array of 
+    # string attributes via options[:fields], for example ["@gd:*", "id", "title"]
+    def calendars(options = {})
+      if(options[:fields])
+        params = "?fields=entry(#{options[:fields].join(",")})"
+      end
+      params ||= ""
+      ret = send_request(GData4Ruby::Request.new(:get, create_url(@@calendar_list_feed + params), nil, {"max-results" => "10000"}))
       cals = []
       REXML::Document.new(ret.body).root.elements.each("entry"){}.map do |entry|
         entry = GData4Ruby::Utils.add_namespaces(entry)
         cal = Calendar.new(self, {:debug => debug})
+        log(entry.inspect)
         cal.load(entry.to_s)
         cals << cal
       end
       return cals
     end
+
     
     #Returns an array of Event objects for each event in this account
     def events

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: edave-gcal4ruby
 version: !ruby/object:Gem::Version 
-  hash: 7
+  hash: 3
   prerelease: 
   segments: 
   - 0
-  - 6
+  - 7
   - 0
-  version: 0.6.0
+  version: 0.7.0
 platform: ruby
 authors: 
 - Mike Reich
@@ -17,7 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-11 00:00:00 -05:00
+date: 2011-01-25 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -46,15 +46,15 @@ executables: []
 extensions: []
 
 extra_rdoc_files: 
-- README
+- README.md
 files: 
 - CHANGELOG
-- README
 - lib/gcal4ruby.rb
 - lib/gcal4ruby/calendar.rb
 - lib/gcal4ruby/event.rb
 - lib/gcal4ruby/recurrence.rb
 - lib/gcal4ruby/service.rb
+- README.md
 - test/unit.rb
 has_rdoc: true
 homepage: https://github.com/edave/GData4Ruby