activerecord-cause 0.3.0 → 0.4.0.beta

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cee58644777354c3bbb13f275b2da5c322d38f15
-  data.tar.gz: 2c9beabd1af3167ba28e8a83b9085c6f7a568ff0
+  metadata.gz: f896ab758049167f03bc26eb7e1acecfc584c516
+  data.tar.gz: e27e4af7d2f5f54f38d0ed74f1f4e9d71258c4cc
 SHA512:
-  metadata.gz: 75b3d107959a1908aab6a0cd70016ba0cc41689ef5a480ef84be64e38a4cf8a2293de3c078c1dfb42d27946cdaf335720eea162b2c44406ec9b5f2a1bc9269a2
-  data.tar.gz: 2180664590df42eedf60a4a5619f4fdfb98d00b60ff7d6027359ec4a683f59d828c90e7497a957c20b4efad38d233d29cf24e034c3c11a766e3163ff5242d194
+  metadata.gz: 6b367c82a2f025d83e711259e61073049f5f8708b7c1d8a851ec25e3c511f746e4d0e70aab8a22d9a7493287c7e83f176c0daa7bd7759425bdf260c2a523dbe6
+  data.tar.gz: 9fe25f5e71f87938501747d56d3edf292e58f78ac1226b504259c49cbba4b7f2de53b7d1efd7ae80228c364a7c5cada28d9271ac4b17b3daee40338bf898203a

data/.travis.yml

@@ -1,10 +1,10 @@
 language: ruby
 sudo: false
 rvm:
-  - 2.2.1
-  - 2.1
+  - 2.3.0
+  - 2.2.4
 gemfile:
-  - gemfiles/activerecord-32.gemfile
   - gemfiles/activerecord-40.gemfile
   - gemfiles/activerecord-41.gemfile
   - gemfiles/activerecord-42.gemfile
+  - gemfiles/activerecord-50.gemfile

data/Rakefile

@@ -7,19 +7,41 @@ task :default => :spec
 
 pwd = File.expand_path('../', __FILE__)
 
+gemfiles = %w(activerecord-40 activerecord-41 activerecord-42 activerecord-50)
+
 namespace :spec do
-  %w(activerecord-32 activerecord-40 activerecord-41 activerecord-42).each do |gemfile|
+  gemfiles.each do |gemfile|
     desc "Run Tests by #{gemfile}.gemfile"
     task gemfile do
-      sh "BUNDLE_GEMFILE='#{pwd}/gemfiles/#{gemfile}.gemfile' bundle install --path #{pwd}/.bundle"
-      sh "BUNDLE_GEMFILE='#{pwd}/gemfiles/#{gemfile}.gemfile' bundle exec rake -t spec"
+      Bundler.with_clean_env do
+        sh "BUNDLE_GEMFILE='#{pwd}/gemfiles/#{gemfile}.gemfile' bundle install --path #{pwd}/.bundle"
+        sh "BUNDLE_GEMFILE='#{pwd}/gemfiles/#{gemfile}.gemfile' bundle exec rake -t spec"
+      end
     end
   end
 
   desc "Run All Tests"
   task :all do
-    %w(activerecord-32 activerecord-40 activerecord-41 activerecord-42).each do |gemfile|
+    gemfiles.each do |gemfile|
       Rake::Task["spec:#{gemfile}"].invoke
     end
   end
 end
+
+namespace :bundle_update do
+  gemfiles.each do |gemfile|
+    desc "Run Tests by #{gemfile}.gemfile"
+    task gemfile do
+      Bundler.with_clean_env do
+        sh "BUNDLE_GEMFILE='#{pwd}/gemfiles/#{gemfile}.gemfile' bundle update"
+      end
+    end
+  end
+
+  desc "Run All Tests"
+  task :all do
+    gemfiles.each do |gemfile|
+      Rake::Task["bundle_update:#{gemfile}"].invoke
+    end
+  end
+end

data/activerecord-cause.gemspec

@@ -18,7 +18,7 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_runtime_dependency "activerecord", ">= 3.2"
+  spec.add_runtime_dependency "activerecord", ">= 4"
 
   spec.add_development_dependency "bundler", ">= 1.6"
   spec.add_development_dependency "rake", "~> 10.0"

data/gemfiles/activerecord-42.gemfile

@@ -1,5 +1,5 @@
 source "https://rubygems.org"
 
-gem "activerecord", "~> 4.1.0"
+gem "activerecord", "~> 4.2.0"
 
 gemspec :path => "../"

data/gemfiles/{activerecord-32.gemfile → activerecord-50.gemfile}

@@ -1,5 +1,5 @@
 source "https://rubygems.org"
 
-gem "activerecord", "~> 3.2.0"
+gem "activerecord", "~> 5.0.0.beta"
 
 gemspec :path => "../"

data/lib/activerecord/cause.rb

@@ -24,13 +24,23 @@ module ActiveRecord
       IGNORE_PAYLOAD_NAMES = ["SCHEMA", "EXPLAIN"]
 
       def sql(event)
-        return if ActiveRecord::Cause.match_paths.empty?
         return unless logger.debug?
 
         payload = event.payload
 
         return if IGNORE_PAYLOAD_NAMES.include?(payload[:name])
 
+        if ActiveRecord.version >= Gem::Version.new("5.0.0.beta")
+          sql_for_ar5(event)
+        else
+          sql_for_ar4(event)
+        end
+      end
+
+      private
+
+      def sql_for_ar4(event)
+        payload = event.payload
         locations = caller_locations.select do |l|
           ActiveRecord::Cause.match_paths.any? do |re|
             re.match(l.absolute_path)
@@ -48,12 +58,10 @@ module ActiveRecord
           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
+          unless (payload[:binds] || []).empty?
+            binds = "  " + payload[:binds].map { |col,v|
+              render_bind(col, v)
+            }.inspect
           end
 
           if odd?
@@ -74,6 +82,48 @@ module ActiveRecord
           debug(output)
         end
       end
+
+      def sql_for_ar5(event)
+        payload = event.payload
+        locations = get_locations
+        return if locations.empty?
+
+        if ActiveRecord::Cause.log_mode != :all
+          locations = locations.take(1)
+        end
+
+        locations.each do |loc|
+          name  = "#{payload[:name]} (ActiveRecord::Cause)"
+          sql   = payload[:sql]
+          binds = nil
+
+          unless (payload[:binds] || []).empty?
+            binds = "  " + payload[:binds].map { |attr| render_bind(attr) }.inspect
+          end
+
+          name = colorize_payload_name(name, payload[:name])
+          sql  = color(sql, sql_color(sql), true)
+          cause = color(loc.to_s, nil, true)
+
+          output =
+            if ActiveRecord::Cause.log_with_sql
+              "  #{name}  #{sql}#{binds} caused by #{cause}"
+            else
+              "  #{name}  caused by #{cause}"
+            end
+
+          debug(output)
+        end
+      end
+
+      def get_locations
+        return [] if ActiveRecord::Cause.match_paths.empty?
+        caller_locations.select do |l|
+          ActiveRecord::Cause.match_paths.any? do |re|
+            re.match(l.absolute_path)
+          end
+        end
+      end
     end
   end
 end

data/lib/activerecord/cause/version.rb

@@ -1,5 +1,5 @@
 module ActiveRecord
   module Cause
-    VERSION = "0.3.0"
+    VERSION = "0.4.0.beta"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activerecord-cause
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0.beta
 platform: ruby
 authors:
 - joker1007
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-05-26 00:00:00.000000000 Z
+date: 2016-04-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '3.2'
+        version: '4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '3.2'
+        version: '4'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -96,10 +96,10 @@ files:
 - activerecord-cause.gemspec
 - bin/console
 - bin/setup
-- gemfiles/activerecord-32.gemfile
 - gemfiles/activerecord-40.gemfile
 - gemfiles/activerecord-41.gemfile
 - gemfiles/activerecord-42.gemfile
+- gemfiles/activerecord-50.gemfile
 - lib/activerecord/cause.rb
 - lib/activerecord/cause/railtie.rb
 - lib/activerecord/cause/version.rb
@@ -117,12 +117,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.6
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: This gem logs where ActiveRecord actually loads record