google-api-client 0.7.1 → 0.8.0

data/lib/google/api_client/auth/installed_app.rb

@@ -26,7 +26,7 @@ module Google
     #    client = Google::APIClient.new
     #    flow = Google::APIClient::InstalledAppFlow.new(
     #      :client_id => '691380668085.apps.googleusercontent.com',
-    #      :client_secret => '...,
+    #      :client_secret => '...',
     #      :scope => 'https://www.googleapis.com/auth/drive'
     #    )
     #    client.authorization = flow.authorize
@@ -92,9 +92,10 @@ module Google
           :Logger => WEBrick::Log.new(STDOUT, 0),
           :AccessLog => []
         )
-        trap("INT") { server.shutdown }
-        
-        server.mount_proc '/' do |req, res|
+        begin
+          trap("INT") { server.shutdown }
+
+          server.mount_proc '/' do |req, res|
             auth.code = req.query['code']
             if auth.code
               auth.fetch_access_token!
@@ -102,10 +103,13 @@ module Google
             res.status = WEBrick::HTTPStatus::RC_ACCEPTED
             res.body = RESPONSE_BODY
             server.stop
-        end
+          end
 
-        Launchy.open(auth.authorization_uri.to_s)
-        server.start
+          Launchy.open(auth.authorization_uri.to_s)
+          server.start
+        ensure
+          server.shutdown
+        end
         if @authorization.access_token
           if storage.respond_to?(:write_credentials)
             storage.write_credentials(@authorization)

data/lib/google/api_client/auth/storage.rb

@@ -0,0 +1,101 @@
+# Copyright 2013 Google Inc.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+require 'signet/oauth_2/client'
+
+module Google
+  class APIClient
+    ##
+    # Represents cached OAuth 2 tokens stored on local disk in a
+    # JSON serialized file. Meant to resemble the serialized format
+    # http://google-api-python-client.googlecode.com/hg/docs/epy/oauth2client.file.Storage-class.html
+    #
+    class Storage
+
+      AUTHORIZATION_URI = 'https://accounts.google.com/o/oauth2/auth'
+      TOKEN_CREDENTIAL_URI = 'https://accounts.google.com/o/oauth2/token'
+
+      # @return [Object] Storage object.
+      attr_accessor :store
+
+      # @return [Signet::OAuth2::Client]
+      attr_reader :authorization
+
+      ##
+      # Initializes the Storage object.
+      #
+      # @params [Object] Storage object
+      def initialize(store)
+        @store= store
+      end
+
+      ##
+      # Write the credentials to the specified store.
+      #
+      # @params [Signet::OAuth2::Client] authorization
+      #    Optional authorization instance. If not provided, the authorization
+      #    already associated with this instance will be written.
+      def write_credentials(authorization=nil)
+        @authorization = authorization if authorization
+        if @authorization.respond_to?(:refresh_token) && @authorization.refresh_token
+          store.write_credentials(credentials_hash)
+        end
+      end
+
+      ##
+      # Loads credentials and authorizes an client.
+      # @return [Object] Signet::OAuth2::Client or NIL
+      def authorize
+        @authorization = nil
+        cached_credentials = load_credentials
+        if cached_credentials && cached_credentials.size > 0
+          @authorization = Signet::OAuth2::Client.new(cached_credentials)
+          @authorization.issued_at = Time.at(cached_credentials['issued_at'].to_i)
+          self.refresh_authorization if @authorization.expired?
+        end
+        return @authorization
+      end
+
+      ##
+      # refresh credentials and save them to store
+      def refresh_authorization
+        authorization.refresh!
+        self.write_credentials
+      end
+
+      private
+
+      ##
+      # Attempt to read in credentials from the specified store.
+      def load_credentials
+        store.load_credentials
+      end
+
+      ##
+      # @return [Hash] with credentials
+      def credentials_hash
+        {
+          :access_token          => authorization.access_token,
+          :authorization_uri     => AUTHORIZATION_URI,
+          :client_id             => authorization.client_id,
+          :client_secret         => authorization.client_secret,
+          :expires_in            => authorization.expires_in,
+          :refresh_token         => authorization.refresh_token,
+          :token_credential_uri  => TOKEN_CREDENTIAL_URI,
+          :issued_at             => authorization.issued_at.to_i
+        }
+      end
+    end
+  end
+end

data/lib/google/api_client/auth/storages/file_store.rb

@@ -0,0 +1,58 @@
+# Copyright 2013 Google Inc.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+require 'json'
+
+module Google
+  class APIClient
+    ##
+    # Represents cached OAuth 2 tokens stored on local disk in a
+    # JSON serialized file. Meant to resemble the serialized format
+    # http://google-api-python-client.googlecode.com/hg/docs/epy/oauth2client.file.Storage-class.html
+    #
+    class FileStore
+
+      attr_accessor :path
+
+      ##
+      # Initializes the FileStorage object.
+      #
+      # @param [String] path
+      #    Path to the credentials file.
+      def initialize(path)
+        @path= path
+      end
+
+      ##
+      # Attempt to read in credentials from the specified file.
+      def load_credentials
+        open(path, 'r') { |f| JSON.parse(f.read) }
+      rescue
+        nil
+      end
+
+      ##
+      # Write the credentials to the specified file.
+      #
+      # @param [Signet::OAuth2::Client] authorization
+      #    Optional authorization instance. If not provided, the authorization
+      #    already associated with this instance will be written.
+      def write_credentials(credentials_hash)
+        open(self.path, 'w+') do |f|
+          f.write(credentials_hash.to_json)
+        end
+      end
+    end
+  end
+end

data/lib/google/api_client/auth/storages/redis_store.rb

@@ -0,0 +1,54 @@
+# Copyright 2013 Google Inc.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+require 'json'
+
+module Google
+  class APIClient
+    class RedisStore
+
+      DEFAULT_REDIS_CREDENTIALS_KEY = "google_api_credentials"
+
+      attr_accessor :redis
+
+      ##
+      # Initializes the RedisStore object.
+      #
+      # @params [Object] Redis instance
+      def initialize(redis, key = nil)
+        @redis= redis
+        @redis_credentials_key = key
+      end
+
+      ##
+      # Attempt to read in credentials from redis.
+      def load_credentials
+        credentials = redis.get redis_credentials_key
+        JSON.parse(credentials) if credentials
+      end
+
+      def redis_credentials_key
+        @redis_credentials_key || DEFAULT_REDIS_CREDENTIALS_KEY
+      end
+
+      ##
+      # Write the credentials to redis.
+      #
+      # @params [Hash] credentials
+      def write_credentials(credentials_hash)
+        redis.set(redis_credentials_key, credentials_hash.to_json)
+      end
+    end
+  end
+end

data/lib/google/api_client/batch.rb

@@ -14,7 +14,7 @@
 
 require 'addressable/uri'
 require 'google/api_client/reference'
-require 'uuidtools'
+require 'securerandom'
 
 module Google
   class APIClient
@@ -90,8 +90,7 @@ module Google
         @global_callback = block if block_given?
         @last_auto_id = 0
         
-        # TODO(sgomes): Use SecureRandom.uuid, drop UUIDTools when we drop 1.8
-        @base_id = UUIDTools::UUID.random_create.to_s
+        @base_id = SecureRandom.uuid
 
         options[:uri] ||= 'https://www.googleapis.com/batch'
         options[:http_method] ||= 'POST'
@@ -140,14 +139,17 @@ module Google
       #   the HTTP response.
       def process_http_response(response)
         content_type = find_header('Content-Type', response.headers)
-        boundary = /.*boundary=(.+)/.match(content_type)[1]
-        parts = response.body.split(/--#{Regexp.escape(boundary)}/)
-        parts = parts[1...-1]
-        parts.each do |part|
-          call_response = deserialize_call_response(part)
-          _, call, callback = @calls.assoc(call_response.call_id)
-          result = Google::APIClient::Result.new(call, call_response)
-          callback.call(result) if callback
+        m = /.*boundary=(.+)/.match(content_type)
+        if m
+          boundary = m[1]
+          parts = response.body.split(/--#{Regexp.escape(boundary)}/)
+          parts = parts[1...-1]
+          parts.each do |part|
+            call_response = deserialize_call_response(part)
+            _, call, callback = @calls.assoc(call_response.call_id)
+            result = Google::APIClient::Result.new(call, call_response)
+            callback.call(result) if callback
+          end
         end
         Google::APIClient::Result.new(self, response)
       end

data/lib/google/api_client/charset.rb

@@ -0,0 +1,33 @@
+require 'faraday'
+require 'zlib'
+ 
+module Google
+  class APIClient
+    class Charset < Faraday::Response::Middleware
+      include Google::APIClient::Logging
+
+      def charset_for_content_type(type)
+        if type
+          m = type.match(/(?:charset|encoding)="?([a-z0-9-]+)"?/i)
+          if m
+            return Encoding.find(m[1])
+          end
+        end
+        nil
+      end
+
+      def adjust_encoding(env)
+        charset = charset_for_content_type(env[:response_headers]['content-type'])
+        if charset && env[:body].encoding != charset
+          env[:body].force_encoding(charset)
+        end
+      end
+      
+      def on_complete(env)
+        adjust_encoding(env)
+      end
+    end
+  end
+end
+ 
+Faraday::Response.register_middleware :charset => Google::APIClient::Charset

data/lib/google/api_client/client_secrets.rb

@@ -13,7 +13,6 @@
 # limitations under the License.
 
 
-require 'multi_json'
 require 'compat/multi_json'
 
 
@@ -63,7 +62,7 @@ module Google
         end
         while filename == nil
           search_path ||= File.expand_path('.')
-          if File.exist?(File.join(search_path, 'client_secrets.json'))
+          if File.exists?(File.join(search_path, 'client_secrets.json'))
             filename = File.join(search_path, 'client_secrets.json')
           elsif search_path == '/' || search_path =~ /[a-zA-Z]:[\/\\]/
             raise ArgumentError,
@@ -89,12 +88,12 @@ module Google
         @client_id = fdata[:client_id] || fdata["client_id"]
         @client_secret = fdata[:client_secret] || fdata["client_secret"]
         @redirect_uris = fdata[:redirect_uris] || fdata["redirect_uris"]
-        @redirect_uris ||= [fdata[:redirect_uri]]
+        @redirect_uris ||= [fdata[:redirect_uri] || fdata["redirect_uri"]].compact
         @javascript_origins = (
           fdata[:javascript_origins] ||
           fdata["javascript_origins"]
         )
-        @javascript_origins ||= [fdata[:javascript_origin]]
+        @javascript_origins ||= [fdata[:javascript_origin] || fdata["javascript_origin"]].compact
         @authorization_uri = fdata[:auth_uri] || fdata["auth_uri"]
         @authorization_uri ||= fdata[:authorization_uri]
         @token_credential_uri = fdata[:token_uri] || fdata["token_uri"]
@@ -121,7 +120,11 @@ module Google
       # @return [String]
       #   JSON
       def to_json
-        return MultiJson.dump({
+        return MultiJson.dump(to_hash)
+      end
+      
+      def to_hash
+        {
           self.flow => ({
             'client_id' => self.client_id,
             'client_secret' => self.client_secret,
@@ -142,7 +145,7 @@ module Google
             end
             accu
           end
-        })
+        }
       end
       
       def to_authorization

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

@@ -15,7 +15,7 @@
 
 require 'addressable/uri'
 require 'multi_json'
-require 'google/inflection'
+require 'active_support/inflector'
 require 'google/api_client/discovery/resource'
 require 'google/api_client/discovery/method'
 require 'google/api_client/discovery/media'
@@ -41,13 +41,13 @@ module Google
         @discovery_document = discovery_document
         metaclass = (class << self; self; end)
         self.discovered_resources.each do |resource|
-          method_name = Google::INFLECTOR.underscore(resource.name).to_sym
+          method_name = ActiveSupport::Inflector.underscore(resource.name).to_sym
           if !self.respond_to?(method_name)
             metaclass.send(:define_method, method_name) { resource }
           end
         end
         self.discovered_methods.each do |method|
-          method_name = Google::INFLECTOR.underscore(method.name).to_sym
+          method_name = ActiveSupport::Inflector.underscore(method.name).to_sym
           if !self.respond_to?(method_name)
             metaclass.send(:define_method, method_name) { method }
           end

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

@@ -15,7 +15,7 @@
 
 require 'addressable/uri'
 
-require 'google/inflection'
+require 'active_support/inflector'
 require 'google/api_client/discovery/method'
 
 
@@ -45,13 +45,13 @@ module Google
         @discovery_document = discovery_document
         metaclass = (class <<self; self; end)
         self.discovered_resources.each do |resource|
-          method_name = Google::INFLECTOR.underscore(resource.name).to_sym
+          method_name = ActiveSupport::Inflector.underscore(resource.name).to_sym
           if !self.respond_to?(method_name)
             metaclass.send(:define_method, method_name) { resource }
           end
         end
         self.discovered_methods.each do |method|
-          method_name = Google::INFLECTOR.underscore(method.name).to_sym
+          method_name = ActiveSupport::Inflector.underscore(method.name).to_sym
           if !self.respond_to?(method_name)
             metaclass.send(:define_method, method_name) { method }
           end

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

@@ -21,7 +21,7 @@ require 'autoparse'
 require 'addressable/uri'
 require 'addressable/template'
 
-require 'google/inflection'
+require 'active_support/inflector'
 require 'google/api_client/errors'
 
 
@@ -78,10 +78,8 @@ module Google
         # puts schema_data.inspect
 
         if schema_name
-          api_name_string =
-            Google::INFLECTOR.camelize(api.name)
-          api_version_string =
-            Google::INFLECTOR.camelize(api.version).gsub('.', '_')
+          api_name_string = ActiveSupport::Inflector.camelize(api.name)
+          api_version_string = ActiveSupport::Inflector.camelize(api.version).gsub('.', '_')
           # This is for compatibility with Ruby 1.8.7.
           # TODO(bobaman) Remove this when we eventually stop supporting 1.8.7.
           args = []