transaction_logger 1.0.1 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c85e18e15f0aa46051bdd6d5d6d827ca662fce6b
-  data.tar.gz: 65889439258e4082571f87310c90a035bf23229d
+  metadata.gz: 30f8e8e54923dfdc287aeb35da8c13dd4ab6b49c
+  data.tar.gz: fcd753fbf378de1fd0e5c3b2d12592c34bfdbf67
 SHA512:
-  metadata.gz: 7b02d897ef866380ce133cd11215f9c974907008aa9d072f549fb7a9652e7511e0b49e7b5326f334c58bd99831d67dc4f795181db8ac3b4ba786b98703a22659
-  data.tar.gz: 9010d7c2270809e8436b22334f7d36ed864fb7aba114ae51d30873ce3af799358bf80df6167466a440694915f1c4ff4481a8d1e8da88d63035487bb6597a6929
+  metadata.gz: 8396dc16368ead80fd6e778acdc4ddf3d1072645ff08699a0caf651c0c58732a3e643ef8a0cb54b1c52ccfb276c1544c9730630f43a5a9e4cccbed31793f49a5
+  data.tar.gz: c514903ed15b3bfcc772c352b4edc18227c3c5ab4499d98fba7ab69db1125bc41afe8040d8f8f174e69ed9c2b8e92a4dfd9d2940d892528f782dd258d219c7a7

data/lib/transaction_logger/version.rb

@@ -1,3 +1,3 @@
 module TransactionLogger
-  VERSION = "1.0.1"
+  VERSION = "1.0.2"
 end

data/lib/transaction_logger.rb

@@ -40,12 +40,24 @@ module TransactionLogger
           transaction.context = options[:context]
           transaction.context ||= {}
 
-          method_info = {}
-          method_info[:logger_method] = self.class.instance_method :logger
-          method_info[:calling_method] = caller_locations(1, 1)[0].label
-          method_info[:includer] = self
+          # Check for a logger on the instance
+          if methods.include? :logger
+            logger_method = method(:logger).unbind
+          # Check for a logger on the class
+          elsif self.class.methods.include? :logger
+            logger_method = self.class.method :logger
+          end
+
+          # Trap the logger if we've found one
+          if logger_method
+            method_info = {}
+            method_info[:logger_method] = logger_method
+            method_info[:calling_method] = caller_locations(1, 1)[0].label
+            method_info[:includer] = self
+
+            TransactionLogger::Helper.trap_logger method, transaction, method_info
+          end
 
-          TransactionLogger::Helper.trap_logger method, transaction, method_info
           old_method.bind(self).call
         }
       end
@@ -65,8 +77,18 @@ module TransactionLogger
       calling_method = method_info[:calling_method]
       includer = method_info[:includer]
 
-      includer.class.send :define_method, :logger, lambda {
-        @original_logger ||= logger_method.bind(includer).call
+      if logger_method.is_a? UnboundMethod
+        method_type = :define_method
+      else
+        method_type = :define_singleton_method
+      end
+
+      includer.class.send method_type, :logger, lambda {
+        if logger_method.is_a? UnboundMethod
+          @original_logger ||= logger_method.bind(includer).call
+        else
+          @original_logger ||= logger_method.call
+        end
 
         @trapped_logger ||= {}
         @trapped_logger[calling_method] ||= LoggerProxy.new @original_logger, transaction

data/spec/transaction_logger_spec.rb

@@ -3,10 +3,77 @@ require "logger"
 
 describe TransactionLogger do
   let (:test_lmbda) {
-    lambda  do |_t|
+    lambda do |_t|
     end
   }
 
+  context "Logger trapping" do
+    let(:instance_logger) {
+      Class.new do
+        include TransactionLogger
+
+        def do_something
+          logger.info "TEST"
+        end
+
+        def logger
+          Logger.new STDOUT
+        end
+
+        add_transaction_log :do_something
+      end
+    }
+
+    let(:klass_logger) {
+      Class.new do
+        include TransactionLogger
+
+        def do_something
+          self.class.logger.info "TEST"
+        end
+
+        def self.logger
+          Logger.new STDOUT
+        end
+
+        add_transaction_log :do_something
+      end
+    }
+
+    let(:no_logger) {
+      Class.new do
+        include TransactionLogger
+
+        def do_something
+          puts "TEST"
+        end
+
+        add_transaction_log :do_something
+      end
+    }
+
+    it "supports #logger" do
+      expect_any_instance_of(TransactionLogger::LoggerProxy).to receive(:info).and_call_original
+      expect_any_instance_of(Logger).to receive(:info).and_call_original
+      test = instance_logger.new
+      test.do_something
+    end
+
+    it "supports .logger" do
+      expect_any_instance_of(TransactionLogger::LoggerProxy).to receive(:info).and_call_original
+      expect_any_instance_of(Logger).to receive(:info).and_call_original
+      test = klass_logger.new
+      test.do_something
+    end
+
+    it "supports no logger" do
+      expect_any_instance_of(TransactionLogger::LoggerProxy).to_not receive(:info)
+      expect_any_instance_of(Logger).to_not receive(:info)
+      test = no_logger.new
+      test.do_something
+    end
+  end
+
   subject {
     TransactionLogger::Transaction.new(
       { prefix: nil, logger: Logger.new(STDOUT), level_threshold: nil }, test_lmbda)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: transaction_logger
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
 platform: ruby
 authors:
 - John Donner
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-21 00:00:00.000000000 Z
+date: 2015-08-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -150,6 +150,10 @@ files:
 - lib/transaction_logger/version.rb
 - spec/spec_helper.rb
 - spec/support/debugging.rb
+- spec/transaction_logger/transaction_manager_spec.rb
+- spec/transaction_logger/transaction_spec.rb
+- spec/transaction_logger_configure_spec.rb
+- spec/transaction_logger_helper_spec.rb
 - spec/transaction_logger_spec.rb
 - transaction_logger.gemspec
 homepage: https://github.com/blinkist/transaction_logger
@@ -179,5 +183,9 @@ summary: Contextual Business Transaction Logger for Ruby
 test_files:
 - spec/spec_helper.rb
 - spec/support/debugging.rb
+- spec/transaction_logger/transaction_manager_spec.rb
+- spec/transaction_logger/transaction_spec.rb
+- spec/transaction_logger_configure_spec.rb
+- spec/transaction_logger_helper_spec.rb
 - spec/transaction_logger_spec.rb
 has_rdoc: