google-dfp-api 0.9.4 → 0.9.5

data/examples/{v201405 → v201505}/placement_service/get_all_placements.rb

@@ -24,9 +24,9 @@
 # Tags: PlacementService.getPlacementsByStatement
 
 require 'dfp_api'
+require 'dfp_api_statement'
 
-API_VERSION = :v201405
-PAGE_SIZE = 500
+API_VERSION = :v201505
 
 def get_all_placements()
   # Get DfpApi instance and load configuration from ~/dfp_api.yml.
@@ -39,31 +39,23 @@ def get_all_placements()
   # Get the PlacementService.
   placement_service = dfp.service(:PlacementService, API_VERSION)
 
-  # Define initial values.
-  offset = 0
-  page = {}
+  # Create statement for placements ordered by ID.
+  statement = DfpApiStatement::FilterStatement.new('ORDER BY id ASC')
 
   begin
-    # Create statement for one page with current offset.
-    statement = {:query => "LIMIT %d OFFSET %d" % [PAGE_SIZE, offset]}
-
     # Get placements by statement.
-    page = placement_service.get_placements_by_statement(statement)
+    page = placement_service.get_placements_by_statement(
+        statement.toStatement())
 
     if page[:results]
-      # Increase query offset by page size.
-      offset += PAGE_SIZE
-
-      # Get the start index for printout.
-      start_index = page[:start_index]
-
       # Print details about each placement in results page.
       page[:results].each_with_index do |placement, index|
         puts "%d) Placement ID: %d, name: %s." %
-            [index + start_index, placement[:id], placement[:name]]
+            [index + statement.offset, placement[:id], placement[:name]]
       end
     end
-  end while offset < page[:total_result_set_size]
+    statement.offset += DfpApiStatement::SUGGESTED_PAGE_LIMIT
+  end while statement.offset < page[:total_result_set_size]
 
   # Print a footer
   if page.include?(:total_result_set_size)

data/examples/{v201405 → v201505}/placement_service/get_placements_by_statement.rb

@@ -18,15 +18,15 @@
 #           See the License for the specific language governing permissions and
 #           limitations under the License.
 #
-# This example gets all active placements. The statement retrieves up to the
-# maximum page size limit of 500. To create a placement, run
+# This example gets all active placements. To create a placement, run
 # create_placements.rb.
 #
 # Tags: PlacementService.getPlacementsByStatement
 
 require 'dfp_api'
+require 'dfp_api_statement'
 
-API_VERSION = :v201405
+API_VERSION = :v201505
 
 def get_placements_by_statement()
   # Get DfpApi instance and load configuration from ~/dfp_api.yml.
@@ -40,23 +40,28 @@ def get_placements_by_statement()
   placement_service = dfp.service(:PlacementService, API_VERSION)
 
   # Create a statement to only select active placements.
-  statement = {
-      :query => 'WHERE status = :status LIMIT 500',
-      :values => [
+  statement = DfpApiStatement::FilterStatement.new(
+      'WHERE status = :status ORDER BY id ASC',
+      [
           {:key => 'status',
            :value => {:value => 'ACTIVE', :xsi_type => 'TextValue'}}
       ]
   }
 
-  # Get placements by statement.
-  page = placement_service.get_placements_by_statement(statement)
+  begin
+    # Get placements by statement.
+    page = placement_service.get_placements_by_statement(
+        statement.toStatement())
 
-  if page and page[:results]
-    page[:results].each_with_index do |placement, index|
-      puts "%d) Placement ID: %d, name: %s, status: %s." % [index,
-          placement[:id], placement[:name], placement[:status]]
+    if page and page[:results]
+      page[:results].each_with_index do |placement, index|
+        puts "%d) Placement ID: %d, name: %s, status: %s." % [
+            index + statement.offset,
+            placement[:id], placement[:name], placement[:status]]
+      end
     end
-  end
+    statement.offset += DfpApiStatement::SUGGESTED_PAGE_LIMIT
+  end while statement.offset < page[:total_result_set_size]
 
   # Print a footer.
   if page.include?(:total_result_set_size)

data/examples/{v201405 → v201505}/placement_service/update_placements.rb

@@ -18,15 +18,16 @@
 #           See the License for the specific language governing permissions and
 #           limitations under the License.
 #
-# This example updates all placements to allow for AdSense targeting up to the
-# first 500. To determine which placements exist, run get_all_placements.rb.
+# This example updates a single placement to allow for AdSense targeting.
+# To determine which placements exist, run get_all_placements.rb.
 #
 # Tags: PlacementService.getPlacementsByStatement
 # Tags: PlacementService.updatePlacements
 
 require 'dfp_api'
+require 'dfp_api_statement'
 
-API_VERSION = :v201405
+API_VERSION = :v201505
 
 def update_placements()
   # Get DfpApi instance and load configuration from ~/dfp_api.yml.
@@ -39,11 +40,20 @@ def update_placements()
   # Get the PlacementService.
   placement_service = dfp.service(:PlacementService, API_VERSION)
 
-  # Create a statement to get first 500 placements.
-  statement = {:query => 'LIMIT 500'}
+  placement_id = 'INSERT_PLACEMENT_ID_HERE'.to_i
+
+  # Create a statement to get a single placement by ID.
+  statement = DfpApiStatement::FilterStatement.new(
+      'WHERE id = :id ORDER BY id ASC',
+      [
+         {:key => 'id',
+          :value => {:value => placement_id, :xsi_type => 'NumberValue'}}
+      ],
+      1
+  )
 
   # Get placements by statement.
-  page = placement_service.get_placements_by_statement(statement)
+  page = placement_service.get_placements_by_statement(statement.toStatement())
 
   if page[:results]
     placements = page[:results]

data/examples/{v201405 → v201505}/publisher_query_language_service/fetch_match_tables.rb

@@ -23,18 +23,18 @@
 #
 # A full list of available tables can be found at:
 #
-#   https://developers.google.com/doubleclick-publishers/docs/reference/v201405/PublisherQueryLanguageService
+#   https://developers.google.com/doubleclick-publishers/docs/reference/v201505/PublisherQueryLanguageService
 #
 # Tags: PublisherQueryLanguageService.select
 
 require 'tempfile'
 
 require 'dfp_api'
+require 'dfp_api_statement'
 
-API_VERSION = :v201405
+API_VERSION = :v201505
 # A string to separate columns in output. Use "," to get CSV.
 COLUMN_SEPARATOR = ','
-PAGE_SIZE = 500
 
 def fetch_match_tables()
   # Get DfpApi instance and load configuration from ~/dfp_api.yml.
@@ -59,19 +59,16 @@ end
 # Fetches a match table from a PQL statement and writes it to a file.
 def fetch_match_table(table_name, pql_service)
   # Create a statement to select all items for the table.
-  statement_text = ('SELECT Id, Name, Status FROM %s ' % table_name) +
-      'ORDER BY Id ASC LIMIT %d OFFSET %d'
+  statement = DfpApiStatement::FilterStatement.new(
+      'SELECT Id, Name, Status FROM %s ' % table_name + 'ORDER BY Id ASC')
 
   # Set initial values.
-  offset = 0
   file_path = '%s.csv' % table_name
 
   open(file_path, 'wb') do |file|
     file_path = file.path()
     begin
-      # Create statement for a page.
-      statement = {:query => statement_text % [PAGE_SIZE, offset]}
-      result_set = pql_service.select(statement)
+      result_set = pql_service.select(statement.toStatement())
 
       if result_set
         # Only write column names if the first page.
@@ -86,8 +83,8 @@ def fetch_match_table(table_name, pql_service)
         end
       end
       # Update the counters.
-      offset += PAGE_SIZE
-    end while result_set[:rows].size == PAGE_SIZE
+      statement.offset += DfpApiStatement::SUGGESTED_PAGE_LIMIT
+    end while result_set[:rows].size == DfpApiStatement::SUGGESTED_PAGE_LIMIT
   end
   return file_path
 end

data/examples/{v201405 → v201505}/publisher_query_language_service/get_all_line_items.rb

@@ -26,11 +26,11 @@
 # Tags: PublisherQueryLanguageService.select
 
 require 'dfp_api'
+require 'dfp_api_statement'
 
-API_VERSION = :v201405
+API_VERSION = :v201505
 # A string to separate columns in output. Use "," to get CSV.
 COLUMN_SEPARATOR = "\t"
-PAGE_SIZE = 500
 
 def get_all_line_items()
   # Get DfpApi instance and load configuration from ~/dfp_api.yml.
@@ -44,16 +44,15 @@ def get_all_line_items()
   pql_service = dfp.service(:PublisherQueryLanguageService, API_VERSION)
 
   # Statement parts to help build a statement to select all line items.
-  statement_text = 'SELECT Id, Name, Status FROM Line_Item LIMIT %d OFFSET %d'
+  statement = DfpApiStatement::FilterStatement.new(
+      'SELECT Id, Name, Status FROM Line_Item ORDER BY Id ASC')
 
   # Set initial values for paging.
-  offset, result_set, all_rows = 0, nil, 0
+  result_set, all_rows = nil, 0
 
   # Get all line items with paging.
   begin
-    # Create statement for a page.
-    statement = {:query => statement_text % [PAGE_SIZE, offset]}
-    result_set = pql_service.select(statement)
+    result_set = pql_service.select(statement.toStatement())
 
     if result_set
       # Print out columns header.
@@ -68,9 +67,9 @@ def get_all_line_items()
     end
 
     # Update the counters.
-    offset += PAGE_SIZE
+    statement.offset += DfpApiStatement::SUGGESTED_PAGE_LIMIT
     all_rows += result_set[:rows].size
-  end while result_set[:rows].size == PAGE_SIZE
+  end while result_set[:rows].size == DfpApiStatement::SUGGESTED_PAGE_LIMIT
 
   # Print a footer.
   if result_set[:rows]

data/examples/{v201405 → v201505}/publisher_query_language_service/get_geo_targets.rb

@@ -18,7 +18,7 @@
 #           See the License for the specific language governing permissions and
 #           limitations under the License.
 #
-# This example gets first 500 cities available to target. A full list of
+# This example gets all cities available to target. A full list of
 # available PQL tables can be found at:
 #
 # https://developers.google.com/doubleclick-publishers/docs/reference/latest/PublisherQueryLanguageService
@@ -26,11 +26,11 @@
 # Tags: PublisherQueryLanguageService.select
 
 require 'dfp_api'
+require 'dfp_api_statement'
 
-API_VERSION = :v201405
+API_VERSION = :v201505
 # A string to separate columns in output. Use "," to get CSV.
 COLUMN_SEPARATOR = "\t"
-PAGE_SIZE = 500
 
 def get_geo_targets()
   # Get DfpApi instance and load configuration from ~/dfp_api.yml.
@@ -46,16 +46,16 @@ def get_geo_targets()
   # Create a statement to select all targetable cities.
   statement_text = "SELECT Id, Name, CanonicalParentId, ParentIds, " +
       "CountryCode, Type, Targetable FROM Geo_Target WHERE Type = 'City' " +
-      "AND Targetable = true LIMIT %d OFFSET %d"
+      "AND Targetable = true ORDER BY Id ASC"
+
+  statement = DfpApiStatement::FilterStatement.new(statement_text)
 
   # Set initial values for paging.
-  offset, result_set, all_rows = 0, nil, 0
+  result_set, all_rows = nil, 0
 
   # Get all cities with paging.
   begin
-    # Create statement for a page.
-    statement = {:query => statement_text % [PAGE_SIZE, offset]}
-    result_set = pql_service.select(statement)
+    result_set = pql_service.select(statement.toStatement())
 
     if result_set
       # Print out columns header.
@@ -70,9 +70,9 @@ def get_geo_targets()
     end
 
     # Update the counters.
-    offset += PAGE_SIZE
+    statement.offset += DfpApiStatement::SUGGESTED_PAGE_LIMIT
     all_rows += result_set[:rows].size
-  end while result_set[:rows].size == PAGE_SIZE
+  end while result_set[:rows].size == DfpApiStatement::SUGGESTED_PAGE_LIMIT
 
   # Print a footer.
   if result_set[:rows]

data/examples/{v201405 → v201505}/publisher_query_language_service/get_line_items_named_like.rb

@@ -24,11 +24,11 @@
 # Tags: PublisherQueryLanguageService.select
 
 require 'dfp_api'
+require 'dfp_api_statement'
 
-API_VERSION = :v201405
+API_VERSION = :v201505
 # A string to separate columns in output. Use "," to get CSV.
 COLUMN_SEPARATOR = "\t"
-PAGE_SIZE = 500
 
 def get_line_items_named_like()
   # Get DfpApi instance and load configuration from ~/dfp_api.yml.
@@ -44,16 +44,16 @@ def get_line_items_named_like()
   # Create a statement to select all line items matching subtext.
   statement_text =
       "SELECT Id, Name, Status FROM Line_Item WHERE Name LIKE 'line item%%' " +
-      "ORDER BY Id ASC LIMIT %d OFFSET %d"
+      "ORDER BY Id ASC"
+
+  statement = DfpApiStatement::FilterStatement.new(statement_text)
 
   # Set initial values for paging.
-  offset, result_set, all_rows = 0, nil, 0
+  result_set, all_rows = nil, 0
 
-  # Get all cities starting with "Santa".
+  # Get all line items starting with "line item".
   begin
-    # Create statement for a page.
-    statement = {:query => statement_text % [PAGE_SIZE, offset]}
-    result_set = pql_service.select(statement)
+    result_set = pql_service.select(statement.toStatement())
 
     if result_set
       # Print out columns header.
@@ -68,9 +68,9 @@ def get_line_items_named_like()
     end
 
     # Update the counters.
-    offset += PAGE_SIZE
+    statement.offset += DfpApiStatement::SUGGESTED_PAGE_LIMIT
     all_rows += result_set[:rows].size
-  end while result_set[:rows].size == PAGE_SIZE
+  end while result_set[:rows].size == DfpApiStatement::SUGGESTED_PAGE_LIMIT
 
   # Print a footer.
   if result_set[:rows]

data/examples/{v201405 → v201505}/report_service/display_report.rb

@@ -28,7 +28,7 @@ require 'dfp_api'
 
 require 'open-uri'
 
-API_VERSION = :v201405
+API_VERSION = :v201505
 
 def display_report()
   # Get DfpApi instance and load configuration from ~/dfp_api.yml.

data/examples/{v201405 → v201505}/report_service/download_report.rb

@@ -27,7 +27,7 @@ require 'dfp_api'
 
 require 'open-uri'
 
-API_VERSION = :v201405
+API_VERSION = :v201505
 
 def download_report()
   # Get DfpApi instance and load configuration from ~/dfp_api.yml.

data/examples/{v201405 → v201505}/report_service/run_delivery_report.rb

@@ -22,11 +22,11 @@
 # with additional attributes and can filter to include just one order.
 # To download the report see download_report.rb.
 #
-# Tags: ReportService.runReportJob, ReportService.getReportJob
+# Tags: ReportService.runReportJob, ReportService.getReportJobStatus
 
 require 'dfp_api'
 
-API_VERSION = :v201405
+API_VERSION = :v201505
 MAX_RETRIES = 10
 RETRY_INTERVAL = 30
 
@@ -70,15 +70,16 @@ def run_delivery_report()
 
   MAX_RETRIES.times do |retry_count|
     # Get the report job status.
-    report_job = report_service.get_report_job(report_job[:id])
+    report_job_status = report_service.get_report_job_status(report_job[:id])
 
-    break unless report_job[:report_job_status] == 'IN_PROGRESS'
+    break unless report_job_status == 'IN_PROGRESS'
     puts "Report with ID: %d is still running." % report_job[:id]
     sleep(RETRY_INTERVAL)
   end
 
   puts "Report job with ID: %d finished with status %s." %
-      [report_job[:id], report_job[:report_job_status]]
+      [report_job[:id],
+       report_service.get_report_job_status(report_job[:id])]
 end
 
 if __FILE__ == $0

data/examples/{v201405 → v201505}/report_service/run_inventory_report.rb

@@ -21,11 +21,11 @@
 # This example runs a report equal to the "Whole network report" on the DFP
 # website. To download the report see download_report.rb.
 #
-# Tags: ReportService.runReportJob, ReportService.getReportJob
+# Tags: ReportService.runReportJob, ReportService.getReportJobStatus
 
 require 'dfp_api'
 
-API_VERSION = :v201405
+API_VERSION = :v201505
 MAX_RETRIES = 10
 RETRY_INTERVAL = 30
 
@@ -79,15 +79,16 @@ def run_inventory_report()
 
   MAX_RETRIES.times do |retry_count|
     # Get the report job status.
-    report_job = report_service.get_report_job(report_job[:id])
+    report_job_status = report_service.get_report_job_status(report_job[:id])
 
-    break unless report_job[:report_job_status] == 'IN_PROGRESS'
+    break unless report_job_status == 'IN_PROGRESS'
     puts "Report with ID: %d is still running." % report_job[:id]
     sleep(RETRY_INTERVAL)
   end
 
   puts "Report job with ID: %d finished with status %s." %
-      [report_job[:id], report_job[:report_job_status]]
+      [report_job[:id],
+       report_service.get_report_job_status(report_job[:id])]
 end
 
 if __FILE__ == $0

data/examples/{v201405 → v201505}/report_service/run_reach_report.rb

@@ -20,11 +20,11 @@
 # This example runs a reach report. To download the report see
 # download_report.rb.
 #
-# Tags: ReportService.runReportJob, ReportService.getReportJob
+# Tags: ReportService.runReportJob, ReportService.getReportJobStatus
 
 require 'dfp_api'
 
-API_VERSION = :v201405
+API_VERSION = :v201505
 MAX_RETRIES = 10
 RETRY_INTERVAL = 30
 
@@ -54,15 +54,16 @@ def run_reach_report()
 
   MAX_RETRIES.times do |retry_count|
     # Get the report job status.
-    report_job = report_service.get_report_job(report_job[:id])
+    report_job_status = report_service.get_report_job_status(report_job[:id])
 
-    break unless report_job[:report_job_status] == 'IN_PROGRESS'
+    break unless report_job_status == 'IN_PROGRESS'
     puts "Report with ID: %d is still running." % report_job[:id]
     sleep(RETRY_INTERVAL)
   end
 
   puts "Report job with ID: %d finished with status %s." %
-      [report_job[:id], report_job[:report_job_status]]
+      [report_job[:id],
+       report_service.get_report_job_status(report_job[:id])]
 end
 
 if __FILE__ == $0