gcal-ruby 0.1.1 → 0.1.2

data/CHANGELOG

@@ -1,2 +1,3 @@
+v0.1.2 added options for events list
 v0.1.1 added calendar events
 v0.1.0 first release

data/README.rdoc

@@ -7,4 +7,7 @@
   client = GCal::Client.new(api_key, api_secret, oauth_token, oauth_secret)
   client.all_calendars                  # returns all user calendars
   client.own_calendars                  # returns user owned calendars
-  client.events(calendar.id)            # returns events in calendar
+  client.events(calendar.id)            # returns events in calendar
+  
+  # retrieving events with options
+  client.events(calendar.id, :start_time => 1.month.ago, :timezone => 'Europe/Moscow')

data/Rakefile

@@ -3,7 +3,7 @@ require 'rubygems'
 require 'rake'
 require 'echoe'
 
-Echoe.new('gcal-ruby', '0.1.1') do |p|
+Echoe.new('gcal-ruby', '0.1.2') do |p|
   p.description    = "Ruby library for Google Calendar API."
   p.url            = "http://github.com/23ninja/gcal-ruby"
   p.author         = "Iskander Haziev"

data/gcal-ruby.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{gcal-ruby}
-  s.version = "0.1.1"
+  s.version = "0.1.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
   s.authors = [%q{Iskander Haziev}]
-  s.date = %q{2011-10-05}
+  s.date = %q{2011-10-06}
   s.description = %q{Ruby library for Google Calendar API.}
   s.email = %q{gvalmon@gmail.com}
   s.extra_rdoc_files = [%q{CHANGELOG}, %q{LICENSE}, %q{README.rdoc}, %q{lib/gcal.rb}, %q{lib/gcal/calendar.rb}, %q{lib/gcal/client.rb}, %q{lib/gcal/event.rb}]

data/lib/gcal/calendar.rb

@@ -15,5 +15,32 @@ module GCal
     def selected?
       selected
     end
+    
+    class << self
+      def parse(entry)
+        parse_time = Time.respond_to?(:parse)
+        calendar = self.new
+
+        # common info
+        calendar.id = entry['id'][0].gsub('http://www.google.com/calendar/feeds/default/allcalendars/full/', '')
+        calendar.title = entry['title'][0]['content']
+        calendar.link = entry['link'][0]['href']
+        calendar.access_level = entry['accesslevel'][0]['value']
+        calendar.color = entry['color'][0]['value']
+        calendar.hidden = entry['hidden'][0]['value'] == 'true'
+        calendar.selected = entry['selected'][0]['value'] == 'true'
+
+        # time info
+        calendar.timezone = entry['timezone'][0]['value']
+        calendar.updated_at = parse_time ? Time.parse(entry['updated'][0]) : entry['updated'][0]
+        calendar.published_at = parse_time ? Time.parse(entry['published'][0]) : entry['published'][0]
+
+        # author
+        author = entry['author'][0]
+        calendar.author_name = author['name'] ? author['name'][0] : ''
+        calendar.author_email = author['email'] ? author['email'][0] : ''
+        calendar
+      end
+    end
   end
 end

data/lib/gcal/client.rb

@@ -28,7 +28,7 @@ module GCal
       xml = call("/default/allcalendars/full")
       calendars = []
       xml['entry'].each do |entry|
-        calendars << parse_calendar(entry)
+        calendars << GCal::Calendar.parse(entry)
       end if xml['entry']
       calendars
     end
@@ -37,69 +37,21 @@ module GCal
       xml = call("/default/owncalendars/full")
       calendars = []
       xml['entry'].each do |entry|
-        calendars << parse_calendar(entry)
+        calendars << GCal::Calendar.parse(entry)
       end if xml['entry']
       calendars
     end
     
-    def events(calendar_id)
-      xml = call("/#{calendar_id}/private/full")
+    def events(calendar_id, options = {})
+      xml = call("/#{calendar_id}/private/full#{GCal::Event.prepare_options(options)}")
       events = []
       xml['entry'].each do |entry|
-        event = GCal::Event.new
-        
-        # common info
-        event.id = entry['id'][0].gsub("http://www.google.com/calendar/feeds/#{calendar_id}/private/full/", '')
-        event.title = entry['title'][0]['content']
-        event.link = entry['link'][0]['href']
-        event.status = entry['eventStatus'][0]['value'].gsub(Event::STATUS_REGEXP, '')
-        event.where = entry['where'][0]['valueString']
-        event.who = entry['who'][0]['valueString']
-        
-        # time info
-        time = entry['when'][0]
-        event.start_time = parse_time? ? Time.parse(time['startTime']) : time['startTime']
-        event.end_time = parse_time? ? Time.parse(time['endTime']) : time['endTime']
-        event.updated_at = parse_time? ? Time.parse(entry['updated'][0]) : entry['updated'][0]
-        event.published_at = parse_time? ? Time.parse(entry['published'][0]) : entry['published'][0]
-        
-        # author
-        author = entry['author'][0]
-        event.author_name = author['name'] ? author['name'][0] : ''
-        event.author_email = author['email'] ? author['email'][0] : ''
-        events << event
+        events << GCal::Event.parse(calendar_id, entry)
       end if xml['entry']
       events
     end
     
     protected
-    def parse_calendar(entry)
-      calendar = GCal::Calendar.new
-      
-      # common info
-      calendar.id = entry['id'][0].gsub('http://www.google.com/calendar/feeds/default/allcalendars/full/', '')
-      calendar.title = entry['title'][0]['content']
-      calendar.link = entry['link'][0]['href']
-      calendar.access_level = entry['accesslevel'][0]['value']
-      calendar.color = entry['color'][0]['value']
-      calendar.hidden = entry['hidden'][0]['value'] == 'true'
-      calendar.selected = entry['selected'][0]['value'] == 'true'
-      
-      # time info
-      calendar.timezone = entry['timezone'][0]['value']
-      calendar.updated_at = parse_time? ? Time.parse(entry['updated'][0]) : entry['updated'][0]
-      calendar.published_at = parse_time? ? Time.parse(entry['published'][0]) : entry['published'][0]
-      
-      # author
-      author = entry['author'][0]
-      calendar.author_name = author['name'] ? author['name'][0] : ''
-      calendar.author_email = author['email'] ? author['email'][0] : ''
-      calendar
-    end
-    
-    def parse_time?
-      Time.respond_to?(:parse)
-    end
     
     def protected_api_call?
       !@api_key.nil?

data/lib/gcal/event.rb

@@ -7,5 +7,52 @@ module GCal
     def confirmed?
       status == 'confirmed'
     end
+    
+    class << self
+      def parse(calendar_id, entry)
+        parse_time = Time.respond_to?(:parse)
+        event = self.new
+        
+        # common info
+        event.id = entry['id'][0].gsub("http://www.google.com/calendar/feeds/#{calendar_id}/private/full/", '')
+        event.title = entry['title'][0]['content']
+        event.link = entry['link'][0]['href']
+        event.status = entry['eventStatus'][0]['value'].gsub(Event::STATUS_REGEXP, '')
+        event.where = entry['where'][0]['valueString']
+        event.who = entry['who'][0]['valueString']
+        
+        # time info
+        time = entry['when'][0]
+        event.start_time = parse_time ? Time.parse(time['startTime']) : time['startTime']
+        event.end_time = parse_time ? Time.parse(time['endTime']) : time['endTime']
+        event.updated_at = parse_time ? Time.parse(entry['updated'][0]) : entry['updated'][0]
+        event.published_at = parse_time ? Time.parse(entry['published'][0]) : entry['published'][0]
+        
+        # author
+        author = entry['author'][0]
+        event.author_name = author['name'] ? author['name'][0] : ''
+        event.author_email = author['email'] ? author['email'][0] : ''
+        event
+      end
+      
+      def prepare_options(options)
+        options.symbolize_keys! if Hash.respond_to?(:symbolize_keys!)
+        prepared_options = {}
+        if options[:start_time]
+          prepared_options['start-min'] = options[:start_time].strftime("%Y-%m-%dT%H:%M:%S")
+        end
+        if options[:end_time]
+          prepared_options['start-max'] = options[:end_time].strftime("%Y-%m-%dT%H:%M:%S")
+        end
+        if options[:timezone]
+          prepared_options['ctz'] = options[:timezone].gsub(' ', '_')
+        end
+        if prepared_options.size > 0 
+          "?" + prepared_options.map{|k, v| "#{k}=#{v}" }.join('&')
+        else
+          ''
+        end
+      end
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gcal-ruby
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-10-05 00:00:00.000000000Z
+date: 2011-10-06 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: oauth
-  requirement: &2165484340 !ruby/object:Gem::Requirement
+  requirement: &2165531020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2165484340
+  version_requirements: *2165531020
 - !ruby/object:Gem::Dependency
   name: typhoeus
-  requirement: &2165483340 !ruby/object:Gem::Requirement
+  requirement: &2165530020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2165483340
+  version_requirements: *2165530020
 - !ruby/object:Gem::Dependency
   name: xml-simple
-  requirement: &2165482160 !ruby/object:Gem::Requirement
+  requirement: &2165528780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,7 +43,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2165482160
+  version_requirements: *2165528780
 description: Ruby library for Google Calendar API.
 email: gvalmon@gmail.com
 executables: []