google-adwords-api 0.5.2 → 0.5.3

data/lib/adwords_api/v201109/traffic_estimator_service_registry.rb

@@ -1,9 +1,11 @@
-#!/usr/bin/ruby
+# Encoding: utf-8
+#
 # This is auto-generated code, changes will be overwritten.
-# Copyright:: Copyright 2011, Google Inc. All Rights Reserved.
-# License:: Licensed under the Apache License,Version 2.0 (the "License").
 #
-# Code generated by AdsCommon library 0.6.0 on 2011-12-02 16:43:03.
+# Copyright:: Copyright 2012, Google Inc. All Rights Reserved.
+# License:: Licensed under the Apache License, Version 2.0.
+#
+# Code generated by AdsCommon library 0.6.4 on 2012-04-12 13:18:22.
 
 require 'adwords_api/errors'
 

data/lib/adwords_api/v201109/user_list_service.rb

@@ -1,9 +1,11 @@
-#!/usr/bin/ruby
+# Encoding: utf-8
+#
 # This is auto-generated code, changes will be overwritten.
-# Copyright:: Copyright 2011, Google Inc. All Rights Reserved.
-# License:: Licensed under the Apache License,Version 2.0 (the "License").
 #
-# Code generated by AdsCommon library 0.6.0 on 2011-12-02 16:43:05.
+# Copyright:: Copyright 2012, Google Inc. All Rights Reserved.
+# License:: Licensed under the Apache License, Version 2.0.
+#
+# Code generated by AdsCommon library 0.6.4 on 2012-04-12 13:18:23.
 
 require 'ads_common/savon_service'
 require 'adwords_api/v201109/user_list_service_registry'

data/lib/adwords_api/v201109/user_list_service_registry.rb

@@ -1,9 +1,11 @@
-#!/usr/bin/ruby
+# Encoding: utf-8
+#
 # This is auto-generated code, changes will be overwritten.
-# Copyright:: Copyright 2011, Google Inc. All Rights Reserved.
-# License:: Licensed under the Apache License,Version 2.0 (the "License").
 #
-# Code generated by AdsCommon library 0.6.0 on 2011-12-02 16:43:05.
+# Copyright:: Copyright 2012, Google Inc. All Rights Reserved.
+# License:: Licensed under the Apache License, Version 2.0.
+#
+# Code generated by AdsCommon library 0.6.4 on 2012-04-12 13:18:23.
 
 require 'adwords_api/errors'
 

data/lib/adwords_api/version.rb

@@ -21,6 +21,6 @@
 
 module AdwordsApi
   module ApiConfig
-    CLIENT_LIB_VERSION = '0.5.2'
+    CLIENT_LIB_VERSION = '0.5.3'
   end
 end

data/test/adwords_api/test_credential_handler.rb

@@ -0,0 +1,105 @@
+#!/usr/bin/env ruby
+# Encoding: utf-8
+#
+# Author:: api.dklimkin@gmail.com (Danial Klimkin)
+#
+# Copyright:: Copyright 2012, 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.
+#
+# Tests credential handler.
+
+require 'test/unit'
+
+require 'adwords_api'
+
+# Overriding default access levels to public for tests.
+module AdwordsApi
+  class CredentialHandler
+    public :validate_headers_for_server
+  end
+end
+
+class TestCredentialHandler < Test::Unit::TestCase
+  def test_validate_headers_for_server_client_email
+    config = AdsCommon::Config.new(
+        {:authentication => {:client_email => 'email@example.com'}})
+    handler = AdwordsApi::CredentialHandler.new(config)
+    assert_nothing_raised do
+      handler.validate_headers_for_server(:v201101)
+    end
+    assert_raise(AdwordsApi::Errors::BadCredentialsError) do
+      handler.validate_headers_for_server(:v201109)
+    end
+  end
+
+  def test_validate_headers_for_server_client_customer_id
+    config = AdsCommon::Config.new(
+        {:authentication => {:client_customer_id => '123-456-7890'}})
+    handler = AdwordsApi::CredentialHandler.new(config)
+    assert_nothing_raised do
+      handler.validate_headers_for_server(:v201101)
+      handler.validate_headers_for_server(:v201109)
+    end
+  end
+
+  def test_validate_headers_for_server_valid_cid
+    config = AdsCommon::Config.new(
+        {:authentication => {:client_customer_id => '123-456-7890'}})
+    handler = AdwordsApi::CredentialHandler.new(config)
+    assert_nothing_raised do
+      handler.validate_headers_for_server(:v201109)
+    end
+
+    config = AdsCommon::Config.new(
+        {:authentication => {:client_customer_id => '1234567890'}})
+    handler = AdwordsApi::CredentialHandler.new(config)
+    assert_nothing_raised do
+      handler.validate_headers_for_server(:v201109)
+    end
+
+    config = AdsCommon::Config.new(
+        {:authentication => {:client_customer_id => 1234567890}})
+    handler = AdwordsApi::CredentialHandler.new(config)
+    assert_nothing_raised do
+      handler.validate_headers_for_server(:v201109)
+    end
+  end
+
+  def test_validate_headers_for_server_invalid_cid
+    config = AdsCommon::Config.new(
+        {:authentication => {:client_customer_id => 'demo@example.com'}})
+    handler = AdwordsApi::CredentialHandler.new(config)
+    assert_raise(AdwordsApi::Errors::BadCredentialsError) do
+      handler.validate_headers_for_server(:v201109)
+    end
+
+    config = AdsCommon::Config.new({
+        :authentication => {
+          :client_customer_id => 'demo@example.com 1234567890'
+        }
+    })
+    handler = AdwordsApi::CredentialHandler.new(config)
+    assert_raise(AdwordsApi::Errors::BadCredentialsError) do
+      handler.validate_headers_for_server(:v201109)
+    end
+
+    config = AdsCommon::Config.new(
+        {:authentication => {:client_customer_id => '123-456-7890-'}})
+    handler = AdwordsApi::CredentialHandler.new(config)
+    assert_raise(AdwordsApi::Errors::BadCredentialsError) do
+      handler.validate_headers_for_server(:v201109)
+    end
+  end
+end

data/test/adwords_api/test_report_utils.rb

@@ -30,6 +30,7 @@ API_VERSION = :v201109
 module AdwordsApi
   class ReportUtils
     public :check_for_errors
+    public :add_report_definition_hash_order
   end
 end
 
@@ -119,4 +120,69 @@ class TestReportUtils < Test::Unit::TestCase
       @report_utils.check_for_errors(response)
     end
   end
+
+  # Tests generated hash order for root (complete set).
+  def test_add_report_definition_hash_order_root1
+    node = {
+      :include_zero_impressions => false,
+      :download_format => 'CSV',
+      :report_type => 'CRITERIA_PERFORMANCE_REPORT',
+      :selector => {},
+      :report_name => 'report_name',
+      :date_range_type => 'LAST_7_DAYS'
+    }
+    expected = [:selector, :report_name, :report_type, :date_range_type,
+                :download_format, :include_zero_impressions]
+    @report_utils.add_report_definition_hash_order(node)
+    assert_not_nil(node[:order!])
+    assert_equal(expected, node[:order!])
+  end
+
+  # Tests generated hash order for root (incomplete set).
+  def test_add_report_definition_hash_order_root2
+    node = {
+      :download_format => 'CSV',
+      :report_type => 'CRITERIA_PERFORMANCE_REPORT',
+      :selector => {},
+      :report_name => 'report_name',
+      :date_range_type => 'LAST_7_DAYS'
+    }
+    expected = [:selector, :report_name, :report_type, :date_range_type,
+                :download_format]
+    @report_utils.add_report_definition_hash_order(node)
+    assert_not_nil(node[:order!])
+    assert_equal(expected, node[:order!])
+  end
+
+  # Tests generated hash order for whole structure.
+  def test_add_report_definition_hash_order_deep
+    node = {
+      :report_name => 'report_name',
+      :report_type => 'CRITERIA_PERFORMANCE_REPORT',
+      :selector => {
+        :date_range => {:max => '20120405', :min => '20120405'},
+        :predicates => {:operator => 'IN', :field => 'S', :values => ['A']},
+        :fields => ['CampaignId']
+      },
+      :include_zero_impressions => false,
+      :download_format => 'CSV',
+      :date_range_type => 'LAST_7_DAYS'
+    }
+    expected1 = [:selector, :report_name, :report_type, :date_range_type,
+                 :download_format, :include_zero_impressions]
+    expected2 = [:fields, :predicates, :date_range]
+    expected3 = [:min, :max]
+    expected4 = [:field, :operator, :values]
+
+    @report_utils.add_report_definition_hash_order(node)
+    assert_not_nil(node[:order!])
+    assert_not_nil(node[:selector][:order!])
+    assert_not_nil(node[:selector][:date_range][:order!])
+    assert_not_nil(node[:selector][:predicates][:order!])
+
+    assert_equal(expected1, node[:order!])
+    assert_equal(expected2, node[:selector][:order!])
+    assert_equal(expected3, node[:selector][:date_range][:order!])
+    assert_equal(expected4, node[:selector][:predicates][:order!])
+  end
 end

metadata

@@ -1,13 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: google-adwords-api
 version: !ruby/object:Gem::Version 
-  hash: 15
   prerelease: false
   segments: 
   - 0
   - 5
-  - 2
-  version: 0.5.2
+  - 3
+  version: 0.5.3
 platform: ruby
 authors: 
 - Danial Klimkin
@@ -15,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-03-20 00:00:00 +04:00
+date: 2012-04-12 00:00:00 +04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -26,12 +25,11 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 53
         segments: 
         - 0
         - 9
-        - 7
-        version: 0.9.7
+        - 9
+        version: 0.9.9
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
@@ -42,7 +40,6 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 1
         segments: 
         - 0
         - 6
@@ -190,6 +187,7 @@ files:
 - test/bugs/test_issue_00000031.rb
 - test/suite_unittests.rb
 - test/adwords_api/test_report_utils.rb
+- test/adwords_api/test_credential_handler.rb
 - test/adwords_api/test_api_config.rb
 - test/adwords_api/test_utils.rb
 - test/suite_exampletests.rb
@@ -211,7 +209,6 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"
@@ -220,7 +217,6 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 23
       segments: 
       - 1
       - 3