embulk-input-google_analytics 0.1.15 → 0.1.16.alpha.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 038d5260b65f61ec9ecb388cd291ae1cd552f39f
-  data.tar.gz: aa8ff1327f96d146542398c024779396994653f4
+  metadata.gz: 93dac5ab48493c13dac60d7640cd9588942858a0
+  data.tar.gz: f3a71a84eea8e0f0933d225d5f66da21fa30b857
 SHA512:
-  metadata.gz: 7c8bce9e227b6fd90b3f007a85c20a652a873b7692914672102d2b089566943de8a50d8eaaca45e33be1cc1e4065b67c2ea13baa67c3eda99d406150f8495725
-  data.tar.gz: 2ba7e78c8be3d73e1c7b6a462bd3b6b0f1cf60c1d097cc12e0c02ae3930bed45360a7dd23f3be3c032b675d7cb90c55b80c99e5b2b39c0d3f9d933a212541a47
+  metadata.gz: f866865ba1a2e5318c490d6274377d8ccafa5394404f62045dca9d5f7845bedc65da83d921b4c9bd4298c424fe59702ea04a6d7da525ef220f894d5eba240d4d
+  data.tar.gz: 106bbd9f7822f76de17ea8ba33fd3fa1817b05ace656dc5d6f6d1329f7342feecaf382a7c475c0554424618d1925aeaa78ffccd66f4505dd8f3645db38c425e7

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.15"
+  spec.version       = "0.1.16.alpha.1"
   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

@@ -127,7 +127,7 @@ module Embulk
           end
 
           if task["incremental"]
-            calculate_next_times(latest_time_series)
+            calculate_next_times(client.get_profile[:timezone], latest_time_series)
           else
             {}
           end
@@ -139,11 +139,12 @@ module Embulk
           false
         end
 
-        def calculate_next_times(fetched_latest_time)
+        def calculate_next_times(client_time_zone, fetched_latest_time)
           task_report = {}
-
           if fetched_latest_time
-            task_report[:start_date] = fetched_latest_time.strftime("%Y-%m-%d")
+            # Convert fetched_last_time to user timezone
+            timezone = ActiveSupport::TimeZone[client_time_zone]
+            task_report[:start_date] = timezone.nil? ? fetched_latest_time.strftime("%Y-%m-%d") : timezone.parse(fetched_latest_time.to_s).strftime("%Y-%m-%d")
 
             # if end_date specified as statically YYYY-MM-DD, it will be conflict with start_date (end_date < start_date)
             # Or when end_date is nil, only start_date will be filled on next run but it is illegal API request.

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

@@ -2,6 +2,7 @@ require "embulk"
 Embulk.setup
 
 require "embulk/input/google_analytics"
+require "active_support/core_ext/time"
 require "override_assert_raise"
 require "fixture_helper"
 
@@ -11,7 +12,7 @@ module Embulk
       class TestPlugin < Test::Unit::TestCase
         include OverrideAssertRaise
         include FixtureHelper
-
+        DEFAULT_TIMEZONE = "America/Los_Angeles"
         sub_test_case ".transaction" do
           setup do
             any_instance_of(Client) do |klass|
@@ -266,6 +267,7 @@ module Embulk
 
         sub_test_case "calculate_next_times" do
           setup do
+            @timeparser = ActiveSupport::TimeZone["UTC"]
             @page_builder = Object.new
             @config = embulk_config(valid_config["in"])
           end
@@ -285,7 +287,7 @@ module Embulk
                   end_date: task["end_date"],
                   last_record_time: task["last_record_time"],
                 }
-                assert_equal expected, plugin.calculate_next_times(nil)
+                assert_equal expected, plugin.calculate_next_times(DEFAULT_TIMEZONE, nil)
               end
             end
 
@@ -297,14 +299,32 @@ module Embulk
                 end
 
                 test "config_diff will modify" do
-                  latest_time = Time.parse("2000-01-07")
+                  latest_time = parse_time("2000-01-07")
+                  plugin = Plugin.new(config, nil, nil, @page_builder)
+                  expected = {
+                    start_date: "2000-01-06",
+                    end_date: "today",
+                    last_record_time: latest_time.strftime("%Y-%m-%d %H:%M:%S %z"),
+                  }
+                  assert_equal expected, plugin.calculate_next_times(DEFAULT_TIMEZONE, latest_time)
+                end
+              end
+              sub_test_case "system timezone is 1 day behind profile timezone" do
+                setup do
+                  @config[:start_date] = "2000-01-01"
+                  @config[:end_date] = "2000-01-05"
+                  @timeparser = ActiveSupport::TimeZone["Asia/Ho_Chi_Minh"]
+                end
+
+                test "config_diff will modify with end date set to correct timezone" do
+                  latest_time = parse_time("2000-01-07 00:00:00")
                   plugin = Plugin.new(config, nil, nil, @page_builder)
                   expected = {
-                    start_date: latest_time.strftime("%Y-%m-%d"),
+                    start_date: "2000-01-06",
                     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)
+                  assert_equal expected, plugin.calculate_next_times(DEFAULT_TIMEZONE, latest_time)
                 end
               end
 
@@ -315,14 +335,14 @@ module Embulk
                 end
 
                 test "config_diff end_date won't modify" do
-                  latest_time = Time.parse("2000-01-07")
+                  latest_time = parse_time("2000-01-07")
                   plugin = Plugin.new(config, nil, nil, @page_builder)
                   expected = {
-                    start_date: latest_time.strftime("%Y-%m-%d"),
+                    start_date: "2000-01-06",
                     end_date: @config[:end_date],
                     last_record_time: latest_time.strftime("%Y-%m-%d %H:%M:%S %z"),
                   }
-                  assert_equal expected, plugin.calculate_next_times(latest_time)
+                  assert_equal expected, plugin.calculate_next_times(DEFAULT_TIMEZONE, latest_time)
                 end
               end
             end
@@ -343,7 +363,7 @@ module Embulk
                   end_date: task["end_date"],
                   last_record_time: task["last_record_time"],
                 }
-                assert_equal expected, plugin.calculate_next_times(nil)
+                assert_equal expected, plugin.calculate_next_times(DEFAULT_TIMEZONE, nil)
               end
             end
 
@@ -355,15 +375,27 @@ module Embulk
                 end
 
                 test "config_diff will modify" do
-                  latest_time = Time.parse("2000-01-07")
+                  latest_time = parse_time("2000-01-07")
                   plugin = Plugin.new(config, nil, nil, @page_builder)
                   expected = {
-                    start_date: latest_time.strftime("%Y-%m-%d"),
+                    start_date: "2000-01-06",
                     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)
+                  assert_equal expected, plugin.calculate_next_times(DEFAULT_TIMEZONE, latest_time)
                 end
+
+                test "config_diff will modify" do
+                  latest_time = parse_time("2000-01-07")
+                  plugin = Plugin.new(config, nil, nil, @page_builder)
+                  expected = {
+                    start_date: "2000-01-06",
+                    end_date: "today",
+                    last_record_time: latest_time.strftime("%Y-%m-%d %H:%M:%S %z"),
+                  }
+                  assert_equal expected, plugin.calculate_next_times(DEFAULT_TIMEZONE, latest_time)
+                end
+
               end
 
               sub_test_case "end_date is nil" do
@@ -373,14 +405,14 @@ module Embulk
                 end
 
                 test "config_diff will modify" do
-                  latest_time = Time.parse("2000-01-07")
+                  latest_time = parse_time("2000-01-07")
                   plugin = Plugin.new(config, nil, nil, @page_builder)
                   expected = {
-                    start_date: latest_time.strftime("%Y-%m-%d"),
+                    start_date: "2000-01-06",
                     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)
+                  assert_equal expected, plugin.calculate_next_times(DEFAULT_TIMEZONE, latest_time)
                 end
               end
 
@@ -391,14 +423,14 @@ module Embulk
                 end
 
                 test "config_diff end_date won't modify" do
-                  latest_time = Time.parse("2000-01-07")
+                  latest_time = parse_time("2000-01-07")
                   plugin = Plugin.new(config, nil, nil, @page_builder)
                   expected = {
-                    start_date: latest_time.strftime("%Y-%m-%d"),
+                    start_date: "2000-01-06",
                     end_date: @config[:end_date],
                     last_record_time: latest_time.strftime("%Y-%m-%d %H:%M:%S %z"),
                   }
-                  assert_equal expected, plugin.calculate_next_times(latest_time)
+                  assert_equal expected, plugin.calculate_next_times(DEFAULT_TIMEZONE, latest_time)
                 end
               end
             end
@@ -411,6 +443,11 @@ module Embulk
           def config
             @config
           end
+
+          def parse_time(time_string)
+            @timeparser.parse(time_string)
+          end
+
         end
 
         def valid_config

metadata

@@ -1,211 +1,211 @@
 --- !ruby/object:Gem::Specification
 name: embulk-input-google_analytics
 version: !ruby/object:Gem::Version
-  version: 0.1.15
+  version: 0.1.16.alpha.1
 platform: ruby
 authors:
 - uu59
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2017-11-29 00:00:00.000000000 Z
+date: 2018-02-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: httpclient
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+  name: httpclient
+  prerelease: false
+  type: :runtime
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  prerelease: false
-  type: :runtime
 - !ruby/object:Gem::Dependency
-  name: google-api-client
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
         version: 0.10.1
+  name: google-api-client
+  prerelease: false
+  type: :runtime
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
         version: 0.10.1
-  prerelease: false
-  type: :runtime
 - !ruby/object:Gem::Dependency
-  name: signet
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+  name: signet
+  prerelease: false
+  type: :runtime
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  prerelease: false
-  type: :runtime
 - !ruby/object:Gem::Dependency
-  name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+  name: activesupport
+  prerelease: false
+  type: :runtime
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  prerelease: false
-  type: :runtime
 - !ruby/object:Gem::Dependency
-  name: perfect_retry
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.5'
+  name: perfect_retry
+  prerelease: false
+  type: :runtime
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.5'
-  prerelease: false
-  type: :runtime
 - !ruby/object:Gem::Dependency
-  name: embulk
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.8.9
+  name: embulk
+  prerelease: false
+  type: :development
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.8.9
-  prerelease: false
-  type: :development
 - !ruby/object:Gem::Dependency
-  name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: 1.10.6
+  name: bundler
+  prerelease: false
+  type: :development
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: 1.10.6
-  prerelease: false
-  type: :development
 - !ruby/object:Gem::Dependency
-  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '10.0'
+  name: rake
+  prerelease: false
+  type: :development
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '10.0'
-  prerelease: false
-  type: :development
 - !ruby/object:Gem::Dependency
-  name: test-unit
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+  name: test-unit
+  prerelease: false
+  type: :development
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  prerelease: false
-  type: :development
 - !ruby/object:Gem::Dependency
-  name: test-unit-rr
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+  name: test-unit-rr
+  prerelease: false
+  type: :development
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  prerelease: false
-  type: :development
 - !ruby/object:Gem::Dependency
-  name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+  name: simplecov
+  prerelease: false
+  type: :development
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  prerelease: false
-  type: :development
 - !ruby/object:Gem::Dependency
-  name: codeclimate-test-reporter
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+  name: codeclimate-test-reporter
+  prerelease: false
+  type: :development
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  prerelease: false
-  type: :development
 - !ruby/object:Gem::Dependency
-  name: pry
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+  name: pry
+  prerelease: false
+  type: :development
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  prerelease: false
-  type: :development
 - !ruby/object:Gem::Dependency
-  name: gem_release_helper
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
+  name: gem_release_helper
+  prerelease: false
+  type: :development
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
-  prerelease: false
-  type: :development
 description: Loads records from Google Analytics.
 email:
 - k@uu59.org
@@ -248,9 +248,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project:
 rubygems_version: 2.6.6