td-logger 0.3.1 → 0.3.2

data/ChangeLog

@@ -1,4 +1,9 @@
 
+== 2011-11-10 version 0.3.2
+
+* Include 'action' column for all preset events
+
+
 == 2011-11-07 version 0.3.1
 
 * Added "debug_mode: true" option in config/treasure_data.yml

data/lib/td/logger/event.rb

@@ -12,7 +12,7 @@ module Logger
       unless uid
         raise ArgumentError, "wrong number of arguments (2 for 3): :uid attribute is required"
       end
-      post(name, record.merge({:uid=>uid}))
+      post(name, record.merge({:action=>name.to_s, :uid=>uid}))
     end
 
     def register(uid=TD.event.attribute[:uid])

data/lib/td/logger/version.rb

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

data/spec/event_spec.rb

@@ -0,0 +1,44 @@
+
+require 'spec_helper'
+
+describe TreasureData::Logger::Event do
+  context 'preset' do
+    let(:test_logger) do
+      Fluent::Logger::TestLogger.new
+    end
+    before(:each) do
+      t = test_logger
+      TreasureData::Logger.class_variable_set(:@@logger, t)
+      TD.event.attribute.clear
+    end
+
+    it 'action' do
+      test_logger.should_receive(:post).with(:doit, {:action=>"doit", :foo=>:bar, :uid=>"uid1"}).twice
+      TD.event.action(:doit, {:foo=>:bar}, "uid1")
+      TD.event.attribute[:uid] = "uid1"
+      TD.event.action(:doit, {:foo=>:bar})
+    end
+
+    it 'register' do
+      test_logger.should_receive(:post).with(:register, {:action=>"register", :uid=>"uid1"}).twice
+      TD.event.register("uid1")
+      TD.event.attribute[:uid] = "uid1"
+      TD.event.register
+    end
+
+    it 'login' do
+      test_logger.should_receive(:post).with(:login, {:action=>"login", :uid=>"uid1"}).twice
+      TD.event.login("uid1")
+      TD.event.attribute[:uid] = "uid1"
+      TD.event.login
+    end
+
+    it 'pay' do
+      test_logger.should_receive(:post).with(:pay, {:action=>"pay", :category=>"cat", :sub_category=>"subcat", :name=>"name", :price=>1980, :count=>1, :uid=>"uid1"}).twice
+      TD.event.pay("cat", "subcat", "name", 1980, 1, "uid1")
+      TD.event.attribute[:uid] = "uid1"
+      TD.event.pay("cat", "subcat", "name", 1980, 1)
+    end
+  end
+end
+

data/spec/rails_config_spec.rb

@@ -0,0 +1,116 @@
+
+require 'spec_helper'
+require 'fileutils'
+require 'logger'
+
+TMP_DIR = File.dirname(__FILE__) + "/tmp"
+FileUtils.rm_rf(TMP_DIR)
+
+class Rails
+  def self.configuration
+    self.new
+  end
+
+  def self.logger
+    Logger.new(STDOUT)
+  end
+
+  def self.root
+    TMP_DIR
+  end
+
+  def self.env
+    "test"
+  end
+
+  def middleware
+    self
+  end
+
+  def use(mod)
+  end
+end
+
+class ActionController
+  class Base
+  end
+end
+
+require 'td/logger/agent/rails'
+
+describe TreasureData::Logger::Agent::Rails::Config do
+  before(:each) do
+    FileUtils.rm_rf(TMP_DIR)
+    FileUtils.mkdir_p(TMP_DIR)
+    ENV.delete('TREASURE_DATA_API_KEY')
+    ENV.delete('TREASURE_DATA_DB')
+  end
+
+  context 'init' do
+    it 'load_env' do
+      ENV['TREASURE_DATA_API_KEY'] = 'test1'
+      ENV['TREASURE_DATA_DB'] = 'db1'
+      c = TreasureData::Logger::Agent::Rails::Config.init
+      c.agent_mode?.should == false
+      c.apikey.should == 'test1'
+      c.database.should == 'db1'
+      c.auto_create_table.should == true
+    end
+
+    it 'load_file' do
+      FileUtils.mkdir_p("#{TMP_DIR}/config")
+      File.open("#{TMP_DIR}/config/treasure_data.yml", "w") {|f|
+        f.write <<EOF
+test:
+  apikey: test2
+  database: db2
+  debug_mode: true
+EOF
+      }
+      c = TreasureData::Logger::Agent::Rails::Config.init
+      c.agent_mode?.should == false
+      c.apikey.should == 'test2'
+      c.database.should == 'db2'
+      c.auto_create_table.should == true
+      c.debug_mode.should == true
+    end
+
+    it 'prefer file than env' do
+      ENV['TREASURE_DATA_API_KEY'] = 'test3'
+      ENV['TREASURE_DATA_DB'] = 'db3'
+
+      FileUtils.mkdir_p("#{TMP_DIR}/config")
+      File.open("#{TMP_DIR}/config/treasure_data.yml", "w") {|f|
+        f.write <<EOF
+test:
+  apikey: test4
+  database: db4
+  auto_create_table: false
+EOF
+      }
+      c = TreasureData::Logger::Agent::Rails::Config.init
+      c.agent_mode?.should == false
+      c.apikey.should == 'test4'
+      c.database.should == 'db4'
+      c.auto_create_table.should == false
+      c.debug_mode.should == false
+    end
+
+    it 'agent mode' do
+      FileUtils.mkdir_p("#{TMP_DIR}/config")
+      File.open("#{TMP_DIR}/config/treasure_data.yml", "w") {|f|
+        f.write <<EOF
+test:
+  agent: localhost
+  tag: td.db5
+EOF
+      }
+      c = TreasureData::Logger::Agent::Rails::Config.init
+      c.agent_mode?.should == true
+      c.tag.should == 'td.db5'
+      c.agent_host.should == 'localhost'
+      c.agent_port.should == 24224
+    end
+  end
+end
+

data/spec/spec_helper.rb

@@ -0,0 +1,11 @@
+$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
+$LOAD_PATH.unshift(File.dirname(__FILE__))
+
+require 'td-logger'
+
+RSpec.configure do |config|
+  #config.filter_run :focus => true
+  config.run_all_when_everything_filtered = true
+
+  config.mock_with :rspec
+end

data/spec/td_logger_spec.rb

@@ -0,0 +1,21 @@
+
+require 'spec_helper'
+
+describe TreasureData::Logger::TreasureDataLogger do
+  context 'init' do
+    it 'db config' do
+      td = TreasureData::Logger::TreasureDataLogger.new('db1', :apikey=>'test')
+      time = Time.now
+      td.should_receive(:add).with('db1', 'table1', {:foo=>:bar, :time=>time.to_i})
+      td.post_with_time('table1', {:foo=>:bar}, time)
+    end
+
+    it 'fluent-logger-td compat' do
+      td = TreasureData::Logger::TreasureDataLogger.new('db1', :apikey=>'test')
+      time = Time.now
+      td.should_receive(:add).with('overwrite', 'table1', {:foo=>:bar, :time=>time.to_i})
+      td.post_with_time('overwrite.table1', {:foo=>:bar}, time)
+    end
+  end
+end
+

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: td-logger
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-11-07 00:00:00.000000000Z
+date: 2011-11-09 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: msgpack
-  requirement: &70341448070920 !ruby/object:Gem::Requirement
+  requirement: &70322049770860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: 0.4.4
   type: :runtime
   prerelease: false
-  version_requirements: *70341448070920
+  version_requirements: *70322049770860
 - !ruby/object:Gem::Dependency
   name: td-client
-  requirement: &70341448070120 !ruby/object:Gem::Requirement
+  requirement: &70322049768540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: 0.8.0
   type: :runtime
   prerelease: false
-  version_requirements: *70341448070120
+  version_requirements: *70322049768540
 - !ruby/object:Gem::Dependency
   name: fluent-logger
-  requirement: &70341448069220 !ruby/object:Gem::Requirement
+  requirement: &70322049767320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,7 +43,7 @@ dependencies:
         version: 0.4.1
   type: :runtime
   prerelease: false
-  version_requirements: *70341448069220
+  version_requirements: *70322049767320
 description: 
 email: 
 executables: []
@@ -62,6 +62,10 @@ files:
 - lib/td/logger/event.rb
 - lib/td/logger/td_logger.rb
 - lib/td/logger/version.rb
+- spec/event_spec.rb
+- spec/rails_config_spec.rb
+- spec/spec_helper.rb
+- spec/td_logger_spec.rb
 - ChangeLog
 - README.rdoc
 homepage: 
@@ -88,4 +92,8 @@ rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: Treasure Data logging library for Rails
-test_files: []
+test_files:
+- spec/event_spec.rb
+- spec/rails_config_spec.rb
+- spec/spec_helper.rb
+- spec/td_logger_spec.rb