google-dfp-api 0.13.0 → 0.13.1

data/ChangeLog

@@ -1,3 +1,6 @@
+0.13.1:
+  - Require google-ads-common 0.11.3 or later from now on.
+
 0.13.0:
   - Added support for DFP v201602.
   - Removed support for DFP v201411.

data/examples/v201602/forecast_service/get_availability_forecast.rb

@@ -82,6 +82,7 @@ def get_availability_forecast()
     :cost_type => 'CPM'
   }
 
+  # [START forecasting_3] MOE:strip_line
   prospective_line_item = {
     :advertiser_id => advertiser_id,
     :line_item => line_item
@@ -96,6 +97,7 @@ def get_availability_forecast()
   # Get forecast for the line item.
   forecast = forecast_service.get_availability_forecast(
       prospective_line_item, forecast_options)
+  # [END forecasting_3] MOE:strip_line
 
   if forecast
     # Display results.

data/examples/v201602/forecast_service/get_availability_forecast_for_line_item.rb

@@ -31,12 +31,15 @@ def get_availability_forecast_for_line_item()
   # the configuration file or provide your own logger:
   # dfp.logger = Logger.new('dfp_xml.log')
 
+  # [START forecasting_1] MOE:strip_line
   # Get the ForecastService.
   forecast_service = dfp.service(:ForecastService, API_VERSION)
+  # [END forecasting_1] MOE:strip_line
 
   # Set the line item to get a forecast for.
   line_item_id = 'INSERT_LINE_ITEM_ID_HERE'.to_i
 
+  # [START forecasting_2] MOE:strip_line
   # Set forecasting options.
   forecast_options = {
     :include_contending_line_items => True,
@@ -60,6 +63,7 @@ def get_availability_forecast_for_line_item()
       puts "%.2f%% %s possible." % [possible_percent, unit_type]
     end
   end
+  # [END forecasting_2] MOE:strip_line
 end
 
 if __FILE__ == $0

data/examples/v201602/forecast_service/get_delivery_forecast_for_line_items.rb

@@ -31,13 +31,16 @@ def get_delivery_forecast_for_line_items()
   # the configuration file or provide your own logger:
   # dfp.logger = Logger.new('dfp_xml.log')
 
+  # [START forecasting_4] MOE:strip_line
   # Get the ForecastService.
   forecast_service = dfp.service(:ForecastService, API_VERSION)
+  # [END forecasting_4] MOE:strip_line
 
   # Set the line items to get a forecast for.
   line_item_id1 = 'INSERT_LINE_ITEM_ID_1_HERE'.to_i
   line_item_id2 = 'INSERT_LINE_ITEM_ID_2_HERE'.to_i
 
+  # [START forecasting_5] MOE:strip_line
   # Get forecast for the line item.
   forecast = forecast_service.get_delivery_forecast_by_ids(
       [line_item_id1, line_item_id2], nil)
@@ -53,6 +56,7 @@ def get_delivery_forecast_for_line_items()
                 single_forecast[:predicted_delivery_units], unit_type]
     end
   end
+  # [END forecasting_5] MOE:strip_line
 end
 
 if __FILE__ == $0

data/lib/dfp_api/version.rb

@@ -19,6 +19,6 @@
 
 module DfpApi
   module ApiConfig
-    CLIENT_LIB_VERSION = '0.13.0'
+    CLIENT_LIB_VERSION = '0.13.1'
   end
 end

data/test/bugs/test_issue_00000081.rb

@@ -0,0 +1,105 @@
+# Copyright:: Copyright 2016, 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 issue #81.
+
+require 'nori'
+require 'ads_savon'
+require 'test/unit'
+
+require 'ads_common/savon_service'
+require 'dfp_api/v201602/line_item_service'
+
+# SavonService is abstract, defining a child class for the test.
+class StubService < AdsCommon::SavonService
+
+  public :get_module
+
+  def initialize(namespace, endpoint, version)
+    @logger = Logger.new(STDERR)
+    @config = AdsCommon::Config.new({:library => {:logger => @logger}})
+    super(@config, namespace, endpoint, version)
+  end
+
+  def get_module()
+    return DfpApi::V201602::LineItemService
+  end
+end
+
+
+class TestDfpIssue81 < Test::Unit::TestCase
+
+  TEST_NAMESPACE = 'https://ads.google.com/apis/ads/publisher/'
+  TEST_ENDPOINT = (
+      'https://ads.google.com/apis/ads/publisher/v201602/LineItemService?wsdl')
+  TEST_VERSION = :v201602
+
+  def setup()
+    @stub_service = StubService.new(TEST_NAMESPACE, TEST_ENDPOINT, TEST_VERSION)
+    nori_options = {
+      :strip_namespaces      => true,
+      :convert_tags_to       => lambda { |tag| tag.snakecase.to_sym },
+      :advanced_typecasting  => false
+    }
+    @nori = Nori.new(nori_options)
+  end
+
+  def test_issue_81()
+    data = @nori.parse(get_xml_text())[:envelope][:body]
+    savon_service = StubService.new(TEST_NAMESPACE, TEST_ENDPOINT, TEST_VERSION)
+    assert_instance_of(DfpApi::V201602::LineItemService::ApiException,
+        savon_service.send(:exception_for_soap_fault, data))
+  end
+
+  def get_xml_text()
+    return <<EOT
+<?xml version="1.0"?>
+<soap:Envelope xmlns:soap="http://schemas.xmlsoap.org/soap/envelope/">
+  <soap:Header>
+    <ResponseHeader xmlns="https://www.google.com/apis/ads/publisher/v201602">
+      <requestId>abc123</requestId>
+      <responseTime>658</responseTime>
+    </ResponseHeader>
+  </soap:Header>
+  <soap:Body>
+    <soap:Fault>
+      <faultcode>soap:Server</faultcode>
+      <faultstring>
+        [PublisherQueryLanguageContextError.UNEXECUTABLE @ Unknown column: 'blah']
+      </faultstring>
+      <detail>
+        <ApiExceptionFault
+         xmlns="https://www.google.com/apis/ads/publisher/v201502">
+          <message>
+            [PublisherQueryLanguageContextError.UNEXECUTABLE
+             @ Unknown column: 'blah']
+          </message>
+          <errors xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+           xsi:type="PublisherQueryLanguageContextError">
+            <fieldPath>Unknown column: 'blah'</fieldPath>
+            <trigger></trigger>
+            <errorString>
+              PublisherQueryLanguageContextError.UNEXECUTABLE
+            </errorString>
+            <reason>UNEXECUTABLE</reason>
+          </errors>
+        </ApiExceptionFault>
+      </detail>
+    </soap:Fault>
+  </soap:Body>
+</soap:Envelope>
+EOT
+  end
+end

data/test/suite_unittests.rb

@@ -21,6 +21,10 @@
 $:.unshift File.expand_path('../../lib/', __FILE__)
 $:.unshift File.expand_path('../../', __FILE__)
 
+# Work around jruby <= 1.7.8 issue with OpenSSL definition.
+require 'openssl'
+OpenSSL::SSL::SSLContext::METHODS = []
+
 # DFP API units tests.
 dfp_mask = File.join(File.dirname(__FILE__), 'dfp_api', 'test_*.rb')
 Dir.glob(dfp_mask).each { |file| require file }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: google-dfp-api
 version: !ruby/object:Gem::Version
-  version: 0.13.0
+  version: 0.13.1
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-23 00:00:00.000000000 Z
+date: 2016-03-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: google-ads-common
@@ -19,7 +19,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.11.0
+        version: 0.11.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -27,7 +27,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.11.0
+        version: 0.11.3
 description: google-dfp-api is a DFP API client library for Ruby
 email:
 - dfpapi-advisor+nicholas@google.com
@@ -1164,6 +1164,7 @@ files:
 - test/suite_unittests.rb
 - test/dfp_api/test_config.yml
 - test/dfp_api/test_dfp_api.rb
+- test/bugs/test_issue_00000081.rb
 - COPYING
 - README.md
 - ChangeLog
@@ -1195,3 +1196,4 @@ specification_version: 3
 summary: Ruby Client libraries for DFP API
 test_files:
 - test/dfp_api/test_dfp_api.rb
+- test/bugs/test_issue_00000081.rb