rails-callback_log 0.2.2 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 5e35dbc7e94c541ced4a75d2c9ba3f22b7caf87e
-  data.tar.gz: eaa385a396104f134f1bf1f49003328eeb852d5a
+SHA256:
+  metadata.gz: dbec58f6b26e03bbc9f75013e301a2215086525f735fffedc050b7089008b443
+  data.tar.gz: 191b4e30f3ecdb953983ee55b07afac4c918f346cf8e723cb1240aaa5771f489
 SHA512:
-  metadata.gz: 584fc2fd59119049e709dc18902742cbab4472c2f0f0d6322141acdbb6607cbf169c1999f2f7f848485b83bdb6ab73c86bfd1981154aeef91082168189d42079
-  data.tar.gz: e80417518690edae4a3ada9d19ae68af12b2af379be0135734c99492bde337bbdd5f1de9f28dd8a67b0490a5d9a6e2cc7ff805aafbf67a8843cb1d329c7f4d93
+  metadata.gz: b2d0426d007902af9d7620143804655473369e5e7e55e9153d7ba0f8bb3dd269599d9a80842bc4af60d8a7804272d7052244ac873595d3297b4c16d7d369625d
+  data.tar.gz: a1ea57f878149dddbba2b5e94876b2c674a303623db399c468c6e6b80e4e0b10c09daaec0404a6110bcfdbc140478a4d9ad94f292e483168813736be089f299a

data/lib/rails-callback_log.rb

@@ -17,6 +17,12 @@ module RailsCallbackLog
       source_location_filters.any? { |f| str.start_with?(f) }
     end
 
+    def log(msg)
+      if !FILTER || caller.any? { |line| matches_filter?(line) }
+        logger.debug(format("Callback: %s", msg))
+      end
+    end
+
     private
 
     def source_location_filters
@@ -26,16 +32,15 @@ module RailsCallbackLog
 
   # 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) }
-          ::RailsCallbackLog.logger.debug(format("Callback: %s", @method_name))
-        end
-        original_lambda.call(*args, &block)
-      }
+    # Rails 5.1 and above call `expand` to get a reference to the object and
+    # method of the callback to execute. If the callback was a proc then
+    # @override_block will be set. If the callback was an object then
+    # @override_target will be set. If the callback was a symbol method name
+    # then @method_name will be set.
+    def expand(target, value, block)
+      ::RailsCallbackLog.log(@override_block || @override_target || @method_name)
+
+      super(target, value, block)
     end
   end
 
@@ -45,10 +50,8 @@ module RailsCallbackLog
     def make_lambda(filter)
       original_lambda = super(filter)
       lambda { |*args, &block|
-        if !::RailsCallbackLog::FILTER ||
-          caller.any? { |line| ::RailsCallbackLog.matches_filter?(line) }
-          ::RailsCallbackLog.logger.debug(format("Callback: %s", filter))
-        end
+        ::RailsCallbackLog.log(filter)
+
         original_lambda.call(*args, &block)
       }
     end

data/lib/rails_callback_log/version.rb

@@ -1,9 +1,7 @@
 require "rubygems"
 
 module RailsCallbackLog
-  VERSION = "0.2.2"
-
   def self.gem_version
-    ::Gem::Version.new(VERSION)
+    ::Gem::Version.new('0.3.0')
   end
 end

data/rails-callback_log.gemspec

@@ -5,7 +5,7 @@ require "rails_callback_log/version"
 
 ::Gem::Specification.new do |spec|
   spec.name = "rails-callback_log"
-  spec.version = ::RailsCallbackLog::VERSION
+  spec.version = ::RailsCallbackLog.gem_version.to_s
   spec.authors = ["Jared Beck"]
   spec.email = ["jared@jaredbeck.com"]
   spec.summary = "Logs callbacks to help with debugging."
@@ -20,7 +20,7 @@ require "rails_callback_log/version"
   ]
   spec.require_paths = ["lib"]
   spec.required_ruby_version = ">= 2.0"
-  spec.add_runtime_dependency "activesupport", [">= 4.2.0", "< 5.2"]
+  spec.add_runtime_dependency "activesupport", [">= 4.2.0", "< 6"]
   spec.add_development_dependency "appraisal", "~> 2.2"
   spec.add_development_dependency "bundler", "~> 1.12"
   spec.add_development_dependency "rake", "~> 10.0"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rails-callback_log
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.3.0
 platform: ruby
 authors:
 - Jared Beck
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-05-08 00:00:00.000000000 Z
+date: 2019-01-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -19,7 +19,7 @@ dependencies:
         version: 4.2.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: '5.2'
+        version: '6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -29,7 +29,7 @@ dependencies:
         version: 4.2.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: '5.2'
+        version: '6'
 - !ruby/object:Gem::Dependency
   name: appraisal
   requirement: !ruby/object:Gem::Requirement
@@ -118,7 +118,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.10
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: Logs callbacks to help with debugging.