embulk-input-zendesk 0.1.12 → 0.1.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 54425e9279b16a3f00fffee29c05a7a393cf3d17
-  data.tar.gz: 2a7875870eba59a55c62c6b2c32652d3cd738b2f
+  metadata.gz: 1a391e53c7f33423839b92cfbaed3b80765ec8fb
+  data.tar.gz: 54253ba9242ad460cb0252912b928aaf81a77af6
 SHA512:
-  metadata.gz: d008e9240a69d23fd6a5fb450dd3280bd07a7a1acfe7f1e7ba349f3e611ae32ca9b3f9d6806803fd8e8767772d711dc6a242034ca8c73188b616507bb7e8e862
-  data.tar.gz: 6eb277d8e9240d87859de789f439242dbd9097a00e09931df157dbd48d90602d374ec148279c42c9b3755f6bbc29dbab15dcb090046fc4760a16dd37feae010e
+  metadata.gz: a0909371764ebeec9b3b083040cab4a6626391d9eb258292428040ce7cc2d91480a2e2edaca6b173f0b8773d3380a21e2e0ca8d462b69f714b25e9bec4242854
+  data.tar.gz: 6f6f530ab66122a1ab329c3a228ee699052acf7114448ef2d4bfe43c11d03dd8afed19ec220a2a23a942178fd380f8c718228716b9ae5dc58f0568949096ce2f

data/CHANGELOG.md

@@ -1,3 +1,6 @@
+## 0.1.13 - 2017-03-23
+* [fixed] Fix to generate config_diff when no data fetched [#18](https://github.com/treasure-data/embulk-input-zendesk/pull/18)
+
 ## 0.1.12 - 2016-10-20
 * [fixed] Fix `*_id` columns to be guessed as string. (e.g. external_id) [#17](https://github.com/treasure-data/embulk-input-zendesk/pull/17)
 

data/embulk-input-zendesk.gemspec

@@ -1,7 +1,7 @@
 
 Gem::Specification.new do |spec|
   spec.name          = "embulk-input-zendesk"
-  spec.version       = "0.1.12"
+  spec.version       = "0.1.13"
   spec.authors       = ["uu59", "muga", "sakama"]
   spec.summary       = "Zendesk input plugin for Embulk"
   spec.description   = "Loads records from Zendesk."
@@ -24,5 +24,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'rr', '~> 1.1.2'
   spec.add_development_dependency 'simplecov'
   spec.add_development_dependency 'gem_release_helper', "~> 1.0"
-  spec.add_development_dependency "codeclimate-test-reporter"
+  spec.add_development_dependency "codeclimate-test-reporter", "~> 0.6"
 end

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

@@ -110,6 +110,7 @@ module Embulk
             args << @start_time.to_i
           end
 
+          fetching_start_at = Time.now
           last_data = client.public_send(method, *args) do |record|
             record = fetch_related_object(record)
             values = extract_values(record)
@@ -119,12 +120,17 @@ module Embulk
           page_builder.finish
 
           task_report = {}
-          if task[:incremental] && last_data && last_data["end_time"]
-            # NOTE: start_time compared as "=>", not ">".
-            #       If we will use end_time for next start_time, we got the same record that is last fetched
-            #       end_time + 1 is workaround for that
-            next_start_time = Time.at(last_data["end_time"] + 1)
-            task_report[:start_time] = next_start_time.strftime("%Y-%m-%d %H:%M:%S%z")
+          if task[:incremental]
+            if last_data && last_data["end_time"]
+              # NOTE: start_time compared as "=>", not ">".
+              #       If we will use end_time for next start_time, we got the same record that is last fetched
+              #       end_time + 1 is workaround for that
+              next_start_time = Time.at(last_data["end_time"] + 1)
+              task_report[:start_time] = next_start_time.strftime("%Y-%m-%d %H:%M:%S%z")
+            else
+              # Sometimes no record and no end_time fetched on the job, but we should generate start_time on config_diff.
+              task_report[:start_time] = fetching_start_at
+            end
           end
 
           return task_report

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

@@ -433,6 +433,23 @@ module Embulk
                   report = @plugin.run
                   assert_equal next_start_time, report[:start_time]
                 end
+
+                test "no record" do
+                  first_report = @plugin.run
+
+                  @httpclient.test_loopback_http_response << [
+                    "HTTP/1.1 200",
+                    "Content-Type: application/json",
+                    "",
+                    {
+                      ticket_events: [],
+                      count: 0,
+                    }.to_json
+                  ].join("\r\n")
+                  second_report = @plugin.run
+
+                  assert second_report.has_key?(:start_time)
+                end
               end
 
               sub_test_case "incremental: false" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: embulk-input-zendesk
 version: !ruby/object:Gem::Version
-  version: 0.1.12
+  version: 0.1.13
 platform: ruby
 authors:
 - uu59
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2016-10-20 00:00:00.000000000 Z
+date: 2017-03-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
@@ -169,17 +169,17 @@ dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.6'
   name: codeclimate-test-reporter
   prerelease: false
   type: :development
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.6'
 description: Loads records from Zendesk.
 email:
 - k@uu59.org