embulk-input-google_analytics 0.1.8 → 0.1.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e97983d59913f897eba87209c18189501345cf99
-  data.tar.gz: a2e0a973d7bc783035c4c141025083e1cb0e6d70
+  metadata.gz: 0cf6819cbdb38173f44900cba3223c59a9176d6e
+  data.tar.gz: 62e041ee887e632aad22de0375b395b42636d0ef
 SHA512:
-  metadata.gz: 936b02145765c0c16ba882a610b35094ff9166bb94a5cb60593341b3d9a444d69540736cd58ff40dcda17bb06f2258592c742992a489970b97e9b34e8d01d6ba
-  data.tar.gz: 10b9a357c2b2f614256b19ac7d2bcf0ff68dd35d8111651d2c25ae206a6bd4a0ef0828902eaaf09e7861573563d25ef1f7f19f22fff5a030f97e21843d09aa76
+  metadata.gz: 5b68652c6e70c2e5b281f7fa7b44d7e24da9c51ffe494915bd90992f0ab28b8bef924ae2d8129e9aae87829705c252d1910ac45498982504ff94d468a4800481
+  data.tar.gz: 57a3ee3ec80110c89f4b17cb6b87e8f2f80fae2da1f69862e11eece4bab571d1bbf5ca3e457488f31a9f96171bc7ff053e6e57f9837e19c156716e75ca36834b

data/CHANGELOG.md

@@ -1,3 +1,6 @@
+## 0.1.9 - 2016-11-22
+* Support 'foobarXX' column names [#16](https://github.com/treasure-data/embulk-input-google_analytics/pull/16)
+
 ## 0.1.8 - 2016-11-09
 * TIME column should be double, not timestamp. e.g. sessionDuration (thx @kazuya030) [#13](https://github.com/treasure-data/embulk-input-google_analytics/pull/13) [#15](https://github.com/treasure-data/embulk-input-google_analytics/pull/15)
 

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.8"
+  spec.version       = "0.1.9"
   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

@@ -122,7 +122,35 @@ module Embulk
         end
 
         def get_columns_list
-          get_custom_dimensions + get_metadata_columns
+          columns = get_custom_dimensions + get_metadata_columns
+          canonical_column_names(columns)
+        end
+
+        def canonical_column_names(columns)
+          result = []
+          columns.each do |col|
+            if col[:id].match(/XX$/)
+              # for such columns:
+              # https://developers.google.com/analytics/devguides/reporting/core/dimsmets#view=detail&group=content_grouping
+              # https://developers.google.com/analytics/devguides/reporting/metadata/v3/devguide#attributes
+              min = [
+                col[:attributes][:minTemplateIndex],
+                col[:attributes][:premiumMinTemplateIndex],
+              ].compact.min
+              max = [
+                col[:attributes][:maxTemplateIndex],
+                col[:attributes][:premiumMaxTemplateIndex],
+              ].compact.max
+
+              min.upto(max) do |n|
+                actual_id = col[:id].gsub(/XX$/, n.to_s)
+                result << col.merge(id: actual_id)
+              end
+            else
+              result << col
+            end
+          end
+          result
         end
 
         def get_metadata_columns

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

@@ -12,6 +12,28 @@ module Embulk
         include OverrideAssertRaise
         include FixtureHelper
 
+        sub_test_case "canonical_column_names" do
+          setup do
+            conf = valid_config["in"]
+            @task = task(embulk_config(conf))
+            @client = Client.new(@task)
+          end
+
+          test "XX column names should be expanded" do
+            columns = @client.canonical_column_names([
+              {id: "foo"},
+              {id: "barXX", attributes: {minTemplateIndex: 1, maxTemplateIndex: 3}},
+              {id: "bazXX", attributes: {minTemplateIndex: 1, maxTemplateIndex: 3, premiumMinTemplateIndex: 1, premiumMaxTemplateIndex: 5}},
+            ])
+            expected_names = %w(
+              foo bar1 bar2 bar3
+              baz1 baz2 baz3 baz4 baz5
+            )
+
+            assert_equal expected_names, columns.map{|col| col[:id]}
+          end
+        end
+
         sub_test_case "get_profile" do
           setup do
             conf = valid_config["in"]

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: embulk-input-google_analytics
 version: !ruby/object:Gem::Version
-  version: 0.1.8
+  version: 0.1.9
 platform: ruby
 authors:
 - uu59
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2016-11-09 00:00:00.000000000 Z
+date: 2016-11-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement