gcalapi 0.1.1 → 0.1.2

data/lib/googlecalendar/service.rb

@@ -11,23 +11,6 @@ module GoogleCalendar
     # Server Path to authenticate
     AUTH_PATH = "/accounts/ClientLogin"
 
-    # URL to get calendar list
-    CALENDAR_LIST_PATH = "http://www.google.com/calendar/feeds/"
-  
-    #
-    # get the list of user's calendars and returns http response object
-    #
-    def calendar_list
-      logger.info("-- calendar list st --") if logger
-      auth unless @auth
-      uri = URI.parse(CALENDAR_LIST_PATH + @email)
-      res = do_get(uri, {})
-      logger.info("-- calendar list en(#{res.message}) --") if logger
-      res
-    end
-
-    alias :calendars :calendar_list
-  
     def initialize(email, pass)
       @email = email
       @pass = pass
@@ -44,7 +27,7 @@ module GoogleCalendar
       head = {'Content-Type' => 'application/x-www-form-urlencoded'}
       logger.info "-- auth st --" if logger
       https.start do |w|
-        res = w.post(AUTH_PATH, "Email=#{@email}&Passwd=#{@pass}&source=company-app-1&service=cl", head)
+        res = w.post(AUTH_PATH, "Email=#{@email}&Passwd=#{CGI.escape(@pass)}&source=company-app-1&service=cl", head)
         logger.debug res if logger
         if res.body =~ /Auth=(.+)/
           @auth = $1 

data/lib/googlecalendar/service_base.rb

@@ -19,6 +19,9 @@ module GoogleCalendar
     # Server name to Authenticate
     AUTH_SERVER = "www.google.com"
 
+    # URL to get calendar list
+    CALENDAR_LIST_PATH = "http://www.google.com/calendar/feeds/default/allcalendars/full"
+  
     # proxy server address
     @@proxy_addr = nil
     def self.proxy_addr
@@ -61,6 +64,20 @@ module GoogleCalendar
 
     attr_accessor :logger
 
+    #
+    # get the list of user's calendars and returns http response object
+    #
+    def calendar_list
+      logger.info("-- calendar list st --") if logger
+      auth unless @auth
+      uri = URI.parse(CALENDAR_LIST_PATH)
+      res = do_get(uri, {})
+      logger.info("-- calendar list en(#{res.message}) --") if logger
+      res
+    end
+
+    alias :calendars :calendar_list
+
     #
     # send query for events of a calendar and returns http response object.
     # available condtions are 

data/test/03_authsub_test.rb

@@ -8,7 +8,7 @@ require "googlecalendar/service_auth_sub"
 require "googlecalendar/auth_sub_util"
 
 class TestService3 < Test::Unit::TestCase
-  SAMPLE_URL = "http://www.example.com/sample.html"
+  SAMPLE_URL = "http://zoriolab.info/test.html"
   attr_accessor :logger
   # get one-time token
   def test_get_onetime_token(use_session = false)
@@ -100,11 +100,12 @@ class TestService3 < Test::Unit::TestCase
   end
   
   def test_session_info
+    uri = URI.parse(SAMPLE_URL)
     test_use_session_token do |token, session|
       ret = GoogleCalendar::AuthSubUtil.token_info(token)
       expected = {"Secure" => "false", 
                   "Scope" => GoogleCalendar::AuthSubUtil::CALENDAR_SCOPE, 
-                  "Target" => "www.example.com"}
+                  "Target" => uri.host}
       expected.each do |k,v|
         assert(ret.key?(k))
         assert_equal(v, ret[k]) if ret.key?(k)
@@ -112,6 +113,17 @@ class TestService3 < Test::Unit::TestCase
     end
   end
 
+  def test_calendar_list
+    test_use_session_token do |token, srv|
+      ret = srv.calendar_list
+      assert_equal("200", ret.code, ret.body)
+      xml = nil
+      assert_nothing_raised { xml = REXML::Document.new(ret.body) }
+      list = xml.root.elements.each("entry/link") {}.map {|e| e.attributes["href"] if e.attributes["rel"] == "alternate"}.compact
+      assert(list.include?(FEED.gsub(/@/,"%40")))
+    end
+  end
+
   def test_ensure_revoked
     10.times do |n|
       test_use_session_token do |token, srv|

data/test/all.bat

@@ -0,0 +1 @@
+ruby -e "Dir.foreach('.') {|file| require file if file =~ /_test.rb$/}"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: gcalapi
 version: !ruby/object:Gem::Version 
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors: 
 - zorio
@@ -9,7 +9,7 @@ autorequire: googlecalendar/calendar
 bindir: bin
 cert_chain: []
 
-date: 2008-02-23 00:00:00 +09:00
+date: 2009-01-11 00:00:00 -06:00
 default_executable: 
 dependencies: []
 
@@ -22,88 +22,65 @@ extensions: []
 extra_rdoc_files: 
 - README
 files: 
-- doc
-- doc/classes
-- doc/classes/CalendarTest.src
-- doc/classes/GoogleCalendar
-- doc/classes/GoogleCalendar/AuthSubFailed.src
-- doc/classes/GoogleCalendar/AuthSubUtil.src
-- doc/classes/GoogleCalendar/Calendar.src
-- doc/classes/GoogleCalendar/Event.src
-- doc/classes/GoogleCalendar/Service.src
-- doc/classes/GoogleCalendar/ServiceAuthSub.src
-- doc/classes/GoogleCalendar/ServiceBase.src
-- doc/classes/GoogleCalendar.src
-- doc/classes/Mail.src
-- doc/classes/TestCalendar1.src
-- doc/classes/TestCalendar2.src
-- doc/classes/TestService0.src
-- doc/classes/TestService3.src
-- doc/files
-- doc/files/example
-- doc/files/example/ol2gcal_rb.src
-- doc/files/lib
-- doc/files/lib/googlecalendar
-- doc/files/test
-- example
-- example/mail2gcal.rb
-- example/mixi2gcal.rb
-- example/ol2gcal.rb
+- lib
+- lib/gcalapi.rb
+- lib/googlecalendar
+- lib/googlecalendar/event.rb
+- lib/googlecalendar/service.rb
+- lib/googlecalendar/auth_sub_util.rb
+- lib/googlecalendar/service_auth_sub.rb
+- lib/googlecalendar/calendar.rb
+- lib/googlecalendar/service_base.rb
+- test
+- test/all.sh
+- test/02_event_test.rb
+- test/each.sh
+- test/03_authsub_test.rb
+- test/template.parameters.rb
+- test/base_unit.rb
+- test/all.bat
+- test/00_service_test.rb
+- test/01_calendar_test.rb
+- VERSION
 - html
 - html/classes
+- html/classes/GoogleCalendar.html
 - html/classes/GoogleCalendar
-- html/classes/GoogleCalendar/AuthenticationFailed.html
-- html/classes/GoogleCalendar/AuthSubFailed.html
 - html/classes/GoogleCalendar/AuthSubUtil.html
-- html/classes/GoogleCalendar/Calendar.html
-- html/classes/GoogleCalendar/Event.html
-- html/classes/GoogleCalendar/EventDeleteFailed.html
+- html/classes/GoogleCalendar/Service.html
 - html/classes/GoogleCalendar/EventGetFailed.html
+- html/classes/GoogleCalendar/EventDeleteFailed.html
 - html/classes/GoogleCalendar/EventInsertFailed.html
-- html/classes/GoogleCalendar/EventUpdateFailed.html
+- html/classes/GoogleCalendar/ServiceBase.html
 - html/classes/GoogleCalendar/InvalidCalendarURL.html
-- html/classes/GoogleCalendar/Service.html
 - html/classes/GoogleCalendar/ServiceAuthSub.html
-- html/classes/GoogleCalendar/ServiceBase.html
-- html/classes/GoogleCalendar.html
-- html/created.rid
+- html/classes/GoogleCalendar/EventUpdateFailed.html
+- html/classes/GoogleCalendar/AuthSubFailed.html
+- html/classes/GoogleCalendar/AuthenticationFailed.html
+- html/classes/GoogleCalendar/Calendar.html
+- html/classes/GoogleCalendar/Event.html
 - html/files
+- html/files/README.html
 - html/files/lib
 - html/files/lib/googlecalendar
-- html/files/lib/googlecalendar/auth_sub_util_rb.html
-- html/files/lib/googlecalendar/calendar_rb.html
 - html/files/lib/googlecalendar/event_rb.html
-- html/files/lib/googlecalendar/service_auth_sub_rb.html
-- html/files/lib/googlecalendar/service_base_rb.html
 - html/files/lib/googlecalendar/service_rb.html
-- html/files/README.html
-- html/fr_class_index.html
+- html/files/lib/googlecalendar/service_base_rb.html
+- html/files/lib/googlecalendar/calendar_rb.html
+- html/files/lib/googlecalendar/auth_sub_util_rb.html
+- html/files/lib/googlecalendar/service_auth_sub_rb.html
 - html/fr_file_index.html
+- html/created.rid
+- html/rdoc-style.css
 - html/fr_method_index.html
 - html/index.html
-- html/rdoc-style.css
-- lib
-- lib/gcalapi.rb
-- lib/googlecalendar
-- lib/googlecalendar/auth_sub_util.rb
-- lib/googlecalendar/calendar.rb
-- lib/googlecalendar/event.rb
-- lib/googlecalendar/service.rb
-- lib/googlecalendar/service_auth_sub.rb
-- lib/googlecalendar/service_base.rb
-- Rakefile
+- html/fr_class_index.html
+- example
+- example/ol2gcal.rb
+- example/mail2gcal.rb
+- example/mixi2gcal.rb
 - README
-- test
-- test/00_service_test.rb
-- test/01_calendar_test.rb
-- test/02_event_test.rb
-- test/03_authsub_test.rb
-- test/all.sh
-- test/base_unit.rb
-- test/each.sh
-- test/template.parameters.rb
-- VERSION
-- VERSION.BAK
+- Rakefile
 has_rdoc: true
 homepage: http://gcalapi.rubyforge.net
 post_install_message: 
@@ -127,12 +104,12 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: gcalapi
-rubygems_version: 1.0.1
+rubygems_version: 1.3.1
 signing_key: 
 specification_version: 2
 summary: Google Calendar API
 test_files: 
-- test/00_service_test.rb
-- test/01_calendar_test.rb
 - test/02_event_test.rb
 - test/03_authsub_test.rb
+- test/00_service_test.rb
+- test/01_calendar_test.rb

data/VERSION.BAK

@@ -1 +0,0 @@
-0.1.0