rails-callback_log 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6f70470e5c23f303bedb00d4aa9f155189d5a76c
-  data.tar.gz: 950dfce87e83a6e5dd26aab9647084e3523df938
+  metadata.gz: c355fe92d45d85b8b9cfc55456401166c13ab836
+  data.tar.gz: e9f60252e41ebf86cdbc6767993bb03fb24c8a02
 SHA512:
-  metadata.gz: 9825b7b8c62c752b2dc76340f3ac579dafde7cdf3fed39e52a57cddeba7f3f321cf09d70ceca48b49eaa1cc13ac1dbbd44e90eaa894eb662ad1ae8defeec6bd8
-  data.tar.gz: cc589b5cbcba867635aa4087d318bda6687387f70216a01683a65bebc6bbae2e9275e86f38b9c1a02ef4ec614e1741eefc73dea58a7e16823bf066fc010f733b
+  metadata.gz: f61b60c7c91c83e134a12f177e5d078ff69d54029b3962aeafc97e5539014d831c16a8d71bdee63474c209644383a4c7d5dd267d6a090bf5b200dab248d43780
+  data.tar.gz: b7b4bd43e5e8198e7b5b85e9a002427a7d8ec0d30cb8a2478e794b093d106a415b48e6c9adbd46e4f5a3347f906981f503a02ba78085b1f0e94e026ea41bcf48

data/lib/rails-callback_log.rb

@@ -9,18 +9,6 @@ module RailsCallbackLog
   FILTER = ENV["RAILS_CALLBACK_LOG_FILTER"].present?.freeze
 
   class << self
-    def assert_method_not_defined(klass, method)
-      if klass.method_defined?(method.to_sym)
-        $stderr.puts(
-          format(
-            "Unable to install rails-callback_log: method already exists: %s",
-            method
-          )
-        )
-        ::Kernel.exit(1)
-      end
-    end
-
     def matches_filter?(str)
       source_location_filters.any? { |f| str.start_with?(f) }
     end
@@ -32,32 +20,33 @@ module RailsCallbackLog
     end
   end
 
-  module CallbackExtension
-    def _rails_cb_log(caller, message)
-      if !::RailsCallbackLog::FILTER ||
-        caller.any? { |line| ::RailsCallbackLog.matches_filter?(line) }
-        ::Rails.logger.debug(format("Callback: %s", message))
-      end
+  # In rails 5.1, we extend `CallTemplate`.
+  module CallTemplateExtension
+    # Returns a lambda that wraps `super`, adding logging.
+    def make_lambda
+      original_lambda = super
+      lambda { |*args, &block|
+        if !::RailsCallbackLog::FILTER ||
+          caller.any? { |line| ::RailsCallbackLog.matches_filter?(line) }
+          ::Rails.logger.debug(format("Callback: %s", @method_name))
+        end
+        original_lambda.call(*args, &block)
+      }
     end
+  end
 
-    if ::ActiveSupport.gem_version >= ::Gem::Version.new("5.1.0")
-      # Returns a lambda that wraps `super`, adding logging.
-      def make_lambda
-        original_lambda = super
-        lambda { |*args, &block|
-          _rails_cb_log(caller, @method_name)
-          original_lambda.call(*args, &block)
-        }
-      end
-    else
-      # Returns a lambda that wraps `super`, adding logging.
-      def make_lambda(filter)
-        original_lambda = super(filter)
-        lambda { |*args, &block|
-          _rails_cb_log(caller, filter)
-          original_lambda.call(*args, &block)
-        }
-      end
+  # In rails 4.2 and 5.0, we extend `Callback`.
+  module CallbackExtension
+    # Returns a lambda that wraps `super`, adding logging.
+    def make_lambda(filter)
+      original_lambda = super(filter)
+      lambda { |*args, &block|
+        if !::RailsCallbackLog::FILTER ||
+          caller.any? { |line| ::RailsCallbackLog.matches_filter?(line) }
+          ::Rails.logger.debug(format("Callback: %s", filter))
+        end
+        original_lambda.call(*args, &block)
+      }
     end
   end
 end
@@ -65,15 +54,11 @@ end
 # Install our `CallbackExtension` using module prepend.
 module ActiveSupport
   module Callbacks
-    # In rails 4.2 and 5.0, `make_lambda` is a method of `Callback`.
-    # In rails 5.1, `make_lambda` is a method of `CallTemplate`.
     if ::ActiveSupport.gem_version >= ::Gem::Version.new("5.1.0")
-      ::RailsCallbackLog.assert_method_not_defined(CallTemplate, :_rails_cb_log)
       class CallTemplate
-        prepend ::RailsCallbackLog::CallbackExtension
+        prepend ::RailsCallbackLog::CallTemplateExtension
       end
     else
-      ::RailsCallbackLog.assert_method_not_defined(Callback, :_rails_cb_log)
       class Callback
         prepend ::RailsCallbackLog::CallbackExtension
       end

data/lib/rails_callback_log/version.rb

@@ -1,7 +1,7 @@
 require "rubygems"
 
 module RailsCallbackLog
-  VERSION = "0.2.0"
+  VERSION = "0.2.1"
 
   def self.gem_version
     ::Gem::Version.new(VERSION)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rails-callback_log
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Jared Beck
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-05-01 00:00:00.000000000 Z
+date: 2017-05-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport