fluent-logger 0.3.1 → 0.4.0

data/spec/null_logger_spec.rb

@@ -0,0 +1,15 @@
+
+require 'spec_helper'
+
+describe Fluent::Logger::NullLogger do
+  context "logger method" do
+    let(:logger) { Fluent::Logger::NullLogger.new }
+
+    context "post" do
+      it('false') {
+        logger.post('tag1', {:foo => :bar}).should == false
+        logger.post('tag2', {:foo => :baz}).should == false
+      }
+    end
+  end
+end

data/spec/spec_helper.rb

@@ -0,0 +1,25 @@
+$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
+$LOAD_PATH.unshift(File.dirname(__FILE__))
+
+if ENV['SIMPLE_COV']
+   require 'simplecov'
+  SimpleCov.start do 
+    add_filter 'spec/'
+    add_filter 'test/'
+    add_filter 'pkg/'
+    add_filter 'vendor/'
+  end
+end
+
+# Requires supporting files with custom matchers and macros, etc,
+# in ./support/ and its subdirectories.
+Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each {|f| require f}
+
+require 'fluent-logger'
+
+RSpec.configure do |config|
+  config.filter_run :focus => true
+  config.run_all_when_everything_filtered = true
+
+  config.mock_with :rspec
+end

data/spec/support/timecop.rb

@@ -0,0 +1,8 @@
+
+require 'timecop'
+
+RSpec.configure do |config|
+  config.after(:each) do
+    Timecop.return
+  end
+end

data/spec/test_logger_spec.rb

@@ -0,0 +1,31 @@
+
+require 'spec_helper'
+
+describe Fluent::Logger::TestLogger do
+  context "logger method" do
+    let(:logger) { Fluent::Logger::TestLogger.new }
+    subject { logger.queue }
+
+    context "post" do
+      before do
+        logger.post('tag1', {:foo => :bar})
+        logger.post('tag2', {:foo => :baz})
+      end
+
+      its(:first) { should == {:foo => :bar } }
+      its(:last)  { should == {:foo => :baz } }
+      its("first.tag") { should == "tag1" }
+      its("last.tag")  { should == "tag2" }
+    end
+
+    context "max" do
+      before do
+        logger.max = 2
+        10.times {|i| logger.post(i.to_s, {}) }
+      end
+
+      its(:size)      { should == 2 }
+      its("last.tag") { should == "9" }
+    end
+  end
+end

metadata

@@ -1,116 +1,153 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: fluent-logger
-version: !ruby/object:Gem::Version 
-  hash: 17
-  prerelease: false
-  segments: 
-  - 0
-  - 3
-  - 1
-  version: 0.3.1
+version: !ruby/object:Gem::Version
+  version: 0.4.0
+  prerelease: 
 platform: ruby
-authors: 
+authors:
 - Sadayuki Furuhashi
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-08-28 00:00:00 +09:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  name: msgpack
+date: 2011-11-04 00:00:00.000000000Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: yajl-ruby
+  requirement: &70346070861020 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.0.0
+  type: :runtime
   prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  version_requirements: *70346070861020
+- !ruby/object:Gem::Dependency
+  name: msgpack
+  requirement: &70346070860420 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 7
-        segments: 
-        - 0
-        - 4
-        - 4
+      - !ruby/object:Gem::Version
         version: 0.4.4
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: json
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: *70346070860420
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: &70346070859840 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 1
-        segments: 
-        - 1
-        - 4
-        - 3
-        version: 1.4.3
-  type: :runtime
-  version_requirements: *id002
-description: 
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.9.2
+  type: :development
+  prerelease: false
+  version_requirements: *70346070859840
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: &70346070859260 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 2.7.0
+  type: :development
+  prerelease: false
+  version_requirements: *70346070859260
+- !ruby/object:Gem::Dependency
+  name: simplecov
+  requirement: &70346070858660 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.5.4
+  type: :development
+  prerelease: false
+  version_requirements: *70346070858660
+- !ruby/object:Gem::Dependency
+  name: timecop
+  requirement: &70346070858200 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.3.0
+  type: :development
+  prerelease: false
+  version_requirements: *70346070858200
+description: fluent logger for ruby
 email: frsyuki@gmail.com
 executables: []
-
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files: []
+files:
+- .gitignore
+- .gitmodules
+- .rspec
+- .travis.yml
+- AUTHORS
+- COPYING
 - ChangeLog
+- Gemfile
 - README.rdoc
-files: 
+- Rakefile
+- VERSION
+- fluent-logger.gemspec
 - lib/fluent-logger.rb
 - lib/fluent/logger.rb
-- lib/fluent/logger/base.rb
-- lib/fluent/logger/console.rb
-- lib/fluent/logger/event.rb
-- lib/fluent/logger/fluent.rb
-- lib/fluent/logger/syslog.rb
-- lib/fluent/logger/test.rb
+- lib/fluent/logger/console_logger.rb
+- lib/fluent/logger/fluent_logger.rb
+- lib/fluent/logger/logger_base.rb
+- lib/fluent/logger/null_logger.rb
+- lib/fluent/logger/test_logger.rb
+- lib/fluent/logger/text_logger.rb
 - lib/fluent/logger/version.rb
-- test/event_test.rb
-- test/instance_test.rb
-- test/simple_test.rb
-- test/test_helper.rb
-- ChangeLog
-- README.rdoc
-has_rdoc: true
-homepage: http://fluent.github.com/
+- spec/console_logger_spec.rb
+- spec/fluent_logger_spec.rb
+- spec/logger_base_spec.rb
+- spec/logger_spec.rb
+- spec/null_logger_spec.rb
+- spec/spec_helper.rb
+- spec/support/timecop.rb
+- spec/test_logger_spec.rb
+homepage: https://github.com/fluent/fluent-logger-ruby
 licenses: []
-
 post_install_message: 
-rdoc_options: 
-- --charset=UTF-8
-require_paths: 
+rdoc_options: []
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
       - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+      hash: 675212802163774553
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
       - 0
-      version: "0"
+      hash: 675212802163774553
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
-summary: Structured event logger
-test_files: 
-- test/event_test.rb
-- test/instance_test.rb
-- test/simple_test.rb
-- test/test_helper.rb
+summary: fluent logger for ruby
+test_files:
+- spec/console_logger_spec.rb
+- spec/fluent_logger_spec.rb
+- spec/logger_base_spec.rb
+- spec/logger_spec.rb
+- spec/null_logger_spec.rb
+- spec/spec_helper.rb
+- spec/support/timecop.rb
+- spec/test_logger_spec.rb

data/lib/fluent/logger/base.rb

@@ -1,89 +0,0 @@
-#
-# Fluent
-#
-# Copyright (C) 2011 FURUHASHI Sadayuki
-#
-#    Licensed under the Apache License, Version 2.0 (the "License");
-#    you may not use this file except in compliance with the License.
-#    You may obtain a copy of the License at
-#
-#        http://www.apache.org/licenses/LICENSE-2.0
-#
-#    Unless required by applicable law or agreed to in writing, software
-#    distributed under the License is distributed on an "AS IS" BASIS,
-#    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-#    See the License for the specific language governing permissions and
-#    limitations under the License.
-#
-module Fluent
-module Logger
-
-
-class LoggerBase
-  def self.open(*args, &block)
-    Fluent::Logger.open(self, *args, &block)
-  end
-
-  def create_event(tag, *args)
-    map = {}
-    keys = []
-    args.each {|a|
-      case a
-      when Hash
-        a.each_pair {|k,v|
-          keys << k.to_sym
-          map[k.to_sym] = v
-        }
-      else
-        keys << a.to_sym
-      end
-    }
-
-    m = Module.new
-    m.module_eval do
-      keys.each {|key|
-        define_method(key) do |v|
-          with(key=>v)
-        end
-        define_method(:"#{key}!") do |v|
-          with!(key=>v)
-        end
-      }
-      define_method(:MODULE) { m }
-    end
-
-    e = TerminalEvent.new(self, tag, map)
-    e.extend(m)
-    e
-  end
-
-  #def post(tag, map)
-  #end
-
-  #def close(map)
-  #end
-end
-
-
-class TextLogger < LoggerBase
-  def initialize
-    require 'json'
-    @time_format = "%b %e %H:%M:%S"
-  end
-
-  def post(tag, map)
-    a = [Time.now.strftime(@time_format), " ", tag, ":"]
-    map.each_pair {|k,v|
-      a << " #{k}="
-      a << v.to_json
-    }
-    post_text a.join
-  end
-
-  #def post_text(text)
-  #end
-end
-
-
-end
-end

data/lib/fluent/logger/event.rb

@@ -1,118 +0,0 @@
-#
-# Fluent
-#
-# Copyright (C) 2011 FURUHASHI Sadayuki
-#
-#    Licensed under the Apache License, Version 2.0 (the "License");
-#    you may not use this file except in compliance with the License.
-#    You may obtain a copy of the License at
-#
-#        http://www.apache.org/licenses/LICENSE-2.0
-#
-#    Unless required by applicable law or agreed to in writing, software
-#    distributed under the License is distributed on an "AS IS" BASIS,
-#    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-#    See the License for the specific language governing permissions and
-#    limitations under the License.
-#
-module Fluent
-module Logger
-
-
-class Event
-  def initialize(link, map)
-    @link = link
-    @map = map
-  end
-
-  def to_hash(o={})
-    @link.to_hash(o)
-    o.merge!(@map)
-    o
-  end
-
-  def tag
-    @link.tag
-  end
-
-  def logger
-    @link.logger
-  end
-
-  def logger=(logger)
-    @link.logger = logger
-  end
-
-  def post!(with_tag=tag)
-    logger.post(with_tag, to_hash)
-    self
-  end
-
-  alias post post!
-
-  def with(a)
-    if a.is_a?(Event)
-      ma = MODULE()
-      mb = a.MODULE()
-      m = Module.new
-      m.module_eval do
-        include ma
-        include mb
-        define_method(:MODULE) { m }
-      end
-      map = a.to_hash(to_hash)
-      e = TerminalEvent.new(LOGGER(), tag, map)
-      e.extend(m)
-    else
-      map = a.to_hash
-      e = Event.new(self, map)
-      e.extend(MODULE())
-    end
-    e
-  end
-
-  alias + with
-
-  def with!(a)
-    if a.is_a?(Event)
-      self.extend a.MODULE()
-      a.to_hash(@map)
-    else
-      @map.merge!(a.to_hash)
-    end
-    self
-  end
-
-  def create_event(*args)
-    self.with(LOGGER().create_event(*args))
-  end
-
-  def LOGGER
-    @link.LOGGER()
-  end
-end
-
-
-class TerminalEvent < Event
-  def initialize(logger, tag, map)
-    @logger = logger
-    @tag = tag
-    @map = map
-  end
-
-  def to_hash(o={})
-    o.merge!(@map)
-    o
-  end
-
-  attr_accessor :tag
-  attr_accessor :logger
-
-  def LOGGER
-    @logger
-  end
-end
-
-
-end
-end