adops_report_scrapper 0.2.40 → 0.2.41

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6ea333993401f2ff4d7e13f6d5cd32ae5248ac8d
-  data.tar.gz: a6e2210faa6c7aef1538239d21d6a28475d90aba
+  metadata.gz: 9c607980aba3786d27f887c7cf3e483e5ca9f9c7
+  data.tar.gz: 612447f3d4b4fd75d33829a526f50bd62f77d701
 SHA512:
-  metadata.gz: 31531634eb4f4fd169568e78c02f86bcf120481d457529a2f2c66dff4e285eb9d7fde7504eecc4d366543cf26b01ec09b0529b75aee554b02315614b055ce1b9
-  data.tar.gz: 51e8a886df41d46d0565fb898a553d858bac656f1b5afba9ede6984ca8b9f61f6dd1c496ccbcde3f86c0d6003ffaa2e540c5b8007474924345120577bb7059bc
+  metadata.gz: 3d343ae25f045bc41b47f1c63461292cc1693cbf4cad20b4f7de623a3ea96a6da084be319158062e11f63b5331a2f460eb1b183262782c2253bbf28e8e34dcd4
+  data.tar.gz: bc3e7b151ce2e26f6a17437e03f93ffb6a4f975de8019ad354f2b8a42b419bbf4526798c283b9b8d3b17072dbabb8c532b587542ed54a756db3bd776a7281dc6

data/CHANGELOG

@@ -1,5 +1,8 @@
 # CHANGELOG
 
+## 0.2.41
+springserve client bug fix for account_id option. revcontent client refactor using their rest api
+
 ## 0.2.40
 tremor resume timezone option
 

data/lib/adops_report_scrapper/revcontent_client.rb

@@ -1,51 +1,43 @@
 require 'date'
 require_relative 'base_client'
+require 'rest-client'
 
 class AdopsReportScrapper::RevcontentClient < AdopsReportScrapper::BaseClient
   private
 
-  def login
-    @client.visit 'https://www.revcontent.com/login'
-    @client.fill_in 'name', :with => @login
-    @client.fill_in 'password', :with => @secret
-    @client.click_button 'Sign In'
-    begin
-      @client.find :xpath, '//*[contains(text(),"Widgets")]'
-    rescue Exception => e
-      raise e, 'Revcontent login error'
-    end
+  def init_client
   end
 
-  def scrap
-    @client.find(:xpath, '//*[contains(text(),"Widgets")]').click
-    @client.find(:css, '.fa.fa-calendar').click
-    @client.find(:xpath, '//*[text()="Yesterday"]').click
-    @data = []
-    %w(desktoplg desktop tablet phone unknown).each do |device|
-      request_report(device)
-      extract_data_from_report(device)
-    end
+  def before_quit_with_error
   end
 
-  def request_report(device)
-    @client.find(:css, '.fa.fa-desktop').click
-    @client.find(:xpath, '//*[text()="All Devices"]').click
-    @client.find(:css, '.fa.fa-desktop').click
-    @client.check device
-  end
+  def scrap
+    date_str = @date.strftime('%Y-%m-%d')
+
+    headers = { cache_control: 'no-cache' }
 
-  def extract_data_from_report(device)
-    rows = @client.find_all :xpath, '//table/*/tr'
-    rows = rows.map { |tr| tr.find_css('td,th').map { |td| td.visible_text } }
-    header = rows.shift
-    rows.shift
-    if @data.count == 0
-      header.unshift 'Device'
-      @data << header
+    response = RestClient.post 'https://api.revcontent.io/oauth/token', { grant_type: 'client_credentials', client_id: @login, client_secret: @secret }, headers
+    data = JSON.parse response
+    token = data['access_token']
+
+    headers = { authorization: "Bearer #{token}", content_type: :json, cache_control: 'no-cache' }
+
+    data = []
+
+    %w(desktoplg desktop tablet mobile unknown).each do |device|
+      response = RestClient.get "https://api.revcontent.io/stats/api/v1.0/widgets?date_from=#{date_str}&date_to=#{date_str}&device=#{device}", headers
+      _data = JSON.parse response
+      _data = _data['data']
+      _data.each { |datum| datum['device'] = device }
+      data += _data
     end
-    rows.each do |row|
-      row.unshift device
+
+    header = data[0].keys
+    @data = [header]
+    @data += data.map do |datum|
+      header.map { |key| datum[key] }
     end
-    @data += rows
+
+    byebug
   end
 end

data/lib/adops_report_scrapper/springserve_client.rb

@@ -6,14 +6,12 @@ class AdopsReportScrapper::SpringserveClient < AdopsReportScrapper::BaseClient
   private
 
   def init_client
-  end
-
-  def before_quit_with_error
     fail 'please specify springserve account_id' unless @options['account_id']
     @account_id = @options['account_id']
   end
 
-  private
+  def before_quit_with_error
+  end
 
   def scrap
     date_str = @date.strftime('%Y-%m-%d')

data/lib/adops_report_scrapper/version.rb

@@ -1,3 +1,3 @@
 module AdopsReportScrapper
-  VERSION = "0.2.40"
+  VERSION = "0.2.41"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: adops_report_scrapper
 version: !ruby/object:Gem::Version
-  version: 0.2.40
+  version: 0.2.41
 platform: ruby
 authors:
 - Stayman Hou
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-11-15 00:00:00.000000000 Z
+date: 2017-11-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httpclient