google_calendar 0.2.0 → 0.2.1

data/VERSION

@@ -1 +1 @@
-0.2.0
+0.2.1

data/google_calendar.gemspec

@@ -4,14 +4,14 @@
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
-  s.name = "google_calendar"
-  s.version = "0.2.0"
+  s.name = %q{google_calendar}
+  s.version = "0.2.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Steve Zich"]
-  s.date = "2011-11-07"
-  s.description = "A minimal wrapper around the google calendar API, which uses nokogiri for fast parsing."
-  s.email = "steve.zich@gmail.com"
+  s.date = %q{2011-11-10}
+  s.description = %q{A minimal wrapper around the google calendar API, which uses nokogiri for fast parsing.}
+  s.email = %q{steve.zich@gmail.com}
   s.extra_rdoc_files = [
     "LICENSE.txt",
     "README.rdoc"
@@ -41,11 +41,11 @@ Gem::Specification.new do |s|
     "test/mocks/successful_login.txt",
     "test/test_google_calendar.rb"
   ]
-  s.homepage = "http://github.com/northworld/google_calendar"
+  s.homepage = %q{http://github.com/northworld/google_calendar}
   s.licenses = ["MIT"]
   s.require_paths = ["lib"]
-  s.rubygems_version = "1.8.10"
-  s.summary = "A lightweight google calendar API wrapper"
+  s.rubygems_version = %q{1.4.2}
+  s.summary = %q{A lightweight google calendar API wrapper}
   s.test_files = [
     "test/helper.rb",
     "test/test_google_calendar.rb"

data/lib/google/calendar.rb

@@ -27,14 +27,18 @@ module Google
     #   # Specify the app_name
     #   Calendar.new(:username => 'some.guy@gmail.com', :password => 'ilovepie!', :app_name => 'mycompany.com-googlecalendar-integration')
     #
+
+    # Calendar attributes
+    attr_accessor :username, :password, :app_name, :auth_url, :connection, :calendar
+
     def initialize(params)
-      username = params[:username]
-      password = params[:password]
-      @calendar = params[:calendar]
-      app_name = params[:app_name]
-      auth_url = params[:auth_url]
+      self.username = params[:username]
+      self.password = params[:password]
+      self.calendar = params[:calendar]
+      self.app_name = params[:app_name]
+      self.auth_url = params[:auth_url]
 
-      @connection = Connection.new(:username => username,
+      self.connection = Connection.new(:username => username,
                                    :password => password,
                                    :app_name => app_name,
                                    :auth_url => auth_url)
@@ -134,6 +138,27 @@ module Google
       @connection.send(Addressable::URI.parse(events_url + "/#{event.id}"), :delete)
     end
 
+    # Explicitly reload the connection to google calendar
+    #
+    # Examples
+    # class User
+    #   def calendar
+    #     @calendar ||= Google::Calendar.new :username => "foo@gmail.com", :password => "bar"
+    #   end
+    # end
+    # user = User.new
+    # 2.times { user.calendar }     #only one HTTP authentication request to google
+    # user.calendar.reload          #new HTTP authentication request to google
+    #
+    # Returns Google::Calendar instance
+    def reload
+      self.connection = Connection.new(:username => username,
+                                   :password => password,
+                                   :app_name => app_name,
+                                   :auth_url => auth_url)
+      self
+    end
+
     protected
 
     def event_lookup(query_string = '') #:nodoc:
@@ -179,7 +204,6 @@ module Google
       event.save
       event
     end
-
   end
 
 end

data/test/test_google_calendar.rb

@@ -31,76 +31,76 @@ class TestGoogleCalendar < Test::Unit::TestCase
           Calendar.new(:username => 'some.one@gmail.com', :password => 'wrong-password')
         end
       end
-      
-      should "login properly with an app_name" do 
+
+      should "login properly with an app_name" do
         assert_nothing_thrown do
-          Calendar.new(:username => 'some.one@gmail.com', :password => 'super-secret', 
-            :app_name => 'northworld.com-googlecalendar-integration'
+          Calendar.new(:username => 'some.one@gmail.com', :password => 'super-secret',
+          :app_name => 'northworld.com-googlecalendar-integration'
           )
         end
       end
-      
-      should "catch login with invalid app_name" do 
-          @http_mock.stubs(:kind_of?).with(Net::HTTPForbidden).returns(true)
-          @http_mock.stubs(:body).returns('Error=BadAuthentication')
-          assert_raise(HTTPAuthorizationFailed) do
-            Calendar.new(:username => 'some.one@gmail.com', :password => 'super-secret', 
-              :app_name => 'northworld.com-silly-cal'
-            )
-          end
-        end 
-        
-        should "login properly with an auth_url" do 
-          assert_nothing_thrown do
-            Calendar.new(:username => 'some.one@gmail.com', :password => 'super-secret', 
-              :auth_url => "https://www.google.com/accounts/ClientLogin"
-            )
-          end
+
+      should "catch login with invalid app_name" do
+        @http_mock.stubs(:kind_of?).with(Net::HTTPForbidden).returns(true)
+        @http_mock.stubs(:body).returns('Error=BadAuthentication')
+        assert_raise(HTTPAuthorizationFailed) do
+          Calendar.new(:username => 'some.one@gmail.com', :password => 'super-secret',
+          :app_name => 'northworld.com-silly-cal'
+          )
         end
+      end
 
-        should "catch login with invalid auth_url" do 
-            @http_mock.stubs(:kind_of?).with(Net::HTTPForbidden).returns(true)
-            @http_mock.stubs(:body).returns('Error=BadAuthentication')
-            assert_raise(HTTPAuthorizationFailed) do
-              Calendar.new(:username => 'some.one@gmail.com', :password => 'super-secret', 
-                :auth_url => "https://www.google.com/accounts/ClientLogin/waffles"
-              )
-            end
-          end
-
-          should "login properly with a calendar" do
-            assert_nothing_thrown do
-              cal = Calendar.new(:username => 'some.one@gmail.com', :password => 'super-secret',
-              :calendar => "Little Giants")
-
-              #mock calendar list request
-              calendar_uri = mock("get calendar uri")
-              Addressable::URI.expects(:parse).with("https://www.google.com/calendar/feeds/default/allcalendars/full").once.returns(calendar_uri)
-              Connection.any_instance.expects(:send).with(calendar_uri, :get).once.returns(mock("response", :body => get_mock_body('list_calendars.xml')))
-
-              #mock events list request
-              events_uri = mock("get events uri")
-              Addressable::URI.expects(:parse).with("https://www.google.com/calendar/feeds/rf1c66uld6dgk2t5lh43svev6g%40group.calendar.google.com/private/full").once.returns(events_uri)
-              Connection.any_instance.expects(:send).with(events_uri, :get).once.returns(mock("response", :body => get_mock_body('events.xml')))
-
-              cal.events
-            end
-          end
-
-          should "catch login with invalid calendar" do
-
-            assert_raise(InvalidCalendar) do
-              cal = Calendar.new(:username => 'some.one@gmail.com', :password => 'super-secret',
-              :calendar => "invalid calendar")
-
-              #mock calendar list request
-              calendar_uri = mock("get calendar uri")
-              Addressable::URI.expects(:parse).with("https://www.google.com/calendar/feeds/default/allcalendars/full").once.returns(calendar_uri)
-              Connection.any_instance.expects(:send).with(calendar_uri, :get).once.returns(mock("response", :body => get_mock_body('list_calendars.xml')))
-
-              cal.events
-            end
-          end               
+      should "login properly with an auth_url" do
+        assert_nothing_thrown do
+          Calendar.new(:username => 'some.one@gmail.com', :password => 'super-secret',
+          :auth_url => "https://www.google.com/accounts/ClientLogin"
+          )
+        end
+      end
+
+      should "catch login with invalid auth_url" do
+        @http_mock.stubs(:kind_of?).with(Net::HTTPForbidden).returns(true)
+        @http_mock.stubs(:body).returns('Error=BadAuthentication')
+        assert_raise(HTTPAuthorizationFailed) do
+          Calendar.new(:username => 'some.one@gmail.com', :password => 'super-secret',
+          :auth_url => "https://www.google.com/accounts/ClientLogin/waffles"
+          )
+        end
+      end
+
+      should "login properly with a calendar" do
+        assert_nothing_thrown do
+          cal = Calendar.new(:username => 'some.one@gmail.com', :password => 'super-secret',
+          :calendar => "Little Giants")
+
+          #mock calendar list request
+          calendar_uri = mock("get calendar uri")
+          Addressable::URI.expects(:parse).with("https://www.google.com/calendar/feeds/default/allcalendars/full").once.returns(calendar_uri)
+          Connection.any_instance.expects(:send).with(calendar_uri, :get).once.returns(mock("response", :body => get_mock_body('list_calendars.xml')))
+
+          #mock events list request
+          events_uri = mock("get events uri")
+          Addressable::URI.expects(:parse).with("https://www.google.com/calendar/feeds/rf1c66uld6dgk2t5lh43svev6g%40group.calendar.google.com/private/full").once.returns(events_uri)
+          Connection.any_instance.expects(:send).with(events_uri, :get).once.returns(mock("response", :body => get_mock_body('events.xml')))
+
+          cal.events
+        end
+      end
+
+      should "catch login with invalid calendar" do
+
+        assert_raise(InvalidCalendar) do
+          cal = Calendar.new(:username => 'some.one@gmail.com', :password => 'super-secret',
+          :calendar => "invalid calendar")
+
+          #mock calendar list request
+          calendar_uri = mock("get calendar uri")
+          Addressable::URI.expects(:parse).with("https://www.google.com/calendar/feeds/default/allcalendars/full").once.returns(calendar_uri)
+          Connection.any_instance.expects(:send).with(calendar_uri, :get).once.returns(mock("response", :body => get_mock_body('list_calendars.xml')))
+
+          cal.events
+        end
+      end
 
     end # login context
 
@@ -109,6 +109,11 @@ class TestGoogleCalendar < Test::Unit::TestCase
         @calendar = Calendar.new(:username => 'some.one@gmail.com', :password => 'super-secret')
       end
 
+      should "reload connection" do
+        old_connection = @calendar.connection
+        assert_not_equal old_connection, @calendar.reload.connection
+      end
+
       should "find all events" do
         @http_mock.stubs(:body).returns( get_mock_body("events.xml") )
         assert_equal @calendar.events.length, 3

metadata

@@ -1,102 +1,139 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: google_calendar
-version: !ruby/object:Gem::Version
-  version: 0.2.0
+version: !ruby/object:Gem::Version 
+  hash: 21
   prerelease: 
+  segments: 
+  - 0
+  - 2
+  - 1
+  version: 0.2.1
 platform: ruby
-authors:
+authors: 
 - Steve Zich
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-11-07 00:00:00.000000000Z
-dependencies:
-- !ruby/object:Gem::Dependency
-  name: nokogiri
-  requirement: &70109869359520 !ruby/object:Gem::Requirement
+
+date: 2011-11-10 00:00:00 -08:00
+default_executable: 
+dependencies: 
+- !ruby/object:Gem::Dependency 
+  type: :runtime
+  version_requirements: &id001 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 15
+        segments: 
+        - 1
+        - 4
+        - 4
         version: 1.4.4
+  requirement: *id001
+  prerelease: false
+  name: nokogiri
+- !ruby/object:Gem::Dependency 
   type: :runtime
+  version_requirements: &id002 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 2
+        - 2
+        - 2
+        version: 2.2.2
+  requirement: *id002
   prerelease: false
-  version_requirements: *70109869359520
-- !ruby/object:Gem::Dependency
   name: addressable
-  requirement: &70109869358300 !ruby/object:Gem::Requirement
+- !ruby/object:Gem::Dependency 
+  type: :development
+  version_requirements: &id003 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 2.2.2
-  type: :runtime
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  requirement: *id003
   prerelease: false
-  version_requirements: *70109869358300
-- !ruby/object:Gem::Dependency
   name: shoulda
-  requirement: &70109869357620 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+- !ruby/object:Gem::Dependency 
   type: :development
-  prerelease: false
-  version_requirements: *70109869357620
-- !ruby/object:Gem::Dependency
-  name: bundler
-  requirement: &70109869346740 !ruby/object:Gem::Requirement
+  version_requirements: &id004 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
+      - !ruby/object:Gem::Version 
+        hash: 23
+        segments: 
+        - 1
+        - 0
+        - 0
         version: 1.0.0
-  type: :development
+  requirement: *id004
   prerelease: false
-  version_requirements: *70109869346740
-- !ruby/object:Gem::Dependency
-  name: jeweler
-  requirement: &70109869345680 !ruby/object:Gem::Requirement
+  name: bundler
+- !ruby/object:Gem::Dependency 
+  type: :development
+  version_requirements: &id005 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
+      - !ruby/object:Gem::Version 
+        hash: 1
+        segments: 
+        - 1
+        - 5
+        - 1
         version: 1.5.1
+  requirement: *id005
+  prerelease: false
+  name: jeweler
+- !ruby/object:Gem::Dependency 
   type: :development
+  version_requirements: &id006 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  requirement: *id006
   prerelease: false
-  version_requirements: *70109869345680
-- !ruby/object:Gem::Dependency
   name: rcov
-  requirement: &70109869343760 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+- !ruby/object:Gem::Dependency 
   type: :development
-  prerelease: false
-  version_requirements: *70109869343760
-- !ruby/object:Gem::Dependency
-  name: mocha
-  requirement: &70109869342600 !ruby/object:Gem::Requirement
+  version_requirements: &id007 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  requirement: *id007
   prerelease: false
-  version_requirements: *70109869342600
-description: A minimal wrapper around the google calendar API, which uses nokogiri
-  for fast parsing.
+  name: mocha
+description: A minimal wrapper around the google calendar API, which uses nokogiri for fast parsing.
 email: steve.zich@gmail.com
 executables: []
+
 extensions: []
-extra_rdoc_files:
+
+extra_rdoc_files: 
 - LICENSE.txt
 - README.rdoc
-files:
+files: 
 - .document
 - Gemfile
 - Gemfile.lock
@@ -120,34 +157,40 @@ files:
 - test/mocks/query_events.xml
 - test/mocks/successful_login.txt
 - test/test_google_calendar.rb
+has_rdoc: true
 homepage: http://github.com/northworld/google_calendar
-licenses:
+licenses: 
 - MIT
 post_install_message: 
 rdoc_options: []
-require_paths:
+
+require_paths: 
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement
+required_ruby_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
-      segments:
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
       - 0
-      hash: 3242428222687686780
-required_rubygems_version: !ruby/object:Gem::Requirement
+      version: "0"
+required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
 requirements: []
+
 rubyforge_project: 
-rubygems_version: 1.8.10
+rubygems_version: 1.4.2
 signing_key: 
 specification_version: 3
 summary: A lightweight google calendar API wrapper
-test_files:
+test_files: 
 - test/helper.rb
 - test/test_google_calendar.rb