google_calendar_api_v2 0.1.2 → 0.1.3

data/lib/google_calendar_api_v2/calendar.rb

@@ -9,18 +9,35 @@ module GoogleCalendarApiV2
     end
 
     def find(calendar_token, url = nil, redirect_count = 0)
-      url ||= "/calendar/feeds/default/allcalendars/full/#{calendar_token}?alt=jsonc"
+      url ||= "https://www.google.com/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)
+        item = JSON.parse(response.body)['data']
+        Response::Calendar.new(item, @connection)
       elsif redirect? response
         find(calendar_token, response['location'], redirect_count += 1)
       end
     end
 
+    def all(url = nil, redirect_count = 0)
+      url ||= "https://www.google.com/calendar/feeds/default/allcalendars/full?alt=jsonc"
+      response = @connection.get url, Client::HEADERS
+
+      if success? response
+        # Response::Event.new(response, @connection, @calendar)
+        if items = JSON.parse(response.body)['data']['items']
+          items.map {|item| Response::Calendar.new(item, @connection, @calendar) }
+        else
+          []
+        end
+      elsif redirect? response
+        all(response['location'], redirect_count += 1)
+      end
+    end
+
     def create(params = {}, url = nil, redirect_count = 0)
       url ||= '/calendar/feeds/default/owncalendars/full?alt=jsonc'
       response = @connection.post url,
@@ -34,7 +51,8 @@ module GoogleCalendarApiV2
       raise 'Redirection Loop' if redirect_count > 3
 
       if success? response
-        Response::Calendar.new(response, @connection)
+        item = JSON.parse(response.body)['data']
+        Response::Calendar.new(item, @connection)
       elsif redirect?(response)
         create(params, response['location'], redirect_count += 1)
       end

data/lib/google_calendar_api_v2/event.rb

@@ -16,12 +16,29 @@ module GoogleCalendarApiV2
       raise 'Redirection Loop' if redirect_count > 3
 
       if success? response
-        Response::Event.new(response, @connection, @calendar)
+        item = JSON.parse(response.body)['data']
+        Response::Event.new(item, @connection, @calendar)
       elsif redirect? response
         find(event_token, response['location'], redirect_count += 1)
       end
     end
 
+    def all(url = nil, redirect_count = 0)
+      url ||= "https://www.google.com/calendar/feeds/#{@calendar.token}/private/full?alt=jsonc&futureevents=false"
+      response = @connection.get url, Client::HEADERS
+
+      if success? response
+        # Response::Event.new(response, @connection, @calendar)
+        if items = JSON.parse(response.body)['data']['items']
+          items.map {|item| Response::Event.new(item, @connection, @calendar) }
+        else
+          []
+        end
+      elsif redirect? response
+        all(response['location'], redirect_count += 1)
+      end
+    end
+
     def create(params = {}, url = nil, redirect_count = 0)
       url ||= "/calendar/feeds/#{@calendar.token}/private/full?alt=jsonc"
 
@@ -36,7 +53,8 @@ module GoogleCalendarApiV2
       raise 'Redirection Loop' if redirect_count > 3
 
       if success? response
-        Response::Event.new(response, @connection, @calendar)
+        item = JSON.parse(response.body)['data']
+        Response::Event.new(item, @connection, @calendar)
       elsif redirect? response
         create(params, response['location'], redirect_count += 1)
       else

data/lib/google_calendar_api_v2/response/base.rb

@@ -5,9 +5,9 @@ module GoogleCalendarApiV2
     module Base
       attr_reader :response, :attributes
 
-      def initialize(response, connection, parent = nil)
+      def initialize(item, connection, parent = nil)
         @response, @connection = response, connection
-        @attributes = JSON.parse(response.body)['data'] rescue {}
+        @attributes = item
       end
 
       def update_attributes(attributes)

metadata

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