activerecord-cause 0.2.1 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: caf49982c78598ccf4fa30e66695e8c0c1d54167
-  data.tar.gz: 8ad409078427198c9e13f2075d86a8c7baa8c48b
+  metadata.gz: cee58644777354c3bbb13f275b2da5c322d38f15
+  data.tar.gz: 2c9beabd1af3167ba28e8a83b9085c6f7a568ff0
 SHA512:
-  metadata.gz: cfa3950a883bb016cc2940efca340e3010775b5384060f5887bbc8cb4ee7d2f727bcd63ca4dfc47128a429dbcbf341ea2ba6f8af073ea72832d5f711a8169abb
-  data.tar.gz: ebf8f857ac336cbd227a7863ba50a3fe731247085dc111386bbceb26fb0da6e8de37f935e531152e24857a6c18e4b01bf815c0bd862979616150bd5bec6a7f31
+  metadata.gz: 75b3d107959a1908aab6a0cd70016ba0cc41689ef5a480ef84be64e38a4cf8a2293de3c078c1dfb42d27946cdaf335720eea162b2c44406ec9b5f2a1bc9269a2
+  data.tar.gz: 2180664590df42eedf60a4a5619f4fdfb98d00b60ff7d6027359ec4a683f59d828c90e7497a957c20b4efad38d233d29cf24e034c3c11a766e3163ff5242d194

data/.travis.yml

@@ -7,3 +7,4 @@ gemfile:
   - gemfiles/activerecord-32.gemfile
   - gemfiles/activerecord-40.gemfile
   - gemfiles/activerecord-41.gemfile
+  - gemfiles/activerecord-42.gemfile

data/README.md

@@ -33,7 +33,11 @@ ActiveRecord::Cause.match_paths = [
   /spec\/spec_helper/,
 ] # default is []
 ActiveRecord::Cause.log_with_sql = true # default is false
+ActiveRecord::Cause.log_mode = :all # default is :single
 ```
+
+If `log_mode` is `:all`, outputs all matched locations;
+
 ```ruby
 # spec/spec_helper.rb
 User.all

data/lib/activerecord/cause.rb

@@ -15,6 +15,11 @@ module ActiveRecord
       false
     end
 
+    # :single or :all
+    config_accessor :log_mode, instance_accessor: false do
+      :single
+    end
+
     class LogSubscriber < ActiveRecord::LogSubscriber
       IGNORE_PAYLOAD_NAMES = ["SCHEMA", "EXPLAIN"]
 
@@ -26,42 +31,48 @@ module ActiveRecord
 
         return if IGNORE_PAYLOAD_NAMES.include?(payload[:name])
 
-        loc = caller_locations.find do |l|
+        locations = caller_locations.select do |l|
           ActiveRecord::Cause.match_paths.any? do |re|
             re.match(l.absolute_path)
           end
         end
 
-        return unless loc
+        return if locations.empty?
 
-        name  = "#{payload[:name]} (ActiveRecord::Cause)"
-        sql   = payload[:sql]
-        binds = nil
-
-        if respond_to?(:render_bind)
-          unless (payload[:binds] || []).empty?
-            binds = "  " + payload[:binds].map { |col,v|
-              render_bind(col, v)
-            }.inspect
-          end
+        if ActiveRecord::Cause.log_mode != :all
+          locations = locations.take(1)
         end
 
-        if odd?
-          name = color(name, CYAN, true)
-          sql  = color(sql, nil, true)
-        else
-          name = color(name, MAGENTA, true)
-        end
-        cause = color(loc.to_s, nil, true)
+        locations.each do |loc|
+          name  = "#{payload[:name]} (ActiveRecord::Cause)"
+          sql   = payload[:sql]
+          binds = nil
+
+          if respond_to?(:render_bind)
+            unless (payload[:binds] || []).empty?
+              binds = "  " + payload[:binds].map { |col,v|
+                render_bind(col, v)
+              }.inspect
+            end
+          end
 
-        output =
-          if ActiveRecord::Cause.log_with_sql
-            "  #{name}  #{sql}#{binds} caused by #{cause}"
+          if odd?
+            name = color(name, CYAN, true)
+            sql  = color(sql, nil, true)
           else
-            "  #{name}  caused by #{cause}"
+            name = color(name, MAGENTA, true)
           end
+          cause = color(loc.to_s, nil, true)
 
-        debug(output)
+          output =
+            if ActiveRecord::Cause.log_with_sql
+              "  #{name}  #{sql}#{binds} caused by #{cause}"
+            else
+              "  #{name}  caused by #{cause}"
+            end
+
+          debug(output)
+        end
       end
     end
   end

data/lib/activerecord/cause/version.rb

@@ -1,5 +1,5 @@
 module ActiveRecord
   module Cause
-    VERSION = "0.2.1"
+    VERSION = "0.3.0"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activerecord-cause
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.3.0
 platform: ruby
 authors:
 - joker1007
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-04-16 00:00:00.000000000 Z
+date: 2015-05-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord