activerecord-cause 0.5.0 → 0.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a18619979f3889a97e7280fe083029b4f83c42c4
-  data.tar.gz: 3163a8a41f7aaa493fbeab493d6dface52e2f9e6
+  metadata.gz: 3633af93848d0ee412d2e055aba320859a69bfbd
+  data.tar.gz: 90d3a3d9c599e197acfaac3f049030cb1adb5012
 SHA512:
-  metadata.gz: 5195069b3cb3f905d625d26ee8c75ea92ecab47c3d5056cfdcc30969b59163e0b499365fdb7ee946da10a76bb8f4e1a32bdc6a3e14e954da40a3ea0dfac71033
-  data.tar.gz: d081b98ce509d9c768186888621967d1d5d1261765da82f0f26cbebdd25796b49593951d0ce1d13dafa1626dd4dd70cd1bfb1862d74859cd202c508e04c423c1
+  metadata.gz: 9bcd4c7215f7bcb314e300f5474b94e04526f6ab5e5bf96b7fbde6bd785ee3d04fb1aa49c4546f885788aae29d82dace79c2412447adb1d9e00da4318e547d4c
+  data.tar.gz: 2618b0b4f6a67128620083b57180b4f784fe0a04c4f73a8c92306b84db37c34194b62786b6c3def4583cadfc61427ec7cbb6f697ca138f12e2ccf4fbd0421dc7

data/.travis.yml

@@ -6,5 +6,5 @@ rvm:
 gemfile:
   - gemfiles/activerecord-42.gemfile
   - gemfiles/activerecord-502.gemfile
-  - gemfiles/activerecord-50.gemfile
+  - gemfiles/activerecord-503.gemfile
   - gemfiles/activerecord-51.gemfile

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

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

data/lib/activerecord/cause.rb

@@ -27,26 +27,9 @@ module ActiveRecord
         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)
-          end
-        end
-
+        locations = get_locations
         return if locations.empty?
 
         if ActiveRecord::Cause.log_mode != :all
@@ -54,22 +37,14 @@ module ActiveRecord
         end
 
         locations.each do |loc|
-          name  = "#{payload[:name]} (ActiveRecord::Cause)"
-          sql   = payload[:sql]
-          binds = nil
+          @is_odd = nil
 
           unless (payload[:binds] || []).empty?
-            binds = "  " + payload[:binds].map { |col,v|
-              render_bind(col, v)
-            }.inspect
+            binds = get_binds(payload)
           end
 
-          if odd?
-            name = color(name, CYAN, true)
-            sql  = color(sql, nil, true)
-          else
-            name = color(name, MAGENTA, true)
-          end
+          name = name_with_color(payload[:name])
+          sql = sql_with_color(payload[:sql])
           cause = color(loc.to_s, nil, true)
 
           output =
@@ -83,41 +58,11 @@ module ActiveRecord
         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 = if ActiveRecord.version >= Gem::Version.new("5.0.3")
-                      "  " + payload[:binds].zip(payload[:type_casted_binds]).map { |attr, value| render_bind(attr, value) }.inspect
-                    else
-                      "  " + payload[:binds].map { |attr| render_bind(attr) }.inspect
-                    end
-          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
+      private
 
-          debug(output)
-        end
+      def is_odd?
+        return @is_odd unless @is_odd.nil?
+        @is_odd = odd?
       end
 
       def get_locations
@@ -128,6 +73,79 @@ module ActiveRecord
           end
         end
       end
+
+      def get_binds(payload)
+        raise NotImplementedError
+      end
+
+      def name_with_color(payload_name)
+        raise NotImplementedError
+      end
+
+      def sql_with_color(payload_sql)
+        raise NotImplementedError
+      end
+    end
+
+    class LogSubscriberAR4 < ActiveRecord::Cause::LogSubscriber
+      def sql(event)
+        super
+      end
+
+      private
+
+      def get_binds(payload)
+        "  " + payload[:binds].map { |col,v|
+          render_bind(col, v)
+        }.inspect
+      end
+
+      def name_with_color(payload_name)
+        name = "#{payload_name} (ActiveRecord::Cause)"
+        if is_odd?
+          color(name, CYAN, true)
+        else
+          color(name, MAGENTA, true)
+        end
+      end
+
+      def sql_with_color(payload_sql)
+        is_odd? ? color(payload_sql, nil, true) : payload_sql
+      end
+    end
+
+    class LogSubscriberAR502 < ActiveRecord::Cause::LogSubscriber
+      def sql(event)
+        super
+      end
+
+      private
+
+      def get_binds(payload)
+        "  " + payload[:binds].map { |attr| render_bind(attr) }.inspect
+      end
+
+      def name_with_color(payload_name)
+        name = "#{payload_name} (ActiveRecord::Cause)"
+        colorize_payload_name(name, payload_name)
+      end
+
+      def sql_with_color(sql)
+        color(sql, sql_color(sql), true)
+      end
+    end
+
+    class LogSubscriberAR503 < LogSubscriberAR502
+      def sql(event)
+        super
+      end
+
+      private
+
+      def get_binds(payload)
+        casted_params = type_casted_binds(payload[:binds], payload[:type_casted_binds])
+        "  " + payload[:binds].zip(casted_params).map { |attr, value| render_bind(attr, value) }.inspect
+      end
     end
   end
 end
@@ -135,5 +153,11 @@ end
 require "activerecord/cause/railtie" if defined?(Rails)
 
 ActiveSupport.on_load(:active_record) do
-  ActiveRecord::Cause::LogSubscriber.attach_to :active_record
+  if ActiveRecord.version >= Gem::Version.new("5.0.3")
+    ActiveRecord::Cause::LogSubscriberAR503.attach_to :active_record
+  elsif ActiveRecord.version >= Gem::Version.new("5.0.0")
+    ActiveRecord::Cause::LogSubscriberAR502.attach_to :active_record
+  else
+    ActiveRecord::Cause::LogSubscriberAR4.attach_to :active_record
+  end
 end

data/lib/activerecord/cause/version.rb

@@ -1,5 +1,5 @@
 module ActiveRecord
   module Cause
-    VERSION = "0.5.0"
+    VERSION = "0.5.1"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activerecord-cause
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.5.1
 platform: ruby
 authors:
 - joker1007
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-05-19 00:00:00.000000000 Z
+date: 2017-05-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -97,8 +97,8 @@ files:
 - bin/console
 - bin/setup
 - gemfiles/activerecord-42.gemfile
-- gemfiles/activerecord-50.gemfile
 - gemfiles/activerecord-502.gemfile
+- gemfiles/activerecord-503.gemfile
 - gemfiles/activerecord-51.gemfile
 - lib/activerecord-cause.rb
 - lib/activerecord/cause.rb