google_calendar 0.3.0 → 0.3.1

data/.travis.yml

@@ -1,6 +1,5 @@
 language: ruby
 rvm:
-  - "1.8.7"
   - "1.9.2"
   - "1.9.3"
   - "2.0.0"

data/Gemfile.lock

@@ -4,26 +4,25 @@ GEM
     activesupport (3.2.13)
       i18n (= 0.6.1)
       multi_json (~> 1.0)
-    addressable (2.3.3)
-    bourne (1.4.0)
-      mocha (~> 0.13.2)
+    addressable (2.3.4)
     i18n (0.6.1)
-    json (1.7.7)
+    json (1.8.0)
     metaclass (0.0.1)
-    mocha (0.13.3)
+    mini_portile (0.5.0)
+    mocha (0.14.0)
       metaclass (~> 0.0.1)
-    multi_json (1.7.2)
-    nokogiri (1.5.9)
+    multi_json (1.7.7)
+    nokogiri (1.6.0)
+      mini_portile (~> 0.5.0)
     rake (10.0.4)
     rdoc (4.0.1)
       json (~> 1.4)
-    shoulda (3.4.0)
+    shoulda (3.5.0)
       shoulda-context (~> 1.0, >= 1.0.1)
-      shoulda-matchers (~> 1.0, >= 1.4.1)
-    shoulda-context (1.1.1)
-    shoulda-matchers (1.5.6)
+      shoulda-matchers (>= 1.4.1, < 3.0)
+    shoulda-context (1.1.2)
+    shoulda-matchers (2.2.0)
       activesupport (>= 3.0.0)
-      bourne (~> 1.3)
 
 PLATFORMS
   ruby

data/README.rdoc

@@ -40,7 +40,7 @@ Note: Google requests that you set the name of your application so they can bett
   puts cal.find_events('my search string')
 
 
-Note: This is not a complete implementation of the calendar api, it just includes the features I needed to support our internal calendar integration.
+Note: This is not a complete implementation of the calendar api, it just includes the features we needed to support our internal calendar integration.
 
 == Contributing to google_calendar
 

data/VERSION

@@ -1 +1 @@
-0.3.0
+0.3.1

data/google_calendar.gemspec

@@ -2,8 +2,8 @@
 
 Gem::Specification.new do |s|
   s.name = "google_calendar"
-  s.version = "0.3.0"
-  s.date = "2013-04-15"
+  s.version = "0.3.1"
+  s.date = "2013-08-23"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
 

data/lib/google/calendar.rb

@@ -77,11 +77,19 @@ module Google
     #   an array of events if many found.
     #
     def find_events_in_range(start_min, start_max,options = {})
-	options[:max_results] ||=  25
+      options[:max_results] ||=  25
+      options[:order_by] ||= 'lastmodified' # other option is 'starttime'
       formatted_start_min = start_min.strftime("%Y-%m-%dT%H:%M:%S")
       formatted_start_max = start_max.strftime("%Y-%m-%dT%H:%M:%S")
       query = "?start-min=#{formatted_start_min}&start-max=#{formatted_start_max}&recurrence-expansion-start=#{formatted_start_min}&recurrence-expansion-end=#{formatted_start_max}"
-	query = "#{query}&max-results=#{options[:max_results]}"
+      query = "#{query}&orderby=#{options[:order_by]}&max-results=#{options[:max_results]}"
+      event_lookup(query)
+    end
+
+    def find_future_events(options={})
+      options[:max_results] ||=  25
+      options[:order_by] ||= 'lastmodified' # other option is 'starttime'
+      query = "?futureevents=true&orderby=#{options[:order_by]}&max-results=#{options[:max_results]}"
       event_lookup(query)
     end
 
@@ -213,7 +221,12 @@ module Google
 
     def setup_event(event) #:nodoc:
       event.calendar = self
-       yield(event) if block_given?
+      if block_given?
+      	yield(event)
+	event.title = event.title.encode(:xml => :text) if event.title
+	event.content = event.content.encode(:xml => :text) if event.content
+	event.where = event.where.encode(:xml => :text) if event.where
+      end
       event.save
       event
     end

data/lib/google/event.rb

@@ -165,14 +165,26 @@ module Google
     # Create a new event from a google 'entry' xml block.
     #
     def self.new_from_xml(xml, calendar) #:nodoc:
-      Event.new(:id           => xml.at_xpath("gCal:uid")['value'].split('@').first,
+      id = xml.at_xpath("gCal:uid")['value'].split('@').first
+
+      # Check if this event came from an apple program (ios, iCal, Calendar, etc)
+      # Id format ex: E52411E2-8DB9-4A26-AD5A-8B6104320D3C
+      if id.match( /[0-9A-Z]{8}-([0-9A-Z]{4}-){3}[0-9A-Z]{12}/ )
+        # Use the ID field instead of the UID which apple overwrites for its own purposes.
+        # TODO With proper testing, this should be way to parse all event id's
+        id = xml.at_xpath("xmlns:id").content.split('/').last
+      end
+
+      event_time_data = xml.at_xpath("gd:when")
+
+      Event.new(:id           => id,
                 :calendar     => calendar,
                 :raw_xml      => xml,
                 :title        => xml.at_xpath("xmlns:title").content,
                 :content      => xml.at_xpath("xmlns:content").content,
                 :where        => xml.at_xpath("gd:where")['valueString'],
-                :start_time   => xml.at_xpath("gd:when")['startTime'],
-                :end_time     => xml.at_xpath("gd:when")['endTime'],
+                :start_time   => (event_time_data.nil? ? nil : xml.at_xpath("gd:when")['startTime']),
+                :end_time     => (event_time_data.nil? ? nil : xml.at_xpath("gd:when")['endTime']),
                 :transparency => xml.at_xpath("gd:transparency")['value'].split('.').last,
                 :quickadd     => (xml.at_xpath("gCal:quickadd") ? (xml.at_xpath("gCal:quickadd")['quickadd']) : nil),
                 :html_link    => xml.at_xpath('//xmlns:link[@title="alternate" and @rel="alternate" and @type="text/html"]')['href'],

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&recurrence-expansion-start=2011-02-01T11:01:01&recurrence-expansion-end=2011-02-28T23:59:59&max-results=25')
+        @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&orderby=lastmodified&max-results=25')
         events = @calendar.find_events_in_range(start_min, start_max)
       end
 
@@ -168,6 +168,22 @@ class TestGoogleCalendar < Test::Unit::TestCase
         assert_equal event.content, "movie tomorrow 23:00 at AMC Van Ness"
       end
 
+      should "format create event with ampersand correctly" do
+	@http_mock.stubs(:body).returns( get_mock_body("create_event.xml") )
+	
+	event = @calendar.create_event do |e|
+	  e.title = 'New Event with &'
+	  e.start_time = Time.now + (60 * 60)
+	  e.end_time = Time.now + (60 * 60 * 2)
+	  e.content = "A new event with &"
+	  e.where = "Joe's House & Backyard"
+	end
+	
+	assert_equal event.title, 'New Event with &amp;'
+	assert_equal event.content, 'A new event with &amp;'
+	assert_equal event.where, "Joe's House &amp; Backyard"
+      end
+
       should "format to_s properly" do
         @http_mock.stubs(:body).returns( get_mock_body("query_events.xml") )
         event = @calendar.find_events('Test')

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: google_calendar
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-15 00:00:00.000000000 Z
+date: 2013-08-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri