adops_report_scrapper 0.2.28 → 0.2.29

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f9a3c43588406d7cab83467fdf7da34747cd794e
-  data.tar.gz: 66c4f19f40b9c957178fa0081d9b609c5b5bd333
+  metadata.gz: 18fe8a9e5d0db433253503138f2d03cd1adee71b
+  data.tar.gz: 73d73a41e74cc15520aae6427901fecdbbae1f73
 SHA512:
-  metadata.gz: 01d805112eb0ff90f1d90ed21815bd0bcc3b28b374f525d0e6ebc1e19233726aea8345190873abd228bfe562be7edf18cfaa81f54a8689cd1872d4b64da788b2
-  data.tar.gz: b52ced1284c164a7bd162d5cf2cf6be807160a1cb2bdedcf020bab9961b8e26315af15923a075b5d559edc732658c22fad8d0daa4028861d32d397a70f96517a
+  metadata.gz: e4fc3188f3b828f25b35217569a71e1f368df3f18acfc896f5bd3098889c6b4d25ca38dd31ab998b1acf2eb616e2e78cce6ae989e94522760ac28ebe7c1daec7
+  data.tar.gz: 15ff71dd798cd90ee71e83fe632d8c95af18ca418dc750b417090282666af8909fbb4aba5382f807a910dc39fd428c47e86bcb4ecf02d637ca871aa362573d9a

data/CHANGELOG

@@ -1,5 +1,8 @@
 # CHANGELOG
 
+## 0.2.29
+fix sovrn
+
 ## 0.2.23
 fix sovrn when hit session expire page before login
 

data/lib/adops_report_scrapper/sovrn_client.rb

@@ -1,5 +1,6 @@
 require 'date'
 require_relative 'base_client'
+require 'selenium-webdriver'
 
 class AdopsReportScrapper::SovrnClient < AdopsReportScrapper::BaseClient
   def date_supported?(date = nil)
@@ -8,11 +9,24 @@ class AdopsReportScrapper::SovrnClient < AdopsReportScrapper::BaseClient
     false
   end
 
+  def init_client
+    Capybara.register_driver :selenium do |app|
+      profile = Selenium::WebDriver::Firefox::Profile.new
+      @download_dir = '/tmp/sovrn'
+      profile['browser.download.dir'] = @download_dir
+      clean_up_download_dir
+      profile['browser.download.folderList'] = 2
+      profile['browser.helperApps.neverAsk.saveToDisk'] = 'application/octet-stream'
+      Capybara::Selenium::Driver.new(app, :browser => :firefox, :profile => profile)
+    end
+    @client = Capybara::Session.new(:selenium)
+  end
+
   private
 
   def login
     @client.visit 'https://meridian.sovrn.com/#welcome'
-    sleep 5
+    sleep 1
     if @client.find_all(:css, '#user-menu-trigger').count > 0
       @client.find_all(:css, '#user-menu-trigger').first.click
       sleep 1
@@ -40,7 +54,6 @@ class AdopsReportScrapper::SovrnClient < AdopsReportScrapper::BaseClient
 
   def request_report
     @client.visit 'https://meridian.sovrn.com/#account/my_downloads'
-    @client.save_screenshot
     sleep 5
     if @client.find_all(:xpath, '//input[@value="domestic_and_international"]').count == 0
       login
@@ -60,15 +73,14 @@ class AdopsReportScrapper::SovrnClient < AdopsReportScrapper::BaseClient
     @client.find_all(:xpath, '//button[text()=" Download "]').first.click
 
     sleep 2
-
-    url = @client.driver.network_traffic[-1].url
-    headers = @client.driver.network_traffic[-1].headers
-
-    @response = HTTPClient.get url, header: headers.map{ |header| [header['name'], header['value']] }.to_h
   end
 
   def extract_data_from_report
-    rows = CSV.parse @response.body
+    rows = CSV.parse File.read("#{@download_dir}/adstats_all_traffic.csv")
     @data = rows[6..-1]
   end
+
+  def clean_up_download_dir
+    FileUtils.rm_rf(Dir.glob("#{@download_dir}/*"))
+  end
 end

data/lib/adops_report_scrapper/version.rb

@@ -1,3 +1,3 @@
 module AdopsReportScrapper
-  VERSION = "0.2.28"
+  VERSION = "0.2.29"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: adops_report_scrapper
 version: !ruby/object:Gem::Version
-  version: 0.2.28
+  version: 0.2.29
 platform: ruby
 authors:
 - Stayman Hou
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-06-21 00:00:00.000000000 Z
+date: 2017-07-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httpclient