adapi 0.0.4 → 0.0.5

data/test/unit/ad_test.rb

@@ -4,7 +4,7 @@ require 'test_helper'
 
 module Adapi
   class AdTest < Test::Unit::TestCase
-    include ActiveModel::Lint::Tests
+    # include ActiveModel::Lint::Tests
 
     def setup
       @model = Ad.new

data/test/unit/campaign_criterion_test.rb

@@ -0,0 +1,23 @@
+# encoding: utf-8
+
+require 'test_helper'
+
+module Adapi
+  class CampaignCriterionTest < Test::Unit::TestCase
+  
+    context "language alias" do
+
+      should "be converted to language id " do
+        assert_equal CampaignCriterion.create_criterion(:language, 'en'),
+          {:xsi_type => 'Language', :id => 1000}
+      end
+
+      should "be automatically converted to lowercase" do
+        assert_equal CampaignCriterion.create_criterion(:language, 'CS'),
+          {:xsi_type => 'Language', :id => 1021}
+      end
+
+    end
+
+  end
+end

data/test/unit/config_test.rb

@@ -0,0 +1,52 @@
+# encoding: utf-8
+require 'test_helper'
+
+module Adapi
+  class ConfigTest < Test::Unit::TestCase
+
+    # FIXME how come that tests work without custom configurations settings?
+    #  Adapi::Config.dir = 'test/config'
+    #  Adapi::Config.filename = 'adapi.yml.template'
+
+    context "Loading adapi.yml" do
+      should "load the configuration" do
+        # because it could have been set in another test
+        # set default values
+        Adapi::Config.dir             = 'test/config'
+        Adapi::Config.filename        = 'adapi.yml.template'
+        @settings                     = Adapi::Config.settings(true)
+
+        assert_equal '555-666-7777', @settings[:default][:authentication][:client_customer_id]
+        assert_equal 'adapi_yml@example.com', @settings[:default][:authentication][:email]
+        assert_equal 'sandbox_email@example.com', @settings[:sandbox][:authentication][:email]
+      end
+    end
+
+    context "Loading adwords_api.yml" do
+      should "loads the configuration" do
+        # because it could have been set in another test
+        # set default values
+        Adapi::Config.dir             = 'test/config'
+        Adapi::Config.filename        = 'adwords_api.yml.template'
+        @settings                     = Adapi::Config.settings(true)
+
+        assert_equal '555-666-7777', @settings[:default][:authentication][:client_customer_id]
+        assert_equal 'adwords_api_yml@example.com', @settings[:default][:authentication][:email]
+        assert_nil @settings[:sandbox]
+      end
+    end
+
+
+    context "Config params can be overwritten and " do
+      should "correctly set Adapi::Config.adapi_dir" do
+        Adapi::Config.dir             = 'adapi_dir'
+        assert_equal 'adapi_dir', Adapi::Config.dir
+      end
+
+      should "correctly set Adapi::Config.adapi_filename" do
+        Adapi::Config.filename        = 'adapi_filename'
+        assert_equal 'adapi_filename', Adapi::Config.filename
+      end
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: adapi
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,33 +9,33 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-12-22 00:00:00.000000000Z
+date: 2012-02-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: google-ads-common
-  requirement: &15506360 !ruby/object:Gem::Requirement
+  requirement: &10751680 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - =
       - !ruby/object:Gem::Version
-        version: 0.5.0
+        version: 0.6.2
   type: :runtime
   prerelease: false
-  version_requirements: *15506360
+  version_requirements: *10751680
 - !ruby/object:Gem::Dependency
   name: google-adwords-api
-  requirement: &15455540 !ruby/object:Gem::Requirement
+  requirement: &10749800 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - =
       - !ruby/object:Gem::Version
-        version: 0.4.0
+        version: 0.5.0
   type: :runtime
   prerelease: false
-  version_requirements: *15455540
+  version_requirements: *10749800
 - !ruby/object:Gem::Dependency
   name: activemodel
-  requirement: &15454880 !ruby/object:Gem::Requirement
+  requirement: &10748340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: '3.1'
   type: :runtime
   prerelease: false
-  version_requirements: *15454880
+  version_requirements: *10748340
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &15454300 !ruby/object:Gem::Requirement
+  requirement: &10747280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: '3.1'
   type: :runtime
   prerelease: false
-  version_requirements: *15454300
+  version_requirements: *10747280
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &15453760 !ruby/object:Gem::Requirement
+  requirement: &10743320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,10 +65,10 @@ dependencies:
         version: 0.9.2
   type: :runtime
   prerelease: false
-  version_requirements: *15453760
+  version_requirements: *10743320
 - !ruby/object:Gem::Dependency
   name: curb
-  requirement: &15453080 !ruby/object:Gem::Requirement
+  requirement: &10742640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -76,10 +76,10 @@ dependencies:
         version: '0.7'
   type: :runtime
   prerelease: false
-  version_requirements: *15453080
+  version_requirements: *10742640
 - !ruby/object:Gem::Dependency
   name: yard
-  requirement: &15452120 !ruby/object:Gem::Requirement
+  requirement: &10740660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -87,10 +87,10 @@ dependencies:
         version: '0.7'
   type: :development
   prerelease: false
-  version_requirements: *15452120
+  version_requirements: *10740660
 - !ruby/object:Gem::Dependency
   name: rcov
-  requirement: &15449500 !ruby/object:Gem::Requirement
+  requirement: &10739480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -98,10 +98,10 @@ dependencies:
         version: '0.9'
   type: :development
   prerelease: false
-  version_requirements: *15449500
+  version_requirements: *10739480
 - !ruby/object:Gem::Dependency
   name: turn
-  requirement: &15423440 !ruby/object:Gem::Requirement
+  requirement: &10738540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -109,10 +109,10 @@ dependencies:
         version: 0.8.2
   type: :development
   prerelease: false
-  version_requirements: *15423440
+  version_requirements: *10738540
 - !ruby/object:Gem::Dependency
   name: shoulda
-  requirement: &15420900 !ruby/object:Gem::Requirement
+  requirement: &10737680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -120,10 +120,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *15420900
+  version_requirements: *10737680
 - !ruby/object:Gem::Dependency
   name: fakeweb
-  requirement: &15419460 !ruby/object:Gem::Requirement
+  requirement: &10732740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -131,10 +131,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *15419460
+  version_requirements: *10732740
 - !ruby/object:Gem::Dependency
   name: factory_girl
-  requirement: &15418480 !ruby/object:Gem::Requirement
+  requirement: &10729600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -142,10 +142,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *15418480
+  version_requirements: *10729600
 - !ruby/object:Gem::Dependency
   name: minitest
-  requirement: &15417640 !ruby/object:Gem::Requirement
+  requirement: &10726800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -153,7 +153,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *15417640
+  version_requirements: *10726800
 description: This gem provides user-friendly interface to Google Adwords API.
 email:
 - lucastej@gmail.com
@@ -162,6 +162,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
+- GUIDELINES.markdown
 - Gemfile
 - LICENSE
 - README.markdown
@@ -171,10 +172,11 @@ files:
 - examples/add_bare_ad_group.rb
 - examples/add_bare_campaign.rb
 - examples/add_campaign.rb
-- examples/add_campaign_targets.rb
+- examples/add_campaign_criteria.rb
 - examples/add_invalid_ad_group.rb
 - examples/add_invalid_text_ad.rb
 - examples/add_keywords.rb
+- examples/add_negative_campaign_criteria.rb
 - examples/add_text_ad.rb
 - examples/custom_settings.yml
 - examples/customize_configuration.rb
@@ -182,6 +184,8 @@ files:
 - examples/find_all_campaigns.rb
 - examples/find_campaign.rb
 - examples/find_campaign_ad_groups.rb
+- examples/find_campaign_criteria.rb
+- examples/find_locations.rb
 - examples/log_to_specific_account.rb
 - examples/rollback_campaign.rb
 - examples/update_campaign.rb
@@ -191,23 +195,32 @@ files:
 - lib/adapi/ad/text_ad.rb
 - lib/adapi/ad_group.rb
 - lib/adapi/ad_group_criterion.rb
+- lib/adapi/ad_param.rb
 - lib/adapi/api.rb
 - lib/adapi/campaign.rb
+- lib/adapi/campaign_criterion.rb
 - lib/adapi/campaign_target.rb
 - lib/adapi/config.rb
+- lib/adapi/constant_data.rb
+- lib/adapi/constant_data/language.rb
 - lib/adapi/keyword.rb
+- lib/adapi/location.rb
 - lib/adapi/version.rb
 - lib/httpi_request_monkeypatch.rb
+- test/config/adapi.yml.template
+- test/config/adwords_api.yml.template
 - test/factories/.gitignore
 - test/factories/ad_group_factory.rb
 - test/factories/ad_text_factory.rb
+- test/integration/create_campaign_test.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_target_test.rb
-homepage: ''
+- test/unit/campaign_criterion_test.rb
+- test/unit/config_test.rb
+homepage: https://github.com/lstejskal/adapi
 licenses: []
 post_install_message: 
 rdoc_options: []

data/examples/add_campaign_targets.rb

@@ -1,26 +0,0 @@
-# encoding: utf-8
-
-require 'adapi'
-
-# create campaign
-require File.join(File.dirname(__FILE__), 'add_bare_campaign')
-
-# TODO we should be able call it from campaign instance, for example:
-# $campaign.set_targets(:language => [ 'en' ], ...)
-
-$campaign_target = Adapi::CampaignTarget.new(
-  :campaign_id => $campaign[:id],
-  :targets => {
-    :language => [ 'en' ],
-    :geo => {
-      # :country => 'CZ'
-      # :province => 'CZ-PR'
-      # :city => { :city_name => 'Prague', :province_code => 'CZ-PR', :country_code => 'CZ' }
-      :proximity => { :geo_point => '50.083333,14.366667', :radius => '50 km' }
-    }
-  }
-)
-
-$campaign_target.create
-
-p $campaign_target.attributes

data/test/unit/campaign_target_test.rb

@@ -1,51 +0,0 @@
-# encoding: utf-8
-
-require 'test_helper'
-
-module Adapi
-  class CampaignTargetTest < Test::Unit::TestCase
-  
-    context "self.create_targets" do
-
-      should "parse :language targets" do
-        assert_equal CampaignTarget.create_targets(:language, ['en', 'cs']),
-          [{:language_code => 'en'}, {:language_code => 'cs'}]
-      end
-
-      should "automatically convert :language targets to lowercase" do
-        assert_equal CampaignTarget.create_targets(:language, ['EN', 'CS']),
-          [{:language_code => 'en'}, {:language_code => 'cs'}]
-      end
-
-      should "parse :geo / :country and :province targets" do
-        assert_equal CampaignTarget.create_targets(:geo, {:country => 'CZ', :province => 'CZ-PR'}),
-          [
-            {:xsi_type => 'CountryTarget', :excluded => false, :country_code => 'CZ'},
-            {:xsi_type => 'ProvinceTarget', :excluded => false, :province_code => 'CZ-PR'}
-          ]
-      end
-
-      should "automatically convert :geo / :country and :province targets to uppercase" do
-        assert_equal CampaignTarget.create_targets(:geo, {:country => 'cz', :province => 'cz-pr'}),
-          [
-            {:xsi_type => 'CountryTarget', :excluded => false, :country_code => 'CZ'},
-            {:xsi_type => 'ProvinceTarget', :excluded => false, :province_code => 'CZ-PR'}
-          ]
-      end
-
-      should "parse :geo / :proximity targets" do
-        assert_equal CampaignTarget.create_targets(:geo,
-          {:proximity => {:geo_point => '38.89859,-77.035971', :radius => '10 km'}}),
-          [{ :xsi_type => 'ProximityTarget', :excluded => false,
-            :radius_in_units => 10, :radius_distance_units => 'KILOMETERS',
-            :geo_point => {
-              :longitude_in_micro_degrees => 38898590,
-              :latitude_in_micro_degrees => -77035971
-            }
-          }]
-      end
-
-    end
-
-  end
-end