pp_sql 0.1.1 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7f27b89855f77001300508a599f026baa13e5399
-  data.tar.gz: 7cb4493dd7d2b14cdb9403d4841edd3d240f5168
+  metadata.gz: b4372a6aad0cedf3145eff498f19164e31e2918c
+  data.tar.gz: a8596ffe4a78038d3817fe0b6127761cf66777e7
 SHA512:
-  metadata.gz: e8b1f3e5e92fc75bffed713b5cad6921306623bf129b06dff4256d9d333fcb1f2865245bc728624965cc390c589948b514db96f5597152f0fd924ce65b5f5b9e
-  data.tar.gz: 702f39163b95445dc07aaba57ea72fd8dd6772a7e918ae9756db6bcae6eef12d13abf49bfffe5ebc0d76253b97528fb01866579d8f9a82068159d8bae1a2afd7
+  metadata.gz: ae497360ecd64748259be104332eb38ae2a07a833e58e63f222bf8b14c4ec9523ea40495622f1c95ca52c6d0a21a3891a60e8b6d7cdc1551b4282b06ddbafe62
+  data.tar.gz: 4208494b16e764d76460c59e6038c7af289c1749118791c17f3f13a342ec9d05b8d60a7a333376805c26d25dd4ca66f0e83c5fab7afbffb6bdba97e9f62bdcd5

data/README.md

@@ -1,7 +1,8 @@
 # PpSql
 
-Replace stanpard `ActieRecord#to_sql` method with [`anbt-sql-formatter`](https://github.com/sonota88/anbt-sql-formatter)
-gem for pretty SQL code output in console. For example:
+Replace stanpard `ActiveRecord#to_sql` method with [`anbt-sql-formatter`](https://github.com/sonota88/anbt-sql-formatter)
+gem for pretty SQL code output in console. Rails log will be formatted also. For example:
+
 ```
 # was
 User.all # => 
@@ -15,13 +16,17 @@ SELECT
     `users`
 ```
 
+## Require
+
+Ruby 2.0+
+
 ## Usage
 
 ```
 Post.first.to_sql
 ```
 
-If you need yo use it in some custome strings, you may include this funcional with
+If you need yo use it in some custom strings, you may include this funcionality with
 
 ```
 String.send :include, PpSql::ToSqlBeautify

data/lib/pp_sql/version.rb

@@ -1,3 +1,3 @@
 module PpSql
-  VERSION = '0.1.1'
+  VERSION = '0.2.0'
 end

data/lib/pp_sql.rb

@@ -1,13 +1,5 @@
 module PpSql
-  module ToSqlBeautify
-    def to_sql
-      _sql_formatter.format(super)
-    end
-
-    def pp_sql
-      puts to_sql
-    end
-
+  module Formatter
     private
 
     def _sql_formatter
@@ -20,10 +12,47 @@ module PpSql
       @_sql_formatter = AnbtSql::Formatter.new(rule)
     end
   end
+  module ToSqlBeautify
+    include Formatter
+    def to_sql
+      _sql_formatter.format(super)
+    end
+
+    def pp_sql
+      puts to_sql
+    end
+  end
+  module LogSubscriberPrettyPrint
+    include Formatter
+    def sql(event)
+      return unless logger.debug?
+
+      self.class.runtime += event.duration
+
+      payload = event.payload
+
+      return if ActiveRecord::LogSubscriber::IGNORE_PAYLOAD_NAMES.include?(payload[:name])
+
+      name  = "#{payload[:name]} (#{event.duration.round(1)}ms)"
+      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])
+      # only this line was rewritten from the AR
+      sql  = color(_sql_formatter.format(sql.dup), sql_color(sql), true)
+
+      debug "  #{name}  #{sql}#{binds}"
+    end
+  end
   class Railtie < Rails::Railtie
     initializer "pp_sql.override_to_sql" do
       ActiveSupport.on_load(:active_record) do
         ActiveRecord::Relation.send(:prepend, ToSqlBeautify)
+        ActiveRecord::LogSubscriber.send(:prepend, LogSubscriberPrettyPrint)
       end
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pp_sql
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.0
 platform: ruby
 authors:
 - Kvokka
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-05 00:00:00.000000000 Z
+date: 2017-01-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails