gdata 1.0.0 → 1.0.1

data/Rakefile

@@ -50,7 +50,7 @@ spec = Gem::Specification.new do |s|
   s.summary = "Google Data APIs Ruby Utility Library"
   s.rubyforge_project = 'gdata'
   s.name = 'gdata'
-  s.version = '1.0.0'
+  s.version = '1.0.1'
   s.requirements << 'none'
   s.require_path = 'lib'
   s.test_files = FileList['test/ts_gdata.rb']

data/lib/gdata/client/base.rb

@@ -12,8 +12,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-require "rexml/document"
-
 module GData
   module Client
     
@@ -83,7 +81,7 @@ module GData
         response = service.make_request(request)
         
         case response.status_code  
-        when 200, 201
+        when 200, 201, 302
           #Do nothing, it's a success.
         when 401, 403
           raise AuthorizationError, response.body
@@ -142,12 +140,15 @@ module GData
         return headers
       end
       
-      # Performs ClientLogin for the service.
-      def clientlogin(username, password, captcha_token = nil, captcha_answer = nil, service = nil)
+      # Performs ClientLogin for the service. See GData::Auth::ClientLogin
+      # for details.
+      def clientlogin(username, password, captcha_token = nil, 
+        captcha_answer = nil, service = nil, account_type = nil)
         if service.nil?
           service = @clientlogin_service
         end
-        @auth_handler = GData::Auth::ClientLogin.new(service)
+        options = { :account_type => account_type }
+        self.auth_handler = GData::Auth::ClientLogin.new(service, options)
         if @clientlogin_url
           @auth_handler.auth_url = @clientlogin_url
         end
@@ -165,7 +166,7 @@ module GData
       
       # Sets an AuthSub token for the service.
       def authsub_token=(token)
-        @auth_handler = GData::Auth::AuthSub.new(token)
+        self.auth_handler = GData::Auth::AuthSub.new(token)
       end
       
       # Sets a private key to use with AuthSub requests.
@@ -178,4 +179,4 @@ module GData
       end
     end
   end
-end
+end

data/lib/gdata/client/calendar.rb

@@ -18,11 +18,41 @@ module GData
     # Client class to wrap working with the Calendar Data API.
     class Calendar < Base
       
+      # Holds on to a session cookie
+      attr_accessor :session_cookie
+      
       def initialize(options = {})
         options[:clientlogin_service] ||= 'cl'
         options[:authsub_scope] ||= 'http://www.google.com/calendar/feeds/'
         super(options)
       end
+      
+      # Overrides auth_handler= so if the authentication changes,
+      # the session cookie is cleared.
+      def auth_handler=(handler)
+        @session_cookie = nil
+        return super(handler)
+      end
+      
+      # Overrides make_request to handle 302 redirects with a session cookie.
+      def make_request(method, url, body = '', retries = 4)
+        response = super(method, url, body)
+        if response.status_code == 302 and retries > 0
+          @session_cookie = response.headers['set-cookie']
+          return self.make_request(method, url, body, 
+            retries - 1)
+        else
+          return response
+        end
+      end
+      
+      # Custom prepare_headers to include the session cookie if it exists
+      def prepare_headers
+        if @session_cookie
+          @headers['cookie'] = @session_cookie
+        end
+        super
+      end
     end
   end
 end

data/lib/gdata/client/youtube.rb

@@ -32,6 +32,7 @@ module GData
         super(options)
       end
       
+      # Custom prepare_headers to include the developer key and clientID
       def prepare_headers
         if @client_id
           @headers['X-GData-Client'] = @client_id

data/lib/gdata/http/request.rb

@@ -12,6 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+require "rexml/document"
 
 module GData
   module HTTP

data/test/tc_gdata_auth_clientlogin.rb

@@ -47,5 +47,13 @@ class TC_GData_Auth_ClientLogin < Test::Unit::TestCase
     end
   end
   
+  def test_specify_account_type
+    gp = GData::Client::Photos.new
+    gp.source = 'GDataUnitTest'
+    assert_nothing_raised do
+      token = gp.clientlogin(self.get_username(), self.get_password(), nil, nil, nil, 'GOOGLE')
+    end
+  end
+  
   
 end

data/test/tc_gdata_client_calendar.rb

@@ -0,0 +1,40 @@
+# Copyright (C) 2008 Google Inc.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+$:.unshift(File.dirname(__FILE__))
+require 'test_helper'
+
+class TC_GData_Client_Calendar < Test::Unit::TestCase
+  
+  include TestHelper
+  
+  def setup
+    @cl = GData::Client::Calendar.new
+    @cl.clientlogin(self.get_username, self.get_password)
+  end
+  
+  def test_get_all_calendars    
+    response = @cl.get('http://www.google.com/calendar/feeds/default/allcalendars/full')
+    self.assert_equal(200, response.status_code, 'Must not be a redirect.')
+    self.assert_not_nil(@cl.session_cookie, 'Must have a session cookie.')
+    feed = response.to_xml
+    self.assert_not_nil(feed, 'feed can not be nil')
+    
+    #login again to make sure the session cookie gets cleared
+    @cl.clientlogin(self.get_username, self.get_password)
+    self.assert_nil(@cl.session_cookie, 'Should clear session cookie.')
+  end
+
+  
+end

data/test/ts_gdata_client.rb

@@ -13,6 +13,7 @@
 # limitations under the License.
 
 require 'tc_gdata_client_base'
+require 'tc_gdata_client_calendar'
 require 'tc_gdata_client_photos'
 require 'tc_gdata_client_youtube'
 
@@ -20,6 +21,7 @@ class TS_GData_Client
   def self.suite
     suite = Test::Unit::TestSuite.new
     suite << TC_GData_Client_Base.suite
+    suite << TC_GData_Client_Calendar.suite
     suite << TC_GData_Client_Photos.suite
     suite << TC_GData_Client_YouTube.suite
     return suite

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: gdata
 version: !ruby/object:Gem::Version 
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors: 
 - Jeff Fisher
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-02-20 00:00:00 -08:00
+date: 2009-04-06 00:00:00 -07:00
 default_executable: 
 dependencies: []
 
@@ -55,6 +55,7 @@ files:
 - test/tc_gdata_auth_authsub.rb
 - test/tc_gdata_auth_clientlogin.rb
 - test/tc_gdata_client_base.rb
+- test/tc_gdata_client_calendar.rb
 - test/tc_gdata_client_photos.rb
 - test/tc_gdata_client_youtube.rb
 - test/tc_gdata_http_mime_body.rb