google_calendar_api_v2 0.1.1 → 0.1.2

data/lib/google_calendar_api_v2/base.rb

@@ -15,5 +15,10 @@ module GoogleCalendarApiV2
         false
       end
     end
+
+    def redirect?(response)
+      response.is_a? Net::HTTPRedirection
+    end
+
   end
 end

data/lib/google_calendar_api_v2/calendar.rb

@@ -8,16 +8,22 @@ module GoogleCalendarApiV2
       @connection = connection
     end
 
-    def find(calendar_token)
-      url = "/calendar/feeds/default/allcalendars/full/#{calendar_token}?alt=jsonc"
+    def find(calendar_token, url = nil, redirect_count = 0)
+      url ||= "/calendar/feeds/default/allcalendars/full/#{calendar_token}?alt=jsonc"
       response = @connection.get url, Client::HEADERS
+
+      raise 'Redirection Loop' if redirect_count > 3
+
       if success? response
         Response::Calendar.new(response, @connection)
+      elsif redirect? response
+        find(calendar_token, response['location'], redirect_count += 1)
       end
     end
 
-    def create(params = {})
-      response = @connection.post '/calendar/feeds/default/owncalendars/full?alt=jsonc',
+    def create(params = {}, url = nil, redirect_count = 0)
+      url ||= '/calendar/feeds/default/owncalendars/full?alt=jsonc'
+      response = @connection.post url,
       {
         :data => {
           :title => "Unnamed calendar",
@@ -25,8 +31,12 @@ module GoogleCalendarApiV2
         }.merge(params)
       }.to_json, Client::HEADERS
 
+      raise 'Redirection Loop' if redirect_count > 3
+
       if success? response
         Response::Calendar.new(response, @connection)
+      elsif redirect?(response)
+        create(params, response['location'], redirect_count += 1)
       end
     end
 

data/lib/google_calendar_api_v2/event.rb

@@ -9,17 +9,23 @@ module GoogleCalendarApiV2
       @calendar = calendar
     end
 
-    def find(event_token)
-      url = "https://www.google.com/calendar/feeds/#{@calendar.token}/private/full/#{event_token}?alt=jsonc"
+    def find(event_token, url = nil, redirect_count = 0)
+      url ||= "https://www.google.com/calendar/feeds/#{@calendar.token}/private/full/#{event_token}?alt=jsonc"
       response = @connection.get url, Client::HEADERS
 
+      raise 'Redirection Loop' if redirect_count > 3
+
       if success? response
-        Response::Calendar.new(response, @connection)
+        Response::Event.new(response, @connection, @calendar)
+      elsif redirect? response
+        find(event_token, response['location'], redirect_count += 1)
       end
     end
 
-    def create(params = {})
-      response = @connection.post "/calendar/feeds/#{@calendar.token}/private/full?alt=jsonc",
+    def create(params = {}, url = nil, redirect_count = 0)
+      url ||= "/calendar/feeds/#{@calendar.token}/private/full?alt=jsonc"
+
+      response = @connection.post url,
       {
         :data => {
           :title => "Undefined event",
@@ -27,8 +33,12 @@ module GoogleCalendarApiV2
         }.merge(params)
       }.to_json, Client::HEADERS
 
+      raise 'Redirection Loop' if redirect_count > 3
+
       if success? response
-        Response::Calendar.new(response, @connection)
+        Response::Event.new(response, @connection, @calendar)
+      elsif redirect? response
+        create(params, response['location'], redirect_count += 1)
       else
         false
       end

data/lib/google_calendar_api_v2/response/base.rb

@@ -29,21 +29,32 @@ module GoogleCalendarApiV2
         }.to_json
       end
 
-      def save
-        res = @connection.put @attributes['selfLink'], self.to_json, GoogleCalendarApiV2::Client::HEADERS
+      def save(url = nil, redirect_count = 0)
+        url ||= @attributes['selfLink']
+        response = @connection.put url, self.to_json, GoogleCalendarApiV2::Client::HEADERS
 
-        @attributes = JSON.parse(res.body)['data'] rescue @attributes
-        if success? res
+        raise 'Redirection Loop' if redirect_count > 3
+
+        if success? response
+          @attributes = JSON.parse(res.body)['data'] rescue @attributes
           true
+        elsif redirect? response
+          save(response['location'], redirect_count += 1)
         else
           false
         end
       end
 
-      def destroy
-        res = @connection.delete @attributes['selfLink'], GoogleCalendarApiV2::Client::HEADERS.merge({ 'If-Match' => '*' })
-        if success? res
+      def destroy(url = nil, redirect_count = 0)
+        url ||= @attributes['selfLink']
+        response = @connection.delete url, GoogleCalendarApiV2::Client::HEADERS.merge({ 'If-Match' => '*' })
+
+        raise 'Redirection Loop' if redirect_count > 3
+
+        if success? response
           true
+        elsif redirect? response
+          destroy(response['location'], redirect_count += 1)
         else
           false
         end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: google_calendar_api_v2
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-14 00:00:00.000000000 Z
+date: 2012-02-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: oauth
-  requirement: &70104510747640 !ruby/object:Gem::Requirement
+  requirement: &70224774125760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,7 +21,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70104510747640
+  version_requirements: *70224774125760
 description: 
 email: unixcharles@gmail.com
 executables: []