rails-callback_log 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6ee7d00d4e5ee7220ced65f81b17d3c67d53412a
-  data.tar.gz: 2658d820fcd402f76f495ce80425fc7652971efe
+  metadata.gz: 6f70470e5c23f303bedb00d4aa9f155189d5a76c
+  data.tar.gz: 950dfce87e83a6e5dd26aab9647084e3523df938
 SHA512:
-  metadata.gz: 947f4b80bc95ee71f91ebeb43db6b3ca829187280db3c9b831380678389c9b1ff4a561992bb572bc87b5b354d2128a9af025a5dadab4b21c610dd93962cccdca
-  data.tar.gz: 3e62d6a4bdecfc925c602df1df5c8e3f9712c15710ba642bcee4ba4f0c7fe9c2d82b44cf6c4c28a6ffee62cccafd1ba1dd876c63afb925fe492e95336041bb4c
+  metadata.gz: 9825b7b8c62c752b2dc76340f3ac579dafde7cdf3fed39e52a57cddeba7f3f321cf09d70ceca48b49eaa1cc13ac1dbbd44e90eaa894eb662ad1ae8defeec6bd8
+  data.tar.gz: cc589b5cbcba867635aa4087d318bda6687387f70216a01683a65bebc6bbae2e9275e86f38b9c1a02ef4ec614e1741eefc73dea58a7e16823bf066fc010f733b

data/lib/rails-callback_log.rb

@@ -1,7 +1,6 @@
 require "rails_callback_log/version"
 
-# We expect `ActiveSupport::Callbacks::Callback#make_lambda` to be defined before we
-# continue, because we are going to overwrite it.
+# Make sure `ActiveSupport::Callbacks` is loaded before we continue.
 require "active_support/all"
 
 module RailsCallbackLog
@@ -10,6 +9,18 @@ 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
@@ -22,25 +33,50 @@ module RailsCallbackLog
   end
 
   module CallbackExtension
-    # Return a lambda that wraps `ActiveSupport::Callbacks::Callback#make_lambda`,
-    # 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)
-      }
+    def _rails_cb_log(caller, message)
+      if !::RailsCallbackLog::FILTER ||
+        caller.any? { |line| ::RailsCallbackLog.matches_filter?(line) }
+        ::Rails.logger.debug(format("Callback: %s", message))
+      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
     end
   end
 end
 
+# Install our `CallbackExtension` using module prepend.
 module ActiveSupport
   module Callbacks
-    class Callback
-      prepend ::RailsCallbackLog::CallbackExtension
+    # 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
+      end
+    else
+      ::RailsCallbackLog.assert_method_not_defined(Callback, :_rails_cb_log)
+      class Callback
+        prepend ::RailsCallbackLog::CallbackExtension
+      end
     end
   end
 end

data/lib/rails_callback_log/version.rb

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

data/rails-callback_log.gemspec

@@ -11,12 +11,17 @@ require "rails_callback_log/version"
   spec.summary = "Logs callbacks to help with debugging."
   spec.homepage = "https://github.com/jaredbeck/rails-callback_log"
   spec.license = "MIT"
-  spec.files = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
-  spec.bindir = "exe"
-  spec.executables = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
+  spec.files = [
+    "Gemfile", # necessary?
+    "LICENSE.txt", # because: lawyers
+    "lib/rails-callback_log.rb",
+    "lib/rails_callback_log/version.rb",
+    "rails-callback_log.gemspec"
+  ]
   spec.require_paths = ["lib"]
   spec.required_ruby_version = ">= 2.0"
-  spec.add_runtime_dependency "activesupport", [">= 4.2.0", "< 5.1"]
+  spec.add_runtime_dependency "activesupport", [">= 4.2.0", "< 5.2"]
+  spec.add_development_dependency "appraisal", "~> 2.2"
   spec.add_development_dependency "bundler", "~> 1.12"
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "rspec", "~> 3.0"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rails-callback_log
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Jared Beck
 autorequire: 
-bindir: exe
+bindir: bin
 cert_chain: []
-date: 2016-07-25 00:00:00.000000000 Z
+date: 2017-05-01 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.1'
+        version: '5.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -29,7 +29,21 @@ dependencies:
         version: 4.2.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: '5.1'
+        version: '5.2'
+- !ruby/object:Gem::Dependency
+  name: appraisal
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.2'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.2'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -79,15 +93,8 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".gitignore"
-- ".rspec"
-- ".travis.yml"
-- CHANGELOG.md
-- CODE_OF_CONDUCT.md
 - Gemfile
 - LICENSE.txt
-- README.md
-- Rakefile
 - lib/rails-callback_log.rb
 - lib/rails_callback_log/version.rb
 - rails-callback_log.gemspec
@@ -111,7 +118,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.6.10
 signing_key: 
 specification_version: 4
 summary: Logs callbacks to help with debugging.

data/.gitignore

@@ -1,10 +0,0 @@
-/.bundle/
-/.yardoc
-/Gemfile.lock
-/_yardoc/
-/coverage/
-/doc/
-/pkg/
-/spec/reports/
-/tmp/
-.ruby-version

data/.rspec

@@ -1,2 +0,0 @@
---format documentation
---color

data/.travis.yml

@@ -1,9 +0,0 @@
-sudo: false
-language: ruby
-rvm:
-  - 1.9.3-p551
-  - 2.0.0-p648
-  - 2.1.10
-  - 2.2.5
-  - 2.3.1
-before_install: gem install bundler -v 1.12.5

data/CHANGELOG.md

@@ -1,21 +0,0 @@
-# Changelog
-
-This gem conforms to [semver 2.0.0][1] and follows the recommendations of
-[keepachangelog.com][2].
-
-### 0.1.0 (2016-07-25)
-
-Breaking changes:
-
-- Drop support for ruby 1.9.3
-
-Added:
-
-- Support for rails 5.0
-
-### 0.0.3 (2016-06-24)
-
-Initial release, support for rails 4.2 only.
-
-[1]: http://semver.org/
-[2]: http://keepachangelog.com/

data/CODE_OF_CONDUCT.md

@@ -1,49 +0,0 @@
-# Contributor Code of Conduct
-
-As contributors and maintainers of this project, and in the interest of
-fostering an open and welcoming community, we pledge to respect all people who
-contribute through reporting issues, posting feature requests, updating
-documentation, submitting pull requests or patches, and other activities.
-
-We are committed to making participation in this project a harassment-free
-experience for everyone, regardless of level of experience, gender, gender
-identity and expression, sexual orientation, disability, personal appearance,
-body size, race, ethnicity, age, religion, or nationality.
-
-Examples of unacceptable behavior by participants include:
-
-* The use of sexualized language or imagery
-* Personal attacks
-* Trolling or insulting/derogatory comments
-* Public or private harassment
-* Publishing other's private information, such as physical or electronic
-  addresses, without explicit permission
-* Other unethical or unprofessional conduct
-
-Project maintainers have the right and responsibility to remove, edit, or
-reject comments, commits, code, wiki edits, issues, and other contributions
-that are not aligned to this Code of Conduct, or to ban temporarily or
-permanently any contributor for other behaviors that they deem inappropriate,
-threatening, offensive, or harmful.
-
-By adopting this Code of Conduct, project maintainers commit themselves to
-fairly and consistently applying these principles to every aspect of managing
-this project. Project maintainers who do not follow or enforce the Code of
-Conduct may be permanently removed from the project team.
-
-This code of conduct applies both within project spaces and in public spaces
-when an individual is representing the project or its community.
-
-Instances of abusive, harassing, or otherwise unacceptable behavior may be
-reported by contacting a project maintainer at jared@jaredbeck.com. All
-complaints will be reviewed and investigated and will result in a response that
-is deemed necessary and appropriate to the circumstances. Maintainers are
-obligated to maintain confidentiality with regard to the reporter of an
-incident.
-
-This Code of Conduct is adapted from the [Contributor Covenant][homepage],
-version 1.3.0, available at
-[http://contributor-covenant.org/version/1/3/0/][version]
-
-[homepage]: http://contributor-covenant.org
-[version]: http://contributor-covenant.org/version/1/3/0/

data/README.md

@@ -1,36 +0,0 @@
-# RailsCallbackLog
-
-Logs callbacks to help with debugging. 
-
-## Installation
-
-```ruby
-# Gemfile
-gem "rails-callback_log", group: [:development, :test]
-```
-
-Do not use this gem in production because it adds significant overhead.
-
-## Filtering Output
-
-Rails has a lot of its own callbacks that you probably don't care about. If you
-don't want to log them, enable filtering.
-
-```
-# Enable filtering
-export RAILS_CALLBACK_LOG_FILTER="make it so"
-
-# Disable filtering
-unset RAILS_CALLBACK_LOG_FILTER
-```
-
-Filtering incurs a serious performance penalty, so it is off by default.
-
-## See Also
-
-- http://stackoverflow.com/q/13089936/567762
-
-## License
-
-The gem is available as open source under the terms of the [MIT
-License](http://opensource.org/licenses/MIT).

data/Rakefile

@@ -1,6 +0,0 @@
-require "bundler/gem_tasks"
-require "rspec/core/rake_task"
-
-RSpec::Core::RakeTask.new(:spec)
-
-task :default => :spec