blabbermouth 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6fb2f9e6c18a243b3d51744b2a5983ce7cc79535
-  data.tar.gz: d018f5297e202f6dc724ac472c029fec2ad7fb1c
+  metadata.gz: a78223e98752990442658537e8adb72eb25c402a
+  data.tar.gz: c4075260334a80209ebaf6567547245afe32a0c7
 SHA512:
-  metadata.gz: d345dd1cf0caefdb0ae661a5bdc94e0d911c45655ead5ac11b100b7bc245f02704bccb9d0e3542e99385686c7e6b1823ad3b62402709e9833dc4d14a7bafe878
-  data.tar.gz: 1f672699d3d0f950c5938e24471b9f3d97bae4a19ad32c1ce2c1332c58e100ceaf1139e3705be01e72a2b276a109b05c190c52e0075518867f746e31ee46b0bf
+  metadata.gz: a5f5d76743381b4a271030215d1c0cb0f5b748f001722addb4fbda92e6e21d3154ce136a677c80ceecb9a38f2465c099cc6c00dfc39761ab363023578f5afb15
+  data.tar.gz: 894723a59b490f1c86ebe83d21fddbb91c45c22d59e476418cf702413487cbfacffa5d565719f67515d286658bad0acac5175415eccc491e31c55338a51e6c79

data/lib/blabbermouth.rb

@@ -23,33 +23,22 @@ module Blabbermouth
   end
 
   def self.error(key, e, *args)
-    opts = args.extract_options!
-    gawkers = args.concat([opts.slice!(:data)])
-    blabber(*gawkers).error(key, e, opts)
+    Blabbermouth::Blabber.error key, e, *args
   end
 
   def self.info(key, msg=nil, *args)
-    opts = args.extract_options!
-    gawkers = args.concat([opts.slice!(:data)])
-    blabber(*gawkers).info(key, msg, opts)
+    Blabbermouth::Blabber.info key, msg, *args
   end
 
   def self.increment(key, by=1, *args)
-    opts = args.extract_options!
-    gawkers = args.concat([opts.slice!(:data)])
-    blabber(*gawkers).increment(key, by, opts)
+    Blabbermouth::Blabber.increment key, by, *args
   end
 
   def self.count(key, total, *args)
-    opts = args.extract_options!
-    gawkers = args.concat([opts.slice!(:data)])
-    blabber(*gawkers).count(key, total, opts)
+    Blabbermouth::Blabber.count key, total, *args
   end
 
   def self.time(key, duration=nil, *args, &block)
-    raise "Blabbermouth.time requires a duration or block" if duration.nil? && !block_given?
-    opts = args.extract_options!
-    gawkers = args.concat([opts.slice!(:data)])
-    blabber(*gawkers).time(key, duration, opts, &block)
+    Blabbermouth::Blabber.time key, duration, *args, &block
   end
 end

data/lib/blabbermouth/blabber.rb

@@ -3,33 +3,35 @@ module Blabbermouth
     attr_reader :gawkers, :options
 
     class << self
-      def error(key, e, *args)
+      def parse_args(*args)
         opts = args.extract_options!
-        gawkers = args.concat([opts.slice!(:data)])
+        args = Blabbermouth.configuration.gawkers if args.empty?
+        gawkers = args + [opts.slice!(:data)]
+        [gawkers, opts]
+      end
+
+      def error(key, e, *args)
+        gawkers, opts = parse_args(*args)
         new(*gawkers).error(key, e, opts)
       end
 
       def info(key, msg=nil, *args)
-        opts = args.extract_options!
-        gawkers = args.concat([opts.slice!(:data)])
+        gawkers, opts = parse_args(*args)
         new(*gawkers).info(key, msg, opts)
       end
 
       def increment(key, by=1, *args)
-        opts = args.extract_options!
-        gawkers = args.concat([opts.slice!(:data)])
+        gawkers, opts = parse_args(*args)
         new(*gawkers).increment(key, by, opts)
       end
 
       def count(key, total, *args)
-        opts = args.extract_options!
-        gawkers = args.concat([opts.slice!(:data)])
+        gawkers, opts = parse_args(*args)
         new(*gawkers).count(key, total, opts)
       end
 
       def time(key, duration=nil, *args, &block)
-        opts = args.extract_options!
-        gawkers = args.concat([opts.slice!(:data)])
+        gawkers, opts = parse_args(*args)
         new(*gawkers).time(key, duration, opts, &block)
       end
     end
@@ -61,26 +63,26 @@ module Blabbermouth
 
     def error(key, e, *args)
       opts = args.extract_options!
-      gawkers.map { |gawker| gawker.error key, e, *args.concat([gawker_options(gawker).merge(opts)]) }
+      gawkers.map { |gawker| gawker.error key, e, *args.concat([gawker_options(gawker, opts)]) }
     end
 
     def info(key, msg=nil, *args)
       opts = args.extract_options!
-      gawkers.map { |gawker| gawker.info key, msg, *args.concat([gawker_options(gawker).merge(opts)]) }
+      gawkers.map { |gawker| gawker.info key, msg, *args.concat([gawker_options(gawker, opts)]) }
     end
 
     def increment(key, by=1, *args)
       opts = args.extract_options!
-      gawkers.map { |gawker| gawker.increment key, by, *args.concat([gawker_options(gawker).merge(opts)]) }
+      gawkers.map { |gawker| gawker.increment key, by, *args.concat([gawker_options(gawker, opts)]) }
     end
 
     def count(key, total, *args)
       opts = args.extract_options!
-      gawkers.map { |gawker| gawker.count key, total, *args.concat([gawker_options(gawker).merge(opts)]) }
+      gawkers.map { |gawker| gawker.count key, total, *args.concat([gawker_options(gawker, opts)]) }
     end
 
     def time(key, duration=nil, *args, &block)
-      raise "Blabbermouth::Blabber.time requires a duration or block" if duration.nil? && !block_given?
+      raise "Blabbermouth::Blabber#time requires a duration or block" if duration.nil? && !block_given?
       opts = args.extract_options!
 
       if block_given?
@@ -89,7 +91,7 @@ module Blabbermouth
         duration = (::Time.now - start_time).to_f
       end
 
-      gawkers.map { |gawker| gawker.time key, duration, *args.concat([gawker_options(gawker).merge(opts)]) }
+      gawkers.map { |gawker| gawker.time key, duration, *args.concat([gawker_options(gawker, opts)]) }
     end
 
     def method_missing(meth, *args, &block)
@@ -107,12 +109,12 @@ module Blabbermouth
 
     def initialize(*gawks)
       @options = gawks.extract_options!
-      gawks.concat(options.keys)
-      gawks.each { |gawker| add_gawker gawker }
+      gawks.concat(options.keys).uniq
+      gawks.each { |gawker| add_gawker! gawker }
     end
 
-    def gawker_options(gawker)
-     @options[gawker.class.name.demodulize.underscore.to_sym] || {}
+    def gawker_options(gawker, opts={})
+     (@options[gawker.class.name.demodulize.underscore.to_sym] || {}).merge(opts)
     end
 
     def gawker_index(gawker)

data/lib/blabbermouth/configuration.rb

@@ -1,6 +1,7 @@
 module Blabbermouth
   class Configuration
     DEFAULT_CONFIGURATION_OPTIONS = {
+      gawkers: [:stdout]
     }
 
     attr_reader *DEFAULT_CONFIGURATION_OPTIONS.keys

data/lib/blabbermouth/version.rb

@@ -1,3 +1,3 @@
 module Blabbermouth
-  VERSION = '0.0.2'
+  VERSION = '0.0.3'
 end

data/spec/spec_helper.rb

@@ -3,6 +3,10 @@ require 'rspec'
 
 Dir[File.join(File.dirname(__FILE__), '..', "spec/support/**/*.rb")].each { |f| require f }
 
+Blabbermouth.configure do |config|
+  config.gawkers = []
+end
+
 RSpec.configure do |config|
   #config.before(:suite) do
   #  ActiveRecord::Base.establish_connection adapter: "sqlite3", database: ":memory:"

data/spec/support/gawker.rb

@@ -2,7 +2,6 @@ module Blabbermouth
   module Gawkers
     class Test < Base
       EVENTS = []
-      attr_reader :events
 
       def self.logged?(event, key, msg)
         EVENTS.any? { |e| e == [event, key, msg] }
@@ -12,27 +11,33 @@ module Blabbermouth
         self.class.logged? event, key, msg
       end
 
-      def error(key, e, *args, data: {})
+      def error(key, e, *args)
+        data, opts, args = parse_args(*args)
         log :error, key, e.message, data
       end
 
-      def info(key, msg=nil, *args, data: {})
+      def info(key, msg=nil, *args)
+        data, opts, args = parse_args(*args)
         log :info, key, msg, data
       end
 
-      def increment(key, by, *args, data: {})
+      def increment(key, by=1, *args)
+        data, opts, args = parse_args(*args)
         log :increment, key, by, data
       end
 
-      def count(key, total, *args, data: {})
+      def count(key, total, *args)
+        data, opts, args = parse_args(*args)
         log :count, key, total, data
       end
 
-      def time(key, value=nil, *args, data: {})
+      def time(key, value=nil, *args)
+        data, opts, args = parse_args(*args)
         log :time, key, value, data
       end
 
-      def test(key, msg=nil, *args, data: {})
+      def test(key, msg=nil, *args)
+        data, opts, args = parse_args(*args)
         log :test, key, msg, data
       end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: blabbermouth
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Mark Rebec