google-api 0.3.0 → 0.4.0

data/.rspec

@@ -1,2 +1 @@
 --colour
---format documentation

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## v0.4.0 (2013-02-10)
+
+* Bump dependency of OAuth2 to 0.9.x.
+
 ## v0.3.0 (2012-11-24)
 
 * Save encrypted values as Base64-encoded strings. (NOTE: This is a non-backward compatible change!)

data/google-api.gemspec

@@ -11,10 +11,10 @@ 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.3.0"
+  gem.version       = "0.4.0"
 
   gem.add_runtime_dependency 'mime-types', '~> 1.0'
-  gem.add_runtime_dependency 'oauth2', '~> 0.8.0'
+  gem.add_runtime_dependency 'oauth2', '~> 0.9.0'
   gem.add_development_dependency 'bundler'
   gem.add_development_dependency 'rake'
   gem.add_development_dependency 'rspec'

data/lib/google-api.rb

@@ -1,6 +1,5 @@
 require 'mime/types'
 require 'oauth2'
-require 'google-api/oauth2'
 require 'google-api/api'
 require 'google-api/client'
 require 'google-api/encrypter'

data/spec/google-api/api_spec.rb

@@ -1,61 +1,48 @@
 require 'spec_helper'
 
 shared_context "api call" do
-
   let(:map) { fixture(:discovery_rest_drive)['resources']['files']['methods'] }
   let(:api) { GoogleAPI::API.new(client.access_token, :drive, map) }
   let(:stubbed_response) { OAuth2Response.new }
-  before(:each) do
+
+  before do
     GoogleAPI.discovered_apis[:drive] = fixture(:discovery_rest_drive)
     client.client.connection = TEST_CONNECTION
   end
-
 end
 
 describe GoogleAPI::API do
 
   let(:object) { User.new }
   let(:client) { GoogleAPI::Client.new(object) }
-  before(:each) do
+
+  before do
     GoogleAPI.configure do |config|
       config.client_id = 'test id'
       config.client_secret = 'test secret'
       config.encryption_key = 'encryption key'
     end
+    GoogleAPI.logger.stub(:error)
     object.authenticated = true
   end
 
   describe "#initialize" do
+    subject { GoogleAPI::API.new(client.access_token, :drive, fixture(:discovery_rest_drive)['resources']) }
 
-    let(:api) { GoogleAPI::API.new(client.access_token, :drive, fixture(:discovery_rest_drive)['resources']) }
-
-    it "should set the access_token attribute" do
-      api.access_token.token.should == client.access_token.token
-    end
-
-    it "should set the api attribute" do
-      api.api.should == :drive
-    end
-
-    it "should set the map attribute" do
-      api.map.should == fixture(:discovery_rest_drive)['resources']
-    end
-
+    its(:api) { should == :drive }
+    its(:map) { should == fixture(:discovery_rest_drive)['resources'] }
+    its('access_token.token') { should == client.access_token.token }
   end
 
   describe "API method generation" do
-
     context "when there are methods lower in the tree" do
-
       it "should build another GoogleAPI::API class with the correct map" do
         api = GoogleAPI::API.new(client.access_token, :drive, fixture(:discovery_rest_drive)['resources'])
         api.files.should be_an_instance_of(GoogleAPI::API)
       end
-
     end
 
     context "when the method tree is the lowest it can be" do
-
       include_context "api call"
 
       it "should call the #build_url method" do
@@ -65,40 +52,29 @@ describe GoogleAPI::API do
 
       %w(POST PUT PATCH).each do |http_method|
         context "when the method's HTTP method is #{http_method}" do
-
           it "should raise ArgumentError if no body was passed" do
-            expect {
-              api.insert(media: '/Test/File/Path.txt')
-            }.to raise_error(ArgumentError)
+            expect { api.insert(media: '/Test/File/Path.txt') }.to raise_error(ArgumentError)
           end
-
         end
       end
 
       context "when the mediaUpload key is present" do
-
         it "should call the #upload method" do
           api.should_receive(:upload).with('post', 'https://www.googleapis.com/resumable/upload/drive/v2/files', body: {title: 'Test File.txt'}, media: '/Test/File/Path.txt')
           api.insert(body: {title: 'Test File.txt'}, media: '/Test/File/Path.txt')
         end
-
       end
 
       context "when it is a normal API method request" do
-
         it "should delegate to the #request method" do
           api.should_receive(:request).with('get', 'https://www.googleapis.com/drive/v2/files', {})
           api.list
         end
-
       end
-
     end
-
   end
 
   describe "#request" do
-
     include_context "api call"
 
     it "should build the correct headers hash" do
@@ -112,7 +88,6 @@ describe GoogleAPI::API do
     end
 
     context "when a request is successful" do
-
       it "should only make the request attempt once" do
         ::OAuth2::AccessToken.any_instance.should_receive(:get).once.and_return(stubbed_response)
         api.list
@@ -125,11 +100,9 @@ describe GoogleAPI::API do
       it "should return the full Response object if body is blank" do
         api.delete(fileId: 'adummyfileidnumber').should be_an_instance_of(::OAuth2::Response)
       end
-
     end
 
     context "when a request fails and development mode is turned off" do
-
       it "should attempt the request 5 times" do
         ::OAuth2::AccessToken.any_instance.should_receive(:put).exactly(5).times.and_return(OAuth2Response.new(404))
         api.update(fileId: 'adummyfileidnumber', body: {bad: 'attribute'})
@@ -140,16 +113,13 @@ describe GoogleAPI::API do
         ::OAuth2::AccessToken.any_instance.should_receive(:put).once.and_return(stubbed_response)
         api.update(fileId: 'adummyfileidnumber', body: {bad: 'attribute'})
       end
-
     end
-
   end
 
   describe "#upload" do
-
     include_context "api call"
 
-    before(:each) { api.stub(:request).and_return(stubbed_response) }
+    before { api.stub(:request).and_return(stubbed_response) }
 
     it "should build the correct options hash that is passed to the first request" do
       api.should_receive(:request).with('post', 'https://www.googleapis.com/resumable/upload/drive/v2/files', body: {title: 'Test File.txt', mimeType: 'application/x-ruby'}, headers: {'X-Upload-Content-Type' => 'application/x-ruby'})
@@ -158,27 +128,22 @@ describe GoogleAPI::API do
 
     it "should change the original headers for the actual file upload" do
       api.should_receive(:request)
-      api.should_receive(:request).with(:put, nil, body: File.read(File.expand_path('spec/spec_helper.rb')), headers: {'Content-Type' => 'application/x-ruby', 'Content-Length' => '399'})
+      api.should_receive(:request).with(:put, nil, body: File.read(File.expand_path('spec/spec_helper.rb')), headers: {'Content-Type' => 'application/x-ruby', 'Content-Length' => '392'})
       api.send(:upload, 'post', 'https://www.googleapis.com/resumable/upload/drive/v2/files', body: {title: 'Test File.txt'}, media: File.expand_path('spec/spec_helper.rb'))
     end
-
   end
 
   describe "#build_url" do
-
     include_context "api call"
 
     context "when the mediaUpload key is present" do
-
       it "should use the rootUrl of the discovered API" do
         url, options = api.send(:build_url, map['insert'], media: File.expand_path('spec/spec_helper.rb'))
         url.should == 'https://www.googleapis.com/resumable/upload/drive/v2/files'
       end
-
     end
 
     context "when it is a normal API method request" do
-
       it "should build the final URL" do
         url, options = api.send(:build_url, map['get'], fileId: 'adummyfileidnumber', updateViewedDate: true)
         url.should == 'https://www.googleapis.com/drive/v2/files/adummyfileidnumber?updateViewedDate=true'
@@ -190,13 +155,9 @@ describe GoogleAPI::API do
       end
 
       it "should raise ArgumentError if the parameter is required and the matching option isn't passed" do
-        expect {
-          api.send(:build_url, map['get'], updateViewedDate: true)
-        }.to raise_error(ArgumentError)
+        expect { api.send(:build_url, map['get'], updateViewedDate: true) }.to raise_error(ArgumentError)
       end
-
     end
-
   end
 
 end

data/spec/google-api/client_spec.rb

@@ -3,114 +3,89 @@ require 'spec_helper'
 describe GoogleAPI::Client do
 
   let(:object) { User.new }
-  let(:client) { GoogleAPI::Client.new(object) }
-  before(:each) do
+
+  subject { GoogleAPI::Client.new(object) }
+
+  before do
     GoogleAPI.configure do |config|
       config.client_id = 'test id'
       config.client_secret = 'test secret'
       config.encryption_key = 'encryption key'
     end
+    GoogleAPI.logger.stub(:info)
     object.authenticated = true
-    client.client.connection = TEST_CONNECTION
+    subject.client.connection = TEST_CONNECTION
   end
 
-  describe "#initialize" do
-
-    it "should set the object attribute" do
-      client = GoogleAPI::Client.new(object)
-      client.object.should == object
-    end
+  its(:object) { should == object }
+  its(:client) { should be_an_instance_of(::OAuth2::Client) }
 
+  describe "#initialize" do
     it "should raise NoMethodError if the object isn't oauthable" do
-      expect {
-        GoogleAPI::Client.new(Class.new)
-      }.to raise_error(NoMethodError)
+      expect { GoogleAPI::Client.new(Class.new) }.to raise_error(NoMethodError)
     end
 
     it "should raise ArgumentError if the object isn't OAuth2 authenticated" do
       object.authenticated = false
-      expect {
-        GoogleAPI::Client.new(object)
-      }.to raise_error(ArgumentError)
+      expect { GoogleAPI::Client.new(object) }.to raise_error(ArgumentError)
     end
-
   end
 
   describe "#access_token" do
-
     it "should call to the OAuth2 Access Token class" do
-      client.access_token.token.should == object.oauth_hash[:access_token]
+      subject.access_token.token.should == object.oauth_hash[:access_token]
     end
 
     context "when the access token is expired" do
-
-      before(:each) { object.expires_at = Time.now - 86400 }
+      before { object.expires_at = Time.now - 86400 }
 
       it "should call refresh on the OAuth2 Access Token" do
         stubbed_access_token = Class.new
         stubbed_access_token.stub(:token).and_return('test token')
         ::OAuth2::AccessToken.any_instance.should_receive(:refresh!).and_return(stubbed_access_token)
-        client.access_token
+        subject.access_token
       end
 
       it "should update the object's stored OAuth information" do
         object.should_receive(:update_oauth!)
-        client.access_token
+        subject.access_token
       end
-
     end
 
     context "when the access token is fresh" do
-
       it "should not try and refresh the token again" do
         ::OAuth2::AccessToken.any_instance.should_not_receive(:refresh!)
-        client.access_token
+        subject.access_token
       end
-
     end
-
-  end
-
-  describe "#client" do
-
-    it "should create the OAuth2 Client instance" do
-      client.client.should be_an_instance_of(::OAuth2::Client)
-    end
-
   end
 
   describe "API method generation" do
-
     context "when the API hasn't been discovered" do
-
       it "should call out to the Discovery API" do
         GoogleAPI.discovered_apis[:drive].should be_nil
-        client.drive
+        subject.drive
         GoogleAPI.discovered_apis[:drive].should == fixture(:discovery_rest_drive)
       end
 
       it "should save the Discovery API map to the cache" do
-        client.drive
+        subject.drive
         GoogleAPI.discovered_apis[:drive].should == fixture(:discovery_rest_drive)
       end
-
     end
 
     context "when the API has already been discovered" do
-
       it "should not fetch the Discovery API map" do
         GoogleAPI.discovered_apis[:drive] = fixture(:discovery_drive)
         ::OAuth2::AccessToken.any_instance.should_not_receive(:get)
-        client.drive
+        subject.drive
       end
-
     end
 
     it "should build the GoogleAPI::API class" do
       GoogleAPI::API.should_receive(:new).with(an_instance_of(::OAuth2::AccessToken), :drive, fixture(:discovery_rest_drive)['resources'])
-      client.drive
+      subject.drive
     end
-
   end
 
 end

data/spec/google-api/encrypter_spec.rb

@@ -2,7 +2,7 @@ require 'spec_helper'
 
 describe GoogleAPI::Encrypter do
 
-  before(:each) do
+  before do
     GoogleAPI.configure do |config|
       config.client_id = 'test id'
       config.client_secret = 'test secret'
@@ -11,19 +11,15 @@ describe GoogleAPI::Encrypter do
   end
 
   describe "#encrypt!" do
-
     it "should return an encrypted version of the string" do
       GoogleAPI::Encrypter.encrypt!('test').should == "MMLzeQigMLGcvTvHczYxjg=="
     end
-
   end
 
   describe "#decrypt!" do
-
     it "should return an decrypted version of the string" do
       GoogleAPI::Encrypter.decrypt!("MMLzeQigMLGcvTvHczYxjg==").should == 'test'
     end
-
   end
 
 end

data/spec/google-api_spec.rb

@@ -3,7 +3,6 @@ require 'spec_helper'
 describe GoogleAPI do
 
   describe "#configure" do
-
     it "should raise an error when the CLIENT ID is blank" do
       expect {
         GoogleAPI.configure do |config|
@@ -88,32 +87,25 @@ describe GoogleAPI do
         config.encryption_key = 'encryption key'
       end
     end
-
   end
 
   describe "#discovered_apis" do
+    subject { GoogleAPI.discovered_apis }
 
-    it "should start as an empty hash" do
-      GoogleAPI.discovered_apis.should == {}
-    end
+    it { should be_an_instance_of(Hash) }
+    it { should be_empty }
 
-    it "should keep a cache of discovered APIs" do
-      GoogleAPI.discovered_apis[:test_api1] = {a: 1, b: 2, c: 3}
+    context "when a new api is cached" do
+      before { GoogleAPI.discovered_apis[:test_api1] = {a: 1, b: 2, c: 3} }
 
-      GoogleAPI.discovered_apis[:test_api1].should == {a: 1, b: 2, c: 3}
+      its([:test_api1]) { should == {a: 1, b: 2, c: 3} }
     end
-
   end
 
   describe "#stdout_logger" do
+    subject { GoogleAPI.stdout_logger }
 
-    let(:logger) { GoogleAPI.stdout_logger }
-
-    it "should create a new Logger object" do
-      logger = GoogleAPI.stdout_logger
-      logger.should be_an_instance_of(Logger)
-    end
-
+    it { should be_an_instance_of(Logger) }
   end
 
 end

data/spec/spec_helper.rb

@@ -13,5 +13,5 @@ Faraday.default_adapter = :test
 Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each {|f| require f}
 
 RSpec.configure do |config|
-  config.after(:each) { GoogleAPI.reset_environment! }
+  config.after { GoogleAPI.reset_environment! }
 end

data/spec/support/oauthable_object.rb

@@ -24,4 +24,4 @@ class User
   def google
   end
 
-end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: google-api
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-25 00:00:00.000000000 Z
+date: 2013-02-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mime-types
@@ -34,7 +34,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.8.0
+        version: 0.9.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -42,7 +42,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.8.0
+        version: 0.9.0
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -128,7 +128,6 @@ files:
 - lib/google-api/api.rb
 - lib/google-api/client.rb
 - lib/google-api/encrypter.rb
-- lib/google-api/oauth2.rb
 - lib/google-api/railtie.rb
 - spec/fixtures/discovery_drive.json
 - spec/fixtures/discovery_rest_drive.json
@@ -158,7 +157,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -5125409393487118
+      hash: 3431589687934800430
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -167,10 +166,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -5125409393487118
+      hash: 3431589687934800430
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 1.8.25
 signing_key: 
 specification_version: 3
 summary: A simple but powerful ruby API wrapper for Google's services.

data/lib/google-api/oauth2.rb

@@ -1,16 +0,0 @@
-# This can go away once the below commit is released with OAuth2.
-# https://github.com/intridea/oauth2/commit/8dc6feab9927c3fc03b8e0975909a96049a1cbd3
-# Should be in 0.8.1 or 0.9.0
-
-module OAuth2
-  class AccessToken
-
-    # Make a PATCH request with the Access Token
-    #
-    # @see AccessToken#request
-    def patch(path, opts={}, &block)
-      request(:patch, path, opts, &block)
-    end
-
-  end
-end