embulk-input-google_analytics 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 122431f951c569688cc1df231944216e766f9356
-  data.tar.gz: 687477c6f8e0c08853b07e681bd3f3e39e81f876
+  metadata.gz: 3ec2cc0b61da3b078e98adbcc7bdfd7376fbfbd5
+  data.tar.gz: fd2ab63207a32052d41f5c3b908ca320cb57140c
 SHA512:
-  metadata.gz: 226f36d2128a30c5f30da1083c6f9bb63db86bb7cd08a9221c3f55f891fee816bc2e154fcf0e48eadbb9f71c959547ca6c644e3cbebe3fdce5b20fcb5234b9b7
-  data.tar.gz: 2c1f6b067797788227f46210ba99270d80f6720da43cb97349fa439e7463fadc6b150c05f665ca60e15388cdf57ac4b67d409a5d2da4dc8e9b73e1b55e9f0854
+  metadata.gz: cf3075e1127d19fce9594fa56376855e59b2564f654d4a0b1f2bed34539059bdcf0ddf179e273bbcf479cd746eae87a8e563a1daf072b20274c0c68a3e0c8bd9
+  data.tar.gz: 2977d85da4a5e3a45894ec48936968c0c825a98a7dc0e9f6ce0c146d1c6f9d6b916b4a9696d6b6fab61c50e3f55fc92267992b6c087a91ce39ab1c05b5ba99e0

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 0.1.2 - 2016-07-13
+
+* Fix when `end_date` is nil [#7](https://github.com/treasure-data/embulk-input-google_analytics/pull/7)
+
 ## 0.1.1 - 2016-07-13
 * Enable scheduled execution [#4](https://github.com/treasure-data/embulk-input-google_analytics/pull/4)
 * Error handling [#6](https://github.com/treasure-data/embulk-input-google_analytics/pull/6)

data/embulk-input-google_analytics.gemspec

@@ -1,7 +1,7 @@
 
 Gem::Specification.new do |spec|
   spec.name          = "embulk-input-google_analytics"
-  spec.version       = "0.1.1"
+  spec.version       = "0.1.2"
   spec.authors       = ["uu59"]
   spec.summary       = "Google Analytics input plugin for Embulk"
   spec.description   = "Loads records from Google Analytics."

data/lib/embulk/input/google_analytics/plugin.rb

@@ -120,8 +120,9 @@ module Embulk
             task_report[:start_date] = fetched_latest_time.strftime("%Y-%m-%d")
 
             # if end_date specified as statically YYYY-MM-DD, it will be conflict with start_date (end_date < start_date)
-            # Modify it as "today" to be safe
-            if task["end_date"].match(/[0-9]{4}-[0-9]{2}-[0-9]{2}/)
+            # Or when end_date is nil, only start_date will be filled on next run but it is illegal API request.
+            # Modify end_date as "today" to be safe
+            if task["end_date"].nil? || task["end_date"].match(/[0-9]{4}-[0-9]{2}-[0-9]{2}/)
               task_report[:end_date] = "today" # "today" means now. running at 03:30 AM, will got 3 o'clock data.
             end
 

data/test/embulk/input/google_analytics/test_plugin.rb

@@ -363,6 +363,24 @@ module Embulk
                 end
               end
 
+              sub_test_case "end_date is nil" do
+                setup do
+                  @config[:start_date] = nil
+                  @config[:end_date] = nil
+                end
+
+                test "config_diff will modify" do
+                  latest_time = Time.parse("2000-01-07")
+                  plugin = Plugin.new(config, nil, nil, @page_builder)
+                  expected = {
+                    start_date: latest_time.strftime("%Y-%m-%d"),
+                    end_date: "today",
+                    last_record_time: latest_time.strftime("%Y-%m-%d %H:%M:%S %z"),
+                  }
+                  assert_equal expected, plugin.calculate_next_times(latest_time)
+                end
+              end
+
               sub_test_case "end_date is given as nDaysAgo" do
                 setup do
                   @config[:start_date] = "2000-01-01"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: embulk-input-google_analytics
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - uu59