google-ads-common 0.9.8 → 0.9.9

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MGIxMjAwNmYzMmE3YWUyODZhMTQzZmI4NDBmYTFmZmZjMDIwYTMyOQ==
+    MmEwMDIzYWQwNzlmYjA4ZjE0OTMzZmMwZjg4YjQ4ZDIxNGRlMDdjOA==
   data.tar.gz: !binary |-
-    OWY0ZDQ4NTlhZGMyMzM2NzU0NTJhNTk0Njk2NWUyNzJhNWE2OGQxNg==
+    ZTg0NmJiYmFlOWJkYjA4NDhjYTRiNzVhOTNjYmNhZWQ0Mjk0NjYzMg==
 SHA512:
   metadata.gz: !binary |-
-    NjNjN2ZjYzdiMDE5ODMxYjE0NDliYmZmYjZkMmU4MzdhYjBiNTUwZGZjZDc2
-    ZjU5NGZlYjljMjUwZGY2NTdjMDlhNjc4MmU4Zjk3YTU2ZmM5YjZhYzQzNDZj
-    NzhlMDcyN2RiZmViNjZjYTRjYTFlZTMzMTM2ZTcwMzNkZWYyMzc=
+    MGZkMGUwMWQ2ZjkyNzk2MGMyMjU4YzFkMDEyYzAxMDY1ZGQ0NTdjZDRhMTMy
+    OGJkY2Q0NmU2NTZhYmZiYzEzODY4ZGZkN2EwMjVkNDY3NzAxZDBkYjcwM2E5
+    N2I2ZjFjMzAxNGQ1MzhjMjFjMWU0MmE4NmY2YmZlZWI5MjkxNzY=
   data.tar.gz: !binary |-
-    YWVkOGEyNGU0OTk3ZTVmMDZmYmZkYTU5MWJkYTQ0ZjYwZTA4ZDA1MTM4Yzhk
-    OGRhMzlhMjZkMGY5YWU1NGNmNTUyZDc3ZjQzNzg3M2NhNzlhNzM0M2E0Mzgz
-    MTBiNzQxYjViYzc3OTgxNmJiMjQzYjY3Y2JmYTA2ZTUyYTkzMGI=
+    OGEwNmUyZTVkYWE5Yzg1ODcxNWYyYjQ3ZTI0YWRhYjcxZDhiYmMyNDlkMTRj
+    OGM5OTM5NTRlODlmNTU4ZTdmYTZmZmM1ODk2NzM2M2M3Mjg1ZDJhYjYzM2Yw
+    Mzc3MDk0MGI2ZjRlMTA0YzU2NTg2OThkNDA2ZDA3OTM1ZGI3Y2Q=

data/ChangeLog

@@ -1,3 +1,6 @@
+0.9.9:
+  - Fixing minor issue where signet doesn't handle String-based times.
+
 0.9.8:
   - Updating signet dependency to 0.6.0.
 

data/lib/ads_common/auth/oauth2_handler.rb

@@ -19,6 +19,8 @@
 #
 # This module manages OAuth2.0 authentication.
 
+require 'time'
+
 require 'faraday'
 require 'signet/oauth_2/client'
 
@@ -88,6 +90,9 @@ module AdsCommon
       def refresh_token!()
         return nil if @token.nil? or @token[:refresh_token].nil?
         begin
+          if @client.issued_at.is_a?(String)
+            @client.issued_at = Time.parse(@client.issued_at)
+          end
           @client.refresh!
         rescue Signet::AuthorizationError => e
           raise AdsCommon::Errors::AuthError.new("OAuth2 token refresh failed",

data/lib/ads_common/version.rb

@@ -21,6 +21,6 @@
 
 module AdsCommon
   module ApiConfig
-    CLIENT_LIB_VERSION = '0.9.8'
+    CLIENT_LIB_VERSION = '0.9.9'
   end
 end

data/test/test_oauth2_handler.rb

@@ -0,0 +1,74 @@
+#!/usr/bin/env ruby
+# Encoding: utf-8
+#
+# Author:: api.mcloonan@gmail.com (Michael Cloonan)
+#
+# Copyright:: Copyright 2015, Google Inc. All Rights Reserved.
+#
+# License:: 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.
+#
+# Test OAuth2 authentication.
+
+require 'time'
+
+require 'ads_common/auth/oauth2_handler'
+require 'webmock/test_unit'
+
+module AdsCommon
+  module Auth
+    class OAuth2Handler
+      def client()
+        @client
+      end
+
+      # Overrides to ensure @client stores issued_at as a string, to test
+      # converting it back.
+      def setup_client()
+        @client = Signet::OAuth2::Client.new({
+          :authorization_uri => 'https://accounts.google.com/o/oauth2/auth',
+          :token_credential_uri => 'https://accounts.google.com/o/oauth2/token',
+          :client_id => 'client_id123',
+          :client_secret => 'client_secret123',
+          :scope => 'https://www.googleapis.com/auth/adwords'
+        })
+      end
+    end
+  end
+end
+
+class TestOAuth < Test::Unit::TestCase
+  def setup()
+    stub_request(:post, 'https://accounts.google.com/o/oauth2/auth').to_return(
+        :status => 200,
+        :body => '{"access_token":"access_token123",' +
+            '"token_type":"Bearer","expires_in":"3600"}\n',
+        :headers => {}
+    )
+  end
+
+  def test_string_issued_at()
+    handler = AdsCommon::Auth::OAuth2Handler.new('', {})
+
+    # Modify @client in the handler to get around a full setup.
+    handler.setup_client()
+    assert_not_nil(handler.client)
+    handler.client.issued_at = Time.now.to_s
+    assert_equal(String, handler.client.issued_at.class)
+
+    # Make sure that we are still able to refresh the token.
+    assert_nothing_raised do
+      token = handler.refresh_token!();
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: google-ads-common
 version: !ruby/object:Gem::Version
-  version: 0.9.8
+  version: 0.9.9
 platform: ruby
 authors:
 - Sergio Gomes
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-12 00:00:00.000000000 Z
+date: 2015-06-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: savon
@@ -90,6 +90,7 @@ files:
 - test/test_config.rb
 - test/test_config.yml
 - test/test_credential_handler.rb
+- test/test_oauth2_handler.rb
 - test/test_parameters_validator.rb
 - test/test_results_extractor.rb
 - test/test_savon_service.rb
@@ -124,4 +125,5 @@ test_files:
 - test/test_credential_handler.rb
 - test/test_utils.rb
 - test/test_parameters_validator.rb
+- test/test_oauth2_handler.rb
 - test/test_results_extractor.rb