adops_report_scrapper 0.1.33 → 0.1.34

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4a633c8cf0856165fc6c1800dba2b47783f8c430
-  data.tar.gz: 4a97596911c12a37f0cdbdf8dc4c1489dca5778f
+  metadata.gz: a1ae6fd211544a7d662b49b8b113ccb60f6b7059
+  data.tar.gz: 57496565cbfbcbcc81650262ec83d8151768c3bf
 SHA512:
-  metadata.gz: 98a1f620bd14c2c635f3651f59167da96755befe938ee32cb4c10f205e33122d39365fedb85060a97c76d73edb180c56b4332aecb2bc75e5d08b80edf0996435
-  data.tar.gz: d6fe2d0a0c1a37e270a718fd21a68d13c9e8e2caf87aed4803986f81f30c05a3fa7d8e00475b15761dc76059b25326c47febfedf06e4c2f343919441b2798809
+  metadata.gz: c5cc4e0d71edf0ec341d493f0b7193eed9ee8105260dc8a52f60b59c725ea3beaeb8a9158084ce4fbdc3148b686d68718ab2ae6b51a5a1e00c1af52bd3680f1e
+  data.tar.gz: 17a4db37edc2203ad9c830dbc0fa9c918d86a528749abfb3279609a63a8d9e4ff900840d3459b24cb5a4277fd13fb8e84122ac8f0dacfae18d5f8b5640254f7f

data/CHANGELOG

@@ -1,5 +1,8 @@
 # CHANGELOG
 
+## 0.1.34
+fixed triple lift for their new ui
+
 ## 0.1.33
 distinguish adx product in adx client
 

data/lib/adops_report_scrapper/triplelift_client.rb

@@ -20,61 +20,34 @@ class AdopsReportScrapper::TripleliftClient < AdopsReportScrapper::BaseClient
     @date_str = @date.strftime('%B %d, %Y')
     @client.find(:xpath, '//*[text()="Reporting"]').click
     wait_for_spin
-    # byebug
-    # @client.find(:xpath, '//button[contains(text(),"Last 7 days")]').click
-    # @client.find(:xpath, '//a[contains(text(),"Yesterday")]').click
-
-
+    @client.find(:xpath, '//button[contains(text(),"Last 7 days")]').click
+    @client.find(:xpath, '//a[contains(text(),"Yesterday")]').click
+    sleep 1
     
-    @client.find(:xpath, '//button[../../div[contains(text(),"Publisher")]]').click
-    @publishers = @client.find_all(:xpath, '//*[@ng-click="selectPublisher(pub)"]').to_a.map { |pub_elem| pub_elem.text(:all) }
-    sleep 2
-    @publishers = @client.find_all(:xpath, '//*[@ng-click="selectPublisher(pub)"]').to_a.map { |pub_elem| pub_elem.text(:all) }
-    @client.find(:xpath, '//button[../../div[contains(text(),"Publisher")]]').click
-    @data = []
-    while @publishers.count > 0
-      extract_data(@publishers.shift)
-    end
-  end
+    @client.find(:xpath, '//tl-checkbox/div/span[text()[normalize-space()="Placement"]]').click
+    sleep 1
+    @client.find(:xpath, '//tl-checkbox/div/span[text()[normalize-space()="Clicks"]]').click
+    sleep 1
+    @client.find(:xpath, '//*[text()[normalize-space()="Run query"]]').click
+    sleep 10
 
-  def extract_data(publisher)
-    10.times do
-      @client.find(:xpath, '//*[text()="Reporting"]').click
-      sleep 2
-      @client.find(:xpath, '//button[../../div[contains(text(),"Publisher")]]').click
-      index = -1 - @publishers.count(publisher)
-      sleep 1
-      @client.find_all(:xpath, "//*[text()=\"#{publisher}\"]")[index].click
-      wait_for_spin
-
-      return if @client.find_all(:xpath, '//*[text()="No data available for selected date range"]').count > 0
-
-      @client.find(:xpath, '//*[@model="startDate"]//input').set @date_str
-      sleep 1
-      @client.find(:xpath, '//*[@model="endDate"]//input').set @date_str
-      sleep 1
-      @client.find(:xpath, '//button[../../div[contains(text(),"Group by")]]').click
-      @client.find(:xpath, '//*[text()="Date and Placement"]').click
-      wait_for_spin
+    extract_data
+  end
 
-      return if @client.find_all(:xpath, '//*[text()="No data available for selected date range"]').count > 0
+  def extract_data
+    @data = []
+    return if @client.find_all(:xpath, '//*[text()="No data available for selected date range"]').count > 0
 
-      rows = @client.find_all :xpath, '//table/*/tr'
-      rows = rows.to_a
-      rows.shift
-      header = rows.shift
-      n_data = rows.map { |tr| tr.find_css('td,th').map { |td| td.visible_text } }
-      if n_data[-1][1].empty?
-        @client.evaluate_script 'window.location.reload()'
-        next
-      end
-      if @data.count == 0
-        n_header = header.find_css('td,th').map { |td| td.visible_text }
-        @data << n_header
-      end
-      @data += n_data
-      break
+    rows = @client.find_all :xpath, '//table/*/tr'
+    rows = rows.to_a
+    rows.pop
+    header = rows.shift
+    n_data = rows.map { |tr| tr.find_css('td,th').map { |td| td.visible_text } }
+    if @data.count == 0
+      n_header = header.find_css('td,th').map { |td| td.visible_text }
+      @data << n_header
     end
+    @data += n_data
   end
 
   def wait_for_spin

data/lib/adops_report_scrapper/version.rb

@@ -1,3 +1,3 @@
 module AdopsReportScrapper
-  VERSION = "0.1.33"
+  VERSION = "0.1.34"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: adops_report_scrapper
 version: !ruby/object:Gem::Version
-  version: 0.1.33
+  version: 0.1.34
 platform: ruby
 authors:
 - Stayman Hou
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-11-28 00:00:00.000000000 Z
+date: 2016-11-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httpclient