adwords4r 15.1.0 → 16.0.0

data/ChangeLog.txt

@@ -1,3 +1,10 @@
+16.0.0
+- Removed support for the v200902 Sandbox, which has been deco'ed.
+- Added support for the v200906 Sandbox and Production environments.
+- Changed handling of service environments in the credentials.
+  The 'alternateUrl' parameter has been replaced with the 'environment' one. This can be set to either PRODUCTION or SANDBOX.
+  It controls which environment both v13 and v200906 connect to.
+
 15.1.0
 - Added downloadCsvReport extension to the Report Service, downloads a report as CSV data.
 - Added getMethodUsage extension to the Info Service, returns a breakdown of API usage per method.

data/Rakefile

@@ -18,7 +18,7 @@
 
 # A little trick so we can load things from the lib/ directory without having
 # to patch the "require" statements in the files
-$LOAD_PATH << File.join(File.dirname(__FILE__), 'lib')
+$:.unshift File.join(File.dirname(__FILE__), 'lib')
 
 require 'fileutils'
 require 'net/https'
@@ -36,7 +36,7 @@ require 'adwords4r/services'
 require 'adwords4r/apiextensions'
 
 # Configure some constants and built-in tasks
-CURRENT_VERSION = '15.1.0'
+CURRENT_VERSION = '16.0.0'
 PKG_VERSION = ENV['REL'] ? ENV['REL'] : CURRENT_VERSION
 
 WSDLDIR = 'wsdl'
@@ -76,7 +76,7 @@ task :getwsdl do
                      "/api/adwords/#{version_name}/#{service}Service?wsdl"),
              get_wsdl_file_name(version_name, service))
       else
-        save(getfile("adwords-sandbox.google.com",
+        save(getfile("adwords.google.com",
                      "/api/adwords/cm/#{version_name}/#{service}Service?wsdl"),
              get_wsdl_file_name(version_name, service))
       end
@@ -286,7 +286,7 @@ else
 Adwords4r provides an easy to use way to access the AdWords API in Ruby.
 Currently the following AdWords API versions are supported:
   * V13
-  * V200902 (sandbox)
+  * V200906
     EOS
 
     # Files and dependencies

data/Readme.txt

@@ -16,7 +16,7 @@ Documentation and comments are a work in progress.
 
 = Docs for Users
 
-== 1 - Instalation:
+== 1 - Installation:
 
 adwords4r is a ruby gem.  See http://docs.rubygems.org/read/book/1
 
@@ -56,6 +56,7 @@ You can also pass API a manually constructed AdWordsCredentials object like:
      'password' => 'PASSWORD',
      'email' => 'user@domain.com'
      'clientEmail' => 'user2@domain.com',
+     'environment' => 'PRODUCTION',
    }))
 
 Then, just specify which service you're looking to use, and which version:
@@ -72,27 +73,34 @@ please set the HTTP_PROXY environment variable. For example, from your code:
    $ ENV['HTTP_PROXY'] = 'http://myproxyserver:8080'
 
 
-=== 2.1 - Using the Sandbox:
+=== 2.1 - Using the Sandbox and other environments:
 
-In order to use the v13 sandbox, you can add a credential named alternateUrl:
-   alternateUrl=https://sandbox.google.com/api/adwords/v13/
+In order to use the v13 and v200906 sandboxes, make sure that the 'environment'
+parameter in the credentials is set to SANDBOX.
+   environment=SANDBOX
 
-As for v200902, the alternateUrl parameter is currently ignored, since only the
-sandbox is available at the moment. For this API version, all requests will be
-sent to the sandbox, using the "email" and "password" fields defined in the
-credentials for authentication, and clientEmail for specifying which client
-account to access. Developer and application tokens are ignored.
+Should you need to use an environment other than production or sandbox, you can
+add it to the list of environments in runtime:
+   AdWords::Service::add_environment('ENVIRONMENT_NAME', {
+       13 => 'URL_FOR_v13',
+       200906 => 'URL_FOR_v200906'
+   })
+and then use it normally in your code:
+   credentials.environment = 'ENVIRONMENT_NAME'
 
-This way, it's possible to access both the v13 and v200902 sandboxes
-simultaneously. Since they share a common backend storage, it is possible for
-your application to choose between v13 and v200902 services at will, mixing and
-matching them.
+
+=== 2.2 - Mixing v13 and v200906:
+
+It's possible to access both the v13 and v200906 sandboxes or production
+environments simultaneously. Since both versions share a common backend storage,
+it is possible for your application to choose between v13 and v200906 services
+at will, mixing and matching them.
 
 The multiple_versions.rb code sample shows you how to build an application using
-v13 and v200902 services simultaneously.
+v13 and v200906 services simultaneously.
 
 
-=== 2.2 - Logging:
+=== 2.3 - Logging:
 
 It is often useful to see a trace of the raw SOAP XML being sent and received.
 The quickest way of achieving this when debugging your application is by setting

data/doc/classes/AdWords.html

@@ -21,18 +21,18 @@
         </h1>
         <ul class="files">
             
-            <li><a href="../files/lib/adwords4r/credentials_rb.html">lib/adwords4r/credentials.rb</a></li>
-            
             <li><a href="../files/lib/adwords4r_rb.html">lib/adwords4r.rb</a></li>
             
+            <li><a href="../files/lib/adwords4r/credentials_rb.html">lib/adwords4r/credentials.rb</a></li>
+            
             <li><a href="../files/lib/adwords4r/services_rb.html">lib/adwords4r/services.rb</a></li>
             
             <li><a href="../files/lib/adwords4r/adwordslogger_rb.html">lib/adwords4r/adwordslogger.rb</a></li>
             
-            <li><a href="../files/lib/adwords4r/authtoken_rb.html">lib/adwords4r/authtoken.rb</a></li>
-            
             <li><a href="../files/lib/adwords4r/apiextensions_rb.html">lib/adwords4r/apiextensions.rb</a></li>
             
+            <li><a href="../files/lib/adwords4r/authtoken_rb.html">lib/adwords4r/authtoken.rb</a></li>
+            
             <li><a href="../files/lib/adwords4r/utils_rb.html">lib/adwords4r/utils.rb</a></li>
             
             <li><a href="../files/lib/adwords4r/v13/AccountServiceWrapper_rb.html">lib/adwords4r/v13/AccountServiceWrapper.rb</a></li>
@@ -49,23 +49,23 @@
             
             <li><a href="../files/lib/adwords4r/v13/KeywordToolServiceWrapper_rb.html">lib/adwords4r/v13/KeywordToolServiceWrapper.rb</a></li>
             
-            <li><a href="../files/lib/adwords4r/v13/SiteSuggestionServiceWrapper_rb.html">lib/adwords4r/v13/SiteSuggestionServiceWrapper.rb</a></li>
-            
             <li><a href="../files/lib/adwords4r/v13/ReportServiceWrapper_rb.html">lib/adwords4r/v13/ReportServiceWrapper.rb</a></li>
             
+            <li><a href="../files/lib/adwords4r/v13/SiteSuggestionServiceWrapper_rb.html">lib/adwords4r/v13/SiteSuggestionServiceWrapper.rb</a></li>
+            
             <li><a href="../files/lib/adwords4r/v13/TrafficEstimatorServiceWrapper_rb.html">lib/adwords4r/v13/TrafficEstimatorServiceWrapper.rb</a></li>
             
-            <li><a href="../files/lib/adwords4r/v200902/AdGroupAdServiceWrapper_rb.html">lib/adwords4r/v200902/AdGroupAdServiceWrapper.rb</a></li>
+            <li><a href="../files/lib/adwords4r/v200906/AdGroupAdServiceWrapper_rb.html">lib/adwords4r/v200906/AdGroupAdServiceWrapper.rb</a></li>
             
-            <li><a href="../files/lib/adwords4r/v200902/AdGroupCriterionServiceWrapper_rb.html">lib/adwords4r/v200902/AdGroupCriterionServiceWrapper.rb</a></li>
+            <li><a href="../files/lib/adwords4r/v200906/AdGroupServiceWrapper_rb.html">lib/adwords4r/v200906/AdGroupServiceWrapper.rb</a></li>
             
-            <li><a href="../files/lib/adwords4r/v200902/AdGroupServiceWrapper_rb.html">lib/adwords4r/v200902/AdGroupServiceWrapper.rb</a></li>
+            <li><a href="../files/lib/adwords4r/v200906/AdGroupCriterionServiceWrapper_rb.html">lib/adwords4r/v200906/AdGroupCriterionServiceWrapper.rb</a></li>
             
-            <li><a href="../files/lib/adwords4r/v200902/CampaignServiceWrapper_rb.html">lib/adwords4r/v200902/CampaignServiceWrapper.rb</a></li>
+            <li><a href="../files/lib/adwords4r/v200906/CampaignCriterionServiceWrapper_rb.html">lib/adwords4r/v200906/CampaignCriterionServiceWrapper.rb</a></li>
             
-            <li><a href="../files/lib/adwords4r/v200902/CampaignCriterionServiceWrapper_rb.html">lib/adwords4r/v200902/CampaignCriterionServiceWrapper.rb</a></li>
+            <li><a href="../files/lib/adwords4r/v200906/CampaignServiceWrapper_rb.html">lib/adwords4r/v200906/CampaignServiceWrapper.rb</a></li>
             
-            <li><a href="../files/lib/adwords4r/v200902/CampaignTargetServiceWrapper_rb.html">lib/adwords4r/v200902/CampaignTargetServiceWrapper.rb</a></li>
+            <li><a href="../files/lib/adwords4r/v200906/CampaignTargetServiceWrapper_rb.html">lib/adwords4r/v200906/CampaignTargetServiceWrapper.rb</a></li>
             
             <li><a href="../files/lib/adwords4r/v13/AccountService_rb.html">lib/adwords4r/v13/AccountService.rb</a></li>
             
@@ -87,17 +87,17 @@
             
             <li><a href="../files/lib/adwords4r/v13/TrafficEstimatorService_rb.html">lib/adwords4r/v13/TrafficEstimatorService.rb</a></li>
             
-            <li><a href="../files/lib/adwords4r/v200902/AdGroupAdService_rb.html">lib/adwords4r/v200902/AdGroupAdService.rb</a></li>
+            <li><a href="../files/lib/adwords4r/v200906/AdGroupAdService_rb.html">lib/adwords4r/v200906/AdGroupAdService.rb</a></li>
             
-            <li><a href="../files/lib/adwords4r/v200902/AdGroupCriterionService_rb.html">lib/adwords4r/v200902/AdGroupCriterionService.rb</a></li>
+            <li><a href="../files/lib/adwords4r/v200906/AdGroupCriterionService_rb.html">lib/adwords4r/v200906/AdGroupCriterionService.rb</a></li>
             
-            <li><a href="../files/lib/adwords4r/v200902/AdGroupService_rb.html">lib/adwords4r/v200902/AdGroupService.rb</a></li>
+            <li><a href="../files/lib/adwords4r/v200906/AdGroupService_rb.html">lib/adwords4r/v200906/AdGroupService.rb</a></li>
             
-            <li><a href="../files/lib/adwords4r/v200902/CampaignCriterionService_rb.html">lib/adwords4r/v200902/CampaignCriterionService.rb</a></li>
+            <li><a href="../files/lib/adwords4r/v200906/CampaignCriterionService_rb.html">lib/adwords4r/v200906/CampaignCriterionService.rb</a></li>
             
-            <li><a href="../files/lib/adwords4r/v200902/CampaignService_rb.html">lib/adwords4r/v200902/CampaignService.rb</a></li>
+            <li><a href="../files/lib/adwords4r/v200906/CampaignService_rb.html">lib/adwords4r/v200906/CampaignService.rb</a></li>
             
-            <li><a href="../files/lib/adwords4r/v200902/CampaignTargetService_rb.html">lib/adwords4r/v200902/CampaignTargetService.rb</a></li>
+            <li><a href="../files/lib/adwords4r/v200906/CampaignTargetService_rb.html">lib/adwords4r/v200906/CampaignTargetService.rb</a></li>
             
         </ul>
     </div>
@@ -108,7 +108,28 @@
         <p>
 Main namespace for all the client library&#8217;s modules and classes.
 </p>
-<hr size="1"></hr>
+<hr size="1"></hr><p>
+Copyright 2009, Google Inc. All Rights Reserved.
+</p>
+<p>
+Licensed under the Apache License, Version 2.0 (the &#8220;License&#8221;);
+you may not use this file except in compliance with the License. You may
+obtain a copy of the License at
+</p>
+<pre>
+    http://www.apache.org/licenses/LICENSE-2.0
+</pre>
+<p>
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an &#8220;AS IS&#8221;
+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.
+</p>
+<p>
+Helper methods for loading and managing the available services.
+</p>
+
     </div>
     
 
@@ -138,7 +159,7 @@ Main namespace for all the client library&#8217;s modules and classes.
         
         <li><span class="type">MODULE</span> <a href="AdWords/V13.html">AdWords::V13</a></li>
         
-        <li><span class="type">MODULE</span> <a href="AdWords/V200902.html">AdWords::V200902</a></li>
+        <li><span class="type">MODULE</span> <a href="AdWords/V200906.html">AdWords::V200906</a></li>
         
         <li><span class="type">CLASS</span> <a href="AdWords/API.html">AdWords::API</a></li>
         
@@ -152,7 +173,7 @@ Main namespace for all the client library&#8217;s modules and classes.
         
         <li><span class="type">CLASS</span> <a href="AdWords/ResponseHandler.html">AdWords::ResponseHandler</a></li>
         
-        <li><span class="type">CLASS</span> <a href="AdWords/Sandbox200902HeaderHandler.html">AdWords::Sandbox200902HeaderHandler</a></li>
+        <li><span class="type">CLASS</span> <a href="AdWords/V200906HeaderHandler.html">AdWords::V200906HeaderHandler</a></li>
         
     </ul>
     

data/doc/classes/AdWords/API.html

@@ -60,7 +60,7 @@ Holds all the services, as well as login credentials.
         <dd>
             <ul>
                 
-                <li><a href="#M000006">get_service</a></li>
+                <li><a href="#M000001">get_service</a></li>
                 
             </ul>
         </dd>
@@ -69,7 +69,7 @@ Holds all the services, as well as login credentials.
         <dd>
             <ul>
                 
-                <li><a href="#M000005">new</a></li>
+                <li><a href="#M000000">new</a></li>
                 
             </ul>
         </dd>
@@ -161,9 +161,9 @@ Number of units spent in total, via this <a href="API.html">API</a> object
             <div class="sectiontitle">Class Public methods</div>
             
             <div class="method">
-                <div class="title" id="M000005">
+                <div class="title" id="M000000">
                     
-                    <a name="M000005"></a><b>new</b>(credentials = AdWordsCredentials.new)
+                    <a name="M000000"></a><b>new</b>(credentials = AdWordsCredentials.new)
                     
                 </div>
                 
@@ -188,10 +188,10 @@ object containing the login information
                 
                 <div class="sourcecode">
                     <p class="source-link">
-                        Source: <a href="javascript:toggleSource('M000005_source')" id="l_M000005_source">show</a>
+                        Source: <a href="javascript:toggleSource('M000000_source')" id="l_M000000_source">show</a>
                         
                     </p>
-                    <div id="M000005_source" class="dyn-source">
+                    <div id="M000000_source" class="dyn-source">
                         <pre><span class="ruby-comment cmt"># File lib/adwords4r.rb, line 63</span>
     <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">initialize</span>(<span class="ruby-identifier">credentials</span> = <span class="ruby-constant">AdWordsCredentials</span>.<span class="ruby-identifier">new</span>)
       <span class="ruby-ivar">@credentials</span> = <span class="ruby-identifier">credentials</span>
@@ -214,9 +214,9 @@ object containing the login information
             <div class="sectiontitle">Instance Public methods</div>
             
             <div class="method">
-                <div class="title" id="M000006">
+                <div class="title" id="M000001">
                     
-                    <a name="M000006"></a><b>get_service</b>(version, name)
+                    <a name="M000001"></a><b>get_service</b>(version, name)
                     
                 </div>
                 
@@ -246,10 +246,10 @@ Returns: The service wrapper for the intended service.
                 
                 <div class="sourcecode">
                     <p class="source-link">
-                        Source: <a href="javascript:toggleSource('M000006_source')" id="l_M000006_source">show</a>
+                        Source: <a href="javascript:toggleSource('M000001_source')" id="l_M000001_source">show</a>
                         
                     </p>
-                    <div id="M000006_source" class="dyn-source">
+                    <div id="M000001_source" class="dyn-source">
                         <pre><span class="ruby-comment cmt"># File lib/adwords4r.rb, line 86</span>
     <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">get_service</span>(<span class="ruby-identifier">version</span>, <span class="ruby-identifier">name</span>)
       <span class="ruby-keyword kw">return</span> <span class="ruby-ivar">@wrappers</span>[[<span class="ruby-identifier">version</span>, <span class="ruby-identifier">name</span>]]

data/doc/classes/AdWords/AdWordsCredentials.html

@@ -56,7 +56,7 @@ Generic credentials class, used for any <a href="API.html">API</a> version.
         <dd>
             <ul>
                 
-                <li><a href="#M000010">auth_token</a></li>
+                <li><a href="#M000012">auth_token</a></li>
                 
             </ul>
         </dd>
@@ -65,7 +65,7 @@ Generic credentials class, used for any <a href="API.html">API</a> version.
         <dd>
             <ul>
                 
-                <li><a href="#M000014">dup</a></li>
+                <li><a href="#M000015">dup</a></li>
                 
             </ul>
         </dd>
@@ -74,9 +74,9 @@ Generic credentials class, used for any <a href="API.html">API</a> version.
         <dd>
             <ul>
                 
-                <li><a href="#M000011">generate_auth_token</a>,</li>
+                <li><a href="#M000013">generate_auth_token</a>,</li>
                 
-                <li><a href="#M000009">get_handlers</a></li>
+                <li><a href="#M000010">get_handlers</a></li>
                 
             </ul>
         </dd>
@@ -85,7 +85,7 @@ Generic credentials class, used for any <a href="API.html">API</a> version.
         <dd>
             <ul>
                 
-                <li><a href="#M000004">new</a></li>
+                <li><a href="#M000008">new</a></li>
                 
             </ul>
         </dd>
@@ -94,7 +94,7 @@ Generic credentials class, used for any <a href="API.html">API</a> version.
         <dd>
             <ul>
                 
-                <li><a href="#M000013">set_header</a></li>
+                <li><a href="#M000014">set_header</a></li>
                 
             </ul>
         </dd>
@@ -128,10 +128,9 @@ Hash of credentials (credential key to value)
             <td class='attr-rw'>
                 [R]
             </td>
-            <td class='attr-name'>alternateUrl</td>
+            <td class='attr-name'>environment</td>
             <td class='attr-desc'><p>
-The alternate URL being used to connect to the service (if any). <= v13
-only.
+The environment being used (production, sandbox)
 </p></td>
         </tr>
         
@@ -142,9 +141,9 @@ only.
             <div class="sectiontitle">Class Public methods</div>
             
             <div class="method">
-                <div class="title" id="M000004">
+                <div class="title" id="M000008">
                     
-                    <a name="M000004"></a><b>new</b>(credentials=nil)
+                    <a name="M000008"></a><b>new</b>(credentials=nil)
                     
                 </div>
                 
@@ -166,7 +165,7 @@ Args:
   'email' =&gt; 'user@domain.com',
   'clientEmail' =&gt; 'client_1+user@domain.com',
   'applicationToken' =&gt; 'IGNORED',
-  'alternateUrl' =&gt; 'https://sandbox.google.com/api/adwords/v13/'
+  'environment' =&gt; 'SANDBOX'
  }
 </pre>
 </li>
@@ -179,21 +178,56 @@ Args:
                 
                 <div class="sourcecode">
                     <p class="source-link">
-                        Source: <a href="javascript:toggleSource('M000004_source')" id="l_M000004_source">show</a>
+                        Source: <a href="javascript:toggleSource('M000008_source')" id="l_M000008_source">show</a>
                         
                     </p>
-                    <div id="M000004_source" class="dyn-source">
-                        <pre><span class="ruby-comment cmt"># File lib/adwords4r/credentials.rb, line 94</span>
+                    <div id="M000008_source" class="dyn-source">
+                        <pre><span class="ruby-comment cmt"># File lib/adwords4r/credentials.rb, line 98</span>
     <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">initialize</span>(<span class="ruby-identifier">credentials</span>=<span class="ruby-keyword kw">nil</span>)
       <span class="ruby-ivar">@credentials</span> = {}
-      <span class="ruby-ivar">@alternateUrl</span> = <span class="ruby-keyword kw">nil</span>
+      <span class="ruby-ivar">@environment</span> = <span class="ruby-keyword kw">nil</span>
       <span class="ruby-ivar">@auth_token</span> = <span class="ruby-keyword kw">nil</span>
       <span class="ruby-ivar">@handlers</span> = []
       <span class="ruby-identifier">credentials</span> = <span class="ruby-identifier">get_defaults</span>() <span class="ruby-keyword kw">if</span> <span class="ruby-identifier">credentials</span>.<span class="ruby-identifier">nil?</span>
       <span class="ruby-identifier">credentials</span>.<span class="ruby-identifier">each</span> <span class="ruby-keyword kw">do</span> <span class="ruby-operator">|</span><span class="ruby-identifier">key</span>, <span class="ruby-identifier">value</span><span class="ruby-operator">|</span>
-        <span class="ruby-ivar">@credentials</span>[<span class="ruby-identifier">key</span>] = <span class="ruby-identifier">value</span> <span class="ruby-keyword kw">if</span> <span class="ruby-operator">!</span>(<span class="ruby-identifier">key</span> <span class="ruby-operator">=~</span> <span class="ruby-regexp re">/^alternateUrl/</span>)
+        <span class="ruby-comment cmt"># 'environment' shouldn't go in the credentials array, and we'll ignore</span>
+        <span class="ruby-comment cmt"># 'alternateUrl' to avoid errors on upgraders' apps.</span>
+        <span class="ruby-keyword kw">if</span> <span class="ruby-identifier">key</span> <span class="ruby-operator">=~</span> <span class="ruby-regexp re">/^alternateUrl/</span>
+          <span class="ruby-identifier">raise</span> <span class="ruby-constant">AdWords</span><span class="ruby-operator">::</span><span class="ruby-constant">Error</span><span class="ruby-operator">::</span><span class="ruby-constant">Error</span>,
+              <span class="ruby-value str">&quot;'alternateUrl' is no longer supported. Please consult the &quot;</span> <span class="ruby-operator">+</span>
+              <span class="ruby-value str">&quot;Readme on how to use 'environment' instead.&quot;</span>
+        <span class="ruby-keyword kw">elsif</span> <span class="ruby-operator">!</span>(<span class="ruby-identifier">key</span> <span class="ruby-operator">=~</span> <span class="ruby-regexp re">/^environment/</span>)
+          <span class="ruby-ivar">@credentials</span>[<span class="ruby-identifier">key</span>] = <span class="ruby-identifier">value</span>
+        <span class="ruby-keyword kw">end</span>
+      <span class="ruby-keyword kw">end</span>
+
+      <span class="ruby-comment cmt"># The user agent header differs in v13 (useragent) and v2009 (userAgent).</span>
+      <span class="ruby-comment cmt"># Properly populate both values, and use the name of the program ($0) if</span>
+      <span class="ruby-comment cmt"># nothing is given.</span>
+      <span class="ruby-identifier">user_agent</span> = <span class="ruby-value str">'adwords4r: %s'</span> <span class="ruby-operator">%</span> (<span class="ruby-ivar">@credentials</span>[<span class="ruby-value str">'useragent'</span>] <span class="ruby-operator">||</span>
+        <span class="ruby-ivar">@credentials</span>[<span class="ruby-value str">'userAgent'</span>] <span class="ruby-operator">||</span> <span class="ruby-identifier">$0</span>)
+      <span class="ruby-ivar">@credentials</span>[<span class="ruby-value str">'useragent'</span>] = <span class="ruby-ivar">@credentials</span>[<span class="ruby-value str">'userAgent'</span>] = <span class="ruby-identifier">user_agent</span>
+
+      <span class="ruby-comment cmt"># The properties file may include the clientEmail in a clientId property.</span>
+      <span class="ruby-comment cmt"># clientId might be a clientCustomerId, though, so check to make sure it</span>
+      <span class="ruby-comment cmt"># is an email address before assigning it to clientEmail.</span>
+      <span class="ruby-comment cmt"># clientCustomerIds don't seem to be supported elsewhere in this client</span>
+      <span class="ruby-comment cmt"># library, so ignore them.</span>
+      <span class="ruby-keyword kw">if</span> <span class="ruby-ivar">@credentials</span>[<span class="ruby-value str">'clientEmail'</span>].<span class="ruby-identifier">nil?</span> <span class="ruby-keyword kw">and</span> <span class="ruby-ivar">@credentials</span>[<span class="ruby-value str">'clientId'</span>] <span class="ruby-keyword kw">and</span>
+          <span class="ruby-ivar">@credentials</span>[<span class="ruby-value str">'clientId'</span>].<span class="ruby-identifier">include?</span>(<span class="ruby-value str">'@'</span>)
+        <span class="ruby-ivar">@credentials</span>[<span class="ruby-value str">'clientEmail'</span>] = <span class="ruby-ivar">@credentials</span>[<span class="ruby-value str">'clientId'</span>]
+      <span class="ruby-keyword kw">end</span>
+
+      <span class="ruby-comment cmt"># Set environment</span>
+      <span class="ruby-keyword kw">if</span> <span class="ruby-identifier">credentials</span>[<span class="ruby-value str">'environment'</span>].<span class="ruby-identifier">nil?</span>
+        <span class="ruby-comment cmt"># First environment is default</span>
+        <span class="ruby-ivar">@environment</span> = <span class="ruby-constant">Service</span>.<span class="ruby-identifier">get_environments</span>[<span class="ruby-value">0</span>]
+      <span class="ruby-keyword kw">elsif</span> <span class="ruby-operator">!</span>(<span class="ruby-constant">Service</span>.<span class="ruby-identifier">get_environments</span>.<span class="ruby-identifier">include?</span>(<span class="ruby-identifier">credentials</span>[<span class="ruby-value str">'environment'</span>]))
+        <span class="ruby-identifier">raise</span> <span class="ruby-constant">AdWords</span><span class="ruby-operator">::</span><span class="ruby-constant">Error</span><span class="ruby-operator">::</span><span class="ruby-constant">Error</span>,
+            <span class="ruby-node">&quot;Unknown environment: #{credentials['environment']}&quot;</span>
+      <span class="ruby-keyword kw">else</span>
+        <span class="ruby-ivar">@environment</span> = <span class="ruby-identifier">credentials</span>[<span class="ruby-value str">'environment'</span>]
       <span class="ruby-keyword kw">end</span>
-      <span class="ruby-ivar">@alternateUrl</span> = <span class="ruby-identifier">credentials</span>[<span class="ruby-value str">'alternateUrl'</span>]
 
       <span class="ruby-comment cmt"># Fix potential problems with changing clientEmail, by forcing it to be</span>
       <span class="ruby-comment cmt"># created</span>
@@ -211,9 +245,9 @@ Args:
             <div class="sectiontitle">Instance Public methods</div>
             
             <div class="method">
-                <div class="title" id="M000010">
+                <div class="title" id="M000012">
                     
-                    <a name="M000010"></a><b>auth_token</b>()
+                    <a name="M000012"></a><b>auth_token</b>()
                     
                 </div>
                 
@@ -233,11 +267,11 @@ Returns: The auth token (as a string).
                 
                 <div class="sourcecode">
                     <p class="source-link">
-                        Source: <a href="javascript:toggleSource('M000010_source')" id="l_M000010_source">show</a>
+                        Source: <a href="javascript:toggleSource('M000012_source')" id="l_M000012_source">show</a>
                         
                     </p>
-                    <div id="M000010_source" class="dyn-source">
-                        <pre><span class="ruby-comment cmt"># File lib/adwords4r/credentials.rb, line 136</span>
+                    <div id="M000012_source" class="dyn-source">
+                        <pre><span class="ruby-comment cmt"># File lib/adwords4r/credentials.rb, line 175</span>
     <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">auth_token</span>
       <span class="ruby-identifier">generate_auth_token</span> <span class="ruby-keyword kw">if</span> <span class="ruby-ivar">@auth_token</span>.<span class="ruby-identifier">nil?</span>
       <span class="ruby-keyword kw">return</span> <span class="ruby-ivar">@auth_token</span>
@@ -248,9 +282,9 @@ Returns: The auth token (as a string).
             </div>
             
             <div class="method">
-                <div class="title" id="M000014">
+                <div class="title" id="M000015">
                     
-                    <a name="M000014"></a><b>dup</b>()
+                    <a name="M000015"></a><b>dup</b>()
                     
                 </div>
                 
@@ -272,14 +306,16 @@ href="AdWordsCredentials.html">AdWordsCredentials</a> object
                 
                 <div class="sourcecode">
                     <p class="source-link">
-                        Source: <a href="javascript:toggleSource('M000014_source')" id="l_M000014_source">show</a>
+                        Source: <a href="javascript:toggleSource('M000015_source')" id="l_M000015_source">show</a>
                         
                     </p>
-                    <div id="M000014_source" class="dyn-source">
-                        <pre><span class="ruby-comment cmt"># File lib/adwords4r/credentials.rb, line 195</span>
+                    <div id="M000015_source" class="dyn-source">
+                        <pre><span class="ruby-comment cmt"># File lib/adwords4r/credentials.rb, line 234</span>
     <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">dup</span>
       <span class="ruby-identifier">creds</span> = <span class="ruby-ivar">@credentials</span>.<span class="ruby-identifier">dup</span>
-      <span class="ruby-identifier">creds</span>[<span class="ruby-value str">'alternateUrl'</span>] = <span class="ruby-ivar">@alternateUrl</span> <span class="ruby-keyword kw">unless</span> <span class="ruby-ivar">@alternateUrl</span>.<span class="ruby-identifier">nil?</span>
+      <span class="ruby-comment cmt"># Remove the prepended 'adwords4r: ' string before creating the duplicate</span>
+      <span class="ruby-identifier">creds</span>[<span class="ruby-value str">'userAgent'</span>][<span class="ruby-value str">'adwords4r: '</span>] = <span class="ruby-value str">''</span>
+      <span class="ruby-identifier">creds</span>[<span class="ruby-value str">'environment'</span>] = <span class="ruby-ivar">@environment</span> <span class="ruby-keyword kw">unless</span> <span class="ruby-ivar">@environment</span>.<span class="ruby-identifier">nil?</span>
       <span class="ruby-keyword kw">return</span> <span class="ruby-constant">AdWordsCredentials</span>.<span class="ruby-identifier">new</span>(<span class="ruby-identifier">creds</span>)
     <span class="ruby-keyword kw">end</span></pre>
                     </div>
@@ -288,9 +324,9 @@ href="AdWordsCredentials.html">AdWordsCredentials</a> object
             </div>
             
             <div class="method">
-                <div class="title" id="M000011">
+                <div class="title" id="M000013">
                     
-                    <a name="M000011"></a><b>generate_auth_token</b>()
+                    <a name="M000013"></a><b>generate_auth_token</b>()
                     
                 </div>
                 
@@ -312,11 +348,11 @@ Returns: The auth token (as a string).
                 
                 <div class="sourcecode">
                     <p class="source-link">
-                        Source: <a href="javascript:toggleSource('M000011_source')" id="l_M000011_source">show</a>
+                        Source: <a href="javascript:toggleSource('M000013_source')" id="l_M000013_source">show</a>
                         
                     </p>
-                    <div id="M000011_source" class="dyn-source">
-                        <pre><span class="ruby-comment cmt"># File lib/adwords4r/credentials.rb, line 149</span>
+                    <div id="M000013_source" class="dyn-source">
+                        <pre><span class="ruby-comment cmt"># File lib/adwords4r/credentials.rb, line 188</span>
     <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">generate_auth_token</span>
       <span class="ruby-identifier">email</span> = <span class="ruby-ivar">@credentials</span>[<span class="ruby-value str">'email'</span>]
       <span class="ruby-identifier">password</span> = <span class="ruby-ivar">@credentials</span>[<span class="ruby-value str">'password'</span>]
@@ -339,9 +375,9 @@ Returns: The auth token (as a string).
             </div>
             
             <div class="method">
-                <div class="title" id="M000009">
+                <div class="title" id="M000010">
                     
-                    <a name="M000009"></a><b>get_handlers</b>(version)
+                    <a name="M000010"></a><b>get_handlers</b>(version)
                     
                 </div>
                 
@@ -369,16 +405,16 @@ Returns: The list of handlers (subclasses of SOAP::Header::SimpleHandler)
                 
                 <div class="sourcecode">
                     <p class="source-link">
-                        Source: <a href="javascript:toggleSource('M000009_source')" id="l_M000009_source">show</a>
+                        Source: <a href="javascript:toggleSource('M000010_source')" id="l_M000010_source">show</a>
                         
                     </p>
-                    <div id="M000009_source" class="dyn-source">
-                        <pre><span class="ruby-comment cmt"># File lib/adwords4r/credentials.rb, line 122</span>
+                    <div id="M000010_source" class="dyn-source">
+                        <pre><span class="ruby-comment cmt"># File lib/adwords4r/credentials.rb, line 161</span>
     <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">get_handlers</span>(<span class="ruby-identifier">version</span>)
-      <span class="ruby-keyword kw">if</span> (<span class="ruby-identifier">version</span> <span class="ruby-operator">&lt;=</span> <span class="ruby-value">13</span>)
+      <span class="ruby-keyword kw">if</span> <span class="ruby-identifier">version</span> <span class="ruby-operator">&lt;=</span> <span class="ruby-value">13</span> <span class="ruby-keyword kw">then</span>
         <span class="ruby-keyword kw">return</span> <span class="ruby-ivar">@handlers</span>
-      <span class="ruby-keyword kw">else</span>
-        <span class="ruby-keyword kw">return</span> [<span class="ruby-constant">Sandbox200902HeaderHandler</span>.<span class="ruby-identifier">new</span>(<span class="ruby-keyword kw">self</span>)]
+      <span class="ruby-keyword kw">elsif</span> <span class="ruby-identifier">version</span> <span class="ruby-operator">==</span> <span class="ruby-value">200906</span> <span class="ruby-keyword kw">then</span>
+        <span class="ruby-keyword kw">return</span> [<span class="ruby-constant">V200906HeaderHandler</span>.<span class="ruby-identifier">new</span>(<span class="ruby-keyword kw">self</span>)]
       <span class="ruby-keyword kw">end</span>
     <span class="ruby-keyword kw">end</span></pre>
                     </div>
@@ -387,9 +423,9 @@ Returns: The list of handlers (subclasses of SOAP::Header::SimpleHandler)
             </div>
             
             <div class="method">
-                <div class="title" id="M000013">
+                <div class="title" id="M000014">
                     
-                    <a name="M000013"></a><b>set_header</b>(header, value)
+                    <a name="M000014"></a><b>set_header</b>(header, value)
                     
                 </div>
                 
@@ -416,11 +452,11 @@ Args:
                 
                 <div class="sourcecode">
                     <p class="source-link">
-                        Source: <a href="javascript:toggleSource('M000013_source')" id="l_M000013_source">show</a>
+                        Source: <a href="javascript:toggleSource('M000014_source')" id="l_M000014_source">show</a>
                         
                     </p>
-                    <div id="M000013_source" class="dyn-source">
-                        <pre><span class="ruby-comment cmt"># File lib/adwords4r/credentials.rb, line 172</span>
+                    <div id="M000014_source" class="dyn-source">
+                        <pre><span class="ruby-comment cmt"># File lib/adwords4r/credentials.rb, line 211</span>
     <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">set_header</span>(<span class="ruby-identifier">header</span>, <span class="ruby-identifier">value</span>)
       <span class="ruby-comment cmt"># Invalidate previous auth token if necessary</span>
       <span class="ruby-ivar">@auth_token</span> = <span class="ruby-keyword kw">nil</span> <span class="ruby-keyword kw">if</span> <span class="ruby-identifier">header</span> <span class="ruby-operator">==</span> <span class="ruby-value str">'email'</span> <span class="ruby-keyword kw">or</span> <span class="ruby-identifier">header</span> <span class="ruby-operator">==</span> <span class="ruby-value str">'password'</span>