google_client 0.2.0 → 0.2.1

data/Rakefile

@@ -1,2 +1,45 @@
 #!/usr/bin/env rake
 require "bundler/gem_tasks"
+
+Bundler::GemHelper.install_tasks
+
+require 'rdoc/task'
+
+task :default => [:spec]
+
+require 'rspec/core/rake_task'
+
+RSpec::Core::RakeTask.new(:spec) do |spec|
+    spec.skip_bundler = true
+    spec.pattern = ['spec/*_spec.rb']
+    spec.rspec_opts = '--color --format doc'
+end
+
+RDoc::Task.new do |rdoc|
+  rdoc.rdoc_dir = 'doc/rdoc'
+  rdoc.title = "google_client #{GoogleClient::VERSION} documentation"
+
+  rdoc.rdoc_files.include('README.md')
+  
+  rdoc.rdoc_files.include('lib/**/*.rb')
+  rdoc.options << '-c' << 'utf-8'
+  rdoc.options << '-m' << 'README.md'  
+end
+
+# extracted from https://github.com/grosser/project_template
+desc "Bump version"
+rule /^version:bump:.*/ do |t|
+  sh "git status | grep 'nothing to commit'" # ensure we are not dirty
+  index = ['major', 'minor','patch'].index(t.name.split(':').last)
+  puts index
+  return
+  file = 'lib/google_client/version.rb'
+
+  version_file = File.read(file)
+  old_version, *version_parts = version_file.match(/(\d+)\.(\d+)\.(\d+)/).to_a
+  version_parts[index] = version_parts[index].to_i + 1
+  new_version = version_parts * '.'
+  File.open(file,'w'){|f| f.write(version_file.sub(old_version, new_version)) }
+
+  sh "bundle && git add -f #{file} Gemfile.lock && git commit -m 'bump version to #{new_version}'"
+end

data/app/controllers/google_client_controller.rb

@@ -9,9 +9,11 @@ class GoogleClientController < ApplicationController
   # OAuth step1: redirect to Google endpoint with the application idenfitifer and the redirect uri
   def index
     _params = {
-      :redirect_uri => Rails.application.config.google_client.redirect_uri,
-      :response_type => "code",
-      :scope => Rails.application.config.google_client.scope,
+      :redirect_uri    => Rails.application.config.google_client.redirect_uri,
+      :response_type   => "code",
+      :scope           => Rails.application.config.google_client.scope,
+      :access_type     => Rails.application.config.google_client.access_type.nil? ? "online" : Rails.application.config.google_client.access_type,
+      #:approval_prompt => Rails.application.config.google_client.approval_prompt.nil? ? "force" : Rails.application.config.google_client.approval_prompt
     }
     _params.merge!(DEFAULT_PARAMS)
     
@@ -24,10 +26,10 @@ class GoogleClientController < ApplicationController
     # This code is retrieved from Google
 
     _params = {
-      :redirect_uri => Rails.application.config.google_client.redirect_uri,
+      :redirect_uri  => Rails.application.config.google_client.redirect_uri,
       :client_secret => Rails.application.config.google_client.client_secret,
-      :grant_type => "authorization_code",
-      :code => params[:code]
+      :grant_type    => "authorization_code",
+      :code          => params[:code]
     }
 
     _params.merge!(DEFAULT_PARAMS)

data/lib/google_client/calendar.rb

@@ -24,7 +24,7 @@ module GoogleClient
     end
 
     def to_s
-      "#{self.class.name} => { id: #{@id}, title: #{@title}, :timezone => #{@timezone}, :location => #{@location} }"
+      "#{self.class.name} => { id: #{@id}, title: #{@title}, timezone => #{@timezone}, location => #{@location} }"
     end
 
     def connection
@@ -97,7 +97,7 @@ module GoogleClient
     end
 
     ##
-    # Fetch forthcoming events in the folowing *time* minutes
+    # Fetch forthcoming events in the following *time* minutes
     def forthcoming_events(time = 3600)
       events({:from => Time.now.strftime("%Y-%m-%dT%k:%M:%S").concat(timezone).gsub(/ /,"0"),
               :to => (Time.now + time).strftime("%Y-%m-%dT%k:%M:%S").concat(timezone).gsub(/ /,"0")})

data/lib/google_client/version.rb

@@ -1,3 +1,3 @@
 module GoogleClient
-  VERSION = "0.2.0"
+  VERSION = "0.2.1"
 end

data/scripts/script_config.rb

@@ -0,0 +1,16 @@
+
+# This value is used to refresh an user token
+CLIENT_ID     = "YOUR-APPLICATION-ID"
+
+# This value is used to refresh an user token
+CLIENT_SECRET = "YOUR-APPLICATION-SECRET"
+
+# This value is used to refresh an user token
+REFRESH_TOKEN = "USER-REFRESH-TOKEN"
+
+# User authentication in any request (except refresh token)
+AUTH_TOKEN    = "USER-AUTH-TOKEN"
+
+# Specific calendar id for calendar related operations
+CALENDAR_ID   = "CALENDAR-ID-TO-WORK-WITH"
+

data/spec/google_client_spec.rb

@@ -2,8 +2,12 @@ require 'google_client'
 
 describe GoogleClient do
   describe "while initializing" do
-    it "should set the OAuth credentials properly" do
-      GoogleClient.create_client("oauth_token").oauth_credentials.should eql("oauth_token")
+    subject { GoogleClient.create_client("oauth_token") }
+
+    it "should return a GoogleClient::User instance" do
+      subject.should be_instance_of GoogleClient::User
     end
+    
+    its(:oauth_credentials) { should == "oauth_token" }
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: google_client
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-11-13 00:00:00.000000000Z
+date: 2011-12-14 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client
-  requirement: &2156255200 !ruby/object:Gem::Requirement
+  requirement: &2156723480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2156255200
+  version_requirements: *2156723480
 - !ruby/object:Gem::Dependency
   name: addressable
-  requirement: &2156251080 !ruby/object:Gem::Requirement
+  requirement: &2156722860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2156251080
+  version_requirements: *2156722860
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &2156250640 !ruby/object:Gem::Requirement
+  requirement: &2156722220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2156250640
+  version_requirements: *2156722220
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2156250220 !ruby/object:Gem::Requirement
+  requirement: &2156721580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2156250220
+  version_requirements: *2156721580
 - !ruby/object:Gem::Dependency
   name: webmock
-  requirement: &2156249780 !ruby/object:Gem::Requirement
+  requirement: &2156720920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,7 +65,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2156249780
+  version_requirements: *2156720920
 description: This gem is a wrapper on top of the Google API that allows a developer
   to handle calendars, events, contacts on behalf of the user.
 email:
@@ -102,6 +102,7 @@ files:
 - scripts/fetch_contacts.rb
 - scripts/fetch_events.rb
 - scripts/refresh_token.rb
+- scripts/script_config.rb
 - scripts/user_profile.rb
 - spec/calendar_spec.rb
 - spec/contact_spec.rb