google-adwords-api 0.25.1 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5315c16efa08e912d7555b3741a3fadc28a3b66b
-  data.tar.gz: 5222e8647f762f2136e7c5adf59f969bf7530700
+  metadata.gz: f83d7759744e0257f1128ff6c29c4b3c5a0581ee
+  data.tar.gz: 24382283437b1625adf05008029ead94f9516ef5
 SHA512:
-  metadata.gz: 14f8b95d707d91ca447a6f7bb712b250d984cbf381cabe47586b7e053da7596a44d4f7e88b3ffaeb2b546f73a1cae761e0b20d3c102f9a34a64d41f4cd20fc10
-  data.tar.gz: 7378e153203a04bc6f26e55ffe58f266379ef883e5148fbd50a2bc5a33833e32ed7e83286247add9da2926af7bcfb5637df8ad08c6e0f829d7f648e1c7581220
+  metadata.gz: b2a5a291c1709cd7e5b7e87da501a36414d336fe34acd1ce6009e57c949b9f86898d1097d2994a650903099d393afbb238ef1fc7f235ded35643d393d3673282
+  data.tar.gz: e6ef2f1ac91de2409449e5a57f59ebd2219cb2c412eb7600e90e1d9f2e279b1427566fd71aa90ce4b527c2869f1fe8f8b93cf20138aabf94b0ee067c0445c99b

data/ChangeLog

@@ -1,3 +1,13 @@
+1.0.0:
+  - Major version bump. The library has been stable and feature complete for
+    some time, and this is more accurately reflected by this version number.
+  - Remove deprecated API version v201609.
+  - No longer include test files in the built gem.
+  - Fixed potential issue where ReportStream could not split sometimes when a
+    unicode character was returned across separate batches.
+  - Removing support for multiple environments.
+  - Require google-ads-common 1.0.0 or later from now on.
+
 0.25.1:
   - Support and examples for v201708.
 

data/adwords_api.yml

@@ -36,9 +36,6 @@
   :developer_token: INSERT_YOUR_DEVELOPER_TOKEN_HERE
   :client_customer_id: INSERT_YOUR_CLIENT_CUSTOMER_ID_HERE
   :user_agent: INSERT_YOUR_USER_AGENT_HERE
-:service:
-  # Only production environment is available now, see: http://goo.gl/Plu3o
-  :environment: PRODUCTION
 :connection:
   # Enable to request all responses to be compressed.
   :enable_gzip: false

data/lib/adwords_api/api_config.rb

@@ -34,7 +34,6 @@ module AdwordsApi
 
     # Set defaults
     DEFAULT_VERSION = :v201708
-    DEFAULT_ENVIRONMENT = :PRODUCTION
     LATEST_VERSION = :v201708
 
     # Set other constants
@@ -43,52 +42,6 @@ module AdwordsApi
 
     # Configure the services available to each version
     @@service_config = {
-      :v201609 => [
-          :AccountLabelService,
-          :AdCustomizerFeedService,
-          :AdGroupAdService,
-          :AdGroupBidModifierService,
-          :AdGroupCriterionService,
-          :AdGroupExtensionSettingService,
-          :AdGroupFeedService,
-          :AdGroupService,
-          :AdParamService,
-          :AdwordsUserListService,
-          :BatchJobService,
-          :BiddingStrategyService,
-          :BudgetOrderService,
-          :BudgetService,
-          :CampaignCriterionService,
-          :CampaignExtensionSettingService,
-          :CampaignFeedService,
-          :CampaignService,
-          :CampaignSharedSetService,
-          :ConstantDataService,
-          :ConversionTrackerService,
-          :CustomerExtensionSettingService,
-          :CustomerFeedService,
-          :CustomerService,
-          :CustomerSyncService,
-          :DataService,
-          :DraftService,
-          :DraftAsyncErrorService,
-          :FeedItemService,
-          :FeedMappingService,
-          :FeedService,
-          :LabelService,
-          :LocationCriterionService,
-          :ManagedCustomerService,
-          :MediaService,
-          :OfflineCallConversionFeedService,
-          :OfflineConversionFeedService,
-          :ReportDefinitionService,
-          :SharedCriterionService,
-          :SharedSetService,
-          :TargetingIdeaService,
-          :TrafficEstimatorService,
-          :TrialService,
-          :TrialAsyncErrorService
-      ],
       :v201702 => [
           :AccountLabelService,
           :AdCustomizerFeedService,
@@ -236,66 +189,18 @@ module AdwordsApi
       ]
     }
 
-    # Configure the different environments, with the base URL for each one
-    @@environment_config = {
-      :PRODUCTION => {
-        :oauth_scope => 'https://www.googleapis.com/auth/adwords',
-        :header_ns => 'https://adwords.google.com/api/adwords/cm/',
-        :v201609 => 'https://adwords.google.com/api/adwords/',
-        :v201702 => 'https://adwords.google.com/api/adwords/',
-        :v201705 => 'https://adwords.google.com/api/adwords/',
-        :v201708 => 'https://adwords.google.com/api/adwords/'
-      }
+    # Configure the base URL for each version and scope.
+    @@config = {
+      :oauth_scope => 'https://www.googleapis.com/auth/adwords',
+      :header_ns => 'https://adwords.google.com/api/adwords/cm/',
+      :v201702 => 'https://adwords.google.com/api/adwords/',
+      :v201705 => 'https://adwords.google.com/api/adwords/',
+      :v201708 => 'https://adwords.google.com/api/adwords/'
     }
 
     # Configure the subdirectories for each version / service pair.
     # A missing pair means that only the base URL is used.
     @@subdir_config = {
-      # v201609
-      [:v201609, :AccountLabelService] => 'mcm/',
-      [:v201609, :AdCustomizerFeedService] => 'cm/',
-      [:v201609, :AdGroupAdService] => 'cm/',
-      [:v201609, :AdGroupBidModifierService] => 'cm/',
-      [:v201609, :AdGroupCriterionService] => 'cm/',
-      [:v201609, :AdGroupExtensionSettingService] => 'cm/',
-      [:v201609, :AdGroupFeedService] => 'cm/',
-      [:v201609, :AdGroupService] => 'cm/',
-      [:v201609, :AdParamService] => 'cm/',
-      [:v201609, :BatchJobService] => 'cm/',
-      [:v201609, :BudgetOrderService] => 'billing/',
-      [:v201609, :CampaignCriterionService] => 'cm/',
-      [:v201609, :CampaignExtensionSettingService] => 'cm/',
-      [:v201609, :CampaignFeedService] => 'cm/',
-      [:v201609, :CampaignService] => 'cm/',
-      [:v201609, :CampaignSharedSetService] => 'cm/',
-      [:v201609, :ConstantDataService] => 'cm/',
-      [:v201609, :ConversionTrackerService] => 'cm/',
-      [:v201609, :CustomerExtensionSettingService] => 'cm/',
-      [:v201609, :CustomerSyncService] => 'ch/',
-      [:v201609, :DataService] => 'cm/',
-      [:v201609, :FeedItemService] => 'cm/',
-      [:v201609, :FeedMappingService] => 'cm/',
-      [:v201609, :FeedService] => 'cm/',
-      [:v201609, :LocationCriterionService] => 'cm/',
-      [:v201609, :MediaService] => 'cm/',
-      [:v201609, :OfflineCallConversionFeedService] => 'cm/',
-      [:v201609, :OfflineConversionFeedService] => 'cm/',
-      [:v201609, :ReportDefinitionService] => 'cm/',
-      [:v201609, :SharedCriterionService] => 'cm/',
-      [:v201609, :SharedSetService] => 'cm/',
-      [:v201609, :TargetingIdeaService] => 'o/',
-      [:v201609, :TrafficEstimatorService] => 'o/',
-      [:v201609, :ManagedCustomerService] => 'mcm/',
-      [:v201609, :CustomerService] => 'mcm/',
-      [:v201609, :CustomerFeedService] => 'cm/',
-      [:v201609, :BudgetService] => 'cm/',
-      [:v201609, :BiddingStrategyService] => 'cm/',
-      [:v201609, :AdwordsUserListService] => 'rm/',
-      [:v201609, :LabelService] => 'cm/',
-      [:v201609, :DraftService] => 'cm/',
-      [:v201609, :DraftAsyncErrorService] => 'cm/',
-      [:v201609, :TrialService] => 'cm/',
-      [:v201609, :TrialAsyncErrorService] => 'cm/',
       # v201702
       [:v201702, :AccountLabelService] => 'mcm/',
       [:v201702, :AdCustomizerFeedService] => 'cm/',
@@ -447,10 +352,6 @@ module AdwordsApi
       DEFAULT_VERSION
     end
 
-    def self.default_environment
-      DEFAULT_ENVIRONMENT
-    end
-
     def self.latest_version
       LATEST_VERSION
     end
@@ -463,9 +364,8 @@ module AdwordsApi
       @@service_config
     end
 
-    def self.environment_config(environment, key)
-      return @@environment_config.include?(environment) ?
-          @@environment_config[environment][key] : nil
+    def self.config(key)
+      @@config[key]
     end
 
     def self.subdir_config
@@ -483,14 +383,13 @@ module AdwordsApi
     # Get the download URL for Ad Hoc reports.
     #
     # Args:
-    # - environment: the service environment to be used
     # - version: the API version (as a symbol)
     #
     # Returns:
     # - The endpoint URL (as a string)
     #
-    def self.adhoc_report_download_url(environment, version)
-      base = get_wsdl_base(environment, version)
+    def self.adhoc_report_download_url(version)
+      base = get_wsdl_base(version)
       if base
         base += 'reportdownload/%s' % version.to_s
       end

data/lib/adwords_api/report_stream.rb

@@ -51,8 +51,14 @@ module AdwordsApi
       leftover_data = ''
       @report_utils.send(method, *args) do |batch|
         data_to_process = leftover_data + batch
+        leftover_data = ''
+        while !data_to_process.valid_encoding?
+          leftover_data = data_to_process[-1] + leftover_data
+          data_to_process = data_to_process[0, data_to_process.length - 1]
+        end
         lines = data_to_process.each_line.map {|line| line}
-        leftover_data = lines.pop
+        remainder = lines.pop
+        leftover_data = remainder + leftover_data unless remainder.nil?
         lines.each do |line|
           yield line.chomp
         end

data/lib/adwords_api/report_utils.rb

@@ -219,8 +219,7 @@ module AdwordsApi
     # Makes request and AdHoc service and returns response.
     def make_adhoc_request(data, cid, &block)
       @api.utils_reporter.report_utils_used()
-      url = @api.api_config.adhoc_report_download_url(
-          @api.config.read('service.environment'), @version)
+      url = @api.api_config.adhoc_report_download_url(@version)
       headers = get_report_request_headers(url, cid)
       log_request(url, headers, data)
       # A given block indicates that we should make a stream request and yield