embulk-input-marketo 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bcfd15d051ac950ef7529b31662348b01f6c5389
-  data.tar.gz: 1161b4da7811e5a0dd29454d5bd44b2ee6be8e73
+  metadata.gz: 3f71b3f65dab9d932934f09d2c5e9b47f9702613
+  data.tar.gz: d951b2cd6e46bedbbdf2f7ea4c25803c3f470d20
 SHA512:
-  metadata.gz: 263729220d75599942c77113e4fed6f481453ed2b079fae30b26f63b12eb2e8ca96a667294ec378594241ae24d7e77a319ae9c5f9c6bb579c40fac58e90d6d4b
-  data.tar.gz: 5f8ee7bc9eaa36e1d08ced80eed97bb5bfd0e581250204a41369bfbe19eb240ad4c05ec6b2a2236bc4ea347f05daa3c1c690d4a0c51c20ff27c7b39f3fe5add6
+  metadata.gz: dd33daed69356a087369dee73c6381dea6e61488227f5aaff52f705168241a97011bb77ed5c6b35ede7dbb3352dfcb03e7c206612f9b9b75dfb5d6ca81727c40
+  data.tar.gz: 02c17f9f3d72b8586a9479bed842b24fa2f2205a82b5a05b535ed291df84bf3b385a0e2d9638da3a924061e97b72db9533a47dd304466b9ebff65ac805772af7

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+## 0.2.1 - 2015-09-01
+
+* [fixed] activity_log: Avoid to cast values unexpectedly [#29](https://github.com/treasure-data/embulk-input-marketo/pull/29)
+* [maintenance] Add a minor comment [#28](https://github.com/treasure-data/embulk-input-marketo/pull/28) [Requested by @muga. Thanks!!]
+* [maintenance] Fix minor issues [#27](https://github.com/treasure-data/embulk-input-marketo/pull/27) [[Reviewed by @muga.](https://github.com/treasure-data/embulk-input-marketo/pull/25#issuecomment-135570967) Thanks!!]
+
 ## 0.2.0 - 2015-08-27
 
 This version breaks backword compatibility of marketo/lead. Please check README.md to modify your config.

data/README.md

@@ -36,7 +36,7 @@ Below parameters are shown in "Admin" > "Web Services" page in Marketo.
 
 ### market/lead
 
-**NOTE: If you use feature of scheduled execution (resume) with marketo/read, you should not specify until\_at because this plugin can't place new to_datetime (can't know the date to run with new config.**
+**NOTE: If you use feature of scheduled execution (resume) with marketo/lead, you should not specify `to_datetime` because this plugin can't place next to_datetime (can't know the date to run with new config).**
 
 - **endpoint** SOAP endpoint URL for your account (string, required)
 - **wsdl** SOAP endpoint URL for your account (string, default: endpoint + "?WSDL")

data/embulk-input-marketo.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |spec|
   spec.name          = "embulk-input-marketo"
-  spec.version       = "0.2.0"
+  spec.version       = "0.2.1"
   spec.authors       = ["uu59", "yoshihara"]
   spec.summary       = "Marketo input plugin for Embulk"
   spec.description   = "Loads records from Marketo."

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

@@ -36,7 +36,15 @@ module Embulk
           last_updated_at = @soap.each(@last_updated_at, batch_size: batch_size) do |activity_log|
             values = @columns.map do |column|
               name = column["name"].to_s
-              activity_log[name]
+              value = activity_log[name]
+              next unless value
+
+              case column["type"]
+              when "timestamp"
+                Time.parse(value)
+              else
+                value
+              end
             end
 
             page_builder.add(values)

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

@@ -6,8 +6,6 @@ module Embulk
       class Lead < Base
         include Timeslice
 
-        PREVIEW_COUNT = 15
-
         Plugin.register_input("marketo/lead", self)
 
         def self.target

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

@@ -51,6 +51,7 @@ module Embulk
               columns << Column.new(nil, name, type, column["format"])
             end
 
+            # TODO tasks should be executed concurrently.
             resume(task, columns, 1, &control)
           end
         end

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

@@ -64,13 +64,13 @@ module Embulk
               return {remaining_count: 0, offset: nil, last_updated_at: nil}
             end
 
-            activities = activities_list[:lead_change_record].sort { |activity| activity[:activity_date_time] }
+            activities = activities_list[:lead_change_record].sort_by { |activity| Time.parse(activity[:activity_date_time]) }
 
             activities.each do |activity|
               record = {
                 "id" => activity[:id],
                 # embulk can't treat DateTime
-                "activity_date_time" => activity[:activity_date_time].to_time,
+                "activity_date_time" => Time.parse(activity[:activity_date_time]),
                 "activity_type" => activity[:activity_type],
                 "mktg_asset_name" => activity[:mktg_asset_name],
                 "mkt_person_id" => activity[:mkt_person_id],

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

@@ -32,16 +32,16 @@ module Embulk
               soap_header: headers,
               endpoint: endpoint,
               open_timeout: 90,
-              read_timeout: 300,
+              read_timeout: 90,
               raise_errors: true,
               namespace_identifier: :ns1,
-              env_namespace: 'SOAP-ENV'
+              env_namespace: 'SOAP-ENV',
             )
           end
 
-          def savon_call(*args)
+          def savon_call(operation, locals={})
             catch_unretryable_error do
-              savon.call(*args)
+              savon.call(operation, locals.merge(advanced_typecasting: false))
             end
           end
 

data/test/activity_log_fixtures.rb

@@ -31,7 +31,7 @@ module ActivityLogFixtures
       remaining_count: "1",
       new_start_position: {
         latest_created_at: true,
-        oldest_created_at: DateTime.parse("2015-07-14T00:13:13+00:00"),
+        oldest_created_at: "2015-07-14T00:13:13+00:00",
         activity_created_at: true,
         offset: offset,
       },
@@ -39,7 +39,7 @@ module ActivityLogFixtures
         lead_change_record: [
           {
             id: "1",
-            activity_date_time: DateTime.parse("2015-07-14T00:00:09+00:00"),
+            activity_date_time: "2015-07-14T00:00:09+00:00",
             activity_type: "at1",
             mktg_asset_name: "score1",
             activity_attributes: {
@@ -60,7 +60,7 @@ module ActivityLogFixtures
           },
           {
             id: "2",
-            activity_date_time: DateTime.parse("2015-07-14T00:00:10+00:00"),
+            activity_date_time: "2015-07-14T00:00:10+00:00",
             activity_type: "at2",
             mktg_asset_name: "score2",
             activity_attributes: {
@@ -98,7 +98,7 @@ module ActivityLogFixtures
         lead_change_record: [
           {
             id: "3",
-            activity_date_time: DateTime.parse("2015-07-14T00:00:11+00:00"),
+            activity_date_time: "2015-07-14T00:00:11+00:00",
             activity_type: "at3",
             mktg_asset_name: "score3",
             activity_attributes: {
@@ -126,7 +126,7 @@ module ActivityLogFixtures
     records = (1..15).map do |i|
       {
         id: i,
-        activity_date_time: DateTime.parse("2015-07-14T00:00:11+00:00"),
+        activity_date_time: "2015-07-14T00:00:11+00:00",
         activity_type: "at#{i}",
         mktg_asset_name: "score#{i}",
         activity_attributes: {

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: embulk-input-marketo
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - uu59
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2015-08-27 00:00:00.000000000 Z
+date: 2015-09-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement