fluent-plugin-bigquery 0.0.7 → 0.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2028a3a22b1855688a3dbda29c3f14d686c7a564
-  data.tar.gz: cba6fc467f68c821af6aa1a8b87e6ae128e9cb15
+  metadata.gz: 4ff7b10c800f4cdee7cc503d0991d101c4fe0b91
+  data.tar.gz: f1cdcd51c9d0016e8c6367dd3c9903903fd0bb78
 SHA512:
-  metadata.gz: 643b083672144627b15a5e822acc57e2180acc63aa5428474ad1953db5a8286211dc222f6b7d6c0c005d5c50f2b4c48abab2bae1fe2e6d3ca6562dc12258b164
-  data.tar.gz: 97dee7b14e15a3e4663722c91f58b18b037f13839284873dfbffe434fce694112e938899703b2ceb805a4fdbba17a2c1e2a62d2c3b6cf47a2bfcf950c233211e
+  metadata.gz: 81168a787618c6687f2cb806d3e69feca256cf4a78f7ccb07bf3af161c7d16a59b34bc70be907909335568adfb38907281175f203fd57bae10be50855791fd5c
+  data.tar.gz: c821cf46374222afb0b69cef16243c8f0889f217b5d59b9480461cddbef7cce7384c96648d00a600e9f8d6ad07e7971e0c64367556d45676131157ccecdff95d

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

@@ -1,6 +1,6 @@
 module Fluent
   module BigQueryPlugin
-    VERSION = "0.0.7"
+    VERSION = "0.0.8"
   end
 end
 

data/lib/fluent/plugin/out_bigquery.rb

@@ -154,22 +154,22 @@ module Fluent
       end
       if @field_string
         @field_string.split(',').each do |fieldname|
-          @fields.register_field fieldname, :string
+          @fields.register_field fieldname.strip, :string
         end
       end
       if @field_integer
         @field_integer.split(',').each do |fieldname|
-          @fields.register_field fieldname, :integer
+          @fields.register_field fieldname.strip, :integer
         end
       end
       if @field_float
         @field_float.split(',').each do |fieldname|
-          @fields.register_field fieldname, :float
+          @fields.register_field fieldname.strip, :float
         end
       end
       if @field_boolean
         @field_boolean.split(',').each do |fieldname|
-          @fields.register_field fieldname, :boolean
+          @fields.register_field fieldname.strip, :boolean
         end
       end
 
@@ -324,6 +324,14 @@ module Fluent
         unless [:nullable, :required, :repeated].include?(mode)
           raise ConfigError, "Unrecognized mode for #{name}: #{mode}"
         end
+        ### https://developers.google.com/bigquery/docs/tables
+        # Each field has the following properties:
+        #
+        # name - Field names are any combination of uppercase and/or lowercase letters (A-Z, a-z),
+        #        digits (0-9) and underscores, but no spaces. The first character must be a letter.
+        unless name =~ /^[A-Za-z][_A-Za-z0-9]*$/
+          raise Fluent::ConfigError, "invalid bigquery field name: '#{name}'"
+        end
 
         @name = name
         @mode = mode

data/test/plugin/test_out_bigquery.rb

@@ -75,6 +75,69 @@ class BigQueryOutputTest < Test::Unit::TestCase
     driver.instance.client()
   end
 
+  def test_configure_fieldname_stripped
+    driver = create_driver(%[
+      table foo
+      email foo@bar.example
+      private_key_path /path/to/key
+      project yourproject_id
+      dataset yourdataset_id
+
+      time_format %s
+      time_field  time
+
+      field_integer time  , status , bytes 
+      field_string  vhost ,path,method,protocol, agent,referer, remote.host ,remote.ip,remote.user 
+      field_float   requesttime 
+      field_boolean bot_access , loginsession 
+    ])
+    fields = driver.instance.instance_eval{ @fields }
+
+    assert (not fields['time  ']), "tailing spaces must be stripped"
+    assert fields['time']
+    assert fields['status']
+    assert fields['bytes']
+    assert fields['vhost']
+    assert fields['protocol']
+    assert fields['agent']
+    assert fields['referer']
+    assert fields['remote']['host']
+    assert fields['remote']['ip']
+    assert fields['remote']['user']
+    assert fields['requesttime']
+    assert fields['bot_access']
+    assert fields['loginsession']
+  end
+
+  def test_configure_invalid_fieldname
+    base = %[
+      table foo
+      email foo@bar.example
+      private_key_path /path/to/key
+      project yourproject_id
+      dataset yourdataset_id
+
+      time_format %s
+      time_field  time
+    ]
+
+    assert_raises(Fluent::ConfigError) do
+      create_driver(base + "field_integer time field\n")
+    end
+    assert_raises(Fluent::ConfigError) do
+      create_driver(base + "field_string my name\n")
+    end
+    assert_raises(Fluent::ConfigError) do
+      create_driver(base + "field_string remote.host name\n")
+    end
+    assert_raises(Fluent::ConfigError) do
+      create_driver(base + "field_float request time\n")
+    end
+    assert_raises(Fluent::ConfigError) do
+      create_driver(base + "field_boolean login session\n")
+    end
+  end
+
   def test_format_stream
     now = Time.now
     input = [

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-bigquery
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.8
 platform: ruby
 authors:
 - TAGOMORI Satoshi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-15 00:00:00.000000000 Z
+date: 2014-06-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake