google-adwords-api 0.7.1 → 0.7.2

data/ChangeLog

@@ -1,3 +1,6 @@
+0.7.2:
+  - Fixed issue #87 specific to ruby1.8.
+
 0.7.1:
   - Support and examples for v201209.
 

data/examples/v201209/misc/use_oauth2.rb

@@ -33,6 +33,24 @@ def use_oauth2()
   # the configuration file or provide your own logger:
   # adwords.logger = Logger.new('adwords_xml.log')
 
+  # You can call authorize explicitely to obtain the access token. Otherwise, it
+  # will be invoked automatically on the first API call.
+  # There are two ways to provide verification code, first one is via the block:
+  token = adwords.authorize() do |auth_url|
+    puts "Hit Auth error, please navigate to URL:\n\t%s" % auth_url
+    print 'log in and type the verification code: '
+    verification_code = gets.chomp
+    verification_code
+  end
+  # Alternatively, you can provide one within the parameters:
+  #token = adwords.authorize({:oauth2_verification_code => verification_code})
+
+  # Note, 'token' is a Hash. Its value is not used in this example. If you need
+  # to be able to access the API in offline mode, with no user present, you
+  # should persist it to be used in subsequent invocations like this:
+  #adwords.authorize({:oauth2_token => token})
+
+  # No exception thrown - we are good to make the request.
   campaign_srv = adwords.service(:CampaignService, API_VERSION)
 
   # Get all the campaigns for this account; empty selector.
@@ -43,24 +61,7 @@ def use_oauth2()
     ]
   }
 
-  retry_count = 0
-
-  begin
-    response = campaign_srv.get(selector)
-  rescue AdsCommon::Errors::OAuth2VerificationRequired => e
-    if retry_count < MAX_RETRIES
-      puts "Hit Auth error, please navigate to URL:\n\t%s" % e.oauth_url
-      print 'log in and type the verification code: '
-      verification_code = gets.chomp
-      adwords.credential_handler.set_credential(
-          :oauth2_verification_code, verification_code)
-      retry_count += 1
-      retry
-    else
-      raise AdsCommon::Errors::AuthError, 'Failed to authenticate.'
-    end
-  end
-
+  response = campaign_srv.get(selector)
   if response and response[:entries]
     campaigns = response[:entries]
     campaigns.each do |campaign|
@@ -74,7 +75,6 @@ end
 
 if __FILE__ == $0
   API_VERSION = :v201209
-  MAX_RETRIES = 3
 
   begin
     use_oauth2()

data/lib/adwords_api/report_utils.rb

@@ -196,7 +196,7 @@ module AdwordsApi
     def check_for_errors(response)
       # Check for error in body.
       report_body = response.body
-      if report_body and (@version <= :v201206) and
+      if report_body and is_legacy_reporting(@version) and
           ((RUBY_VERSION < '1.9.1') or report_body.valid_encoding?)
         check_for_legacy_error(report_body, response.code)
       end
@@ -210,6 +210,13 @@ module AdwordsApi
       return nil
     end
 
+    # Returns true is the provided API version has legacy reporting.
+    def is_legacy_reporting(version)
+      return (version == :v201206 or
+              version == :v201109_1 or
+              version == :v201109)
+    end
+
     # Checks for a legacy error in the response body and raises an exception if
     # it was found.
     def check_for_legacy_error(report_body, response_code)

data/lib/adwords_api/version.rb

@@ -21,6 +21,6 @@
 
 module AdwordsApi
   module ApiConfig
-    CLIENT_LIB_VERSION = '0.7.1'
+    CLIENT_LIB_VERSION = '0.7.2'
   end
 end

data/test/examples/v201209/utils.rb

@@ -27,6 +27,11 @@ class UtilsV201209
     @adwords = adwords
   end
 
+  def get_budget
+    @budget ||= create_budget()
+    return @budget
+  end
+
   def get_campaign
     @campaign ||= create_campaign()
     return @campaign
@@ -60,29 +65,47 @@ class UtilsV201209
 
   private
 
-  def create_campaign
+  def create_campaign()
+    budget = get_budget()
+    budget_id = budget[:budget_id]
+
     campaign_srv = @adwords.service(:CampaignService, API_VERSION)
     campaign = {
       :name => "Example tests campaign #%d" % (Time.new.to_f * 1000).to_i,
       :status => 'PAUSED',
       :bidding_strategy => {:xsi_type => 'ManualCPC'},
-      :budget => {
-        :period => 'DAILY',
-        :amount => {:micro_amount => 50000000},
-        :delivery_method => 'STANDARD'
-      },
+      :budget => {:budget_id => budget_id},
       :network_setting => {
         :target_google_search => true,
         :target_search_network => true,
         :target_content_network => true
-      }
+      },
+      :settings => [
+        {
+          :xsi_type => 'KeywordMatchSetting',
+          :opt_in => true
+        }
+      ]
     }
     operation = {:operator => 'ADD', :operand => campaign}
     response = campaign_srv.mutate([operation])
     return response[:value].first
   end
 
-  def create_ad_group
+  def create_budget()
+    budget_srv = @adwords.service(:BudgetService, API_VERSION)
+    budget = {
+      :name => 'Example tests budget #%d' % (Time.new.to_f * 1000).to_i,
+      :amount => {:micro_amount => 50000000},
+      :delivery_method => 'STANDARD',
+      :period => 'DAILY'
+    }
+    operation = {:operator => 'ADD', :operand => budget}
+    response = budget_srv.mutate([operation])
+    return response[:value].first
+  end
+
+  def create_ad_group()
     campaign = get_campaign()
     ad_group_srv = @adwords.service(:AdGroupService, API_VERSION)
     ad_group = {

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: google-adwords-api
 version: !ruby/object:Gem::Version
-  version: 0.7.1
+  version: 0.7.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-05 00:00:00.000000000 Z
+date: 2012-10-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: google-ads-common