intouch-gcal4ruby 0.5.7.1 → 0.5.7.2

data/lib/gcal4ruby/calendar.rb

@@ -121,7 +121,7 @@ module GCal4Ruby
     def events
       events = []
       ret = @service.send_request(GData4Ruby::Request.new(:get, @content_uri))
-      REXML::Document.new(ret.body).root.elements.each("entry"){}.map do |entry|
+      REXML::Document.new(ret).root.elements.each("entry"){}.map do |entry|
         entry = GData4Ruby::Utils.add_namespaces(entry)
         e = Event.new(service)
         if e.load(entry.to_s)
@@ -274,7 +274,7 @@ module GCal4Ruby
           @public = false
           return true
         end
-        r = REXML::Document.new(ret.body)
+        r = REXML::Document.new(ret)
         r.root.elements.each("entry") do |ele|
           e = GData4Ruby::ACL::AccessRule.new(service, self)
           ele = GData4Ruby::Utils.add_namespaces(ele)
@@ -358,8 +358,8 @@ module GCal4Ruby
     
     private
     def self.get_instance(service, d)
-      if d.is_a? Net::HTTPOK
-        xml = REXML::Document.new(d.body).root
+      if d.status == 200
+        xml = REXML::Document.new(d).root
         if xml.name == 'feed'
           xml = xml.elements.each("entry"){}[0]
         end

data/lib/gcal4ruby/event.rb

@@ -396,14 +396,14 @@ module GCal4Ruby
           feed_uri = args[:calendar].is_a?(Calendar) ? args[:calendar].content_uri : self.event_feed_uri(args[:calendar])
           args.delete(:calendar)
           ret = service.send_request(GData4Ruby::Request.new(:get, feed_uri, nil, nil, args))
-          xml = REXML::Document.new(ret.body).root
+          xml = REXML::Document.new(ret).root
           xml.elements.each("entry") do |e|
             results << get_instance(service, e)
           end
         else
           service.calendars.each do |cal|
             ret = service.send_request(GData4Ruby::Request.new(:get, cal.content_uri, nil, nil, args))
-            xml = REXML::Document.new(ret.body).root
+            xml = REXML::Document.new(ret).root
             xml.elements.each("entry") do |e|
               results << get_instance(service, e)
             end
@@ -438,8 +438,8 @@ module GCal4Ruby
     end
 
     def self.get_instance(service, d)
-      if d.success?
-        xml = REXML::Document.new(d.body).root
+      if d.status == 200
+        xml = REXML::Document.new(d).root
         if xml.name == 'feed'
           xml = xml.elements.each("entry"){}[0]
         end

data/lib/gcal4ruby/service.rb

@@ -92,7 +92,7 @@ module GCal4Ruby
       feed_url = options[:only_owner_access_level] ? GCal4Ruby::Calendar::OWN_CALENDARS_FEED : GCal4Ruby::Calendar::ALL_CALENDARS_FEED
       ret = send_request(GData4Ruby::Request.new(:get, feed_url, nil, {"max-results" => "10000"}))
       cals = []
-      REXML::Document.new(ret.body).root.elements.each("entry"){}.map do |entry|
+      REXML::Document.new(ret).root.elements.each("entry"){}.map do |entry|
         entry = GData4Ruby::Utils.add_namespaces(entry)
         cal = Calendar.new(self)
         cal.load(entry.to_s)
@@ -103,12 +103,12 @@ module GCal4Ruby
     
     #Returns an array of Event objects for each event in this account
     def events
-      if not @auth_token
+      if not (@auth_token || @access_token)
          raise NotAuthenticated
       end
       ret = send_request(GData4Ruby::Request.new(:get, Event.event_feed_uri(@account), nil, {"max-results" => "10000"}))
       events = []
-      REXML::Document.new(ret.body).root.elements.each("entry"){}.map do |entry|
+      REXML::Document.new(ret).root.elements.each("entry"){}.map do |entry|
         entry = GData4Ruby::Utils.add_namespaces(entry)
         event = Event.new(self)
         event.load(entry.to_s)

metadata

@@ -2,7 +2,7 @@
 name: intouch-gcal4ruby
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.5.7.1
+  version: 0.5.7.2
 platform: ruby
 authors: 
 - Mike Reich
@@ -20,7 +20,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.1.5.1
+        version: 0.1.5.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: Create and edit calendar events, Add and invite users to events, Set reminders, Make recurring events."