embulk-input-mixpanel 0.4.4 → 0.4.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f5cb5156064ae0192f6d1d2321a173cd12ef5fd3
-  data.tar.gz: 2a2f3a63e55035bb8dd96a8edf27eb45e546866d
+  metadata.gz: 3c39e9af49ffa9cfcc15fe3156896652720fb72e
+  data.tar.gz: 350093593fbd3f62c80a10071cdcb473f36203e3
 SHA512:
-  metadata.gz: 48d7e7af0b5ad28fc030e7c1baaa4c34fd236b60fb34df7e8cc1b764825c143aadcab7725d4d78afe3b1ba0ffb05067418217872d79cc0a1d00af7440e7abd90
-  data.tar.gz: b001c794683c39d69ae6b29782988ee3c64ea17a9449d29fb7d86342b144854116116b1928946f33691eaaf0f3ed6d711f985fbe7e4a414c7579a3fd6baf38ec
+  metadata.gz: a7fe90abd0541686bb1dc4e5426a65524d93d02d4781d3f96b30d2cc8db97231302df64a11db378279a665bafeb086712d0bc3f465588f2e0bb0d9003e8cd34f
+  data.tar.gz: 89953f9317aae738fc331f878dde1096cfa7e53f8ef869081957306cf9fec5097f10d7affe9a19e467a5f22bf91b8af72b087aa136f550f55ed1e93ff4f7bcf9

data/CHANGELOG.md

@@ -1,3 +1,6 @@
+## 0.4.5 - 2016-09-05
+* [fixed] Don't try to guess future date [#43](https://github.com/treasure-data/embulk-input-mixpanel/pull/43)
+
 ## 0.4.4 - 2016-09-02
 * [enhancement] Reduce memory usage by streaming processing [#42](https://github.com/treasure-data/embulk-input-mixpanel/pull/42)
 

data/embulk-input-mixpanel.gemspec

@@ -1,7 +1,7 @@
 
 Gem::Specification.new do |spec|
   spec.name          = "embulk-input-mixpanel"
-  spec.version       = "0.4.4"
+  spec.version       = "0.4.5"
   spec.authors       = ["yoshihara", "uu59"]
   spec.summary       = "Mixpanel input plugin for Embulk"
   spec.description   = "Loads records from Mixpanel."

data/lib/embulk/input/mixpanel_api/client.rb

@@ -56,13 +56,11 @@ module Embulk
         end
 
         def export_for_small_dataset(params = {})
-          try_to_dates = 5.times.map do |n|
-            # from_date + 1, from_date + 10, from_date + 100, ... so on
-            days = 1 * (10 ** n)
-            Date.parse(params["from_date"].to_s) + days
-          end
-
-          try_to_dates.each do |to_date|
+          yesterday = Date.today - 1
+          latest_tried_to_date = nil
+          try_to_dates(params["from_date"]).each do |to_date|
+            next if yesterday < to_date
+            latest_tried_to_date = to_date
             params["to_date"] = to_date.strftime("%Y-%m-%d")
             records = retryer.with_retry do
               request_small_dataset(params, SMALLSET_BYTE_RANGE)
@@ -71,7 +69,18 @@ module Embulk
             return records
           end
 
-          raise ConfigError.new "#{params["from_date"]}..#{try_to_dates.last} has no record. too old date?"
+          raise ConfigError.new "#{params["from_date"]}..#{latest_tried_to_date} has no record."
+        end
+
+        def try_to_dates(from_date)
+          try_to_dates = 5.times.map do |n|
+            # from_date + 1, from_date + 10, from_date + 100, ... so on
+            days = 1 * (10 ** n)
+            Date.parse(from_date.to_s) + days
+          end
+          yesterday = Date.today - 1
+          try_to_dates << yesterday
+          try_to_dates.find_all {|date| date <= yesterday}.uniq
         end
 
         private

data/test/embulk/input/mixpanel_api/test_client.rb

@@ -30,6 +30,36 @@ module Embulk
           assert_equal(expected, @client.__send__(:signature, params))
         end
 
+        class TryToDatesTest < self
+          def setup
+            @client = Client.new(API_KEY, API_SECRET)
+          end
+
+          data do
+            [
+              ["2000-01-01", "2000-01-01"],
+              ["2010-01-01", "2010-01-01"],
+              ["3 days ago", (Date.today - 3).to_s],
+            ]
+          end
+          def test_candidates(from_str)
+            from = Date.parse(from_str)
+            yesterday = Date.today - 1
+            dates = @client.try_to_dates(from.to_s)
+            expect = [
+              from + 1,
+              from + 10,
+              from + 100,
+              from + 1000,
+              from + 10000,
+              yesterday,
+            ].find_all{|d| d <= yesterday}
+
+            assert_equal expect, dates
+            assert dates.all?{|d| d <= yesterday}
+          end
+        end
+
         class ExportTest < self
           def setup
             super

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: embulk-input-mixpanel
 version: !ruby/object:Gem::Version
-  version: 0.4.4
+  version: 0.4.5
 platform: ruby
 authors:
 - yoshihara
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2016-09-02 00:00:00.000000000 Z
+date: 2016-09-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement