adapi 0.0.8 → 0.0.9

data/lib/adapi.rb

@@ -2,13 +2,16 @@
 
 require 'rubygems'
 require 'adwords_api'
+# TODO use for optional logging of general activity
+# currently we only load communication with adwords-api
+# in form of complete SOAP requests
 # require 'logger'
 require 'yaml'
 require 'pp'
 
 require 'active_model'
-# TODO require only ActiveSupport parts that we actually use
-require 'active_support/all'
+# load only ActiveSupport core extensions
+require 'active_support/core_ext'
 
 require 'adapi/version'
 require 'adapi/config'
@@ -31,10 +34,10 @@ require 'adapi/location'
 # monkeypatch that hardcodes HTTP timeout to 5 minutes
 require 'httpi_monkeypatch'
 
-# optional monkeypatch that saves SOAP in Savon log in pretty format
-# doesn't save SOAP in pretty format by default (it's faster)
-if (Adapi::Config.read[:library][:log_pretty_format] rescue false)
-  require 'savon_monkeypatch'
+# optionally prettify Savon SOAP log
+# PS: slow, should be set to false in production
+Savon.configure do |config|
+  config.pretty_print_xml = ((Adapi::Config.read[:library][:log_pretty_format] == true) rescue false)
 end
 
 HTTPI.adapter = :curb
@@ -46,4 +49,4 @@ end
 
 if RUBY_VERSION < '1.9'
   puts "WARNING: please use ruby 1.9, adapi gem won't work properly in 1.8 and earlier versions"
-end
+end

data/test/{config/adapi.yml.template → fixtures/adapi.yml}

@@ -1,21 +1,30 @@
+
 :default:
   :authentication:
     :method: ClientLogin
-    :email: adapi_yml@example.com
+    :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@example.com
+    :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/test/{config/adwords_api.yml.template → fixtures/adwords_api.yml}

@@ -1,10 +1,14 @@
+
 :authentication:
   :method: ClientLogin
-  :email: adwords_api_yml@example.com
+  :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/integration/find_location_test.rb

@@ -44,7 +44,7 @@ module Adapi
         @location = Adapi::Location.find( :country => "CZ", :province => "CZ-JM" )
         assert_not_nil @location
         assert_equal 20219, @location[:id]
-        assert_equal "South Moravia", @location[:location_name]
+        assert_equal "South Moravian Region", @location[:location_name]
         assert_equal "Region", @location[:display_type]
      end
 

data/test/unit/ad_group_test.rb

@@ -31,8 +31,8 @@ module Adapi
 
       context " / data method" do
         should "return params in hash" do
-          assert @ad_group.data.is_a?(Hash)
-          assert_equal @ad_group.name, @ad_group.data[:name]
+          assert @ad_group.attributes.is_a?(Hash)
+          assert_equal @ad_group.name, @ad_group.attributes[:name]
         end
       end
 

data/test/unit/config_test.rb

@@ -1,52 +1,33 @@
 # 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'
+        Adapi::Config.dir             = 'test/fixtures'
+        Adapi::Config.filename        = 'adapi.yml'
         @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]
+        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
-        # because it could have been set in another test
-        # set default values
-        Adapi::Config.dir             = 'test/config'
-        Adapi::Config.filename        = 'adwords_api.yml.template'
+        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 'adwords_api_yml@example.com', @settings[:default][:authentication][:email]
+        assert_equal 'default_email@gmail.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

data/test/unit/constant_data/language_test.rb

@@ -0,0 +1,34 @@
+# encoding: utf-8
+
+require 'test_helper'
+
+module Adapi
+  class LanguageTest < Test::Unit::TestCase
+
+    context "Language.find" do
+
+      should "return instance of Language class" do
+        assert_instance_of ConstantData::Language, ConstantData::Language.find('cs')
+      end
+
+      should "find language id by language code" do
+        assert_equal 1021, ConstantData::Language.find('cs').id
+      end
+
+      should "return nil for unknown language code" do
+        assert_equal nil, ConstantData::Language.find('unknown').id
+      end
+
+      should "return language code for language id" do
+        assert_equal :cs, ConstantData::Language.find(1021).code
+      end
+
+      should "return nil for unknown language id" do
+        assert_equal nil, ConstantData::Language.find(12345).code
+      end
+
+    end
+
+  end
+end
+

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: adapi
 version: !ruby/object:Gem::Version
-  version: 0.0.8
+  version: 0.0.9
   prerelease: 
 platform: ruby
 authors:
@@ -9,75 +9,55 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-27 00:00:00.000000000 Z
+date: 2012-07-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: google-ads-common
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &14836360 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - '='
+    - - =
       - !ruby/object:Gem::Version
-        version: 0.7.0
+        version: 0.7.3
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 0.7.0
+  version_requirements: *14836360
 - !ruby/object:Gem::Dependency
   name: google-adwords-api
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &14835520 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - '='
+    - - =
       - !ruby/object:Gem::Version
-        version: 0.6.0
+        version: 0.6.2
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 0.6.0
+  version_requirements: *14835520
 - !ruby/object:Gem::Dependency
   name: activemodel
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &14834820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '3.1'
+        version: '3.0'
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '3.1'
+  version_requirements: *14834820
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &14834120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '3.1'
+        version: '3.0'
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '3.1'
+  version_requirements: *14834120
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &14849580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -85,15 +65,10 @@ dependencies:
         version: 0.9.2
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.9.2
+  version_requirements: *14849580
 - !ruby/object:Gem::Dependency
   name: curb
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &14848220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -101,15 +76,10 @@ dependencies:
         version: 0.8.0
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.8.0
+  version_requirements: *14848220
 - !ruby/object:Gem::Dependency
   name: yard
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &14846280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -117,15 +87,10 @@ dependencies:
         version: '0.7'
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '0.7'
+  version_requirements: *14846280
 - !ruby/object:Gem::Dependency
   name: rcov
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &14845320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -133,31 +98,21 @@ dependencies:
         version: '0.9'
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '0.9'
+  version_requirements: *14845320
 - !ruby/object:Gem::Dependency
   name: turn
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &14843740 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - '='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 0.8.2
+        version: 0.9.6
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 0.8.2
+  version_requirements: *14843740
 - !ruby/object:Gem::Dependency
   name: shoulda
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &14842660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -165,15 +120,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  version_requirements: *14842660
 - !ruby/object:Gem::Dependency
   name: fakeweb
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &14858140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -181,15 +131,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  version_requirements: *14858140
 - !ruby/object:Gem::Dependency
   name: factory_girl
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &14857440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -197,15 +142,10 @@ dependencies:
         version: 3.3.0
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 3.3.0
+  version_requirements: *14857440
 - !ruby/object:Gem::Dependency
   name: minitest
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &14856840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -213,12 +153,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  version_requirements: *14856840
 description: This gem provides user-friendly interface to Google Adwords API.
 email:
 - lucastej@gmail.com
@@ -239,14 +174,19 @@ files:
 - examples/add_campaign.rb
 - examples/add_campaign_criteria.rb
 - examples/add_invalid_ad_group.rb
+- examples/add_invalid_keywords.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
+- examples/delete_ad_group.rb
 - examples/delete_keyword.rb
+- examples/delete_text_ad.rb
+- examples/find_ad_group.rb
 - examples/find_all_campaigns.rb
+- examples/find_bare_campaign.rb
 - examples/find_campaign.rb
 - examples/find_campaign_ad_groups.rb
 - examples/find_campaign_criteria.rb
@@ -254,8 +194,12 @@ files:
 - examples/log_to_specific_account.rb
 - examples/rollback_campaign.rb
 - examples/test_diacritics.rb
+- examples/update_ad_group.rb
 - examples/update_campaign.rb
-- examples/update_campaign_status.rb
+- examples/update_campaign_ad_groups.rb
+- examples/update_campaign_criteria.rb
+- examples/update_complete_campaign.rb
+- examples/update_text_ad.rb
 - lib/adapi.rb
 - lib/adapi/ad.rb
 - lib/adapi/ad/text_ad.rb
@@ -275,13 +219,12 @@ files:
 - lib/adapi/location.rb
 - lib/adapi/version.rb
 - lib/httpi_monkeypatch.rb
-- lib/savon_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/factories/campaign_factory.rb
+- test/fixtures/adapi.yml
+- test/fixtures/adwords_api.yml
 - test/integration/create_campaign_test.rb
 - test/integration/find_location_test.rb
 - test/test_helper.rb
@@ -292,6 +235,7 @@ files:
 - test/unit/campaign_criterion_test.rb
 - test/unit/campaign_test.rb
 - test/unit/config_test.rb
+- test/unit/constant_data/language_test.rb
 homepage: https://github.com/lstejskal/adapi
 licenses: []
 post_install_message: 
@@ -306,7 +250,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -478548313315719997
+      hash: 3921754169281817969
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -315,10 +259,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -478548313315719997
+      hash: 3921754169281817969
 requirements: []
 rubyforge_project: adapi
-rubygems_version: 1.8.21
+rubygems_version: 1.8.15
 signing_key: 
 specification_version: 3
 summary: User-friendly interface to Google Adwords API

data/examples/update_campaign_status.rb

@@ -1,15 +0,0 @@
-
-require 'adapi'
-
-# create campaign
-require_relative 'add_bare_campaign'
-
-p "ORIGINAL STATUS: %s" % $campaign.status
-
-$campaign.activate
-
-p "STATUS UPDATE 1: %s" % $campaign.status
-
-$campaign.delete
-
-p "STATUS UPDATE 2: %s" % $campaign.status

data/lib/savon_monkeypatch.rb

@@ -1,43 +0,0 @@
-
-# This monkeypatch adds option to prettify Savon SOAP log
-#
-# Not necessary, but very convenient feature - unless you're fond of deciphering
-# endless SOAP request/response one-liners.
-#
-# Can be safely removed. Should be only temporary, as the idea is taken straight
-# out of Savon pull requests and should be included in its future version.
-
-module Savon
-  module Config
-
-   # Logs a given +message+. Optionally filtered if +xml+ is truthy.
-    def log(message, xml = false)
-      return unless log?
-
-      # ORIG
-      # message = filter_xml(message) if xml && !log_filter.empty?
-
-      # NEW: always run filter_xml method 
-      message = filter_xml(message) # if xml && !log_filter.empty?
-
-      logger.send log_level, message
-    end
-
-    # Filters the given +xml+ based on log filter.
-    def filter_xml(xml)
-      doc = Nokogiri::XML(xml)
-      return xml unless doc.errors.empty?
-
-      log_filter.each do |filter|
-        doc.xpath("//*[local-name()='#{filter}']").map { |node| node.content = "***FILTERED***" }
-      end
-
-      # ORIG
-      # doc.root.to_s
-
-      # NEW: return formatted SOAP
-      doc.to_xml(:indent => 2)
-    end
-
-  end
-end