google_calendar 0.2.1 → 0.2.2

data/VERSION

@@ -1 +1 @@
-0.2.1
+0.2.2

data/google_calendar.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{google_calendar}
-  s.version = "0.2.1"
+  s.version = "0.2.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Steve Zich"]
-  s.date = %q{2011-11-10}
+  s.date = %q{2012-03-27}
   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 = [
@@ -44,7 +44,7 @@ Gem::Specification.new do |s|
   s.homepage = %q{http://github.com/northworld/google_calendar}
   s.licenses = ["MIT"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.4.2}
+  s.rubygems_version = %q{1.6.2}
   s.summary = %q{A lightweight google calendar API wrapper}
   s.test_files = [
     "test/helper.rb",

data/lib/google/calendar.rb

@@ -79,7 +79,7 @@ module Google
     def find_events_in_range(start_min, start_max)
       formatted_start_min = start_min.strftime("%Y-%m-%dT%H:%M:%S")
       formatted_start_max = start_max.strftime("%Y-%m-%dT%H:%M:%S")
-      event_lookup("?start-min=#{formatted_start_min}&start-max=#{formatted_start_max}")
+      event_lookup("?start-min=#{formatted_start_min}&start-max=#{formatted_start_max}&recurrence-expansion-start=#{formatted_start_min}&recurrence-expansion-end=#{formatted_start_max}")
     end
 
     # Attempts to find the event specified by the id
@@ -158,6 +158,10 @@ module Google
                                    :auth_url => auth_url)
       self
     end
+    
+    def display_color
+      calendar_data.xpath("//entry[title='#{@calendar}']/color/@value").first.value
+    end
 
     protected
 
@@ -188,15 +192,21 @@ module Google
     #
     def events_url
       if @calendar and !@calendar.include?("@")
-         xml = @connection.send(Addressable::URI.parse("https://www.google.com/calendar/feeds/default/allcalendars/full"), :get)
-         doc = Nokogiri::XML(xml.body)
-         doc.remove_namespaces!
-         link = doc.xpath("//entry[title='#{@calendar}']/link[contains(@rel, '#eventFeed')]/@href").to_s
+         link = calendar_data.xpath("//entry[title='#{@calendar}']/link[contains(@rel, '#eventFeed')]/@href").to_s
          link.empty? ? raise(Google::InvalidCalendar) : link
        else
          "https://www.google.com/calendar/feeds/#{calendar_id}/private/full"
       end
     end
+    
+    def calendar_data
+      unless @calendar_data
+        xml = @connection.send(Addressable::URI.parse("https://www.google.com/calendar/feeds/default/allcalendars/full"), :get)
+        @calendar_data = Nokogiri::XML(xml.body)
+        @calendar_data.remove_namespaces!
+      end
+      @calendar_data
+    end
 
     def setup_event(event) #:nodoc:
       event.calendar = self

data/lib/google/event.rb

@@ -36,6 +36,7 @@ module Google
       @where = params[:where]
       @start_time = params[:start_time]
       @end_time = params[:end_time]
+      self.all_day= params[:all_day] if params[:all_day]
       @calendar = params[:calendar]
       @raw_xml = params[:raw_xml]
       @quickadd = params[:quickadd]
@@ -72,6 +73,25 @@ module Google
       raise ArgumentError, "End Time must be either Time or String" unless (time.is_a?(String) || time.is_a?(Time))
       @end_time = ((time.is_a? String) ? Time.parse(time) : time)
     end
+    
+    # Returns whether the Event is an all-day event, based on whether the event starts at the beginning and ends at the end of the day.
+    #
+    def all_day?
+      duration == 24 * 60 * 60 # Exactly one day
+    end
+    
+    def all_day=(time)
+      if time.class == String
+        time = Time.parse(time)
+      end
+      @start_time = time.strftime("%Y-%m-%d")
+      @end_time = (time + 24*60*60).strftime("%Y-%m-%d")
+    end
+    
+    # Duration in seconds
+    def duration
+      Time.parse(end_time) - Time.parse(start_time)
+    end
 
     #
     def self.build_from_google_feed(xml, calendar)

data/test/test_google_calendar.rb

@@ -128,7 +128,7 @@ class TestGoogleCalendar < Test::Unit::TestCase
       should "find events in range" do
         start_min = DateTime.new(2011, 2, 1, 11, 1, 1)
         start_max = DateTime.new(2011, 2, 28, 23, 59, 59)
-        @calendar.expects(:event_lookup).with('?start-min=2011-02-01T11:01:01&start-max=2011-02-28T23:59:59')
+        @calendar.expects(:event_lookup).with('?start-min=2011-02-01T11:01:01&start-max=2011-02-28T23:59:59&recurrence-expansion-start=2011-02-01T11:01:01&recurrence-expansion-end=2011-02-28T23:59:59')
         events = @calendar.find_events_in_range(start_min, start_max)
       end
 
@@ -216,6 +216,41 @@ class TestGoogleCalendar < Test::Unit::TestCase
     end # Logged on context
 
   end # Connected context
+  
+  context "Event instance methods" do
+    context "#all_day?" do
+      context "when the event is 24 hours long or more" do
+        should "be true" do
+          @event = Event.new(:start_time => "2012-03-31", :end_time => "2012-04-01")
+          assert @event.all_day?
+        end
+      end
+      context "when the event is not an all-day event" do
+        should "be false" do
+          @event = Event.new(:start_time => "2012-03-27T10:00:00.000-07:00", :end_time => "2012-03-27T10:30:00.000-07:00")
+          assert !@event.all_day?
+        end
+      end
+    end
+    
+    context "#all_day=" do
+      context "sets the start and end time to the appropriate values for an all day event on that day" do
+        should "set the start time" do
+          @event = Event.new :all_day => Time.parse("2012-05-02 12:24")
+          assert_equal @event.start_time, "2012-05-02"
+        end
+        should "set the end time" do
+          @event = Event.new :all_day => Time.parse("2012-05-02 12:24")
+          assert_equal @event.end_time, "2012-05-03"
+        end
+        should "be able to handle strings" do
+          @event = Event.new :all_day => "2012-05-02 12:24"
+          assert_equal @event.start_time, "2012-05-02"
+          assert_equal @event.end_time, "2012-05-03"
+        end
+      end
+    end
+  end
 
   def test_https_extension
     assert_nothing_thrown do

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: google_calendar
 version: !ruby/object:Gem::Version 
-  hash: 21
+  hash: 19
   prerelease: 
   segments: 
   - 0
   - 2
-  - 1
-  version: 0.2.1
+  - 2
+  version: 0.2.2
 platform: ruby
 authors: 
 - Steve Zich
@@ -15,12 +15,12 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-11-10 00:00:00 -08:00
+date: 2012-03-27 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   type: :runtime
-  version_requirements: &id001 !ruby/object:Gem::Requirement 
+  requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -31,12 +31,12 @@ dependencies:
         - 4
         - 4
         version: 1.4.4
-  requirement: *id001
-  prerelease: false
   name: nokogiri
+  version_requirements: *id001
+  prerelease: false
 - !ruby/object:Gem::Dependency 
   type: :runtime
-  version_requirements: &id002 !ruby/object:Gem::Requirement 
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -47,12 +47,12 @@ dependencies:
         - 2
         - 2
         version: 2.2.2
-  requirement: *id002
-  prerelease: false
   name: addressable
+  version_requirements: *id002
+  prerelease: false
 - !ruby/object:Gem::Dependency 
   type: :development
-  version_requirements: &id003 !ruby/object:Gem::Requirement 
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -61,12 +61,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  requirement: *id003
-  prerelease: false
   name: shoulda
+  version_requirements: *id003
+  prerelease: false
 - !ruby/object:Gem::Dependency 
   type: :development
-  version_requirements: &id004 !ruby/object:Gem::Requirement 
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -77,12 +77,12 @@ dependencies:
         - 0
         - 0
         version: 1.0.0
-  requirement: *id004
-  prerelease: false
   name: bundler
+  version_requirements: *id004
+  prerelease: false
 - !ruby/object:Gem::Dependency 
   type: :development
-  version_requirements: &id005 !ruby/object:Gem::Requirement 
+  requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -93,12 +93,12 @@ dependencies:
         - 5
         - 1
         version: 1.5.1
-  requirement: *id005
-  prerelease: false
   name: jeweler
+  version_requirements: *id005
+  prerelease: false
 - !ruby/object:Gem::Dependency 
   type: :development
-  version_requirements: &id006 !ruby/object:Gem::Requirement 
+  requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -107,12 +107,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  requirement: *id006
-  prerelease: false
   name: rcov
+  version_requirements: *id006
+  prerelease: false
 - !ruby/object:Gem::Dependency 
   type: :development
-  version_requirements: &id007 !ruby/object:Gem::Requirement 
+  requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -121,9 +121,9 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  requirement: *id007
-  prerelease: false
   name: mocha
+  version_requirements: *id007
+  prerelease: false
 description: A minimal wrapper around the google calendar API, which uses nokogiri for fast parsing.
 email: steve.zich@gmail.com
 executables: []
@@ -187,7 +187,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.4.2
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: A lightweight google calendar API wrapper