fluent-plugin-bigquery 0.3.3 → 0.3.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 66cdf151a1711b82f972e108d736638c017637ca
-  data.tar.gz: 29de9f545e896319d26105753a8569a60d411441
+  metadata.gz: 3b4f46435678df7e2b883e2dfdbb0a77a9359481
+  data.tar.gz: 7cbe9b3aa6e4c22ccf0299bfd0a8ff8d1892ccff
 SHA512:
-  metadata.gz: 3e413ccab59cb232dae2b2808bb4637df291eb96a0540a98387aff8397a0fb39b0f7585c6c0d565d6f2d5851b516737e7308deb9c11572a303af55832f49cd13
-  data.tar.gz: f7fdfa22e82ff9f5748782e8b62429c005467bfec9ff3ea0133b2cd53f71359d90789275d42859b96f2d583830a1a6160916a0452ad9efa5a57c559fe07af366
+  metadata.gz: b3e02368662e2c7448726d9d3652aa80d60cd19a040122cfdd05aed6b36949e2c5b760cc3812f690633e4ad3685fd01da14eacab65066caa18e754b8432e7dde
+  data.tar.gz: b9d5c81042fe958b6230d9ebffbf6c09526d7f7bdb0b2641667e2c7c34ab70418d03542a23bb90bff23e565315f7c1e6817ba792b1e622d94d015bad6eea4ef0

data/.travis.yml

@@ -4,7 +4,18 @@ rvm:
   - 2.0
   - 2.1
   - 2.2
-  - 2.3.0
+  - 2.3.3
+
+gemfile:
+  - Gemfile
+  - gemfiles/activesupport-4.gemfile
+
+matrix:
+  exclude:
+    - rvm: 2.0
+      gemfile: Gemfile
+    - rvm: 2.1
+      gemfile: Gemfile
 
 before_install:
   - gem update bundler

data/README.md

@@ -14,6 +14,9 @@
 Current version of this plugin supports Google API with Service Account Authentication, but does not support
 OAuth flow for installed applications.
 
+## Notice
+If you use ruby-2.1 or earlier, you must use activesupport-4.2.x or earlier.
+
 ## Configuration
 
 ### Options

data/fluent-plugin-bigquery.gemspec

@@ -20,13 +20,13 @@ Gem::Specification.new do |spec|
 
   spec.add_development_dependency "rake"
   spec.add_development_dependency "rr"
-  spec.add_development_dependency "test-unit", "~> 3.0.2"
-  spec.add_development_dependency "test-unit-rr", "~> 1.0.3"
+  spec.add_development_dependency "test-unit"
+  spec.add_development_dependency "test-unit-rr"
 
   spec.add_runtime_dependency "google-api-client", "~> 0.9.3"
   spec.add_runtime_dependency "googleauth", ">= 0.5.0"
   spec.add_runtime_dependency "multi_json"
-  spec.add_runtime_dependency "activesupport", ">= 3.2", "< 5"
+  spec.add_runtime_dependency "activesupport", ">= 3.2", "< 6"
   spec.add_runtime_dependency "fluentd", "~> 0.12.0"
   spec.add_runtime_dependency "fluent-mixin-plaintextformatter", '>= 0.2.1'
   spec.add_runtime_dependency "fluent-mixin-config-placeholders", ">= 0.3.0"

data/gemfiles/activesupport-4.gemfile

@@ -0,0 +1,6 @@
+source 'https://rubygems.org'
+
+gem 'activesupport', '< 5'
+
+# Specify your gem's dependencies in fluent-plugin-bigquery.gemspec
+gemspec :path => '../'

data/lib/fluent/plugin/bigquery/version.rb

@@ -1,5 +1,5 @@
 module Fluent
   module BigQueryPlugin
-    VERSION = "0.3.3".freeze
+    VERSION = "0.3.4".freeze
   end
 end

data/lib/fluent/plugin/bigquery/writer.rb

@@ -25,6 +25,7 @@ module Fluent
         create_table_retry_limit = 3
         create_table_retry_wait = 1
         create_table_retry_count = 0
+        table_id = safe_table_id(table_id)
 
         begin
           definition = {
@@ -93,7 +94,7 @@ module Fluent
           options: {timeout_sec: timeout_sec, open_timeout_sec: open_timeout_sec}
         })
         log.debug "insert rows", project_id: project, dataset: dataset, table: table_id, count: rows.size
-        log.warn "insert errors", insert_errors: res.insert_errors.to_s if res.insert_errors && !res.insert_errors.empty?
+        log.warn "insert errors", project_id: project, dataset: dataset, table: table_id, insert_errors: res.insert_errors.to_s if res.insert_errors && !res.insert_errors.empty?
       rescue Google::Apis::ServerError, Google::Apis::ClientError, Google::Apis::AuthorizationError => e
         @client = nil
 
@@ -254,6 +255,10 @@ module Fluent
       def get_auth_from_application_default
         Google::Auth.get_application_default([@scope])
       end
+
+      def safe_table_id(table_id)
+        table_id.gsub(/\$\d+$/, "")
+      end
     end
   end
 end

data/lib/fluent/plugin/out_bigquery.rb

@@ -434,6 +434,10 @@ module Fluent
           record = replace_record_key(record)
         end
 
+        if @convert_hash_to_json
+          record = convert_hash_to_json(record)
+        end
+
         buf = String.new
         row = @fields.format(@add_time_field.call(record, time))
         unless row.empty?

data/test/helper.rb

@@ -1,4 +1,3 @@
-require 'rubygems'
 require 'bundler'
 begin
   Bundler.setup(:default, :development)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-bigquery
 version: !ruby/object:Gem::Version
-  version: 0.3.3
+  version: 0.3.4
 platform: ruby
 authors:
 - Naoya Ito
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-11-15 00:00:00.000000000 Z
+date: 2016-12-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -43,30 +43,30 @@ dependencies:
   name: test-unit
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 3.0.2
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 3.0.2
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: test-unit-rr
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.0.3
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.0.3
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: google-api-client
   requirement: !ruby/object:Gem::Requirement
@@ -118,7 +118,7 @@ dependencies:
         version: '3.2'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '5'
+        version: '6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -128,7 +128,7 @@ dependencies:
         version: '3.2'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '5'
+        version: '6'
 - !ruby/object:Gem::Dependency
   name: fluentd
   requirement: !ruby/object:Gem::Requirement
@@ -201,6 +201,7 @@ files:
 - README.md
 - Rakefile
 - fluent-plugin-bigquery.gemspec
+- gemfiles/activesupport-4.gemfile
 - lib/fluent/plugin/bigquery/errors.rb
 - lib/fluent/plugin/bigquery/schema.rb
 - lib/fluent/plugin/bigquery/version.rb
@@ -232,7 +233,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.4
+rubygems_version: 2.6.8
 signing_key: 
 specification_version: 4
 summary: Fluentd plugin to store data on Google BigQuery