cabin 0.1.6 → 0.1.7

data/CHANGELIST

@@ -1,3 +1,6 @@
+v0.1.7 (2011-11-07)
+  - Add support for ruby 1.8
+
 v0.1.6 (2011-11-07)
   - Add 'Dragons' mixin for times when info/debug/fatal log levels don't cut it
     and you'd rather deal in D&D alignments instead.

data/lib/cabin/mixins/logger.rb

@@ -33,7 +33,28 @@ module Cabin::Mixins::Logger
 
     # def info, def warn, etc...
 
-    define_method(level) do |message, data={}|
+    # Arguments: message, data, data is assumed to be {} if nil
+    # This hack is necessary because ruby 1.8 doesn't support default arguments
+    # on blocks.
+    define_method(level) do |*args| #|message, data={}|
+      if args.size < 1
+        raise ::ArgumentError.new("#{self.class.name}##{level}(message, " \
+                                  "data={}) requires at least 1 argument")
+      end
+      if args.size > 2
+        raise ::ArgumentError.new("#{self.class.name}##{level}(message, " \
+                                  "data={}) takes at most 2 arguments")
+      end
+
+      message = args[0]
+      data = args[1] || {}
+
+      if not data.is_a?(Hash)
+        raise ::ArgumentError.new("#{self.class.name}##{level}(message, " \
+                                  "data={}) - second argument you gave me was" \
+                                  "a #{data.class.name}, I require a Hash.")
+      end
+
       log(level, message, data) if send(predicate)
     end
 

data/test/test_logging.rb

@@ -123,4 +123,20 @@ describe Cabin::Channel do
     assert(!event.include?(:line), "At non-debug level, there should not be a :line attribute")
     assert(!event.include?(:method), "At non-debug level, there should not be a :method attribute")
   end
+
+  test "invalid arguments to logger.info raises ArgumentError" do
+    assert_raises(ArgumentError, "logger.info() should raise ArgumentError") do
+      @logger.info()
+    end
+
+    assert_raises(ArgumentError, "logger.info('foo', 'bar') should raise " \
+                  "ArgumentError because 'bar' is not a Hash.") do
+      @logger.info("foo", "bar")
+    end
+
+    assert_raises(ArgumentError, "logger.info('foo', { 'foo': 'bar' }, 'baz')" \
+                  "should raise ArgumentError for too many arguments") do
+      @logger.info("foo", { "foo" => "bar" }, "bar")
+    end
+  end
 end # describe Cabin::Channel do

metadata

@@ -1,97 +1,77 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: cabin
-version: !ruby/object:Gem::Version 
-  hash: 23
+version: !ruby/object:Gem::Version
+  version: 0.1.7
   prerelease: 
-  segments: 
-  - 0
-  - 1
-  - 6
-  version: 0.1.6
 platform: ruby
-authors: 
+authors:
 - Jordan Sissel
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-11-08 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2011-11-08 00:00:00.000000000Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: json
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &23531280 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id001
-description: This is an experiment to try and make logging more flexible and more consumable. Plain text logs are bullshit, let's emit structured and contextual logs.
-email: 
+  prerelease: false
+  version_requirements: *23531280
+description: This is an experiment to try and make logging more flexible and more
+  consumable. Plain text logs are bullshit, let's emit structured and contextual logs.
+email:
 - jls@semicomplete.com
-executables: 
+executables:
 - rubygems-cabin-test
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
-- lib/test.rb
-- lib/cabin/context.rb
-- lib/cabin/timer.rb
-- lib/cabin/outputs/stdlib-logger.rb
+files:
+- lib/cabin.rb
 - lib/cabin/outputs/em-stdlib-logger.rb
-- lib/cabin/mixins/logger.rb
-- lib/cabin/mixins/dragons.rb
-- lib/cabin/namespace.rb
+- lib/cabin/outputs/stdlib-logger.rb
 - lib/cabin/channel.rb
-- lib/cabin.rb
+- lib/cabin/namespace.rb
+- lib/cabin/timer.rb
+- lib/cabin/context.rb
+- lib/cabin/mixins/dragons.rb
+- lib/cabin/mixins/logger.rb
 - examples/fibonacci-timing.rb
 - examples/sinatra-logging.rb
 - examples/sample.rb
-- test/test_logging.rb
 - test/minitest-patch.rb
+- test/test_logging.rb
 - LICENSE
 - CHANGELIST
 - bin/rubygems-cabin-test
 homepage: https://github.com/jordansissel/ruby-cabin
-licenses: 
+licenses:
 - Apache License (2.0)
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
 - 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: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.7.2
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: Experiments in structured and contextual logging
 test_files: []
-

data/lib/test.rb

@@ -1,8 +0,0 @@
-require "cabin"
-require "cabin/mixins/dragons"
-
-logger = Cabin::Channel.new
-logger.subscribe(Logger.new(STDOUT))
-logger.extend(Cabin::Mixins::Dragons)
-
-logger.chaotic_evil("Some shit is whack")