google_calendar 0.2.8 → 0.2.9

data/.gitignore

@@ -0,0 +1,45 @@
+# rcov generated
+coverage
+
+# rdoc generated
+rdoc
+
+# yard generated
+doc
+.yardoc
+
+# bundler
+.bundle
+
+# jeweler generated
+pkg
+
+# Have editor/IDE/OS specific files you need to ignore? Consider using a global gitignore:
+#
+# * Create a file at ~/.gitignore
+# * Include files you want ignored
+# * Run: git config --global core.excludesfile ~/.gitignore
+#
+# After doing this, these files will be ignored in all your git projects,
+# saving you from having to 'pollute' every project you touch with them
+#
+# Not sure what to needs to be ignored for particular editors/OSes? Here's some ideas to get you started. (Remember, remove the leading # of the line)
+#
+
+# For MacOS:
+#
+.DS_Store
+
+
+# For TextMate
+*.tmproj
+tmtags
+
+
+# For emacs:
+#*~
+#\#*
+#.\#*
+#
+# For vim:
+#*.swp

data/.travis.yml

@@ -0,0 +1,7 @@
+language: ruby
+rvm:
+  - "1.8.7"
+  - "1.9.2"
+  - "1.9.3"
+# uncomment this line if your project needs to run something other than `rake`:
+# script: bundle exec rspec spec

data/Gemfile

@@ -7,8 +7,8 @@ gem "addressable", ">= 2.2.2"
 # Gem development dependencies.
 group :development do
   gem "shoulda", ">= 0"
-  gem "bundler", "~> 1.0.0"
-  gem "jeweler", "~> 1.5.1"
-  gem "rcov", ">= 0"
+  gem "bundler", ">= 1.0.0"
   gem "mocha", ">= 0"
+  gem "rake", "> 10"
+  gem "rdoc", "> 3"
 end

data/Gemfile.lock

@@ -1,27 +1,38 @@
 GEM
   remote: http://rubygems.org/
   specs:
-    addressable (2.2.2)
-    git (1.2.5)
-    jeweler (1.5.1)
-      bundler (~> 1.0.0)
-      git (>= 1.2.5)
-      rake
-    mocha (0.9.10)
-      rake
-    nokogiri (1.4.4)
-    rake (0.8.7)
-    rcov (0.9.9)
-    shoulda (2.11.3)
+    activesupport (3.2.12)
+      i18n (~> 0.6)
+      multi_json (~> 1.0)
+    addressable (2.3.2)
+    bourne (1.1.2)
+      mocha (= 0.10.5)
+    i18n (0.6.1)
+    json (1.7.7)
+    metaclass (0.0.1)
+    mocha (0.10.5)
+      metaclass (~> 0.0.1)
+    multi_json (1.6.1)
+    nokogiri (1.5.6)
+    rake (10.0.3)
+    rdoc (3.12.1)
+      json (~> 1.4)
+    shoulda (3.3.2)
+      shoulda-context (~> 1.0.1)
+      shoulda-matchers (~> 1.4.1)
+    shoulda-context (1.0.2)
+    shoulda-matchers (1.4.2)
+      activesupport (>= 3.0.0)
+      bourne (~> 1.1.2)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
   addressable (>= 2.2.2)
-  bundler (~> 1.0.0)
-  jeweler (~> 1.5.1)
+  bundler (>= 1.0.0)
   mocha
   nokogiri (>= 1.4.4)
-  rcov
+  rake (> 10)
+  rdoc (> 3)
   shoulda

data/README.rdoc

@@ -1,3 +1,7 @@
+[![Build Status](https://travis-ci.org/northworld/google_calendar.png?branch=master)](https://travis-ci.org/northworld/google_calendar)
+
+[![Code Climate](https://codeclimate.com/github/northworld/google_calendar.png)](https://codeclimate.com/github/northworld/google_calendar)
+
 = Google Calendar
 
 A fast lightweight and minimalist wrapper around the google calendar api.

data/Rakefile

@@ -9,19 +9,6 @@ rescue Bundler::BundlerError => e
 end
 require 'rake'
 
-require 'jeweler'
-Jeweler::Tasks.new do |gem|
-  # gem is a Gem::Specification... see http://docs.rubygems.org/read/chapter/20 for more options
-  gem.name = "google_calendar"
-  gem.homepage = "http://github.com/northworld/google_calendar"
-  gem.license = "MIT"
-  gem.summary = %Q{A lightweight google calendar API wrapper}
-  gem.description = %Q{A minimal wrapper around the google calendar API, which uses nokogiri for fast parsing.}
-  gem.email = "steve.zich@gmail.com"
-  gem.authors = ["Steve Zich"]
-end
-Jeweler::RubygemsDotOrgTasks.new
-
 require 'rake/testtask'
 Rake::TestTask.new(:test) do |test|
   test.libs << 'lib' << 'test'
@@ -29,16 +16,9 @@ Rake::TestTask.new(:test) do |test|
   test.verbose = true
 end
 
-require 'rcov/rcovtask'
-Rcov::RcovTask.new do |test|
-  test.libs << 'test'
-  test.pattern = 'test/**/test_*.rb'
-  test.verbose = true
-end
-
 task :default => :test
 
-require 'rake/rdoctask'
+require 'rdoc/task'
 Rake::RDocTask.new do |rdoc|
   version = File.exist?('VERSION') ? File.read('VERSION') : ""
 

data/VERSION

@@ -1 +1 @@
-0.2.8
+0.2.9

data/google_calendar.gemspec

@@ -1,55 +1,31 @@
-# Generated by jeweler
-# DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
   s.name = "google_calendar"
-  s.version = "0.2.8"
+  s.version = "0.2.9"
+  s.date = "2013-02-15"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+
   s.authors = ["Steve Zich"]
-  s.date = "2013-01-10"
-  s.description = "A minimal wrapper around the google calendar API, which uses nokogiri for fast parsing."
   s.email = "steve.zich@gmail.com"
+
+  s.summary = "A lightweight google calendar API wrapper"
+  s.description = "A minimal wrapper around the google calendar API, which uses nokogiri for fast parsing."
+  s.homepage = "http://github.com/northworld/google_calendar"
+  s.licenses = ["MIT"]  
+  
   s.extra_rdoc_files = [
     "LICENSE.txt",
     "README.rdoc"
   ]
-  s.files = [
-    ".document",
-    "Gemfile",
-    "Gemfile.lock",
-    "LICENSE.txt",
-    "README.rdoc",
-    "Rakefile",
-    "VERSION",
-    "google_calendar.gemspec",
-    "lib/google/calendar.rb",
-    "lib/google/connection.rb",
-    "lib/google/errors.rb",
-    "lib/google/event.rb",
-    "lib/google/net/https.rb",
-    "lib/google_calendar.rb",
-    "test/helper.rb",
-    "test/mocks/create_event.xml",
-    "test/mocks/create_quickadd_event.xml",
-    "test/mocks/events.xml",
-    "test/mocks/find_event_by_id.xml",
-    "test/mocks/list_calendars.xml",
-    "test/mocks/query_events.xml",
-    "test/mocks/successful_login.txt",
-    "test/test_google_calendar.rb"
-  ]
-  s.homepage = "http://github.com/northworld/google_calendar"
-  s.licenses = ["MIT"]
+
+  s.files         = `git ls-files`.split("\n")
+  s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
+
   s.require_paths = ["lib"]
   s.rubygems_version = "1.8.24"
-  s.summary = "A lightweight google calendar API wrapper"
-  s.test_files = [
-    "test/helper.rb",
-    "test/test_google_calendar.rb"
-  ]
+
 
   if s.respond_to? :specification_version then
     s.specification_version = 3
@@ -58,26 +34,20 @@ Gem::Specification.new do |s|
       s.add_runtime_dependency(%q<nokogiri>, [">= 1.4.4"])
       s.add_runtime_dependency(%q<addressable>, [">= 2.2.2"])
       s.add_development_dependency(%q<shoulda>, [">= 0"])
-      s.add_development_dependency(%q<bundler>, ["~> 1.0.0"])
-      s.add_development_dependency(%q<jeweler>, ["~> 1.5.1"])
-      s.add_development_dependency(%q<rcov>, [">= 0"])
+      s.add_development_dependency(%q<bundler>, [">= 1.0.0"])
       s.add_development_dependency(%q<mocha>, [">= 0"])
     else
       s.add_dependency(%q<nokogiri>, [">= 1.4.4"])
       s.add_dependency(%q<addressable>, [">= 2.2.2"])
       s.add_dependency(%q<shoulda>, [">= 0"])
-      s.add_dependency(%q<bundler>, ["~> 1.0.0"])
-      s.add_dependency(%q<jeweler>, ["~> 1.5.1"])
-      s.add_dependency(%q<rcov>, [">= 0"])
+      s.add_dependency(%q<bundler>, [">= 1.0.0"])
       s.add_dependency(%q<mocha>, [">= 0"])
     end
   else
     s.add_dependency(%q<nokogiri>, [">= 1.4.4"])
     s.add_dependency(%q<addressable>, [">= 2.2.2"])
     s.add_dependency(%q<shoulda>, [">= 0"])
-    s.add_dependency(%q<bundler>, ["~> 1.0.0"])
-    s.add_dependency(%q<jeweler>, ["~> 1.5.1"])
-    s.add_dependency(%q<rcov>, [">= 0"])
+    s.add_dependency(%q<bundler>, [">= 1.0.0"])
     s.add_dependency(%q<mocha>, [">= 0"])
   end
 end

data/lib/google/connection.rb

@@ -49,36 +49,61 @@ module Google
       set_session_if_necessary(uri)
 
       http = (uri.scheme == 'https' ? Net::HTTPS.new(uri.host, uri.inferred_port) : Net::HTTP.new(uri.host, uri.inferred_port))
+      response =  http.request(build_request(uri, method, content))
 
+      # recurse if necessary.
+      if response.kind_of? Net::HTTPRedirection
+        response = send(Addressable::URI.parse(response['location']), method, content, redirect_count - 1)
+      end
+
+      check_for_errors(response)
+
+      return response
+    end
+
+    protected
+
+    # Check to see if we are using a session and extract it's values if required.
+    # 
+    def set_session_if_necessary(uri) #:nodoc:
+      # only extract the session if we don't already have one.
+      @session_id = uri.query_values['gsessionid'] if @session_id == nil && uri.query
+
+      if @session_id
+        uri.query ||= ''
+        uri.query_values = uri.query_values.merge({'gsessionid' => @session_id})
+      end
+    end
+
+    # Construct the appropriate request object.
+    #
+    def build_request(uri, method, content) #:nodoc
       case method
       when :delete
-        # puts "in delete: #{uri.to_s}"
         request = Net::HTTP::Delete.new(uri.to_s, @update_header)
+
       when :get
-        # puts "in get: #{uri.to_s}"
         request = Net::HTTP::Get.new(uri.to_s, @headers)
+
       when :post_form
-        # puts "in post_form: #{uri.to_s}"
         request = Net::HTTP::Post.new(uri.to_s, @headers)
         request.set_form_data(content)
+
       when :post
-        # puts "in post: #{uri.to_s}\n#{content}"
         request = Net::HTTP::Post.new(uri.to_s, @headers)
         request.body = content
+
       when :put
-        # puts "in put: #{uri.to_s}\n#{content}"
         request = Net::HTTP::Put.new(uri.to_s, @update_header)
         request.body = content
-      end
+      end # case
 
-      response =  http.request(request)
-
-      # recurse if necessary.
-      if response.kind_of? Net::HTTPRedirection
-        response = send(Addressable::URI.parse(response['location']), method, content, redirect_count - 1)
-      end
+      return request
+    end
 
-      # Raise the appropiate error if necessary.
+    # Check for common HTTP Errors and raise the appropriate response.
+    #
+    def check_for_errors(response) #:nodoc
       if response.kind_of? Net::HTTPForbidden
         raise HTTPAuthorizationFailed, response.body
 
@@ -88,20 +113,6 @@ module Google
       elsif response.kind_of? Net::HTTPNotFound
         raise HTTPNotFound, response.body
       end
-
-      return response
-    end
-
-    protected
-
-    def set_session_if_necessary(uri) #:nodoc:
-      # only extract the session if we don't already have one.
-      @session_id = uri.query_values['gsessionid'] if @session_id == nil && uri.query
-
-      if @session_id
-        uri.query ||= ''
-        uri.query_values = uri.query_values.merge({'gsessionid' => @session_id})
-      end
     end
 
   end

data/lib/google/event.rb

@@ -3,7 +3,7 @@ require 'time'
 
 module Google
 
-  # Represents a google Event.
+  # Represents a Google Event.
   #
   # === Attributes
   #
@@ -50,8 +50,7 @@ module Google
     # Sets the start time of the Event.  Must be a Time object or a parsable string representation of a time.
     #
     def start_time=(time)
-      raise ArgumentError, "Start Time must be either Time or String" unless (time.is_a?(String) || time.is_a?(Time))
-      @start_time = (time.is_a? String) ? Time.parse(time) : time.dup.utc
+      @start_time = parse_time(time)
     end
 
     # Get the start_time of the event.
@@ -75,6 +74,7 @@ module Google
     # Sets the end time of the Event.  Must be a Time object or a parsable string representation of a time.
     #
     def end_time=(time)
+      @end_time = parse_time(time)
       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.dup.utc
     end
@@ -83,7 +83,7 @@ module Google
     #
     def all_day?
       time = Time.parse(@start_time)
-      duration % (24 * 60 * 60) == 0 && time == Time.new(time.year,time.month,time.day)
+      duration % (24 * 60 * 60) == 0 && time == Time.local(time.year,time.month,time.day)
     end
     
     def all_day=(time)
@@ -163,27 +163,17 @@ module Google
     # Create a new event from a google 'entry' xml block.
     #
     def self.new_from_xml(xml, calendar) #:nodoc:
-      id           = xml.at_xpath("gCal:uid")['value'].split('@').first
-      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']
-      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']
-
-      Event.new(:id => id,
-                :title => title,
-                :content => content,
-                :where => where,
-                :start_time => start_time,
-                :end_time => end_time,
-                :calendar => calendar,
-                :raw_xml => xml,
-                :transparency => transparency,
-                :quickadd => quickadd,
-                :html_link => html_link)
+      Event.new(:id           => xml.at_xpath("gCal:uid")['value'].split('@').first,
+                :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'],
+                :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'])
     end
 
     # Set the ID after google assigns it (only necessary when we are creating a new event)
@@ -197,5 +187,12 @@ module Google
       @raw_xml = xml
     end
 
+    # A utility method used centralize time parsing.
+    #
+    def parse_time(time) #:nodoc
+      raise ArgumentError, "Start Time must be either Time or String" unless (time.is_a?(String) || time.is_a?(Time))
+      (time.is_a? String) ? Time.parse(time) : time.dup.utc
+    end
+
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: google_calendar
 version: !ruby/object:Gem::Version
-  version: 0.2.8
+  version: 0.2.9
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-10 00:00:00.000000000 Z
+date: 2013-02-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -61,44 +61,12 @@ dependencies:
         version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 1.0.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 1.0.0
-- !ruby/object:Gem::Dependency
-  name: jeweler
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 1.5.1
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 1.5.1
-- !ruby/object:Gem::Dependency
-  name: rcov
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.0.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -106,7 +74,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.0.0
 - !ruby/object:Gem::Dependency
   name: mocha
   requirement: !ruby/object:Gem::Requirement
@@ -133,6 +101,8 @@ extra_rdoc_files:
 - README.rdoc
 files:
 - .document
+- .gitignore
+- .travis.yml
 - Gemfile
 - Gemfile.lock
 - LICENSE.txt
@@ -168,9 +138,6 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 2763887538730031791
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -185,4 +152,11 @@ specification_version: 3
 summary: A lightweight google calendar API wrapper
 test_files:
 - test/helper.rb
+- test/mocks/create_event.xml
+- test/mocks/create_quickadd_event.xml
+- test/mocks/events.xml
+- test/mocks/find_event_by_id.xml
+- test/mocks/list_calendars.xml
+- test/mocks/query_events.xml
+- test/mocks/successful_login.txt
 - test/test_google_calendar.rb