google-api-client 0.4.4 → 0.4.5

data/CHANGELOG.md

@@ -1,3 +1,11 @@
+# 0.4.5
+
+* Updated Launchy dependency
+* Updated Faraday dependency
+* Updated Addressable dependency
+* Updated Autoparse dependency
+* Removed Sinatra development dependency
+
 # 0.4.4
 
 * Added batch execution

data/Gemfile

@@ -1,16 +1,18 @@
 source :rubygems
 
-gem 'signet', '>= 0.3.4'
-gem 'addressable', '>= 2.2.3'
+gemspec
+
+gem 'signet', '>= 0.4.1'
+gem 'addressable', '>= 2.3.2'
 gem 'uuidtools', '>= 2.1.0'
-gem 'autoparse', '>= 0.3.1'
-gem 'faraday', '~> 0.7.0'
-gem 'multi_json', '>= 1.3.0'
+gem 'autoparse', '>= 0.3.2'
+gem 'faraday', '~> 0.8.1'
+gem 'multi_json', '>= 1.0.0'
 gem 'extlib', '>= 0.9.15'
 gem 'jruby-openssl', :platforms => :jruby
 
 group :development do
-  gem 'launchy'
+  gem 'launchy', '>= 2.1.1'
   gem 'yard'
   gem 'redcarpet'
 end
@@ -21,7 +23,7 @@ end
 
 group :test, :development do
   gem 'rake', '>= 0.9.0'
-  gem 'rspec', '~> 1.2.9'
+  gem 'rspec', '>= 2.11.0'
   gem 'rcov', '>= 0.9.9', :platform => :mri_18
 end
 

data/Gemfile.lock

@@ -1,22 +1,33 @@
+PATH
+  remote: .
+  specs:
+    google-api-client (0.4.5)
+      addressable (>= 2.3.2)
+      autoparse (>= 0.3.2)
+      extlib (>= 0.9.15)
+      faraday (~> 0.8.1)
+      launchy (>= 2.1.1)
+      multi_json (>= 1.0.0)
+      signet (>= 0.4.1)
+      uuidtools (>= 2.1.0)
+
 GEM
   remote: http://rubygems.org/
   specs:
-    addressable (2.2.8)
-    autoparse (0.3.1)
-      addressable (~> 2.2.3)
+    addressable (2.3.2)
+    autoparse (0.3.2)
+      addressable (>= 2.3.1)
       extlib (>= 0.9.15)
       multi_json (>= 1.0.0)
+    diff-lcs (1.1.3)
     extlib (0.9.15)
-    faraday (0.7.6)
-      addressable (~> 2.2)
+    faraday (0.8.1)
       multipart-post (~> 1.1)
-      rack (~> 1.1)
     idn (0.0.2)
-    json (1.7.3)
-    jwt (0.1.4)
-      json (>= 1.2.4)
-    launchy (2.1.0)
-      addressable (~> 2.2.6)
+    jwt (0.1.5)
+      multi_json (>= 1.0)
+    launchy (2.1.1)
+      addressable (~> 2.3)
     multi_json (1.3.6)
     multipart-post (1.1.5)
     rack (1.4.1)
@@ -25,37 +36,45 @@ GEM
     rake (0.9.2.2)
     rcov (1.0.0)
     redcarpet (2.1.1)
-    rspec (1.2.9)
-    signet (0.3.4)
-      addressable (~> 2.2.3)
-      faraday (~> 0.7.0)
-      jwt (>= 0.1.4)
+    rspec (2.11.0)
+      rspec-core (~> 2.11.0)
+      rspec-expectations (~> 2.11.0)
+      rspec-mocks (~> 2.11.0)
+    rspec-core (2.11.1)
+    rspec-expectations (2.11.2)
+      diff-lcs (~> 1.1.3)
+    rspec-mocks (2.11.1)
+    signet (0.4.1)
+      addressable (>= 2.2.3)
+      faraday (~> 0.8.1)
+      jwt (>= 0.1.5)
       multi_json (>= 1.0.0)
     sinatra (1.3.2)
       rack (~> 1.3, >= 1.3.6)
       rack-protection (~> 1.2)
       tilt (~> 1.3, >= 1.3.3)
     tilt (1.3.3)
-    uuidtools (2.1.2)
-    yard (0.8.1)
+    uuidtools (2.1.3)
+    yard (0.8.2.1)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  addressable (>= 2.2.3)
-  autoparse (>= 0.3.1)
+  addressable (>= 2.3.2)
+  autoparse (>= 0.3.2)
   extlib (>= 0.9.15)
-  faraday (~> 0.7.0)
+  faraday (~> 0.8.1)
+  google-api-client!
   idn
   jruby-openssl
-  launchy
-  multi_json (>= 1.3.0)
+  launchy (>= 2.1.1)
+  multi_json (>= 1.0.0)
   rake (>= 0.9.0)
   rcov (>= 0.9.9)
   redcarpet
-  rspec (~> 1.2.9)
-  signet (>= 0.3.4)
+  rspec (>= 2.11.0)
+  signet (>= 0.4.1)
   sinatra
   uuidtools (>= 2.1.0)
   yard

data/Rakefile

@@ -5,15 +5,6 @@ $LOAD_PATH.uniq!
 require 'rubygems'
 require 'rake'
 
-gem 'rspec', '~> 1.2.9'
-begin
-  require 'spec/rake/spectask'
-rescue LoadError
-  STDERR.puts "Please install rspec:"
-  STDERR.puts "sudo gem install rspec"
-  exit(1)
-end
-
 require File.join(File.dirname(__FILE__), 'lib/google/api_client', 'version')
 
 PKG_DISPLAY_NAME   = 'Google API Client'
@@ -38,7 +29,7 @@ PKG_FILES = FileList[
     '[A-Z]*', 'Rakefile'
 ].exclude(/database\.yml/).exclude(/[_\.]git$/)
 
-RCOV_ENABLED = (RUBY_PLATFORM != 'java' && RUBY_VERSION =~ /^1\.8/)
+RCOV_ENABLED = !!(RUBY_PLATFORM != 'java' && RUBY_VERSION =~ /^1\.8/)
 if RCOV_ENABLED
   task :default => 'spec:rcov'
 else

data/bin/google-api

@@ -11,7 +11,7 @@ OAUTH_SERVER_PORT = 12736
 require 'rubygems'
 require 'optparse'
 
-gem 'faraday', '~> 0.7.0'
+gem 'faraday', '~> 0.8.1'
 require 'faraday'
 require 'faraday/utils'
 
@@ -187,7 +187,7 @@ HTML
       end
 
       def client
-        gem 'signet', '~> 0.3.0'
+        gem 'signet', '~> 0.4.0'
         require 'signet/oauth_1/client'
         require 'yaml'
         require 'irb'
@@ -281,7 +281,7 @@ HTML
       ]
 
       def oauth_1_login
-        gem 'signet', '~> 0.3.0'
+        gem 'signet', '~> 0.4.0'
         require 'signet/oauth_1/client'
         require 'launchy'
         require 'yaml'
@@ -349,7 +349,7 @@ HTML
       end
 
       def oauth_2_login
-        gem 'signet', '~> 0.3.0'
+        gem 'signet', '~> 0.4.0'
         require 'signet/oauth_2/client'
         require 'launchy'
         require 'yaml'

data/lib/google/api_client.rb

@@ -13,7 +13,7 @@
 # limitations under the License.
 
 
-gem 'faraday', '~> 0.7.0'
+gem 'faraday', '~> 0.8.1'
 require 'faraday'
 require 'faraday/utils'
 require 'multi_json'
@@ -113,7 +113,7 @@ module Google
     def authorization=(new_authorization)
       case new_authorization
       when :oauth_1, :oauth
-        gem 'signet', '~> 0.3.0'
+        gem 'signet', '~> 0.4.0'
         require 'signet/oauth_1/client'
         # NOTE: Do not rely on this default value, as it may change
         new_authorization = Signet::OAuth1::Client.new(
@@ -127,7 +127,7 @@ module Google
           :client_credential_secret => 'anonymous'
         )
       when :two_legged_oauth_1, :two_legged_oauth
-        gem 'signet', '~> 0.3.0'
+        gem 'signet', '~> 0.4.0'
         require 'signet/oauth_1/client'
         # NOTE: Do not rely on this default value, as it may change
         new_authorization = Signet::OAuth1::Client.new(
@@ -136,7 +136,7 @@ module Google
           :two_legged => true
         )
       when :oauth_2
-        gem 'signet', '~> 0.3.0'
+        gem 'signet', '~> 0.4.0'
         require 'signet/oauth_2/client'
         # NOTE: Do not rely on this default value, as it may change
         new_authorization = Signet::OAuth2::Client.new(
@@ -542,7 +542,7 @@ module Google
     def generate_request(options={})
       # Note: The merge method on a Hash object will coerce an API Reference
       # object into a Hash and merge with the default options.
-      
+
       options={
         :version => 'v1',
         :authorization => self.authorization,
@@ -550,7 +550,7 @@ module Google
         :user_ip => self.user_ip,
         :connection => Faraday.default_connection
       }.merge(options)
-      
+
       # The Reference object is going to need this to do method ID lookups.
       options[:client] = self
       # The default value for the :authenticated option depends on whether an
@@ -655,8 +655,10 @@ module Google
         end
       end
 
-      request = Faraday::Request.create(method.to_s.downcase.to_sym) do |req|
-        req.url(Addressable::URI.parse(uri))
+      request = options[:connection].build_request(
+        method.to_s.downcase.to_sym
+      ) do |req|
+        req.url(Addressable::URI.parse(uri).normalize.to_s)
         req.headers = Faraday::Utils::Headers.new(headers)
         req.body = body
       end
@@ -709,6 +711,7 @@ module Google
           params.size == 1
         batch = params.pop
         options = batch.options
+        options[:connection] ||= Faraday.default_connection
         http_request = batch.to_http_request
         request = nil
 
@@ -716,8 +719,10 @@ module Google
           method, uri, headers, body = http_request
           method = method.to_s.downcase.to_sym
 
-          faraday_request = Faraday::Request.create(method) do |req|
-            req.url(uri.to_s)
+          faraday_request = options[:connection].build_request(
+            method.to_s.downcase.to_sym
+          ) do |req|
+            req.url(Addressable::URI.parse(uri).normalize.to_s)
             req.headers = Faraday::Utils::Headers.new(headers)
             req.body = body
           end
@@ -755,6 +760,7 @@ module Google
         options[:body] = params.shift if params.size > 0
         options[:headers] = params.shift if params.size > 0
         options[:client] = self
+        options[:connection] ||= Faraday.default_connection
         reference = Google::APIClient::Reference.new(options)
         request = self.generate_request(reference)
         response = self.transmit(
@@ -772,27 +778,18 @@ module Google
     # @see Google::APIClient#execute
     def execute!(*params)
       result = self.execute(*params)
-      if result.data?
-        if result.data.respond_to?(:error) &&
-             result.data.error.respond_to?(:message)
-          # You're going to get a terrible error message if the response isn't
-          # parsed successfully as an error.
-          error_message = result.data.error.message
-        elsif result.data['error'] && result.data['error']['message']
-          error_message = result.data['error']['message']
-        end
-      end
-      if result.response.status >= 400
+      if result.error?
+        error_message = result.error_message
         case result.response.status
-        when 400...500
-          exception_type = ClientError
-          error_message ||= "A client error has occurred."
-        when 500...600
-          exception_type = ServerError
-          error_message ||= "A server error has occurred."
-        else
-          exception_type = TransmissionError
-          error_message ||= "A transmission error has occurred."
+          when 400...500
+            exception_type = ClientError
+            error_message ||= "A client error has occurred."
+          when 500...600
+            exception_type = ServerError
+            error_message ||= "A server error has occurred."
+          else
+            exception_type = TransmissionError
+            error_message ||= "A transmission error has occurred."
         end
         raise exception_type, error_message
       end

data/lib/google/api_client/discovery/media.rb

@@ -24,7 +24,7 @@ module Google
     ##
     # Media upload elements for discovered methods
     class MediaUpload
-    
+
       ##
       # Creates a description of a particular method.
       #
@@ -45,17 +45,17 @@ module Google
       ##
       # List of acceptable mime types
       #
-      # @return [Array] 
+      # @return [Array]
       #   List of acceptable mime types for uploaded content
       def accepted_types
         @discovery_document['accept']
       end
-      
+
       ##
       # Maximum size of an uplad
       # TODO: Parse & convert to numeric value
       #
-      # @return [String]  
+      # @return [String]
       def max_size
         @discovery_document['maxSize']
       end
@@ -72,6 +72,6 @@ module Google
       end
 
     end
-    
+
   end
 end

data/lib/google/api_client/discovery/method.rb

@@ -163,7 +163,7 @@ module Google
             unless k.kind_of?(String)
               raise TypeError, "Expected String, got #{k.class}."
             end
-            accu << [k,v]
+            accu << [k, v]
             accu
           end
         else
@@ -204,7 +204,7 @@ module Google
         # encode all non-template parameters
         params = ""
         unless query_parameters.empty?
-          params = "?" + Addressable::URI.form_encode(query_parameters)
+          params = "?" + Addressable::URI.form_encode(query_parameters.sort)
         end
         # Normalization is necessary because of undesirable percent-escaping
         # during URI template expansion
@@ -218,9 +218,12 @@ module Google
       #   The parameters to send.
       # @param [String, StringIO] body The body for the HTTP request.
       # @param [Hash, Array] headers The HTTP headers for the request.
+      # @option options [Faraday::Connection] :connection
+      #   The HTTP connection to use.
       #
       # @return [Array] The generated HTTP request.
-      def generate_request(parameters={}, body='', headers=[])
+      def generate_request(parameters={}, body='', headers=[], options={})
+        options[:connection] ||= Faraday.default_connection
         if body.respond_to?(:string)
           body = body.string
         elsif body.respond_to?(:to_str)
@@ -234,8 +237,10 @@ module Google
         method = self.http_method
         uri = self.generate_uri(parameters)
         headers = headers.to_a if headers.kind_of?(Hash)
-        return Faraday::Request.create(method.to_s.downcase.to_sym) do |req|
-          req.url(Addressable::URI.parse(uri))
+        return options[:connection].build_request(
+          method.to_s.downcase.to_sym
+        ) do |req|
+          req.url(Addressable::URI.parse(uri).normalize.to_s)
           req.headers = Faraday::Utils::Headers.new(headers)
           req.body = body
         end
@@ -306,7 +311,7 @@ module Google
         required_variables = ((self.parameter_descriptions.select do |k, v|
           v['required']
         end).inject({}) { |h,(k,v)| h[k]=v; h }).keys
-        missing_variables = required_variables - parameters.map(&:first)
+        missing_variables = required_variables - parameters.map { |(k, _)| k }
         if missing_variables.size > 0
           raise ArgumentError,
             "Missing required parameters: #{missing_variables.join(', ')}."

data/lib/google/api_client/reference.rb

@@ -13,7 +13,7 @@
 # limitations under the License.
 
 
-gem 'faraday', '~> 0.7.0'
+gem 'faraday', '~> 0.8.1'
 require 'faraday'
 require 'faraday/utils'
 require 'multi_json'
@@ -26,8 +26,8 @@ require 'google/api_client/discovery'
 module Google
   class APIClient
     class Reference
-      
       MULTIPART_BOUNDARY = "-----------RubyApiMultipartPost".freeze
+
       def initialize(options={})
         # We only need this to do lookups on method ID String values
         # It's optional, but method ID lookups will fail if the client is
@@ -41,34 +41,57 @@ module Google
         self.parameters = options[:parameters] || {}
         # These parameters are handled differently because they're not
         # parameters to the API method, but rather to the API system.
-        self.parameters['key'] ||= options[:key] if options[:key]
-        self.parameters['userIp'] ||= options[:user_ip] if options[:user_ip]
+        if self.parameters.kind_of?(Array)
+          if options[:key]
+            self.parameters.reject! { |k, _| k == 'key' }
+            self.parameters << ['key', options[:key]]
+          end
+          if options[:user_ip]
+            self.parameters.reject! { |k, _| k == 'userIp' }
+            self.parameters << ['userIp', options[:user_ip]]
+          end
+        elsif self.parameters.kind_of?(Hash)
+          self.parameters['key'] ||= options[:key] if options[:key]
+          self.parameters['userIp'] ||= options[:user_ip] if options[:user_ip]
+          # Convert to Array, because they're easier to work with when
+          # repeated parameters are an issue.
+          self.parameters = self.parameters.to_a
+        else
+          raise TypeError,
+            "Expected Array or Hash, got #{self.parameters.class}."
+        end
         self.headers = options[:headers] || {}
         if options[:media]
           self.media = options[:media]
-          upload_type = parameters['uploadType'] || parameters['upload_type'] 
+          upload_type = parameters['uploadType'] || parameters['upload_type']
           case upload_type
           when "media"
-            if options[:body] || options[:body_object] 
-              raise ArgumentError, "Can not specify body & body object for simple uploads"
+            if options[:body] || options[:body_object]
+              raise ArgumentError,
+                "Can not specify body & body object for simple uploads."
             end
             self.headers['Content-Type'] ||= self.media.content_type
             self.body = self.media
           when "multipart"
-            unless options[:body_object] 
-              raise ArgumentError, "Multipart requested but no body object"              
+            unless options[:body_object]
+              raise ArgumentError, "Multipart requested but no body object."
             end
-            # This is all a bit of a hack due to signet requiring body to be a string
-            # Ideally, update signet to delay serialization so we can just pass
-            # streams all the way down through to the HTTP lib
+            # This is all a bit of a hack due to Signet requiring body to be a
+            # string. Ideally, update Signet to delay serialization so we can
+            # just pass streams all the way down through to the HTTP library.
             metadata = StringIO.new(serialize_body(options[:body_object]))
             env = {
-              :request_headers => {'Content-Type' => "multipart/related;boundary=#{MULTIPART_BOUNDARY}"},
-              :request => { :boundary => MULTIPART_BOUNDARY }
+              :request_headers => {
+                'Content-Type' =>
+                  "multipart/related;boundary=#{MULTIPART_BOUNDARY}"
+              },
+              :request => {:boundary => MULTIPART_BOUNDARY}
             }
             multipart = Faraday::Request::Multipart.new
             self.body = multipart.create_multipart(env, [
-              [nil,Faraday::UploadIO.new(metadata, 'application/json', 'file.json')], 
+              [nil, Faraday::UploadIO.new(
+                metadata, 'application/json', 'file.json'
+              )],
               [nil, self.media]])
             self.headers.update(env[:request_headers])
           when "resumable"
@@ -77,13 +100,13 @@ module Google
             self.headers['X-Upload-Content-Length'] = file_length.to_s
             if options[:body_object]
               self.headers['Content-Type'] ||= 'application/json'
-              self.body = serialize_body(options[:body_object]) 
+              self.body = serialize_body(options[:body_object])
             else
               self.body = ''
             end
           else
-            raise ArgumentError, "Invalid uploadType for media"
-          end 
+            raise ArgumentError, "Invalid uploadType for media."
+          end
         elsif options[:body]
           self.body = options[:body]
         elsif options[:body_object]
@@ -96,35 +119,38 @@ module Google
           self.http_method = options[:http_method] || 'GET'
           self.uri = options[:uri]
           unless self.parameters.empty?
-            self.uri.query_values =
-              (self.uri.query_values || {}).merge(self.parameters)
+            query_values = (self.uri.query_values(Array) || [])
+            self.uri.query = Addressable::URI.form_encode(
+              (query_values + self.parameters).sort
+            )
+            self.uri.query = nil if self.uri.query == ""
           end
         end
       end
-      
+
       def serialize_body(body)
         return body.to_json if body.respond_to?(:to_json)
         return MultiJson.dump(options[:body_object].to_hash) if body.respond_to?(:to_hash)
         raise TypeError, 'Could not convert body object to JSON.' +
                          'Must respond to :to_json or :to_hash.'
       end
-      
+
       def media
         return @media
       end
-      
+
       def media=(media)
         @media = (media)
       end
-      
+
       def authorization
         return @authorization
       end
-      
+
       def authorization=(new_authorization)
         @authorization = new_authorization
       end
-      
+
       def connection
         return @connection
       end
@@ -199,7 +225,8 @@ module Google
             accu
           end).string
         else
-          raise TypeError, "Expected body to be String, IO, or Enumerable chunks."
+          raise TypeError,
+            "Expected body to be String, IO, or Enumerable chunks."
         end
       end
 
@@ -241,13 +268,14 @@ module Google
       def to_request
         if self.api_method
           return self.api_method.generate_request(
-            self.parameters, self.body, self.headers
+            self.parameters, self.body, self.headers,
+            :connection => self.connection
           )
         else
-          return Faraday::Request.create(
+          return self.connection.build_request(
             self.http_method.to_s.downcase.to_sym
           ) do |req|
-            req.url(Addressable::URI.parse(self.uri))
+            req.url(Addressable::URI.parse(self.uri).normalize.to_s)
             req.headers = Faraday::Utils::Headers.new(self.headers)
             req.body = self.body
           end
@@ -266,7 +294,9 @@ module Google
         options[:headers] = self.headers
         options[:body] = self.body
         options[:connection] = self.connection
-        options[:authorization] = self.authorization unless self.authorization.nil?
+        unless self.authorization.nil?
+          options[:authorization] = self.authorization
+        end
         return options
       end
     end