adapi 0.1.5 → 0.2.0

data/README.md

@@ -1,7 +1,5 @@
 # Adapi [![Code Climate](https://codeclimate.com/badge.png)](https://codeclimate.com/github/lstejskal/adapi)
 
-*NEWS:* new version with support for AdWords API v201209 and test accounts will be released before the end of February 2013.
-
 ## Description
 
 Adapi (ADwords API) is a Ruby library for easy and painless work with Google
@@ -23,7 +21,7 @@ come from there, but adapi takes it several steps further:
 Adapi is *still in development* and not nearly done yet! Version 1.0.0 should
 have all planned functionality.
 
-Adapi supports the latest version of AdWords API: *v201206*. 
+Adapi supports the latest version of AdWords API: *v201209*. 
 
 ## Installation
 
@@ -40,34 +38,38 @@ rake install
 
 ## Configuration
 
-This section explains how to connect to specific AdWords account and client.
-There are several options to choose from:
-
-#### Configuration by adwords_api.yml
+This section explains how to connect to specific AdWords account and client. The configuration
+structure is quite similar to the configuration of `google-adwords-api` gem.
 
-If you already have `google-adwords-api` gem configured and use just one account,
-the same configuration will also work for adapi: `~/adwords_api.yml`
+There are several options to choose from:
 
 #### Single account set directly in code
 
 ```ruby
-Adapi::Config.load_settings(:in_hash => {
-  :sandbox => {   
-      :authentication => {
-        :method               => "ClientLogin"
-        :email                => "sandbox_email@gmail.com",
-        :password             => "sandbox_password",
-        :developer_token      => "sandbox_token",
-        :client_customer_id   => "555-666-7777",
-        :user_agent           => "Adwords API Test"
+Adapi::Config.load_settings( in_hash: {
+  production: {
+    authentication: {
+      method:                 "OAuth2",
+      oauth2_client_id:       "abc",
+      oauth2_client_secret:   "def",
+      oauth2_token: {
+        access_token:         "123",
+        refresh_token:        "456",
+        issued_at:            "2013-03-03 13:33:39.734203841 +01:00",
+        expires_in:           3600,
+        id_token:             nil
       },
-      :service => {
-        :environment          => "SANDBOX"
-      }
+      developer_token:        "789",
+      user_agent:             "My Adwords API Client",
+      client_customer_id:     "555-666-7777"
+    },
+    service: {
+      environment: "PRODUCTION"
+    }
   }
 })
 
-Adapi::Config.set(:sandbox)
+Adapi::Config.set(:production)
 ```
 
 #### Multiple accounts set directly in code
@@ -76,31 +78,9 @@ You can set many AdWords accounts to connect to and switch between while running
 the application. You can even update single values of the settings on-the-fly.
 
 ```ruby 
-Adapi::Config.load_settings(:in_hash => {
-  :coca_cola => {
-    :authentication => {
-      :method => 'ClientLogin',
-      :email => 'coca_cola_email@gmail.com',
-      :password => 'coca_cola_password',
-      :developer_token => 'coca_cola_developer_token',
-      :user_agent => 'Coca-Cola Adwords API Test'
-    },
-    :service => {
-      :environment => 'SANDBOX'
-    }
-  },
- :pepsi => {
-    :authentication => {
-      :method => 'ClientLogin',
-      :email => 'pepsi_email@gmail.com',
-      :password => 'pepsi_password',
-      :developer_token => 'pepsi_developer_token',
-      :user_agent => 'Pepsi Adwords API Test'
-    },
-    :service => {
-      :environment => 'SANDBOX'
-    }
-  }
+Adapi::Config.load_settings( in_hash: {
+  coca_cola:  config_hash_for_coca_cola,
+  pepsi:      config_hash_for_pepsi
 })
 
 # set to pepsi and specific client       
@@ -120,54 +100,76 @@ Stored in `~/adapi.yml`. Supports multiple accounts, which are identifed by
 aliases. Example:
 
 ```
+
 :default:
   :authentication:
-    :method: ClientLogin
-    :email: default_email@gmail.com
-    :password: default_password
-    :developer_token: default_token
-    :client_customer_id: 777-666-5555
+    :method: OAuth2
+    :oauth2_client_id: "abc"
+    :oauth2_client_secret: "def"
+    :oauth2_token:
+        :access_token: "123"
+        :refresh_token: "456"
+        :issued_at: 2013-03-03 13:33:39.734203841 +01:00
+        :expires_in: 3600
+        :id_token:
+    :developer_token: "789"
     :user_agent: My Adwords API Client
+    :client_customer_id: 555-666-7777
   :service:
     :environment: PRODUCTION
+  :library:
+    :log_level: WARN
+    :log_path: /tmp/adapi.log
+    :log_pretty_format: true
 
-:sandbox:
-  :authentication:
-    :method: ClientLogin
-    :email: sandbox_email@gmail.com
-    :password: sandbox_password
-    :developer_token: sandbox_token
-    :client_customer_id: 555-666-7777
-    :user_agent: Adwords API Test
-  :service:
-    :environment: SANDBOX
 ```
 
 To tell adapi which account to use:
 
 ```ruby
-Adapi::Config.set(:sandbox)
+Adapi::Config.set(:production)
 ```
 
 `:default` account is, as name implies, used by default. If you don't have
 `:default` account available, you have to manually set account alias to
 `Adapi::Config`.
 
-### Authentication workflow
+### How to get OAuth2 token
+
+* get `oauth2_client_id` and `oauth2_client_secret`: [https://code.google.com/p/google-api-ads-ruby/wiki/OAuth2][https://code.google.com/p/google-api-ads-ruby/wiki/OAuth2]
+
+* put them into adapi configuration file
+
+* run following script:
+
+```ruby
+require 'adapi'
+require 'yaml'
+
+adapi_object = Adapi::Location.new() # load any adapi object
+adwords_api = adapi_object.adwords # get adwords object
+
+# got to url and paste verification code to the script
+oauth2_token = adwords.authorize() do |auth_url|
+  puts "Go to URL:\n\t%s" % auth_url
+  print 'log in and type the verification code: '
+  gets.chomp
+end
+
+puts oauth2_token.to_yaml 
+```
+
+* put `oauth2_token` hash adapi configuration file
 
-* try to load configuration from `~/adapi.yml`
-* if `~/adapi.yml`doesn't exist, try to load configuration from
-  `~/adwords_api.yml` (used by adwords-api gem)
-* if there are no configuration files available, set configuration directly to
-  `Adapi::Config` (overrides previous settings)
+Code taken from this google-adwords-api example: [https://code.google.com/p/google-api-ads-ruby/source/browse/adwords_api/examples/v201209/misc/use_oauth2.rb][https://code.google.com/p/google-api-ads-ruby/source/browse/adwords_api/examples/v201209/misc/use_oauth2.rb]
 
 ## API Version Support
 
-Adapi supports the latest version of AdWords API: *v201206*. 
+Adapi supports the latest version of AdWords API: *v201209*. 
 
 For support of earlier versions of AdWords API, downgrade to earlier 
-versions of adapi: 0.0.9 for *v201109_1*, 0.07 for *v201109*. 
-(You shoudn't need it though, because older versions of AdWords API are 
+versions of adapi: 0.1.5 for *v201206*, 0.0.9 for *v201109_1*, 0.07 for *v201109*. 
+(You shoudn't need it though, older versions of AdWords API are 
 eventually shut down.) Latest revision for specific AdWords API version 
 is also marked by a tag.
 
@@ -178,8 +180,8 @@ and update your code accordingly. Adapi won't accept obsolete attributes etc.
 
 ## Unsupported AdWords services
 
-Following AdWords services are not supported by adapi at the moment. However,
-they will be implemented (this also serves as TODO list):
+Following AdWords services are not supported by adapi at the moment, and exist
+only on my TODO list:
 
 * Campaign Data Management
   * ConversionTrackerService
@@ -433,5 +435,5 @@ Example of logger configuration:
 
 ## Author
 
-2011-2012 Lukas Stejskal, Ataxo Interactive, a.s.
+2011-2013 Lukas Stejskal, Ataxo Interactive, a.s.
 

data/adapi.gemspec

@@ -37,9 +37,14 @@ Gem::Specification.new do |s|
 
   s.add_development_dependency "yard", "~> 0.8"
   s.add_development_dependency "turn", "~> 0.9.6"
+  # if this breaks budnle, run: bundle update shoulda-matchers
+  # this is a HOTFIX, can be removed when this bug is resolved:
+  # https://github.com/thoughtbot/shoulda-matchers/issues/235
+  s.add_development_dependency "shoulda-matchers", "1.4.1"
   s.add_development_dependency "shoulda", "~> 3.1"
   s.add_development_dependency "fakeweb", "~> 1.3"
   s.add_development_dependency "factory_girl", "~> 3.3"
   s.add_development_dependency "minitest", "~> 3.3"
+  s.add_development_dependency('mocha', '~> 0.13.3')
 
 end

data/examples/add_invalid_keywords.rb

@@ -2,15 +2,10 @@
 
 require 'adapi'
 
-# Errors will appear only in production, not in sandbox
-#
-# Adapi performs exemption requests on receiving policy violation errors.
-# If keyword errors are exemptable, they will eventually pass.
-#
-#Adapi::Config.load_settings
-#Adapi::Config.set(:production_settings)
-#
-#pp "Running in #{Adapi::Config.read[:service][:environment]}"
+# Example work-flow:
+# * try to add keywords which will trigger policy violation errors (PolicyViolationError)
+# * adapi will perform exemption requests (check the adapi log for more details)
+# * if keyword errors are exemptable, they will be eventually added
 
 # create ad group
 require_relative 'add_bare_ad_group'

data/examples/add_invalid_text_ad.rb

@@ -1,21 +1,12 @@
 
 require 'adapi'
 
-# PolicyViolations will appear only in production, not in sandbox
-#
-# Adapi performs exemption requests on receiving policy violation errors.
-# If text_ad errors are exemptable, they will eventually pass.
-#
-#Adapi::Config.load_settings
-#Adapi::Config.set(:production_settings)
-#
-#pp "Running in #{Adapi::Config.read[:service][:environment]}"
-
 require_relative 'add_bare_ad_group'
 
-# PS: exemptable PolicyViolationError is triggered by "ho":
-# legimitateword in Czech, but suspicious word in English
-#
+# Example workflow:
+# * "ho", which is suspicious word in English, will trigger exemptable PolicyViolationError
+# * adapi performs exemption request(s) and text_ad will eventually pass
+
 $ad = Adapi::Ad::TextAd.create(
   :ad_group_id => $ad_group[:id],
   :headline => "Neo Blog - poznej ho",

data/examples/delete_ad_group.rb

@@ -8,4 +8,4 @@ $ad_group.delete
 
 $ad_group = Adapi::AdGroup.find(:first, :id => $ad_group.id, :campaign_id => $campaign.id)
 
-puts "AdGroup status is now set to: " + $ad_group.status
+puts "TRYING TO FIND IT: " + ($ad_group.present? ? $ad_group.attributes : "nil")

data/examples/log_to_specific_account.rb

@@ -12,7 +12,7 @@ Adapi::Config.load_settings(:in_hash => {
       :user_agent => 'Coca-Cola Adwords API Test'
     },
     :service => {
-      :environment => 'SANDBOX'
+      :environment => 'PRODUCTION'
     }
   },
  :pepsi => {
@@ -24,11 +24,15 @@ Adapi::Config.load_settings(:in_hash => {
       :user_agent => 'Pepsi Adwords API Test'
     },
     :service => {
-      :environment => 'SANDBOX'
+      :environment => 'PRODUCTION'
     }
   }
 })
 
 Adapi::Config.set(:pepsi, :client_customer_id => '555-666-7777')
+p "PEPSI"
+p Adapi::Config.read
 
+Adapi::Config.set(:coca_cola, :client_customer_id => '111-222-3333')
+p "COCA_COLA"
 p Adapi::Config.read

data/examples/update_text_ad.rb

@@ -4,7 +4,7 @@ require 'adapi'
 require_relative 'add_text_ad'
 
 $new_ad = $ad.update(
-  :status => 'ACTIVE',
+  :status => 'ENABLED',
   :headline => "Code like Trinity",
   :description1 => 'Need mad update skills?',
   :description2 => 'Check out my updates!',

data/lib/adapi.rb

@@ -47,7 +47,7 @@ HTTPI.adapter = :curb
 HTTPI.log = false # supress HTTPI output
 
 module Adapi
-  API_VERSION = :v201206
+  API_VERSION = :v201209
 end
 
 if RUBY_VERSION < '1.9'

data/lib/adapi/api.rb

@@ -44,9 +44,31 @@ module Adapi
 
       raise "Missing Service Name" unless params[:service_name]
 
-      # if params[:api_login] in nil, default login data are used
-      # from ~/adwords_api.yml
-      @adwords = params[:adwords_api_instance] || AdwordsApi::Api.new(Adapi::Config.read)
+      @adwords = params[:adwords_api_instance]
+
+      # REFACTOR
+      unless @adwords
+        @adwords = AdwordsApi::Api.new(Adapi::Config.read)
+
+        authentication_method = Adapi::Config.read[:authentication][:method].to_s.upcase
+
+        case authentication_method
+        when "CLIENTLOGIN", "OAUTH"
+          warn "#{authentication_method} is nearly obsolete, please update to OAuth2"
+        when "OAUTH2_JWT"
+          raise "OAUTH2_JWT is not yet implemented, please use OAUTH2 instead"
+        # authorize to oauth2
+        when "OAUTH2"
+          oauth2_token = Adapi::Config.read[:authentication][:oauth2_token]
+
+          if oauth2_token.nil? || oauth2_token.class != Hash 
+            raise "Missing or invalid OAuth2 token"
+          end
+
+          @adwords.authorize({:oauth2_verification_code => $token})
+        end
+      end
+
       @adwords.logger = LOGGER if LOGGER
       @version = API_VERSION
       @service = @adwords.service(params[:service_name].to_sym, @version)

data/lib/adapi/campaign.rb

@@ -8,7 +8,7 @@ module Adapi
   class Campaign < Api
 
     NETWORK_SETTING_KEYS = [ :target_google_search, :target_search_network, 
-      :target_content_network, :target_content_contextual, :target_partner_search_network ]
+      :target_content_network, :target_partner_search_network ]
 
     ATTRIBUTES = [ :name, :status, :serving_status, :start_date, :end_date, :budget,
       :bidding_strategy, :network_setting, :campaign_stats, :criteria, :ad_groups,

data/lib/adapi/version.rb

@@ -1,10 +1,17 @@
 # encoding: utf-8
 
 module Adapi
-  VERSION = "0.1.5"
+  VERSION = "0.2.0"
 
   # CHANGELOG:
   #
+  # 0.2.0
+  # updated to AdWords API version v201209
+  # switched authentication to OAuth2
+  # updated README
+  # updated tests and examples 
+  # removed compatibility of config setting with adwords-api
+  #
   # 0.1.5
   # updated gems - second try to fix the "bundle install" infinite loop
   #
@@ -44,39 +51,4 @@ module Adapi
   # added conversion of legacy province_code to province_name in location search
   # added tests for Campaign, CampaignCriterion and Location service
   # added Getting Started section to README
-  #
-  # 0.0.7
-  # fix Location search by country code
-  # hotfix OAuth
-  #
-  # 0.0.6
-  # updated to latest adwords-api and ads-common gems, which fix many issues with AdWords API version v201109
-  # fix CampaignCriterion service
-  # fix examples
-  #
-  # 0.0.5
-  # converted to AdWords API version v201109
-  #   moved from CampaignTarget to CampaignCriterion
-  #   implemented Location and Language finders
-  # started writing integration tests
-  # added logging of SOAP requests
-  #
-  # 0.0.4
-  # changed README to markdown format
-  # updated DSL for creating campaign and campaign target
-  # implemented find methods for campaigns and ad groups
-  # implemented getting complete campaigns (in one hash with targets, ad groups, keywords and ads)
-  #
-  # 0.0.3
-  # converted to ActiveModel
-  # moved common functionality to Api class
-  # changed http client to curb and hotfix ssl authentication bug in HTTPI
-  # added basic error handling
-  # changed DSL for Campaign attributes
-  # changed Ad model to general Ad model and moved TextAd to separate model
-  # added support for more target types and changed DSL for CampaignTarget
-  # converted to Ruby 1.9.2 (should work in Ruby 1.8.7 as well)
-  #
-  # 0.0.2
-  # [FIX] switched google gem dependencies from edge to stable release
 end

data/test/fixtures/adapi.yml

@@ -1,30 +1,21 @@
 
 :default:
   :authentication:
-    :method: ClientLogin
-    :email: default_email@gmail.com
-    :password: default_password
-    :developer_token: default_token
-    :client_customer_id: 555-666-7777
+    :method: OAuth2
+    :oauth2_client_id: "abc"
+    :oauth2_client_secret: "def"
+    :oauth2_token:
+        :access_token: "123"
+        :refresh_token: "456"
+        :issued_at: 2013-03-03 13:33:39.734203841 +01:00
+        :expires_in: 3600
+        :id_token:
+    :developer_token: "789"
     :user_agent: My Adwords API Client
+    :client_customer_id: 555-666-7777
   :service:
     :environment: PRODUCTION
   :library:
     :log_level: WARN
-    :log_path: /tmp/adapi_production.log
-#   :log_pretty_format is set to :false by default
-
-:sandbox:
-  :authentication:
-    :method: ClientLogin
-    :email: sandbox_email@gmail.com
-    :password: sandbox_password
-    :developer_token: sandbox_token
-    :client_customer_id: 555-666-7777
-    :user_agent: Adwords API Test
-  :service:
-    :environment: SANDBOX
-  :library:
-    :log_level: DEBUG
-    :log_path: /tmp/adapi_sandbox.log
+    :log_path: /tmp/adapi.log
     :log_pretty_format: true

data/test/integration/create_ad_group_test.rb

@@ -1,6 +1,7 @@
 # encoding: utf-8
 
 require 'test_helper'
+require 'integration_test_helper'
 
 module Adapi
   class AdGroupCreateTest < Test::Unit::TestCase

data/test/integration/create_campaign_test.rb

@@ -1,6 +1,7 @@
 # encoding: utf-8
 
 require 'test_helper'
+require 'integration_test_helper'
 
 module Adapi
   class CampaignCreateTest < Test::Unit::TestCase

data/test/integration/find_location_test.rb

@@ -1,6 +1,7 @@
 # encoding: utf-8
 
 require 'test_helper'
+require 'integration_test_helper'
 
 module Adapi
   class FindLocationTest < Test::Unit::TestCase

data/test/integration_test_helper.rb

@@ -0,0 +1,11 @@
+
+# this is a monkeypatch for integration tests
+#
+class Test::Unit::TestCase
+  FakeWeb.allow_net_connect = true
+
+  def setup
+    # allow OAuth2 authorization for integration tests
+    AdwordsApi::Api.any_instance.unstub(:authorize)
+  end
+end

data/test/test_helper.rb

@@ -9,6 +9,7 @@ require 'turn'
 require 'shoulda'
 require 'fakeweb'
 require 'factory_girl'
+require 'mocha/setup'
 
 # always test the latest version of the gem
 # TODO make it an option only through ENV variable switch
@@ -20,6 +21,11 @@ Dir[ File.join(File.dirname(__FILE__), 'factories', '*.rb') ].each { |f| require
 class Test::Unit::TestCase
   FakeWeb.allow_net_connect = false
 
+  def setup
+    # omit OAuth2 authorization for tests
+    AdwordsApi::Api.any_instance.stubs(:authorize).returns(nil)
+  end
+
   # many integration tests need to use campaign or ad group
   # instead of creating them in every test, we do it here  
   #

data/test/unit/ad_group_test.rb

@@ -4,11 +4,6 @@ require 'test_helper'
 
 module Adapi
   class AdGroupTest < Test::Unit::TestCase
-    # include ActiveModel::Lint::Tests
-
-    def setup
-      @model = AdGroup.new
-    end
 
     context "valid new instance" do
       setup do

data/test/unit/config_test.rb

@@ -12,20 +12,7 @@ module Adapi
         @settings                     = Adapi::Config.settings(true)
 
         assert_equal '555-666-7777', @settings[:default][:authentication][:client_customer_id]
-        assert_equal 'default_email@gmail.com', @settings[:default][:authentication][:email]
-        assert_equal 'sandbox_email@gmail.com', @settings[:sandbox][:authentication][:email]
-      end
-    end
-
-    context "Loading adwords_api.yml" do
-      should "loads the configuration" do
-        Adapi::Config.dir             = 'test/fixtures'
-        Adapi::Config.filename        = 'adwords_api.yml'
-        @settings                     = Adapi::Config.settings(true)
-
-        assert_equal '555-666-7777', @settings[:default][:authentication][:client_customer_id]
-        assert_equal 'default_email@gmail.com', @settings[:default][:authentication][:email]
-        assert_nil @settings[:sandbox]
+        assert_instance_of Hash, @settings[:default][:authentication][:oauth2_token]
       end
     end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: adapi
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-22 00:00:00.000000000 Z
+date: 2013-03-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: google-ads-common
-  requirement: &25836340 !ruby/object:Gem::Requirement
+  requirement: &6871560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -21,10 +21,10 @@ dependencies:
         version: 0.9.2
   type: :runtime
   prerelease: false
-  version_requirements: *25836340
+  version_requirements: *6871560
 - !ruby/object:Gem::Dependency
   name: google-adwords-api
-  requirement: &25835220 !ruby/object:Gem::Requirement
+  requirement: &6884860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -32,10 +32,10 @@ dependencies:
         version: 0.8.1
   type: :runtime
   prerelease: false
-  version_requirements: *25835220
+  version_requirements: *6884860
 - !ruby/object:Gem::Dependency
   name: activemodel
-  requirement: &25833860 !ruby/object:Gem::Requirement
+  requirement: &6878440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: 3.2.12
   type: :runtime
   prerelease: false
-  version_requirements: *25833860
+  version_requirements: *6878440
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &25867140 !ruby/object:Gem::Requirement
+  requirement: &6891600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: 3.2.12
   type: :runtime
   prerelease: false
-  version_requirements: *25867140
+  version_requirements: *6891600
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &25865140 !ruby/object:Gem::Requirement
+  requirement: &6897540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,10 +65,10 @@ dependencies:
         version: 0.9.6
   type: :runtime
   prerelease: false
-  version_requirements: *25865140
+  version_requirements: *6897540
 - !ruby/object:Gem::Dependency
   name: curb
-  requirement: &25864680 !ruby/object:Gem::Requirement
+  requirement: &6908740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -76,10 +76,10 @@ dependencies:
         version: 0.8.3
   type: :runtime
   prerelease: false
-  version_requirements: *25864680
+  version_requirements: *6908740
 - !ruby/object:Gem::Dependency
   name: yard
-  requirement: &25863940 !ruby/object:Gem::Requirement
+  requirement: &6905520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -87,10 +87,10 @@ dependencies:
         version: '0.8'
   type: :development
   prerelease: false
-  version_requirements: *25863940
+  version_requirements: *6905520
 - !ruby/object:Gem::Dependency
   name: turn
-  requirement: &25862600 !ruby/object:Gem::Requirement
+  requirement: &6903680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -98,10 +98,21 @@ dependencies:
         version: 0.9.6
   type: :development
   prerelease: false
-  version_requirements: *25862600
+  version_requirements: *6903680
+- !ruby/object:Gem::Dependency
+  name: shoulda-matchers
+  requirement: &6912040 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - =
+      - !ruby/object:Gem::Version
+        version: 1.4.1
+  type: :development
+  prerelease: false
+  version_requirements: *6912040
 - !ruby/object:Gem::Dependency
   name: shoulda
-  requirement: &25861480 !ruby/object:Gem::Requirement
+  requirement: &6924660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -109,10 +120,10 @@ dependencies:
         version: '3.1'
   type: :development
   prerelease: false
-  version_requirements: *25861480
+  version_requirements: *6924660
 - !ruby/object:Gem::Dependency
   name: fakeweb
-  requirement: &25895380 !ruby/object:Gem::Requirement
+  requirement: &6922840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -120,10 +131,10 @@ dependencies:
         version: '1.3'
   type: :development
   prerelease: false
-  version_requirements: *25895380
+  version_requirements: *6922840
 - !ruby/object:Gem::Dependency
   name: factory_girl
-  requirement: &25894140 !ruby/object:Gem::Requirement
+  requirement: &6935460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -131,10 +142,10 @@ dependencies:
         version: '3.3'
   type: :development
   prerelease: false
-  version_requirements: *25894140
+  version_requirements: *6935460
 - !ruby/object:Gem::Dependency
   name: minitest
-  requirement: &25893240 !ruby/object:Gem::Requirement
+  requirement: &6934660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -142,7 +153,18 @@ dependencies:
         version: '3.3'
   type: :development
   prerelease: false
-  version_requirements: *25893240
+  version_requirements: *6934660
+- !ruby/object:Gem::Dependency
+  name: mocha
+  requirement: &6934040 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.13.3
+  type: :development
+  prerelease: false
+  version_requirements: *6934040
 description: This gem provides user-friendly interface to Google Adwords API.
 email:
 - lucastej@gmail.com
@@ -169,8 +191,6 @@ files:
 - examples/add_negative_campaign_criteria.rb
 - examples/add_text_ad.rb
 - examples/add_text_ads.rb
-- examples/custom_settings.yml
-- examples/customize_configuration.rb
 - examples/delete_ad_group.rb
 - examples/delete_keyword.rb
 - examples/delete_text_ad.rb
@@ -216,15 +236,14 @@ files:
 - test/factories/ad_text_factory.rb
 - test/factories/campaign_factory.rb
 - test/fixtures/adapi.yml
-- test/fixtures/adwords_api.yml
 - test/integration/create_ad_group_test.rb
 - test/integration/create_campaign_test.rb
 - test/integration/find_location_test.rb
+- test/integration_test_helper.rb
 - test/test_helper.rb
 - test/unit/.gitignore
 - test/unit/ad/ad_text_test.rb
 - test/unit/ad_group_test.rb
-- test/unit/ad_test.rb
 - test/unit/campaign_criterion_test.rb
 - test/unit/campaign_test.rb
 - test/unit/config_test.rb
@@ -243,7 +262,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3720972372896659817
+      hash: 153566960593043723
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -252,7 +271,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3720972372896659817
+      hash: 153566960593043723
 requirements: []
 rubyforge_project: adapi
 rubygems_version: 1.8.15

data/examples/custom_settings.yml

@@ -1,30 +0,0 @@
-
-:default:
-  :authentication:
-    :method: ClientLogin
-    :email: default_email@gmail.com
-    :password: default_password
-    :developer_token: default_token
-    :client_customer_id: 555-666-7777
-    :user_agent: My Adwords API Client
-  :service:
-    :environment: PRODUCTION
-  :library:
-    :log_level: WARN
-    :log_path: /tmp/adapi_production.log
-#   :log_pretty_format is set to :false by default
-
-:sandbox:
-  :authentication:
-    :method: ClientLogin
-    :email: sandbox_email@gmail.com
-    :password: sandbox_password
-    :developer_token: sandbox_token
-    :client_customer_id: 555-666-7777
-    :user_agent: Adwords API Test
-  :service:
-    :environment: SANDBOX
-  :library:
-    :log_level: DEBUG
-    :log_path: /tmp/adapi_sandbox.log
-    :log_pretty_format: true

data/examples/customize_configuration.rb

@@ -1,18 +0,0 @@
-# encoding: utf-8
-
-require 'adapi'
-
-# this example shows how to load custom settings
-
-Adapi::Config.load_settings(
-  :dir => File.expand_path(File.dirname(__FILE__)),
-  :filename => 'custom_settings.yml'
-)
-
-# :default account is set automatically
-p "Default settings:"
-p Adapi::Config.read[:authentication][:email]
-
-Adapi::Config.set(:sandbox)
-p "Set :sandbox account:"
-p Adapi::Config.read[:authentication][:email]

data/test/fixtures/adwords_api.yml

@@ -1,14 +0,0 @@
-
-:authentication:
-  :method: ClientLogin
-  :email: default_email@gmail.com
-  :password: default_password
-  :developer_token: default_token
-  :client_customer_id: 555-666-7777
-  :user_agent: My Adwords API Client
-:service:
-  :environment: PRODUCTION
-:library:
-  :log_level: WARN
-  :log_path: /tmp/adapi_production.log
-#   :log_pretty_format is set to :false by default

data/test/unit/ad_test.rb

@@ -1,14 +0,0 @@
-# encoding: utf-8
-
-require 'test_helper'
-
-module Adapi
-  class AdTest < Test::Unit::TestCase
-    # include ActiveModel::Lint::Tests
-
-    def setup
-      @model = Ad.new
-    end
-
-  end
-end