google-api-client 0.1.3 → 0.2.0

data/spec/google/api_client_spec.rb

@@ -16,32 +16,50 @@ require 'spec_helper'
 
 require 'signet/oauth_1/client'
 require 'httpadapter/adapters/net_http'
+require 'httpadapter/adapters/mock'
 
 require 'google/api_client'
 require 'google/api_client/version'
 require 'google/api_client/parsers/json_parser'
 
-describe Google::APIClient, 'with default configuration' do
-  before do
-    @client = Google::APIClient.new
+shared_examples_for 'configurable user agent' do
+  it 'should allow the user agent to be modified' do
+    @client.user_agent = 'Custom User Agent/1.2.3'
+    @client.user_agent.should == 'Custom User Agent/1.2.3'
   end
 
-  it 'should make its version number available' do
-    ::Google::APIClient::VERSION::STRING.should be_instance_of(String)
+  it 'should allow the user agent to be set to nil' do
+    @client.user_agent = nil
+    @client.user_agent.should == nil
   end
 
-  it 'should use the default JSON parser' do
-    @client.parser.should be(Google::APIClient::JSONParser)
+  it 'should not allow the user agent to be used with bogus values' do
+    (lambda do
+      @client.user_agent = 42
+      @client.transmit_request(
+        ['GET', 'http://www.google.com/', [], []]
+      )
+    end).should raise_error(TypeError)
   end
 
-  it 'should not use an authorization mechanism' do
-    @client.authorization.should be_nil
+  it 'should transmit a User-Agent header when sending requests' do
+    @client.user_agent = 'Custom User Agent/1.2.3'
+    request = ['GET', 'http://www.google.com/', [], []]
+    adapter = HTTPAdapter::MockAdapter.create do |request_ary, connection|
+      method, uri, headers, body = request_ary
+      headers.should be_any { |k, v| k.downcase == 'user-agent' }
+      headers.each do |k, v|
+        v.should == @client.user_agent if k.downcase == 'user-agent'
+      end
+      [200, [], ['']]
+    end
+    @client.transmit_request(request, adapter)
   end
 end
 
-describe Google::APIClient, 'with default oauth configuration' do
+describe Google::APIClient do
   before do
-    @client = Google::APIClient.new(:authorization => :oauth_1)
+    @client = Google::APIClient.new
   end
 
   it 'should make its version number available' do
@@ -52,28 +70,60 @@ describe Google::APIClient, 'with default oauth configuration' do
     @client.parser.should be(Google::APIClient::JSONParser)
   end
 
-  it 'should use the default OAuth1 client configuration' do
-    @client.authorization.temporary_credential_uri.to_s.should ==
-      'https://www.google.com/accounts/OAuthGetRequestToken'
-    @client.authorization.authorization_uri.to_s.should include(
-      'https://www.google.com/accounts/OAuthAuthorizeToken'
-    )
-    @client.authorization.token_credential_uri.to_s.should ==
-      'https://www.google.com/accounts/OAuthGetAccessToken'
-    @client.authorization.client_credential_key.should == 'anonymous'
-    @client.authorization.client_credential_secret.should == 'anonymous'
+  it 'should default to OAuth 2' do
+    Signet::OAuth2::Client.should === @client.authorization
   end
-end
 
-describe Google::APIClient, 'with custom pluggable parser' do
-  before do
-    class FakeJsonParser
+  it_should_behave_like 'configurable user agent'
+
+  describe 'configured for OAuth 1' do
+    before do
+      @client.authorization = :oauth_1
     end
 
-    @client = Google::APIClient.new(:parser => FakeJsonParser.new)
+    it 'should use the default OAuth1 client configuration' do
+      @client.authorization.temporary_credential_uri.to_s.should ==
+        'https://www.google.com/accounts/OAuthGetRequestToken'
+      @client.authorization.authorization_uri.to_s.should include(
+        'https://www.google.com/accounts/OAuthAuthorizeToken'
+      )
+      @client.authorization.token_credential_uri.to_s.should ==
+        'https://www.google.com/accounts/OAuthGetAccessToken'
+      @client.authorization.client_credential_key.should == 'anonymous'
+      @client.authorization.client_credential_secret.should == 'anonymous'
+    end
+
+    it_should_behave_like 'configurable user agent'
+  end
+
+  describe 'configured for OAuth 2' do
+    before do
+      @client.authorization = :oauth_2
+    end
+
+    # TODO
+    it_should_behave_like 'configurable user agent'
   end
 
-  it 'should use the custom parser' do
-    @client.parser.should be_instance_of(FakeJsonParser)
+  describe 'with custom pluggable parser' do
+    before do
+      class FakeJsonParser
+        def serialize(value)
+          return "42"
+        end
+
+        def parse(value)
+          return 42
+        end
+      end
+
+      @client.parser = FakeJsonParser.new
+    end
+
+    it 'should use the custom parser' do
+      @client.parser.should be_instance_of(FakeJsonParser)
+    end
+
+    it_should_behave_like 'configurable user agent'
   end
 end

data/tasks/gem.rake

@@ -20,16 +20,14 @@ namespace :gem do
     s.rdoc_options.concat ['--main',  'README']
 
     # Dependencies used in the main library
-    s.add_runtime_dependency('signet', '>= 0.1.4')
-    s.add_runtime_dependency('addressable', '>= 2.2.2')
-    s.add_runtime_dependency('httpadapter', '>= 0.2.0')
-    s.add_runtime_dependency('json', '>= 1.1.9')
+    s.add_runtime_dependency('signet', '~> 0.2.2')
+    s.add_runtime_dependency('addressable', '~> 2.2.2')
+    s.add_runtime_dependency('httpadapter', '~> 1.0.0')
+    s.add_runtime_dependency('json', '>= 1.4.6')
     s.add_runtime_dependency('extlib', '>= 0.9.15')
 
     # Dependencies used in the CLI
     s.add_runtime_dependency('launchy', '>= 0.3.2')
-    s.add_runtime_dependency('rack', '= 1.2.0')
-    s.add_runtime_dependency('sinatra', '>= 1.0')
 
     # Dependencies used in the examples
     s.add_runtime_dependency('liquid', '>= 2.2.2')

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: google-api-client
 version: !ruby/object:Gem::Version 
-  hash: 29
-  prerelease: false
+  hash: 23
+  prerelease: 
   segments: 
   - 0
-  - 1
-  - 3
-  version: 0.1.3
+  - 2
+  - 0
+  version: 0.2.0
 platform: ruby
 authors: []
 
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-04 00:00:00 -07:00
+date: 2011-05-12 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -24,14 +24,14 @@ dependencies:
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
         hash: 19
         segments: 
         - 0
-        - 1
-        - 4
-        version: 0.1.4
+        - 2
+        - 2
+        version: 0.2.2
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
@@ -40,7 +40,7 @@ dependencies:
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
         hash: 3
         segments: 
@@ -56,14 +56,14 @@ dependencies:
   requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
         hash: 23
         segments: 
+        - 1
         - 0
-        - 2
         - 0
-        version: 0.2.0
+        version: 1.0.0
   type: :runtime
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
@@ -74,12 +74,12 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 1
+        hash: 11
         segments: 
         - 1
-        - 1
-        - 9
-        version: 1.1.9
+        - 4
+        - 6
+        version: 1.4.6
   type: :runtime
   version_requirements: *id004
 - !ruby/object:Gem::Dependency 
@@ -114,41 +114,10 @@ dependencies:
         version: 0.3.2
   type: :runtime
   version_requirements: *id006
-- !ruby/object:Gem::Dependency 
-  name: rack
-  prerelease: false
-  requirement: &id007 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - "="
-      - !ruby/object:Gem::Version 
-        hash: 31
-        segments: 
-        - 1
-        - 2
-        - 0
-        version: 1.2.0
-  type: :runtime
-  version_requirements: *id007
-- !ruby/object:Gem::Dependency 
-  name: sinatra
-  prerelease: false
-  requirement: &id008 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 15
-        segments: 
-        - 1
-        - 0
-        version: "1.0"
-  type: :runtime
-  version_requirements: *id008
 - !ruby/object:Gem::Dependency 
   name: liquid
   prerelease: false
-  requirement: &id009 !ruby/object:Gem::Requirement 
+  requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -160,11 +129,11 @@ dependencies:
         - 2
         version: 2.2.2
   type: :runtime
-  version_requirements: *id009
+  version_requirements: *id007
 - !ruby/object:Gem::Dependency 
   name: rake
   prerelease: false
-  requirement: &id010 !ruby/object:Gem::Requirement 
+  requirement: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -176,11 +145,11 @@ dependencies:
         - 3
         version: 0.7.3
   type: :development
-  version_requirements: *id010
+  version_requirements: *id008
 - !ruby/object:Gem::Dependency 
   name: rspec
   prerelease: false
-  requirement: &id011 !ruby/object:Gem::Requirement 
+  requirement: &id009 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -192,11 +161,11 @@ dependencies:
         - 9
         version: 1.2.9
   type: :development
-  version_requirements: *id011
+  version_requirements: *id009
 - !ruby/object:Gem::Dependency 
   name: rcov
   prerelease: false
-  requirement: &id012 !ruby/object:Gem::Requirement 
+  requirement: &id010 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -208,11 +177,11 @@ dependencies:
         - 9
         version: 0.9.9
   type: :development
-  version_requirements: *id012
+  version_requirements: *id010
 - !ruby/object:Gem::Dependency 
   name: diff-lcs
   prerelease: false
-  requirement: &id013 !ruby/object:Gem::Requirement 
+  requirement: &id011 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -224,7 +193,7 @@ dependencies:
         - 2
         version: 1.1.2
   type: :development
-  version_requirements: *id013
+  version_requirements: *id011
 description: |
   The Google API Ruby Client makes it trivial to discover and access supported
   APIs.
@@ -238,9 +207,12 @@ extra_rdoc_files:
 - README
 files: 
 - lib/google/api_client/discovery.rb
+- lib/google/api_client/environment.rb
+- lib/google/api_client/errors.rb
 - lib/google/api_client/parsers/json_parser.rb
 - lib/google/api_client/version.rb
 - lib/google/api_client.rb
+- lib/google/inflection.rb
 - spec/google/api_client/discovery_spec.rb
 - spec/google/api_client/parsers/json_parser_spec.rb
 - spec/google/api_client_spec.rb
@@ -289,7 +261,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.4.1
 signing_key: 
 specification_version: 3
 summary: Package Summary