embulk-input-marketo 0.2.2 → 0.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 17a277c0df4feaded10161dcf1ed102720aec4e4
-  data.tar.gz: a80c7582a7c4fdd2becd1e4c34ae612b7379d7c7
+  metadata.gz: 5485d5527116194e9cf43129e39a686675038d35
+  data.tar.gz: 932cd341055835466e2022c950babd2c0f7966ae
 SHA512:
-  metadata.gz: c613c70701ccc188deac206d407954804632353ab1fe11fd79bdf1294426e5cbc42b19a7b021d28345cfb93f810e6a7701163d65c6ec2604742fc3beafc9635b
-  data.tar.gz: af31cd4811d5e8bd3bb3e54977d52e80e295d7770fd7f3b3d0929a7ebe777d455d24714c6ef60f9b8d91e64f710911eb3acf22b03bd2b766247cca28fb6aabec
+  metadata.gz: 31b2aa93cbb0e301b1a71fbf15c0b53f0841558aaeafb8e5d38ce884fd6cd9d34c34bc7d44678d57421e47f10739748b9815e523dffd956a6c9c76d7ebe50e41
+  data.tar.gz: b25b1163d52542cf8f284396f36e428fb55a35f1f4418784b93885cc678cc2fd320d53c98ea6648b8ace4dab920e431e447a60747295cf18e238dbcc2a2a2c76

data/.travis.yml

@@ -19,6 +19,9 @@ gemfile:
   - gemfiles/embulk-0.6.21
   - gemfiles/embulk-0.6.22
   - gemfiles/embulk-0.6.23
+  - gemfiles/embulk-0.6.24
+  - gemfiles/embulk-0.6.25
+  - gemfiles/embulk-0.6.26
   - gemfiles/embulk-latest
 matrix:
   allow_failures:

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+## 0.2.3 - 2015-09-14
+
+* [enhancement] Catch config error [#33](https://github.com/treasure-data/embulk-input-marketo/pull/33)
+* [enhancement] Concurrent worker [#31](https://github.com/treasure-data/embulk-input-marketo/pull/31)
+
 ## 0.2.2 - 2015-09-08
 
 * [fixed] Fix handling for activity_date_time [#32](https://github.com/treasure-data/embulk-input-marketo/pull/32)

data/embulk-input-marketo.gemspec

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

data/gemfiles/embulk-0.6.26

@@ -0,0 +1,4 @@
+source 'https://rubygems.org/'
+gemspec :path => '../'
+
+gem "embulk", "0.6.26"

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

@@ -41,7 +41,11 @@ module Embulk
 
               case column["type"].to_s
               when "timestamp"
-                Time.parse(value)
+                begin
+                  Time.parse(value)
+                rescue => e
+                  raise ConfigError, "Can't parse as Time '#{value}' (column is #{column["name"]})"
+                end
               else
                 value
               end

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

@@ -67,14 +67,6 @@ module Embulk
           @soap = MarketoApi.soap_client(task, target)
         end
 
-        def self.logger
-          Embulk.logger
-        end
-
-        def logger
-          self.class.logger
-        end
-
         private
 
         def preview?

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

@@ -41,36 +41,48 @@ module Embulk
           columns
         end
 
+        def init
+          @last_updated_at = task[:last_updated_at]
+          @columns = task[:columns]
+          @ranges = task[:ranges][index]
+          @soap = MarketoApi.soap_client(task, target)
+        end
+
         def run
-          count = 0
           from_datetime = task[:from_datetime]
-          to_datetime = task[:to_datetime]
+          to_datetime = task[:to_datetime] || Time.now
+
           options = {}
           options[:batch_size] = PREVIEW_COUNT if preview?
 
-          soap.each(from_datetime, to_datetime, options) do |lead|
-            values = @columns.map do |column|
-              name = column["name"].to_s
-              value = (lead[name] || {})[:value]
-              next unless value
+          @ranges.each do |range|
+            soap.each(range, options) do |lead|
+              values = @columns.map do |column|
+                name = column["name"].to_s
+                value = (lead[name] || {})[:value]
+                next unless value
 
-              case column["type"]
-              when "timestamp"
-                Time.parse(value)
-              else
-                value
+                case column["type"]
+                when "timestamp"
+                  begin
+                    Time.parse(value)
+                  rescue => e
+                    raise ConfigError, "Can't parse as Time '#{value}' (column is #{column["name"]})"
+                  end
+                else
+                  value
+                end
               end
-            end
-
-            page_builder.add(values)
 
-            count += 1
-            break if preview? && count >= PREVIEW_COUNT
+              page_builder.add(values)
+            end
           end
 
           page_builder.finish
 
-          commit_report = {from_datetime: to_datetime}
+          commit_report = {
+            from_datetime: to_datetime
+          }
           return commit_report
         end
       end

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

@@ -2,6 +2,8 @@ module Embulk
   module Input
     module Marketo
       module Timeslice
+        TIMESLICE_COUNT_PER_TASK = 24
+
         def self.included(klass)
           klass.extend ClassMethods
         end
@@ -28,10 +30,20 @@ module Embulk
             from_datetime = config.param(:from_datetime, :string)
             to_datetime = config.param(:to_datetime, :string, default: Time.now.to_s)
 
+            # check from/to format to parse
+            begin
+              Time.parse(from_datetime)
+              Time.parse(to_datetime)
+            rescue => e
+              # possibly Time.parse fail
+              raise ConfigError, e.message
+            end
+
             if Time.parse(from_datetime) > Time.parse(to_datetime)
               raise ConfigError, "config: from_datetime '#{from_datetime}' is later than '#{to_datetime}'."
             end
 
+            ranges = timeslice(from_datetime, to_datetime, TIMESLICE_COUNT_PER_TASK)
             task = {
               endpoint_url: endpoint_url,
               wsdl_url: config.param(:wsdl, :string, default: "#{endpoint_url}?WSDL"),
@@ -39,6 +51,7 @@ module Embulk
               encryption_key: config.param(:encryption_key, :string),
               from_datetime: from_datetime,
               to_datetime: to_datetime,
+              ranges: ranges,
               columns: config.param(:columns, :array)
             }
 
@@ -51,9 +64,53 @@ module Embulk
               columns << Column.new(nil, name, type, column["format"])
             end
 
-            # TODO tasks should be executed concurrently.
-            resume(task, columns, 1, &control)
+            resume(task, columns, ranges.size, &control)
           end
+
+          def timeslice(from, to, count)
+            generate_time_range(from, to).each_slice(count).to_a
+          end
+
+          def generate_time_range(from, to)
+            # e.g. from = 2010-01-01 15:00, to = 2010-01-03 09:30
+            # convert to such array:
+            # [
+            #   {from: 2010-01-01 15:00, to: 2010-01-01 16:00},
+            #   {from: 2010-01-01 16:00, to: 2010-01-01 17:00},
+            #   ...
+            #   {from: 2010-01-03 08:00, to: 2010-01-03 09:00},
+            #   {from: 2010-01-03 09:00, to: 2010-01-03 09:30},
+            # ]
+            # to fetch data from Marketo API with each day as
+            # desribed on official blog:
+            # http://developers.marketo.com/blog/performance-tuning-api-requests/
+            to ||= Time.now
+            from = Time.parse(from) unless from.is_a?(Time)
+            to = Time.parse(to) unless to.is_a?(Time)
+
+            result = []
+            since = from
+            while since < to
+              next_since = since + 3600
+              if to < next_since
+                next_since = to
+              end
+              result << {
+                "from" => since,
+                "to" => next_since
+              }
+              since = next_since
+            end
+            result
+          end
+
+          def resume(task, columns, count, &control)
+            commit_reports = yield(task, columns, count)
+
+            # all task returns same report as {from_datetime: to_datetime}
+            return commit_reports.first
+          end
+
         end
       end
     end

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

@@ -1,5 +1,4 @@
 require "savon"
-require "embulk/input/marketo_api/soap/timeslice"
 
 module Embulk
   module Input
@@ -80,10 +79,10 @@ module Embulk
               # unretryable error such as Authentication Failed, Invalid Request, etc.
               raise ConfigError, soap_message
             end
-          rescue SocketError => e
+          rescue SocketError, Errno::ECONNREFUSED => e
             # maybe endpoint/wsdl domain was wrong
-            Embulk.logger.debug "SocketError: endpoint=#{endpoint} wsdl=#{wsdl}"
-            raise ConfigError, "SocketError: #{e.message} (endpoint is '#{endpoint}')"
+            Embulk.logger.debug "Connection error: endpoint=#{endpoint} wsdl=#{wsdl}"
+            raise ConfigError, "Connection error: #{e.message} (endpoint is '#{endpoint}')"
           end
         end
       end

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

@@ -5,8 +5,6 @@ module Embulk
     module MarketoApi
       module Soap
         class Lead < Base
-          include Timeslice
-
           # NOTE: batch_size is allowed at 1000, but that takes 2 minutes in 1 request.
           #       We use 250 for the default (about 30 seconds)
           BATCH_SIZE_DEFAULT = 250
@@ -17,28 +15,30 @@ module Embulk
             response.body[:success_describe_m_object][:result][:metadata][:field_list][:field]
           end
 
-          def each(from_datetime, to_datetime, options = {}, &block)
+          def each(range, options = {}, &block)
             # http://developers.marketo.com/documentation/soap/getmultipleleads/
-            to_datetime ||= Time.now
+            from = range["from"]
+            to = range["to"]
 
-            generate_time_range(from_datetime, to_datetime).each do |range|
-              request = {
-                lead_selector: {
-                  oldest_updated_at: range[:from].iso8601,
-                  latest_updated_at: range[:to].iso8601,
-                },
-                attributes!: {
-                  lead_selector: {"xsi:type" => "ns1:LastUpdateAtSelector"}
-                },
-                batch_size: options[:batch_size] || BATCH_SIZE_DEFAULT,
-              }
-              Embulk.logger.info "Fetching from '#{range[:from]}' to '#{range[:to]}'..."
+            from = Time.parse(from) unless from.is_a?(Time)
+            to = Time.parse(to) unless to.is_a?(Time)
 
-              stream_position = fetch(request, &block)
+            request = {
+              lead_selector: {
+                oldest_updated_at: from.iso8601,
+                latest_updated_at: to.iso8601,
+              },
+              attributes!: {
+                lead_selector: {"xsi:type" => "ns1:LastUpdateAtSelector"}
+              },
+              batch_size: options[:batch_size] || BATCH_SIZE_DEFAULT,
+            }
+            Embulk.logger.info "Fetching from '#{from}' to '#{to}'..."
 
-              while stream_position
-                stream_position = fetch(request.merge(stream_position: stream_position), &block)
-              end
+            stream_position = fetch(request, &block)
+
+            while stream_position
+              stream_position = fetch(request.merge(stream_position: stream_position), &block)
             end
           end
 

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

@@ -141,6 +141,26 @@ module Embulk
             @plugin.run
           end
 
+          def test_wrong_type
+            any_instance_of(Savon::Client) do |klass|
+              stub(klass).call(:get_lead_changes, message: request) do
+                next_stream_activity_logs_response
+              end
+            end
+            stub(@page_builder).add {}
+            stub(@page_builder).finish {}
+
+            task = task()
+            task[:columns] = [
+              {"name" => "Old Value", "type" => :timestamp}
+            ]
+            @plugin = ActivityLog.new(task, nil, nil, @page_builder)
+
+            assert_raise(Embulk::ConfigError) do
+              @plugin.run
+            end
+          end
+
           private
 
           def request

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

@@ -22,6 +22,9 @@ module Embulk
 
         def setup_plugin
           @page_builder = Object.new
+          any_instance_of(Embulk::Input::Marketo::Lead) do |klass|
+            stub(klass).index { 0 }
+          end
           @plugin = Lead.new(task, nil, nil, @page_builder)
           mute_logger
         end
@@ -47,6 +50,49 @@ module Embulk
           end
         end
 
+        def test_invalid_datetime_given
+          control = proc {} # dummy
+
+          settings = {
+            endpoint: "https://marketo.example.com",
+            wsdl: "https://marketo.example.com/?wsdl",
+            user_id: "user_id",
+            encryption_key: "TOPSECRET",
+            from_datetime: "invalid time from",
+            to_datetime: "invalid time to",
+            columns: [
+              {"name" => "Name", "type" => "string"},
+            ]
+          }
+          config = DataSource[settings.to_a]
+
+          assert_raise(ConfigError) do
+            Lead.transaction(config, &control)
+          end
+        end
+
+        def test_wrong_type
+          control = proc {} # dummy
+
+          settings = {
+            endpoint: "https://marketo.example.com",
+            wsdl: "https://marketo.example.com/?wsdl",
+            user_id: "user_id",
+            encryption_key: "TOPSECRET",
+            from_datetime: "invalid time from",
+            to_datetime: "invalid time to",
+            columns: [
+              {"name" => "Name", "type" => "timestamp"},
+            ]
+          }
+
+          config = DataSource[settings.to_a]
+
+          assert_raise(ConfigError) do
+            Lead.transaction(config, &control)
+          end
+        end
+
         class RunTest < self
           def setup
             setup_soap
@@ -159,13 +205,84 @@ module Embulk
             end
           end
 
+          class TestTimeslice < self
+            class TestGenerateTimeRange < self
+              def setup
+                super
+                mute_logger
+              end
+
+              data do
+                {
+                  "8/1 to 8/2" => ["2015-08-01 00:00:00", "2015-08-02 00:00:00", 24],
+                  "over the days" => ["2015-08-01 19:00:00", "2015-08-03 05:00:00", 34],
+                  "odd times" => ["2015-08-01 11:11:11", "2015-08-01 22:22:22", 12],
+                }
+              end
+              def test_generate_time_range_by_1hour(data)
+                from, to, count = data
+                range = Lead.generate_time_range(from, to)
+                assert_equal count, range.length
+              end
+
+              def test_if_to_is_nil_use_time_now
+                from = "2000-01-01"
+                now = Time.now
+                stub(Time).now { now }
+
+                range = Lead.generate_time_range(from, nil)
+                assert_equal now, range.last["to"]
+              end
+            end
+
+            def test_timeslice
+              from = "2015-08-02 20:00:00"
+              to = "2015-08-03 08:08:08"
+              count = 4
+
+              raw_expect = [
+                [
+                  {from: "2015-08-02 20:00:00", to: "2015-08-02 21:00:00"},
+                  {from: "2015-08-02 21:00:00", to: "2015-08-02 22:00:00"},
+                  {from: "2015-08-02 22:00:00", to: "2015-08-02 23:00:00"},
+                  {from: "2015-08-02 23:00:00", to: "2015-08-03 00:00:00"},
+                ],
+                [
+                  {from: "2015-08-03 00:00:00", to: "2015-08-03 01:00:00"},
+                  {from: "2015-08-03 01:00:00", to: "2015-08-03 02:00:00"},
+                  {from: "2015-08-03 02:00:00", to: "2015-08-03 03:00:00"},
+                  {from: "2015-08-03 03:00:00", to: "2015-08-03 04:00:00"},
+                ],
+                [
+                  {from: "2015-08-03 04:00:00", to: "2015-08-03 05:00:00"},
+                  {from: "2015-08-03 05:00:00", to: "2015-08-03 06:00:00"},
+                  {from: "2015-08-03 06:00:00", to: "2015-08-03 07:00:00"},
+                  {from: "2015-08-03 07:00:00", to: "2015-08-03 08:00:00"},
+                ],
+                [
+                  {from: "2015-08-03 08:00:00", to: "2015-08-03 08:08:08"},
+                ]
+              ]
+
+              expect = raw_expect.map do |slice|
+                slice.map do |range|
+                  {
+                    "from" => Time.parse(range[:from]),
+                    "to" => Time.parse(range[:to])
+                  }
+                end
+              end
+              assert_equal(expect, Lead.timeslice(from, to, count))
+            end
+          end
+
           private
 
           def request
             {
               lead_selector: {
-                oldest_updated_at: timerange.first[:from].iso8601,
-                latest_updated_at: timerange.first[:to].iso8601,
+                oldest_updated_at: timerange.first["from"].iso8601,
+                latest_updated_at: timerange.first["to"].iso8601,
               },
               attributes!: {lead_selector: {"xsi:type"=>"ns1:LastUpdateAtSelector"}},
               batch_size: MarketoApi::Soap::Lead::BATCH_SIZE_DEFAULT,
@@ -225,8 +342,7 @@ module Embulk
         end
 
         def timerange
-          soap = MarketoApi::Soap::Lead.new(settings[:endpoint], settings[:wsdl], settings[:user_id], settings[:encryption_key])
-          soap.send(:generate_time_range, from_datetime, to_datetime)
+          Lead.generate_time_range(from_datetime, to_datetime)
         end
 
         def task
@@ -237,6 +353,7 @@ module Embulk
             encryption_key: "TOPSECRET",
             from_datetime: from_datetime,
             to_datetime: to_datetime,
+            ranges: Lead.timeslice(from_datetime, to_datetime, Lead::TIMESLICE_COUNT_PER_TASK),
             columns: [
               {"name" => "Name", "type" => "string"},
             ]
@@ -260,6 +377,70 @@ module Embulk
               is_dynamic: true,
               dynamic_field_ref: "leadAttributeList",
               updated_at: DateTime.parse("2000-01-01 22:22:22")
+            },
+            {
+              name: "FieldInt",
+              description: nil,
+              display_name: "The Name of Field",
+              source_object: "Lead",
+              data_type: "integer",
+              size: nil,
+              is_readonly: false,
+              is_update_blocked: false,
+              is_name: nil,
+              is_primary_key: false,
+              is_custom: true,
+              is_dynamic: true,
+              dynamic_field_ref: "leadAttributeList",
+              updated_at: DateTime.parse("2000-01-01 22:22:22")
+            },
+            {
+              name: "FieldBoolean",
+              description: nil,
+              display_name: "The Name of Field",
+              source_object: "Lead",
+              data_type: "boolean",
+              size: nil,
+              is_readonly: false,
+              is_update_blocked: false,
+              is_name: nil,
+              is_primary_key: false,
+              is_custom: true,
+              is_dynamic: true,
+              dynamic_field_ref: "leadAttributeList",
+              updated_at: DateTime.parse("2000-01-01 22:22:22")
+            },
+            {
+              name: "FieldFloat",
+              description: nil,
+              display_name: "The Name of Field",
+              source_object: "Lead",
+              data_type: "float",
+              size: nil,
+              is_readonly: false,
+              is_update_blocked: false,
+              is_name: nil,
+              is_primary_key: false,
+              is_custom: true,
+              is_dynamic: true,
+              dynamic_field_ref: "leadAttributeList",
+              updated_at: DateTime.parse("2000-01-01 22:22:22")
+            },
+            {
+              name: "FieldString",
+              description: nil,
+              display_name: "The Name of Field",
+              source_object: "Lead",
+              data_type: "string",
+              size: nil,
+              is_readonly: false,
+              is_update_blocked: false,
+              is_name: nil,
+              is_primary_key: false,
+              is_custom: true,
+              is_dynamic: true,
+              dynamic_field_ref: "leadAttributeList",
+              updated_at: DateTime.parse("2000-01-01 22:22:22")
             }
           ]
         end
@@ -269,6 +450,10 @@ module Embulk
             {name: "id", type: "long"},
             {name: "email", type: "string"},
             {name: "FieldName", type: "timestamp"},
+            {name: "FieldInt", type: "long"},
+            {name: "FieldBoolean", type: "boolean"},
+            {name: "FieldFloat", type: "double"},
+            {name: "FieldString", type: "string"},
           ]
         end
       end

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

@@ -19,40 +19,31 @@ module Embulk
               super
             end
 
-            def test_each_invoke_fetch
-              from_datetime = "2015-07-06"
-              to_datetime = "2015-07-07"
-              timerange = soap.send(:generate_time_range, from_datetime, to_datetime)
-
-              stub(soap).fetch { nil }
-              mock(soap).fetch(anything).times(timerange.length)
-
-              soap.each(from_datetime, to_datetime) { }
-            end
-
             def test_each_invoke_fetch_with_specified_time
-              from_datetime = "2015-07-06"
-              to_datetime = "2015-07-07"
-              timerange = soap.send(:generate_time_range, from_datetime, to_datetime)
+              timerange = {
+                "from" => Time.parse("2015-07-06 00:00:00"),
+                "to" => Time.parse("2015-07-06 12:00:00"),
+              }
 
               request = {
                 lead_selector: {
-                  oldest_updated_at: timerange.first[:from].iso8601,
-                  latest_updated_at: timerange.first[:to].iso8601,
+                  oldest_updated_at: timerange["from"].iso8601,
+                  latest_updated_at: timerange["to"].iso8601,
                 },
                 attributes!: {lead_selector: {"xsi:type"=>"ns1:LastUpdateAtSelector"}},
                 batch_size: Lead::BATCH_SIZE_DEFAULT,
               }
 
-              stub(soap).fetch { nil }
               mock(soap).fetch(request)
 
-              soap.each(from_datetime, to_datetime) { }
+              soap.each(timerange) { }
             end
 
             def test_each_fetch_next_page
-              from_datetime = "2015-07-06 00:00:00"
-              to_datetime = "2015-07-06 00:00:01"
+              timerange = {
+                "from" => Time.parse("2015-07-06 23:30:00"),
+                "to" => Time.parse("2015-07-07 00:00:00"),
+              }
 
               any_instance_of(Savon::Client) do |klass|
                 mock(klass).call(:get_multiple_leads, anything) do
@@ -64,35 +55,7 @@ module Embulk
               leads_count = next_stream_leads_response.xpath('//leadRecord').length
               mock(proc).call(anything).times(leads_count)
 
-              soap.each(from_datetime, to_datetime, &proc)
-            end
-          end
-
-          class TestGenerateTime < self
-            def setup
-              mute_logger
-            end
-
-            data do
-              {
-                "8/1 to 8/2" => ["2015-08-01 00:00:00", "2015-08-02 00:00:00", 24],
-                "over the days" => ["2015-08-01 19:00:00", "2015-08-03 05:00:00", 34],
-                "odd times" => ["2015-08-01 11:11:11", "2015-08-01 22:22:22", 12],
-              }
-            end
-            def test_generate_time_range_by_1hour(data)
-              from, to, count = data
-              range = soap.send(:generate_time_range, from, to)
-              assert_equal count, range.length
-            end
-
-            def test_if_to_is_nil_use_time_now
-              from = "2000-01-01"
-              now = Time.now
-              stub(Time).now { now }
-
-              range = soap.send(:generate_time_range, from, nil)
-              assert_equal now, range.last[:to]
+              soap.each(timerange, {}, &proc)
             end
           end
 

data/test/run-test.rb

@@ -14,5 +14,8 @@ $LOAD_PATH.unshift(test_dir)
 ENV["TEST_UNIT_MAX_DIFF_TARGET_STRING_SIZE"] ||= "5000"
 
 CodeClimate::TestReporter.start
+SimpleCov.start do
+  add_filter "/test/"
+end if ENV["COV"]
 
 exit Test::Unit::AutoRunner.run(true, test_dir)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: embulk-input-marketo
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.3
 platform: ruby
 authors:
 - uu59
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2015-09-08 00:00:00.000000000 Z
+date: 2015-09-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
@@ -170,6 +170,7 @@ files:
 - gemfiles/embulk-0.6.23
 - gemfiles/embulk-0.6.24
 - gemfiles/embulk-0.6.25
+- gemfiles/embulk-0.6.26
 - gemfiles/embulk-latest
 - gemfiles/template.erb
 - lib/embulk/input/marketo/activity_log.rb
@@ -180,7 +181,6 @@ files:
 - lib/embulk/input/marketo_api/soap/activity_log.rb
 - lib/embulk/input/marketo_api/soap/base.rb
 - lib/embulk/input/marketo_api/soap/lead.rb
-- lib/embulk/input/marketo_api/soap/timeslice.rb
 - test/activity_log_fixtures.rb
 - test/embulk/input/marketo/test_activity_log.rb
 - test/embulk/input/marketo/test_base.rb

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

@@ -1,44 +0,0 @@
-module Embulk
-  module Input
-    module MarketoApi
-      module Soap
-        module Timeslice
-          private
-
-          def generate_time_range(from, to)
-            # e.g. from = 2010-01-01 15:00, to = 2010-01-03 09:30
-            # convert to such array:
-            # [
-            #   {from: 2010-01-01 15:00, to: 2010-01-01 16:00},
-            #   {from: 2010-01-01 16:00, to: 2010-01-01 17:00},
-            #   ...
-            #   {from: 2010-01-03 08:00, to: 2010-01-03 09:00},
-            #   {from: 2010-01-03 09:00, to: 2010-01-03 09:30},
-            # ]
-            # to fetch data from Marketo API with each day as
-            # desribed on official blog:
-            # http://developers.marketo.com/blog/performance-tuning-api-requests/
-            to ||= Time.now
-            from = Time.parse(from) unless from.is_a?(Time)
-            to = Time.parse(to) unless to.is_a?(Time)
-
-            result = []
-            since = from
-            while since < to
-              next_since = since + 3600
-              if to < next_since
-                next_since = to
-              end
-              result << {
-                from: since,
-                to: next_since
-              }
-              since = next_since
-            end
-            result
-          end
-        end
-      end
-    end
-  end
-end