embulk-input-google_analytics 0.1.19 → 0.1.21

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 98cf1ab1dabc69c3b8ee6a48e7054f9ed7a13bfc
-  data.tar.gz: b214635c4b353bde69fc9358aa937c82765b6fe7
+  metadata.gz: 9c31715b2885f74b4c7e5de1945fe89992e90f4a
+  data.tar.gz: de5826031ef4faef63a8a34464d6901ff3db1f2e
 SHA512:
-  metadata.gz: e24333e7618c3c729a78ae1a9d0fdb1cac380fef1f9b08bd31fb0a7fdc1b1b0ba25d31a2e399b8c33eed283a3d39007d1da2569dffa6f7c02143dafe55337c6a
-  data.tar.gz: bcee119969919b4352761643d18a0c650dd5b5d017abedf1f75a1f980a2e282174d983ea5622dda77b7c7cbc05d0e35db794a0b70f4b5fbed4c2b847c4be0e1c
+  metadata.gz: 5f4c2643bd6bb00009cafb2e8cc3d6d1326a45ca41079172067148455574e670a050ed10cbed413f4c6ca542f543e21edc97a9d50fe14e943888f29f95eb78ef
+  data.tar.gz: 6f09530aad995baf95f5812d55be0a51ea8e499830622a5969f4cb69fdd85388bceeb0dabde8dcb64bdf2554429df3bcccfcc02cb3a7a2cff3ec6d48b28d9cc7

data/.circleci/config.yml

@@ -0,0 +1,37 @@
+version: 2
+jobs:
+  build:
+    parallelism: 1
+    environment:
+      JRUBY_OPTS: "-Xcli.debug=true --debug"
+    docker:
+      - image: circleci/jruby:9.1.17.0
+    working_directory: ~/workspace
+    steps:
+    - checkout
+    - restore_cache:
+        keys:
+          - deps-{{ .Environment.CIRCLE_JOB }}-{{ checksum "embulk-input-google_analytics.gemspec" }}
+    - run: 
+        name: Install bundle
+        command: |
+          ruby -v
+          gem install bundler
+    - run: 
+        name: Install dependencies
+        command: |
+          bundle -v
+          bundle config https://treasuredata.jfrog.io $TD_ARTIFACTORY_USERNAME:$TD_ARTIFACTORY_PASSWORD
+          bundle install --path=vendor/bundle
+    - save_cache:
+        paths:
+          - vendor/bundle
+        key: deps-{{ .Environment.CIRCLE_JOB }}-{{ checksum "embulk-input-google_analytics.gemspec" }}
+    - run: 
+        name: Build
+        command: |
+          bundle exec rake build
+    - run: 
+        name: Execute tests
+        command: |
+          bundle exec rake

data/CHANGELOG.md

@@ -1,5 +1,8 @@
+## 0.1.21 - 2019-04-01
+* Fix **(ArgumentError) no time information in ""** when last_record_time is null [#42](https://github.com/treasure-data/embulk-input-google_analytics/pull/42)
+
 ## 0.1.19 - 2018-10-03
-* Make it easy to understand error message of Google Analytics connector (https://github.com/treasure-data/embulk-input-google_analytics/pull/39)
+* Make it easy to understand error message of Google Analytics connector
 
 ## 0.1.18 - 2018-05-23
 * Suport User Account Authentication [#33](https://github.com/treasure-data/embulk-input-google_analytics/pull/33)

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.19"
+	spec.version       = "0.1.21"
   spec.authors       = ["uu59"]
   spec.summary       = "Google Analytics input plugin for Embulk"
   spec.description   = "Loads records from Google Analytics."
@@ -22,7 +22,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'embulk', ['>= 0.8.9']
   spec.add_development_dependency 'bundler', ['>= 1.10.6']
   spec.add_development_dependency 'rake', ['>= 10.0']
-  spec.add_development_dependency 'test-unit'
+  spec.add_development_dependency 'test-unit', ['< 3.2']
   spec.add_development_dependency 'test-unit-rr'
   spec.add_development_dependency 'simplecov'
   spec.add_development_dependency "codeclimate-test-reporter"

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

@@ -134,8 +134,7 @@ module Embulk
           client = Client.new(task, preview?)
           columns = self.class.columns_from_task(task) + ["view_id"]
 
-          last_record_time = task['incremental'] && task["last_record_time"] ? Time.parse(task["last_record_time"]) : nil
-
+          last_record_time = Time.parse(task["last_record_time"]) if task['incremental'] && !task["last_record_time"].blank?
           latest_time_series = nil
           skip_counter, total_counter = 0, 0
           client.each_report_row do |row|
@@ -215,11 +214,13 @@ module Embulk
             # no records fetched, don't modify config_diff
             task_report = {
               start_date: task["start_date"],
-              end_date: task["end_date"],
-              last_record_time: task["last_record_time"],
+              end_date: task["end_date"]
             }
+            # write last_record_time only when last_record_time is not nil and not empty
+            unless task["last_record_time"].blank?
+              task_report[:last_record_time] = task["last_record_time"]
+            end 
           end
-
           task_report
         end
       end

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

@@ -380,13 +380,22 @@ module Embulk
             end
 
             sub_test_case "no records fetched" do
-              test "config_diff won't modify" do
-                plugin = Plugin.new(config, nil, nil, @page_builder)
+              data do
+              [
+                ["last_record_time is nil", [nil, nil]],
+                ["last_record_time is empty", ["", nil]],
+                ["last_record_time is blank", ["   ", nil]],
+                ["last_record_time is valid", ["2019-01-01", "2019-01-01"]]
+              ]
+              end
+              test "test calculate_next_times" do |(in_last_record_time, expected_last_record_time)|
+                config["last_record_time"] = in_last_record_time
                 expected = {
                   start_date: task["start_date"],
-                  end_date: task["end_date"],
-                  last_record_time: task["last_record_time"],
+                  end_date: task["end_date"]
                 }
+                expected[:last_record_time] = expected_last_record_time unless expected_last_record_time.blank?
+                plugin = Plugin.new(config, nil, nil, @page_builder)
                 assert_equal expected, plugin.calculate_next_times(DEFAULT_TIMEZONE, nil)
               end
             end
@@ -452,6 +461,7 @@ module Embulk
             setup do
               conf = valid_config["in"]
               conf["time_series"] = "ga:date"
+              conf["last_record_time"] = "2019-01-01"
               @config = embulk_config(conf)
             end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: embulk-input-google_analytics
 version: !ruby/object:Gem::Version
-  version: 0.1.19
+  version: 0.1.21
 platform: ruby
 authors:
 - uu59
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2018-10-03 00:00:00.000000000 Z
+date: 2019-04-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
@@ -125,17 +125,17 @@ dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.2'
   name: test-unit
   prerelease: false
   type: :development
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.2'
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
@@ -213,6 +213,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".circleci/config.yml"
 - ".gitignore"
 - ".ruby-version"
 - CHANGELOG.md
@@ -220,7 +221,6 @@ files:
 - LICENSE.txt
 - README.md
 - Rakefile
-- circle.yml
 - embulk-input-google_analytics.gemspec
 - lib/embulk/input/google_analytics.rb
 - lib/embulk/input/google_analytics/client.rb

data/circle.yml

@@ -1,26 +0,0 @@
-machine:
-  java:
-    version: oraclejdk8
-  ruby:
-    version: jruby-9.1.5.0
-  environment:
-    JRUBY_OPTS: "-Xcli.debug=true --debug"
-
-dependencies:
-  pre:
-    - ruby -v
-    - bundle -v
-    - grep bundler <<< "$(gem list)" || gem i bundler --no-document
-    - bundle -v
-
-test:
-  override:
-    - bundle exec rake cov
-notify:
-  webhooks:
-    - url: http://td-beda.herokuapp.com/circleci_callback
-    
-general:
-  artifacts:
-    - "coverage"
-