embulk-input-google_analytics 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5d3324d9256b97a4edd184262d0f2dc3dc2f89de
-  data.tar.gz: 00702b551777df80b496395274b97a4cd1e21da7
+  metadata.gz: 45cf305036e0b44cbd5f8dc0327280406b9f541b
+  data.tar.gz: 357797127e74378167f8ef27cf0e10d2a5c4223e
 SHA512:
-  metadata.gz: 9caa9caea04f155c084b07339d8f2e1a29c1050c79048115c98ec6db2507b58ae643168140dc0be1cd259692e8c0107994151c84d0798170258082906445edf9
-  data.tar.gz: edc535541bd7ef54f5335fbda215d4d7efe7bd8176246cf2a1723a6bd32b62b8405b3317660ecca0790620053a42ecd5cc79f5e1fea40c2d85a421e6b07cdee3
+  metadata.gz: b5417ea74d3e6a700a0f42edc4558ca7a4fe5e56024aa79f9c49c8122c96acbb7519697805fed62d8fde13989a176dd00dc35bee3337fd9549b3b746bf42ae30
+  data.tar.gz: 6fec758e1ee78ca9e4055060bca8caef42ac3be47d97ef0623d7790135c40bf945627618ac92507a16da029a4760043db7cdec41a91507ec390a9dbec7ddf8a9

data/CHANGELOG.md

@@ -1,3 +1,6 @@
+## 0.1.4 - 2016-08-19
+* Always add `view_id` into records [#9](https://github.com/treasure-data/embulk-input-google_analytics/pull/9)
+
 ## 0.1.3 - 2016-08-15
 * Use net/http to avoid TLS error [#8](https://github.com/treasure-data/embulk-input-google_analytics/pull/8)
 

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.3"
+  spec.version       = "0.1.4"
   spec.authors       = ["uu59"]
   spec.summary       = "Google Analytics input plugin for Embulk"
   spec.description   = "Loads records from Google Analytics."

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

@@ -54,6 +54,7 @@ module Embulk
               raw_time = format_row[task["time_series"]]
               next if too_early_data?(raw_time)
               format_row[task["time_series"]] = time_parse_with_profile_timezone(raw_time)
+              format_row["view_id"] = view_id
               block.call format_row
             end
 

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

@@ -36,6 +36,8 @@ module Embulk
             Column.new(nil, canonicalize_column_name(col_name), col_type)
           end
 
+          columns << Column.new(nil, "view_id", :string)
+
           resume(task, columns, 1, &control)
         end
 
@@ -81,7 +83,7 @@ module Embulk
 
         def run
           client = Client.new(task, preview?)
-          columns = self.class.columns_from_task(task)
+          columns = self.class.columns_from_task(task) + ["view_id"]
 
           last_record_time = task["last_record_time"] ? Time.parse(task["last_record_time"]) : nil
 

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

@@ -271,7 +271,8 @@ module Embulk
         sub_test_case "each_report_row" do
           setup do
             conf = valid_config["in"]
-            @client = Client.new(task(embulk_config(conf)))
+            @task = task(embulk_config(conf))
+            @client = Client.new(@task)
             stub(@client).get_profile { {timezone: "Asia/Tokyo"} }
             @logger = Logger.new(File::NULL)
             stub(Embulk).logger { @logger }
@@ -290,18 +291,21 @@ module Embulk
                 "ga:browser" => "curl",
                 "ga:visits" => "1",
                 "ga:pageviews" => "1",
+                "view_id" => @task["view_id"],
               },
               {
                 "ga:dateHour" => @client.time_parse_with_profile_timezone("2016060121"),
                 "ga:browser" => "curl",
                 "ga:visits" => "2",
                 "ga:pageviews" => "2",
+                "view_id" => @task["view_id"],
               },
               {
                 "ga:dateHour" => @client.time_parse_with_profile_timezone("2016060122"),
                 "ga:browser" => "curl",
                 "ga:visits" => "3",
                 "ga:pageviews" => "3",
+                "view_id" => @task["view_id"],
               },
             ]
             assert_equal expected, fetched_rows

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

@@ -40,6 +40,7 @@ module Embulk
               Embulk::Column.new(nil, "browser", :string),
               Embulk::Column.new(nil, "visits", :long),
               Embulk::Column.new(nil, "pageviews", :long),
+              Embulk::Column.new(nil, "view_id", :string),
             ]
             mock(Plugin).resume(anything, columns, 1)
             Plugin.transaction(embulk_config(valid_config["in"]))
@@ -115,6 +116,7 @@ module Embulk
                 Column.new(nil, "ctr", :double),
                 Column.new(nil, "visits", :long),
                 Column.new(nil, "items_per_purchase", :double),
+                Column.new(nil, "view_id", :string),
               ]
 
               mock(Plugin).resume(anything, expected_columns, anything)
@@ -152,7 +154,7 @@ module Embulk
                   end
                 end
 
-                mock(@page_builder).add([time, "wget", 3, 4])
+                mock(@page_builder).add([time, "wget", 3, 4, nil]) # nil for view_id
                 mock(@page_builder).finish
                 @plugin.run
               end
@@ -209,7 +211,7 @@ module Embulk
                   end
                 end
 
-                mock(@page_builder).add([time, "wget", 3, 4])
+                mock(@page_builder).add([time, "wget", 3, 4, nil]) # nil for view_id
                 mock(@page_builder).finish
                 @plugin.run
               end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: embulk-input-google_analytics
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - uu59
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2016-08-15 00:00:00.000000000 Z
+date: 2016-08-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement