embulk-input-marketo 0.5.1 → 0.5.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 74bbb311bf2dcb785889f5b475a07b26b521a98a
-  data.tar.gz: 2f1baeff76a61820a7616e6f860ae8166b85aa9c
+  metadata.gz: de07e24ca3f14e364b3f15895ed56a96f09852a4
+  data.tar.gz: 87f22e2378c027eed276168c6b46ace5aebb262d
 SHA512:
-  metadata.gz: a5cf2a4f8bf7fa74f4c6a13507824146624039abe1768fcf8d134bfd7b2100c958ca92df3e51eeecd822d65053d6dde697d846e3778b67de7469d44e91a1f84d
-  data.tar.gz: 1eb35066356697f2cfaf3f743d251f7ec34e837185fc9d1daf1dd9fd3f1e9aff81d63cc447c60bf571f2ea51513e59b96b771ba930263b25429afbece98c9c8e
+  metadata.gz: ba3f66db79035db3ae0c6a32f55c6e2e9ce003db9dd5c858eab4b65c1c7897e8e79f36af128729e3452a2c5c1b178391bbd9d3e05e8e13941fe33175d5bf1d9c
+  data.tar.gz: c4a34c34dc46d20767a79e0ac3832d4dd5cc4cc57b15cc936e0cb3dd9840ffa08fcbf5ae1bbc1275a3511e7b78b75106d34526a8b454b52070ad215b21ca3b06

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 0.5.2 - 2016-04-27
+* [enhancement] Make debug easier [#54](https://github.com/treasure-data/embulk-input-marketo/pull/54)
+* [fixed] Recognize empty string as nil value [#53](https://github.com/treasure-data/embulk-input-marketo/pull/53)
+
 ## 0.5.1 - 2016-04-06
 
 * [maintenance] Relax dependency version

data/embulk-input-marketo.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |spec|
   spec.name          = "embulk-input-marketo"
-  spec.version       = "0.5.1"
+  spec.version       = "0.5.2"
   spec.authors       = ["uu59", "yoshihara"]
   spec.summary       = "Marketo input plugin for Embulk"
   spec.description   = "Loads records from Marketo."
@@ -14,7 +14,7 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency 'savon', ['~> 2.11.1']
   spec.add_dependency 'httpclient'
-  spec.add_dependency 'perfect_retry', ["~> 0.3"]
+  spec.add_dependency 'perfect_retry', ["~> 0.5"]
   spec.add_development_dependency 'embulk', [">= 0.6.13", "< 1.0"]
   spec.add_development_dependency 'bundler', ['~> 1.0']
   spec.add_development_dependency 'rake', ['>= 10.0']

data/lib/embulk/input/marketo/base.rb

@@ -108,7 +108,7 @@ module Embulk
         end
 
         def cast_value(column, value)
-          return unless value
+          return if value.to_s.empty? # nil or empty string
 
           case column["type"].to_s
           when "timestamp"

data/lib/embulk/input/marketo_api/soap/activity_log.rb

@@ -51,14 +51,13 @@ module Embulk
             }
             request[:start_position][:offset] = options[:offset] if options[:offset]
 
-            Embulk.logger.info "Fetching from '#{from}' to '#{to}'..."
             fetch(request, options, &block)
           end
 
           def fetch(request, options={}, &block)
             response = savon_call(:get_lead_changes, {message: request}, options)
             remaining = response.xpath('//remainingCount').text.to_i
-            Embulk.logger.info "Remaining records: #{remaining}"
+            Embulk.logger.info "Remaining #{remaining} records for this range: from '#{request[:start_position][:oldest_created_at]}' to '#{request[:start_position][:latest_created_at]}'."
 
             activities = response.xpath('//leadChangeRecord')
 

data/lib/embulk/input/marketo_api/soap/base.rb

@@ -29,7 +29,7 @@ module Embulk
             # NOTE: Do not memoize this to use always fresh signature (avoid 20016 error)
             # ref. https://jira.talendforge.org/secure/attachmentzip/unzip/167201/49761%5B1%5D/Marketo%20Enterprise%20API%202%200.pdf (41 page)
             Savon.client(
-              log: true,
+              log: false,
               logger: Embulk.logger,
               wsdl: wsdl,
               soap_header: headers,
@@ -50,6 +50,7 @@ module Embulk
               config.rescues = [StandardError, Timeout::Error]
               config.logger = Embulk.logger
               config.log_level = nil
+              config.raise_original_error = true
             end
           end
 

data/lib/embulk/input/marketo_api/soap/lead.rb

@@ -47,11 +47,11 @@ module Embulk
           def fetch(request = {}, retry_options, &block)
             start = Time.now
             response = savon_call(:get_multiple_leads, {message: request}, retry_options)
-            Embulk.logger.info "Fetched in #{Time.now - start} seconds"
+            Embulk.logger.debug "Fetched in #{Time.now - start} seconds"
 
             records = response.xpath('//leadRecordList/leadRecord')
             remaining = response.xpath('//remainingCount').text.to_i
-            Embulk.logger.info "Fetched records in the range: #{records.size}"
+            Embulk.logger.debug "Fetched records in the range: #{records.size}"
             Embulk.logger.info "Remaining records in the range: #{remaining}"
 
             records.each do |lead|

data/test/embulk/input/marketo/test_activity_log.rb

@@ -171,6 +171,37 @@ module Embulk
           end
         end
 
+        class FormatRecordTest < self
+          def setup
+            @page_builder = Object.new
+            plugin_task = task.dup
+            plugin_task[:columns] = [
+              {"name" => "time", "type" => :timestamp, "format" => "%Y-%m-%d %H:%M:%S"}
+            ]
+            @plugin = ActivityLog.new(plugin_task, nil, nil, @page_builder)
+          end
+
+          data do
+            [
+              ["valid timestamp", [Time.parse("2000-01-01 00:00:00"), "2000-01-01 00:00:00"]],
+              ["nil", [nil, nil]],
+              ["empty", [nil, ""]],
+            ]
+          end
+          def test_valid_timestamp(data)
+            expected, actual = data
+            record = { "time" => actual }
+            assert_equal [expected], @plugin.format_record(record)
+          end
+
+          def test_invalid_timestamp
+            record = { "time" => "123" }
+            assert_raise(Embulk::ConfigError) do
+              @plugin.format_record(record)
+            end
+          end
+        end
+
         class RunTest < self
           def setup_soap
             @soap = MarketoApi::Soap::ActivityLog.new(settings[:endpoint], settings[:wsdl], settings[:user_id], settings[:encryption_key])

data/test/embulk/input/marketo_api/soap/test_base.rb

@@ -22,7 +22,7 @@ module Embulk
 
               mock(Embulk.logger).warn(/Retrying/).times(retry_options[:retry_limit])
 
-              assert_raise(PerfectRetry::TooManyRetry) do
+              assert_raise(::Timeout::Error) do
                 soap.send(:savon_call, :timeout_test, {}, retry_options)
               end
             end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: embulk-input-marketo
 version: !ruby/object:Gem::Version
-  version: 0.5.1
+  version: 0.5.2
 platform: ruby
 authors:
 - uu59
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2016-04-06 00:00:00.000000000 Z
+date: 2016-04-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
@@ -44,7 +44,7 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.3'
+        version: '0.5'
   name: perfect_retry
   prerelease: false
   type: :runtime
@@ -52,7 +52,7 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.3'
+        version: '0.5'
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements: