td-logger 0.3.24 → 0.3.25

data/spec/td/logger_spec.rb

@@ -0,0 +1,128 @@
+require "spec_helper"
+
+describe TreasureData::Logger do
+  describe ".logger" do
+    subject { described_class.logger }
+
+    context ".open called" do
+      before { described_class.open("tag", apikey: "dummy") }
+      it { is_expected.to be_kind_of(TreasureData::Logger::TreasureDataLogger) }
+    end
+
+    context ".open_agent called" do
+      before { described_class.open_agent("tag") }
+      it { is_expected.to be_kind_of(Fluent::Logger::FluentLogger) }
+    end
+
+    context ".open_null called" do
+      before { described_class.open_null }
+      it { is_expected.to be_kind_of(Fluent::Logger::NullLogger) }
+    end
+
+    context ".open_test called" do
+      before { described_class.open_test }
+      it { is_expected.to be_kind_of(Fluent::Logger::TestLogger) }
+    end
+  end
+
+  describe ".post" do
+    let(:args) { ["tag", foo: "dummy"] }
+
+    it "invoke TreasureData::Logger.post with args" do
+      expect(TreasureData::Logger.logger).to receive(:post).with(*args)
+      described_class.post(*args)
+    end
+  end
+
+  describe ".post_with_time" do
+    let(:args) { ["tag", {foo: "dummy"}, Time.now] }
+
+    it "invoke TreasureData::Logger.post_with_time with args" do
+      expect(TreasureData::Logger.logger).to receive(:post_with_time).with(*args)
+      described_class.post_with_time(*args)
+    end
+  end
+
+  describe "shortcut methods" do
+    let(:klass) { TreasureData }
+
+    describe ".logger" do
+      subject{ klass.logger }
+
+      it { is_expected.to eq TreasureData::Logger.logger }
+    end
+
+    describe ".open" do
+      let(:args) { ["tag", apikey: "dummy"] }
+
+      it "invoke TreasureData::Logger.open with args" do
+        expect(TreasureData::Logger).to receive(:open).with(*args)
+        klass.open(*args)
+      end
+    end
+
+    describe ".open_agent" do
+      let(:args) { ["tag", apikey: "dummy"] }
+
+      it "invoke TreasureData::Logger.open_agent with args" do
+        expect(TreasureData::Logger).to receive(:open_agent).with(*args)
+        klass.open_agent(*args)
+      end
+    end
+
+    describe ".open_null" do
+      it "invoke TreasureData::Logger.open_null" do
+        expect(TreasureData::Logger).to receive(:open_null).with(no_args)
+        klass.open_null
+      end
+    end
+
+    describe ".open_test" do
+      it "invoke TreasureData::Logger.open_test" do
+        expect(TreasureData::Logger).to receive(:open_test).with(no_args)
+        klass.open_test
+      end
+    end
+
+    describe ".post" do
+      let(:args) { ["tag", foo: "dummy"] }
+
+      it "invoke TreasureData::Logger.post with args" do
+        expect(TreasureData::Logger).to receive(:post).with(*args)
+        klass.post(*args)
+      end
+    end
+
+    describe ".post_with_time" do
+      let(:args) { ["tag", {foo: "dummy"}, Time.now] }
+
+      it "invoke TreasureData::Logger.post_with_time with args" do
+        expect(TreasureData::Logger).to receive(:post_with_time).with(*args)
+        klass.post_with_time(*args)
+      end
+    end
+
+    describe ".event" do
+      subject{ klass.event }
+
+      it { is_expected.to eq TreasureData::Logger.event }
+    end
+
+    describe ".log (backward compatibility)" do
+      let(:args) { ["tag", foo: "dummy"] }
+
+      it "invoke TreasureData::Logger.log with args" do
+        expect(TreasureData::Logger).to receive(:post).with(*args)
+        klass.log(*args)
+      end
+    end
+
+    describe "Event" do
+      it { expect(klass.const_get(:Event)).to eq TreasureData::Logger::Event }
+    end
+  end
+
+  it "define TD as TreasureData" do
+    expect(TD).to eq TreasureData
+  end
+end

data/td-logger.gemspec

@@ -30,9 +30,11 @@ EOF
   gem.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   gem.require_paths = ['lib']
 
-  gem.add_dependency "msgpack", [">= 0.4.4", "!= 0.5.0", "!= 0.5.1", "!= 0.5.2", "!= 0.5.3", "< 0.6.0"]
+  gem.add_dependency "msgpack", [">= 0.4.4", "!= 0.5.0", "!= 0.5.1", "!= 0.5.2", "!= 0.5.3", "< 0.8.0"]
   gem.add_dependency "td-client", "~> 0.8.66"
-  gem.add_dependency "fluent-logger", "~> 0.4.9"
+  gem.add_dependency "fluent-logger", "~> 0.5.0"
   gem.add_development_dependency 'rake', '>= 0.9.2'
-  gem.add_development_dependency 'rspec', '>= 2.7.0'
+  gem.add_development_dependency 'rspec', '~> 3.0'
+  gem.add_development_dependency 'coveralls'
+  gem.add_development_dependency 'rack'
 end

metadata

@@ -1,128 +1,158 @@
 --- !ruby/object:Gem::Specification
 name: td-logger
 version: !ruby/object:Gem::Version
-  version: 0.3.24
+  version: 0.3.25
 platform: ruby
 authors:
 - Sadayuki Furuhashi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-19 00:00:00.000000000 Z
+date: 2016-01-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: msgpack
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.4.4
-    - - ! '!='
+    - - "!="
       - !ruby/object:Gem::Version
         version: 0.5.0
-    - - ! '!='
+    - - "!="
       - !ruby/object:Gem::Version
         version: 0.5.1
-    - - ! '!='
+    - - "!="
       - !ruby/object:Gem::Version
         version: 0.5.2
-    - - ! '!='
+    - - "!="
       - !ruby/object:Gem::Version
         version: 0.5.3
-    - - <
+    - - "<"
       - !ruby/object:Gem::Version
-        version: 0.6.0
+        version: 0.8.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.4.4
-    - - ! '!='
+    - - "!="
       - !ruby/object:Gem::Version
         version: 0.5.0
-    - - ! '!='
+    - - "!="
       - !ruby/object:Gem::Version
         version: 0.5.1
-    - - ! '!='
+    - - "!="
       - !ruby/object:Gem::Version
         version: 0.5.2
-    - - ! '!='
+    - - "!="
       - !ruby/object:Gem::Version
         version: 0.5.3
-    - - <
+    - - "<"
       - !ruby/object:Gem::Version
-        version: 0.6.0
+        version: 0.8.0
 - !ruby/object:Gem::Dependency
   name: td-client
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.8.66
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.8.66
 - !ruby/object:Gem::Dependency
   name: fluent-logger
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.4.9
+        version: 0.5.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.4.9
+        version: 0.5.0
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.9.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.9.2
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.0'
+- !ruby/object:Gem::Dependency
+  name: coveralls
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rack
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 2.7.0
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 2.7.0
+        version: '0'
 description: Treasure Data logging library
 email: 
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .travis.yml
+- ".coveralls.yml"
+- ".gitignore"
+- ".travis.yml"
 - ChangeLog
 - Gemfile
 - README.rdoc
 - Rakefile
 - VERSION
+- appveyor.yml
 - config/heroku/treasure_data.yml
 - lib/td-logger.rb
 - lib/td/logger.rb
@@ -134,10 +164,13 @@ 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
+- spec/td/logger/agent/config_spec.rb
+- spec/td/logger/agent/rack_spec.rb
+- spec/td/logger/agent/rails_spec.rb
+- spec/td/logger/event_spec.rb
+- spec/td/logger/treasure_data_logger_spec.rb
+- spec/td/logger_spec.rb
 - td-logger.gemspec
 homepage: 
 licenses: []
@@ -148,22 +181,25 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: Treasure Data logging library
 test_files:
-- spec/event_spec.rb
-- spec/rails_config_spec.rb
 - spec/spec_helper.rb
-- spec/td_logger_spec.rb
+- spec/td/logger/agent/config_spec.rb
+- spec/td/logger/agent/rack_spec.rb
+- spec/td/logger/agent/rails_spec.rb
+- spec/td/logger/event_spec.rb
+- spec/td/logger/treasure_data_logger_spec.rb
+- spec/td/logger_spec.rb

data/spec/event_spec.rb

@@ -1,46 +0,0 @@
-
-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.module_eval do
-        class_variable_set(:@@logger, t)
-      end
-      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

@@ -1,159 +0,0 @@
-
-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
-
-class ActiveSupport
-  class TimeWithZone
-  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.disabled.should == false
-      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.disabled.should == false
-      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 'load_file without test' do
-      FileUtils.mkdir_p("#{TMP_DIR}/config")
-      File.open("#{TMP_DIR}/config/treasure_data.yml", "w") {|f|
-        f.write <<EOF
-development:
-  apikey: test2
-  database: db2
-  debug_mode: true
-EOF
-      }
-      c = TreasureData::Logger::Agent::Rails::Config.init
-      c.disabled.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.disabled.should == false
-      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.disabled.should == false
-      c.agent_mode?.should == true
-      c.tag.should == 'td.db5'
-      c.agent_host.should == 'localhost'
-      c.agent_port.should == 24224
-    end
-
-    it 'test 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
-  test_mode: true
-EOF
-      }
-      c = TreasureData::Logger::Agent::Rails::Config.init
-      c.disabled.should == false
-      c.test_mode?.should == true
-    end
-  end
-end
-
-describe ActiveSupport::TimeWithZone do
-  it 'has to_msgpack' do
-    ActiveSupport::TimeWithZone.method_defined?(:to_msgpack).should be_true
-  end
-end