google-api 0.0.1.rc1 → 0.1.0

data/.travis.yml

@@ -0,0 +1,4 @@
+language: ruby
+rvm:
+  - 1.9.3
+script: bundle exec rspec spec

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## v0.0.1.rc2 (TBD)
+
+* Generalize #update_oauth! method for an oauthable ActiveRecord object. See active_record_inclusions.rb for more.
+
 ## v0.0.1.rc1 (2012-09-20)
 
 * Add OAuth2 token encryption.

data/README.md

@@ -1,7 +1,7 @@
-**This gem is in its infancy! Proceed at your own risk...**
-
 # Google API
 
+[![Build Status](https://secure.travis-ci.org/agrobbin/google-api.png?branch=master)](https://travis-ci.org/agrobbin/google-api) [![Dependency Status](https://gemnasium.com/agrobbin/google-api.png)](https://gemnasium.com/agrobbin/google-api)
+
 A simple but powerful ruby API wrapper for Google's services.
 
 ## Installation
@@ -66,12 +66,12 @@ user.google.drive.files.list
 
 This will fetch all files and folders in the user's Google Drive and return them in an array of hashes.
 
-## What Google APIs has this gem be tested against?
+## What Google APIs has this gem been tested against?
 
 * Calendar
 * Drive
 
-## I need to use an API that is not yet tested
+## Help! I need to use an API that is not yet tested
 
 Open an issue, and we will do our best to fully test the API you need. Or, you can submit a pull request with any necessary updates!
 

data/google-api.gemspec

@@ -11,7 +11,7 @@ Gem::Specification.new do |gem|
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
   gem.name          = "google-api"
   gem.require_paths = ["lib"]
-  gem.version       = "0.0.1.rc1"
+  gem.version       = "0.1.0"
 
   gem.add_runtime_dependency 'mime-types', '~> 1.0'
   gem.add_runtime_dependency 'oauth2', '~> 0.8.0'

data/lib/google-api/active_record_inclusions.rb

@@ -20,10 +20,16 @@ module GoogleAPI
           }
         end
 
-        define_method :update_access_token! do |access_token|
-          self.oauth_access_token = GoogleAPI.encrypt!(access_token)
-          self.oauth_access_token_expires_at = 59.minutes.from_now
-          self.save
+        # This method is used both within the GoogleAPI and can be used outside it in your own app to update
+        # the OAuth2 values in the database. Refresh token doesn't need to be passed, and any other attributes
+        # that you want to update on the object can be passed as a final parameter.
+        define_method :update_oauth! do |access_token, refresh_token = nil, additional_attrs = {}|
+          attrs = {
+            oauth_access_token: GoogleAPI.encrypt!(access_token),
+            oauth_access_token_expires_at: 59.minutes.from_now # it's actually an hour from now, but just to make sure we don't overlap at all, let's set it to 59 minutes
+          }.merge(additional_attrs)
+          attrs[:oauth_refresh_token] = GoogleAPI.encrypt!(refresh_token) if refresh_token
+          update_attributes(attrs)
         end
 
         define_method :google do

data/lib/google-api/client.rb

@@ -23,7 +23,7 @@ module GoogleAPI
       if @access_token.expired?
         GoogleAPI.logger.info "Access Token expired for #{object.class.name}(#{object.id}), refreshing..."
         @access_token = @access_token.refresh!
-        object.update_access_token!(@access_token.token)
+        object.update_oauth!(@access_token.token)
       end
 
       @access_token

data/spec/google-api/client_spec.rb

@@ -54,7 +54,7 @@ describe GoogleAPI::Client do
       end
 
       it "should update the object's stored OAuth information" do
-        object.should_receive(:update_access_token!)
+        object.should_receive(:update_oauth!)
         client.access_token
       end
 

data/spec/support/oauthable_object.rb

@@ -18,7 +18,7 @@ class User
     }
   end
 
-  def update_access_token!(access_token)
+  def update_oauth!(access_token, refresh_token = nil, additional_attrs = {})
   end
 
   def google

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: google-api
 version: !ruby/object:Gem::Version
-  version: 0.0.1.rc1
-  prerelease: 6
+  version: 0.1.0
+  prerelease: 
 platform: ruby
 authors:
 - Alex Robbin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-21 00:00:00.000000000 Z
+date: 2012-11-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mime-types
@@ -116,6 +116,7 @@ extra_rdoc_files: []
 files:
 - .gitignore
 - .rspec
+- .travis.yml
 - CHANGELOG.md
 - Gemfile
 - LICENSE
@@ -155,13 +156,16 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -4437608343180398710
+      hash: -3705329295137939947
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
-  - - ! '>'
+  - - ! '>='
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
+      segments:
+      - 0
+      hash: -3705329295137939947
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24