scrolls 0.3.7 → 0.3.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0dd730a76cce1b9b08ea5dfe7bae8edb9bed2fc3
-  data.tar.gz: 1d48b1371bff58dc40ce28148ce95f91c756aefa
+  metadata.gz: 034a31a03289b207b07627691c1b34e94269391b
+  data.tar.gz: 128743101d71f87a8d880b50b75291411fc113d6
 SHA512:
-  metadata.gz: 587412cda539145df827237b30a54d651ab67641689b972fe21bf75fcb79702b9263e7bc646b298301d95bcee75e7951be28e294179de3d77e1b3f93b8198b95
-  data.tar.gz: db5eb2c16f307861ffaa1f9ab724e0eae99e675017736466a8e819f358a42cacba914473ce3291f640112ad3bde4d35045e824d78a1ee11e1e2484e5b271441a
+  metadata.gz: a9b2e61cdb5ddbb617d541a250120427e874546819936c6cc00ac516b36827589635f20211c1814dd53204d93eb2de7206b9d5ad573eb334b5ddfd7a2e3991ff
+  data.tar.gz: b2ed49f6e31c968b303ca419a211eb07c47f8d25647e9baa6f3d5de2de6fbe23bacb57ffc458cbb6109980edf83281ea09a2300afd102d8064862b740aa82005

data/lib/scrolls.rb

@@ -248,7 +248,7 @@ module Scrolls
   #   => nil
   #
   def debug(data, &blk)
-    data = data.merge(:level => "debug")
+    data = data.merge(:level => "debug") if data.is_a?(Hash)
     Log.log(data, &blk)
   end
 
@@ -266,7 +266,7 @@ module Scrolls
   #   => nil
   #
   def error(data, &blk)
-    data = data.merge(:level => "warning")
+    data = data.merge(:level => "warning") if data.is_a?(Hash)
     Log.log(data, &blk)
   end
 
@@ -284,7 +284,7 @@ module Scrolls
   #   => nil
   #
   def fatal(data, &blk)
-    data = data.merge(:level => "error")
+    data = data.merge(:level => "error") if data.is_a?(Hash)
     Log.log(data, &blk)
   end
 
@@ -302,7 +302,7 @@ module Scrolls
   #   => nil
   #
   def info(data, &blk)
-    data = data.merge(:level => "info")
+    data = data.merge(:level => "info") if data.is_a?(Hash)
     Log.log(data, &blk)
   end
 
@@ -320,7 +320,7 @@ module Scrolls
   #   => nil
   #
   def warn(data, &blk)
-    data = data.merge(:level => "notice")
+    data = data.merge(:level => "notice") if data.is_a?(Hash)
     Log.log(data, &blk)
   end
 
@@ -338,7 +338,7 @@ module Scrolls
   #   => nil
   #
   def unknown(data, &blk)
-    data = data.merge(:level => "alert")
+    data = data.merge(:level => "alert") if data.is_a?(Hash)
     Log.log(data, &blk)
   end
 

data/lib/scrolls/version.rb

@@ -1,3 +1,3 @@
 module Scrolls
-  VERSION = "0.3.7"
+  VERSION = "0.3.8"
 end

data/test/test_scrolls.rb

@@ -3,7 +3,7 @@ require_relative "test_helper"
 class TestScrolls < Test::Unit::TestCase
   def setup
     @out = StringIO.new
-    Scrolls.stream = @out
+    Scrolls.init(:stream => @out)
   end
 
   def teardown
@@ -204,4 +204,24 @@ class TestScrolls < Test::Unit::TestCase
     assert_equal "t=t level=alert\n", @out.string
   end
 
+  def test_sending_string_error
+    Scrolls.error("error")
+    assert_equal "log_message=error\n", @out.string
+  end
+
+  def test_sending_string_fatal
+    Scrolls.fatal("fatal")
+    assert_equal "log_message=fatal\n", @out.string
+  end
+
+  def test_sending_string_warn
+    Scrolls.warn("warn")
+    assert_equal "log_message=warn\n", @out.string
+  end
+
+  def test_sending_string_unknown
+    Scrolls.unknown("unknown")
+    assert_equal "log_message=unknown\n", @out.string
+  end
+
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: scrolls
 version: !ruby/object:Gem::Version
-  version: 0.3.7
+  version: 0.3.8
 platform: ruby
 authors:
 - Curt Micol
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-10 00:00:00.000000000 Z
+date: 2014-02-11 00:00:00.000000000 Z
 dependencies: []
 description: Logging, easier, more consistent.
 email: