td-logger 0.3.2 → 0.3.3

data/ChangeLog

@@ -1,4 +1,9 @@
 
+== 2011-11-10 version 0.3.3
+
+* Validate database name and table name before queuing events
+
+
 == 2011-11-10 version 0.3.2
 
 * Include 'action' column for all preset events

data/lib/td/logger/td_logger.rb

@@ -47,7 +47,7 @@ class TreasureDataLogger < Fluent::Logger::LoggerBase
     require 'net/http'
     require 'cgi'
     require 'logger'
-    require 'td/client'
+    require 'td-client'
 
     @logger = ::Logger.new(STDERR)
     if debug
@@ -156,6 +156,19 @@ class TreasureDataLogger < Fluent::Logger::LoggerBase
   end
 
   def add(db, table, msg)
+    begin
+      TreasureData::API.validate_database_name(db)
+    rescue
+      @logger.error("TreasureDataLogger: Invalid database name #{db.inspect}: #{$!}")
+      return false
+    end
+    begin
+      TreasureData::API.validate_table_name(table)
+      @logger.error("TreasureDataLogger: Invalid table name #{table.inspect}: #{$!}")
+    rescue
+      return false
+    end
+
     begin
       data = to_msgpack(msg)
     rescue

data/lib/td/logger/version.rb

@@ -1,7 +1,7 @@
 module TreasureData
 module Logger
 
-VERSION = '0.3.2'
+VERSION = '0.3.3'
 
 end
 end

data/spec/td_logger_spec.rb

@@ -16,6 +16,25 @@ describe TreasureData::Logger::TreasureDataLogger do
       td.should_receive(:add).with('overwrite', 'table1', {:foo=>:bar, :time=>time.to_i})
       td.post_with_time('overwrite.table1', {:foo=>:bar}, time)
     end
+
+    it 'success' do
+      td = TreasureData::Logger::TreasureDataLogger.new('db1', :apikey=>'test')
+      td.post('valid', {}).should == true
+    end
+  end
+
+  context 'validate' do
+    it 'validate table name' do
+      td = TreasureData::Logger::TreasureDataLogger.new('db1', :apikey=>'test')
+      td.post('invalid-name', {}).should == false
+      td.post('', {}).should == false
+      td.post('9', {}).should == false
+    end
+
+    it 'validate database name' do
+      td = TreasureData::Logger::TreasureDataLogger.new('invalid-db-name', :apikey=>'test')
+      td.post('table', {}).should == false
+    end
   end
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: td-logger
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.3.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-11-09 00:00:00.000000000Z
+date: 2011-11-10 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: msgpack
-  requirement: &70322049770860 !ruby/object:Gem::Requirement
+  requirement: &70314747460680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: 0.4.4
   type: :runtime
   prerelease: false
-  version_requirements: *70322049770860
+  version_requirements: *70314747460680
 - !ruby/object:Gem::Dependency
   name: td-client
-  requirement: &70322049768540 !ruby/object:Gem::Requirement
+  requirement: &70314747460200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: 0.8.0
   type: :runtime
   prerelease: false
-  version_requirements: *70322049768540
+  version_requirements: *70314747460200
 - !ruby/object:Gem::Dependency
   name: fluent-logger
-  requirement: &70322049767320 !ruby/object:Gem::Requirement
+  requirement: &70314747459720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,7 +43,7 @@ dependencies:
         version: 0.4.1
   type: :runtime
   prerelease: false
-  version_requirements: *70322049767320
+  version_requirements: *70314747459720
 description: 
 email: 
 executables: []