google-api-client 0.1.2 → 0.1.3

data/CHANGELOG

@@ -1,3 +1,9 @@
+== 0.1.3
+
+* added support for manual overrides of the discovery URI
+* added support for manual overrides of the API base
+* added support for xoauth_requestor_id
+
 == 0.1.2
 
 * added support for two-legged OAuth

data/bin/google-api

@@ -132,11 +132,21 @@ HTML
               "Sets the URI to perform a request against") do |u|
             options[:uri] = u
           end
+          opts.on(
+              "--discovery-uri <uri>", String,
+              "Sets the URI to perform discovery") do |u|
+            options[:discovery_uri] = u
+          end
           opts.on(
               "-m", "--method <method>", String,
               "Sets the HTTP method to use for the request") do |m|
             options[:http_method] = m
           end
+          opts.on(
+              "--requestor-id <email>", String,
+              "Sets the email address of the requestor") do |e|
+            options[:requestor_id] = e
+          end
 
           opts.on("-v", "--verbose", "Run verbosely") do |v|
             options[:verbose] = v
@@ -259,10 +269,17 @@ HTML
 
       def list
         service_name = options[:service_name]
+        unless service_name
+          STDERR.puts('No service name supplied.')
+          exit(1)
+        end
         client = Google::APIClient.new(
           :service => service_name,
           :authorization => nil
         )
+        if options[:discovery_uri]
+          client.discovery_uri = options[:discovery_uri]
+        end
         service_version =
           options[:service_version] ||
           client.latest_service_version(service_name).version
@@ -277,6 +294,7 @@ HTML
         require 'yaml'
         config_file = File.expand_path('~/.google-api.yaml')
         signed = File.exist?(config_file)
+        authorization_type = :oauth_1
 
         # Setup HTTP request data
         request_body = ''
@@ -307,6 +325,9 @@ HTML
             config["token_credential_key"]
           client.authorization.token_credential_secret =
             config["token_credential_secret"]
+          if client.authorization.token_credential == nil
+            authorization_type = :two_legged_oauth_1
+          end
         end
 
         if options[:uri]
@@ -316,10 +337,18 @@ HTML
             STDERR.puts('URI may not be relative.')
             exit(1)
           end
+          if options[:requestor_id]
+            uri.query_values = uri.query_values.merge(
+              'xoauth_requestor_id' => options[:requestor_id]
+            )
+          end
           method = options[:http_method]
           method ||= request_body == '' ? 'GET' : 'POST'
           method.upcase!
-          client = Google::APIClient.new(:authorization => :two_legged_oauth_1)
+          client = Google::APIClient.new(:authorization => authorization_type)
+          if options[:discovery_uri]
+            client.discovery_uri = options[:discovery_uri]
+          end
           configure_authorization.call(client) if signed
           request = [method, uri.to_str, headers, [request_body]]
           request = client.sign_request(request)
@@ -337,8 +366,11 @@ HTML
             options[:service_name] || self.rpcname[/^([^\.]+)\./, 1]
           client = Google::APIClient.new(
             :service => service_name,
-            :authorization => :oauth_1
+            :authorization => authorization_type
           )
+          if options[:discovery_uri]
+            client.discovery_uri = options[:discovery_uri]
+          end
           configure_authorization.call(client) if signed
           service_version =
             options[:service_version] ||
@@ -357,6 +389,9 @@ HTML
             accu[name] = value
             accu
           end
+          if options[:requestor_id]
+            parameters['xoauth_requestor_id'] = options[:requestor_id]
+          end
           begin
             response = client.execute(
               method, parameters, request_body, headers, {:signed => signed}

data/lib/google/api_client.rb

@@ -131,6 +131,15 @@ module Google
       end)
     end
 
+    ##
+    # Sets the discovery URI for the client.
+    #
+    # @param [Addressable::URI, #to_str, String] new_discovery_uri
+    #   The new discovery URI.
+    def discovery_uri=(new_discovery_uri)
+      @options[:discovery_uri] = Addressable::URI.parse(new_discovery_uri)
+    end
+
     ##
     # Returns the parsed discovery document.
     #

data/lib/google/api_client/discovery.rb

@@ -89,6 +89,21 @@ module Google
         return @base ||= Addressable::URI.parse(self.description['baseUrl'])
       end
 
+      ##
+      # Updates the hierarchy of resources and methods with the new base.
+      #
+      # @param [Addressable::URI, #to_str, String] new_base
+      #   The new base URI to use for the service.
+      def base=(new_base)
+        @base = Addressable::URI.parse(new_base)
+        self.resources.each do |resource|
+          resource.base = @base
+        end
+        self.methods.each do |method|
+          method.base = @base
+        end
+      end
+
       ##
       # A list of resources available at the root level of this version of the
       # service.
@@ -155,7 +170,11 @@ module Google
           split_version = lambda do |version|
             dotted_version = version[/^v?(\d+(.\d+)*)-?(.*?)?$/, 1]
             suffix = version[/^v?(\d+(.\d+)*)-?(.*?)?$/, 3]
-            [dotted_version.split('.').map { |v| v.to_i }, suffix]
+            if dotted_version && suffix
+              [dotted_version.split('.').map { |v| v.to_i }, suffix]
+            else
+              [[-1], version]
+            end
           end
           self_sortable, self_suffix = split_version.call(self.version)
           other_sortable, other_suffix = split_version.call(other.version)
@@ -240,6 +259,21 @@ module Google
       # @return [Addressable::URI] The base URI that methods are joined to.
       attr_reader :base
 
+      ##
+      # Updates the hierarchy of resources and methods with the new base.
+      #
+      # @param [Addressable::URI, #to_str, String] new_base
+      #   The new base URI to use for the resource.
+      def base=(new_base)
+        @base = Addressable::URI.parse(new_base)
+        self.resources.each do |resource|
+          resource.base = @base
+        end
+        self.methods.each do |method|
+          method.base = @base
+        end
+      end
+
       ##
       # A list of sub-resources available on this resource.
       #
@@ -336,6 +370,16 @@ module Google
       #   The base URI that this method will be joined to.
       attr_reader :base
 
+      ##
+      # Updates the method with the new base.
+      #
+      # @param [Addressable::URI, #to_str, String] new_base
+      #   The new base URI to use for the method.
+      def base=(new_base)
+        @base = Addressable::URI.parse(new_base)
+        @uri_template = nil
+      end
+
       ##
       # Returns the RPC name for the method.
       #

data/lib/google/api_client/version.rb

@@ -17,7 +17,7 @@ module Google
     module VERSION
       MAJOR = 0
       MINOR = 1
-      TINY  = 2
+      TINY  = 3
 
       STRING = [MAJOR, MINOR, TINY].join('.')
     end

data/spec/google/api_client/discovery_spec.rb

@@ -156,6 +156,8 @@ describe Google::APIClient, 'configured for the prediction API' do
       Google::APIClient::Service.new('two', 'v2', {})
     @client.discovered_services <<
       Google::APIClient::Service.new('two', 'v2beta1', {})
+    @client.discovered_services <<
+      Google::APIClient::Service.new('two', 'test2', {})
     @client.latest_service_version('two').version.should == 'v2'
   end
 
@@ -198,6 +200,18 @@ describe Google::APIClient, 'configured for the prediction API' do
       'https://www.googleapis.com/prediction/v1/training?query=12345'
   end
 
+  it 'should allow modification to the base URIs for testing purposes' do
+    prediction = @client.discovered_service('prediction', 'v1')
+    prediction.base = 'https://testing-domain.googleapis.com/prediction/v1/'
+    request = @client.generate_request(
+      prediction.training.insert,
+      {'query' => '123'}
+    )
+    method, uri, headers, body = request
+    uri.should ==
+      'https://testing-domain.googleapis.com/prediction/v1/training?query=123'
+  end
+
   it 'should generate signed requests' do
     @client.authorization = :oauth_1
     @client.authorization.token_credential_key = '12345'

data/tasks/spec.rake

@@ -6,10 +6,10 @@ namespace :spec do
     t.spec_opts = ['--require', 'rubygems', '--color', '--format', 'specdoc']
     if RCOV_ENABLED
       if `which rcov`.strip == ""
-        STDERR.puts "Please install rcov:"
         STDERR.puts(
-          "sudo gem install relevance-rcov --source http://gems.github.com/"
+          "Please install rcov and ensure that its binary is in the PATH:"
         )
+        STDERR.puts("sudo gem install rcov")
         exit(1)
       end
       t.rcov = true

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: google-api-client
 version: !ruby/object:Gem::Version 
-  hash: 31
+  hash: 29
   prerelease: false
   segments: 
   - 0
   - 1
-  - 2
-  version: 0.1.2
+  - 3
+  version: 0.1.3
 platform: ruby
 authors: []
 
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-22 00:00:00 -07:00
+date: 2010-11-04 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency