embulk-input-lkqd 0.6.0 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e78a508c2bc1e83afe5ede32c630eac17f91090c
-  data.tar.gz: 30f105b4e714b3ab8279a9299cd01520e7e87fb4
+  metadata.gz: 699c8a2abf576d12dbc93d62310ea5198d04aa5f
+  data.tar.gz: def429a9636de45856499e19085ebef8fd7aee86
 SHA512:
-  metadata.gz: e87b274e23130b4f6851ded3e1115d18822402617a576f717d3dc9dad161a34ca3758890b01bf6df733db38745783c9ea5b6606fe3fea8c948cb0ec0b3110895
-  data.tar.gz: 6bad46bac5acfe15126a677e4a7a734ec921b01103d18613e5c1629eb8d5c6e452e34ca3e44197b574268ab12c9bc0eee46b235a30d53d5b84a6225c1d27e701
+  metadata.gz: 8ae2cc084340adaacade236fd350c98cef31707548d945b5e0cf1238660f75a0095a2bd0419df53f25d9b1d08094cb1acbd1af270ca786d877e0065df36b3c48
+  data.tar.gz: 133919c57ce94e915ebd3c0d99c2a3c2ae58c77ef05a7e79ad2e352cafacf7dc3161151003678280211cc0ca1a76254ad8c6bb8792a05f308990c54c19b73386

data/embulk-input-lkqd.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |spec|
   spec.name          = "embulk-input-lkqd"
-  spec.version       = "0.6.0"
+  spec.version       = "0.7.0"
   spec.authors       = ["Ming Liu"]
   spec.summary       = "LKQD input plugin for Embulk"
   spec.description   = "Loads reporting data from LKQD API."

data/lib/embulk/input/lkqd.rb

@@ -17,7 +17,6 @@ module Embulk
           "secret_key" => config.param("secret_key", :string),
           "endpoint" => config.param("endpoint", :string, default: 'https://api.lkqd.com/reports'),
           "copy_temp_to" => config.param("copy_temp_to", :string, default: nil),
-          "try_convert" => config.param("try_convert", :bool, default: true),
           "measurable_impressions" => config.param("measurable_impressions", :bool, default: false),
           "viewable_impressions" => config.param("viewable_impressions", :bool, default: false),
           "report_parameters" => config.param("report_parameters", :hash, default: {}),
@@ -25,7 +24,7 @@ module Embulk
         task['authorization'] = Base64.urlsafe_encode64("#{task['secret_key_id']}:#{task['secret_key']}")
 
         response = request_lkqd({authorization: task['authorization'], endpoint: task['endpoint'], report_parameters: task['report_parameters']})
-        tempfile = Tempfile.new('emublk-input-lkqd_')
+        tempfile = Tempfile.new('embulk-input-lkqd_')
         while chunk = response.body.readpartial
           tempfile.write chunk
         end
@@ -78,7 +77,7 @@ module Embulk
         column_name.gsub!(/^\W/, '')
         column_option = DEFAULT_COLUMNS[column_name]
         if column_option
-          return {type: column_option['type'].to_sym, name: column_name, format: column_option['format']}
+          return {type: column_option['type'].to_sym, name: column_name}
         else
           return {type: :string, name: column_name}
         end
@@ -91,8 +90,8 @@ module Embulk
           column_option = DEFAULT_COLUMNS[column_name]
           if column_option.nil?
             next value
-          elsif column_option['type'] == 'timestamp'
-            next Time.strptime(value + " " + options[:timezone], column_option['format'] + " %Z").to_i
+          #elsif column_option['type'] == 'timestamp'
+          #  next Time.strptime(value + " " + options[:timezone], column_option['format'] + " %Z").to_i
           elsif column_option['type'] == 'long'
             next value.gsub(',','').to_i
           elsif column_option['type'] == 'double' && value.match(/%$/)
@@ -106,13 +105,12 @@ module Embulk
       end
 
       def self.measurable_impressions?(task)
-        task['try_convert'] && task['measurable_impressions'] &&
-        task['viewability_measured_rate_index'] && task['impressions_index']
+        task['measurable_impressions'] && task['viewability_measured_rate_index'] && task['impressions_index']
       end
 
       def self.viewable_impressions?(task)
-        task['try_convert'] && task['viewable_impressions'] &&
-        task['viewability_rate_index'] && task['viewability_measured_rate_index'] && task['impressions_index']
+        task['viewable_impressions'] && task['viewability_rate_index'] &&
+        task['viewability_measured_rate_index'] && task['impressions_index']
       end
 
       def init
@@ -121,13 +119,12 @@ module Embulk
 
       def run
         convert_options = {timezone: @task['report_parameters']['timezone']}
-        try_convert = @task['try_convert']
         viewability_measured_rate_index = @task['viewability_measured_rate_index']
         viewability_rate_index = @task['viewability_rate_index']
         impressions_index = @task['impressions_index']
 
         CSV.foreach(@task['tempfile_path'], {headers: true}).each do |row|
-          row = try_convert ? Lkqd.try_convert(row, convert_options) : row
+          row = Lkqd.try_convert(row, convert_options)
           if Lkqd.measurable_impressions?(@task)
             row << row[impressions_index] * row[viewability_measured_rate_index]
           end
@@ -146,7 +143,7 @@ module Embulk
 
       DEFAULT_COLUMNS = {
         # dimensions' columns
-        'Time'=> { 'type' => 'timestamp', 'format' => "%Y-%m-%dT%H" },
+        'Time'=> { 'type' => 'string' },
         'Account'=> { 'type' => 'string' },
         'Supply Source ID'=> { 'type' => 'string' },
         'Supply Source'=> { 'type' => 'string' },

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: embulk-input-lkqd
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.7.0
 platform: ruby
 authors:
 - Ming Liu
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-08-22 00:00:00.000000000 Z
+date: 2017-08-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: http
@@ -101,7 +101,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.8
+rubygems_version: 2.6.12
 signing_key: 
 specification_version: 4
 summary: LKQD input plugin for Embulk