tq 0.1.5 → 0.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b2607111dfe096e9497fe2998bdfae1f26adc4ab
-  data.tar.gz: 0588748479920a858bcfd5931a032265a75ef79c
+  metadata.gz: f1189c610b90b4d6e1af73a3e075981588797bff
+  data.tar.gz: dd0f3598d6261f985e8830d0bb73d848f29fce0c
 SHA512:
-  metadata.gz: 057f43875d39cda15a42423f8e35d4ac0ca852ac63ca0b40c30005d180ac5ed5c7b67f3907ed7c7f1d1428461e6885d28217e8a86cd1f33f59bd66f3af2ffc83
-  data.tar.gz: e9a86c79db545598a8ecc8494f49f9c11376bced85e00a5f6e4ed452345d2cfcd7ce0e3b42beb68a7031076f1b42420aed06e207956c41143356886cd7cc6735
+  metadata.gz: 0684ba5f822f4ee215c131d7c56d0f9f939309b8faa85c8cebcf140da75b9e0212586dac3e093acffb3b224af28c2d855aa23c3dbf4c3171e9678bb6b8c01bab
+  data.tar.gz: a178c5c079388733ad77f4e075bd1ecc14346a48aad514275a48d5a08161dbbe30ecf77dffef32c0d7ca8a5cc3f8ddf57d26752e4f268362cca0e691f35c5d6d

data/lib/tq/logger.rb

@@ -36,10 +36,13 @@ module TQ
     end
 
     def add(severity, message=nil, progname=nil, context=nil, &block)
-      t = Time.now       
-      @log.add(severity, message, progname, &block)
+      t = Time.now
+      severity, message, data, context = 
+        normalize_params(severity, message, progname, context, &block)
+
+      @log.add(severity, message, data[:progname])
       @queue.push!( 
-        queue_message(t, severity, message, progname, context, &block), 
+        queue_message(t, severity, message, data, context), 
         ::Logger::SEV_LABEL[severity].to_s.downcase
       ) if (severity >= level)
     end
@@ -64,7 +67,7 @@ module TQ
 
     # damn, the ruby logger interface is weird... this logic is copied almost verbatim
     # from ::Logger.add
-    def queue_message(t, severity, message, progname, context, &block)
+    def normalize_params(severity, message, progname, context, &block)
       severity ||= ::Logger::UNKNOWN
       progname ||= self.progname
       if message.nil?
@@ -75,16 +78,27 @@ module TQ
           progname = self.progname
         end
       end
+    
+      # for case where progname is passed as hash
+      data = {}
+      if progname.respond_to?(:has_key?) && progname.respond_to?(:merge)
+        data = {progname: self.progname}.merge(progname)
+      else
+        data = {progname: progname}
+      end
+
+      return [severity, message, data, context]
+    end
 
-      return {
+    def queue_message(t, severity, message, data={}, context={})
+      return data.merge({
         time: t.iso8601,
         timestamp: t.to_i,
         level: severity,
         label: ::Logger::SEV_LABEL[severity],
         message: message,
-        progname: progname,
         context: context
-      }
+      })
     end
 
   end

data/lib/tq/queue.rb

@@ -1,3 +1,5 @@
+require 'json'
+require 'base64'
 
 module TQ
 

data/lib/version.rb

@@ -1,4 +1,4 @@
 
 module TQ
-  VERSION = '0.1.5'
+  VERSION = '0.1.6'
 end

data/test/test_logger.rb

@@ -46,14 +46,21 @@ class LoggerTests < Minitest::Spec
     exps.each_with_index do |exp,i|
       act = acts[i]
       next if act.nil?
-      [:level, :message, :progname].each do |elem|
+      [:level, :message].each do |elem|
         unless (a = exp[elem]) == (b = act[elem.to_s])
           errs.push( "[#{i}] Expected #{elem} to be #{a}, was #{b}" )
         end
       end
+ 
+      a = (Hash === exp[:progname] ? exp[:progname][:progname] : exp[:progname])
+      unless a == (b = act['progname'])
+        errs.push( "[#{i}] Expected #{elem} to be #{a}, was #{b}" )
+      end
+
       unless (a = ::Logger::SEV_LABEL[exp[:level]]) == (b = act['label'])
         errs.push( "[#{i}] Expected label to be #{a}, was #{b}" )
       end
+
     end
     assert errs.length == 0, errs.join("\n")
   end
@@ -179,6 +186,49 @@ class LoggerTests < Minitest::Spec
 
   end
 
+  it 'log methods should accept hash of values as first parameter' do
+    subject = TQ::Logger.new(@queue, test_logger )
+
+    expected_messages = [
+      { method: :debug, 
+        level: ::Logger::DEBUG,
+        progname: { 
+           progname: 'prog1', id: '1234'
+        },
+        message: 'debug message', 
+        context: { key: 1 } 
+      },
+      { method: :info,  
+        level: ::Logger::INFO, 
+        progname: {
+           id: '2345', progname: 'prog2'
+        },
+        message: 'info message',  
+        context: { key: 2 } 
+      },
+      { method: :warn,  
+        message: 'warn message',
+        level: ::Logger::WARN, 
+        progname: {
+          id: '3456',  progname: 'prog3'
+        }
+      },
+      { method: :error,  
+        message: 'error message',
+        level: ::Logger::ERROR, 
+        progname: {
+          progname: 'prog4', id: '4567'
+        },
+        context: { key: 4 } 
+      }
+    ]
+
+    send_messages_to!(subject, expected_messages)
+
+    verify_logged_messages_to_level! expected_messages, test_logger.level
+
+  end
+
 end
 
 setup_test_logger!

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tq
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.6
 platform: ruby
 authors:
 - Eric Gjertsen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-16 00:00:00.000000000 Z
+date: 2015-05-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: google-api-client