pp_sql 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b4372a6aad0cedf3145eff498f19164e31e2918c
-  data.tar.gz: a8596ffe4a78038d3817fe0b6127761cf66777e7
+  metadata.gz: 5038184d5f8ed886733d19559eef2b1c053889e4
+  data.tar.gz: 4cb400cad3c8a5247f9906932a01f308aeeb9e80
 SHA512:
-  metadata.gz: ae497360ecd64748259be104332eb38ae2a07a833e58e63f222bf8b14c4ec9523ea40495622f1c95ca52c6d0a21a3891a60e8b6d7cdc1551b4282b06ddbafe62
-  data.tar.gz: 4208494b16e764d76460c59e6038c7af289c1749118791c17f3f13a342ec9d05b8d60a7a333376805c26d25dd4ca66f0e83c5fab7afbffb6bdba97e9f62bdcd5
+  metadata.gz: 916631092c11d88e5b5847b8ff5a87a04975d46c6c84975d54d67c414e7c9f8cf7ee39877d50a5c4bf1fdfe45d793db31ead30ba22cacb79a810f8f6f2fdd385
+  data.tar.gz: 7b8180e94856428e05fdfb0809b87ffe3aa3d6b636b498847c4c3c60ee23877a5bdc890fd1d9b2de0f12295afea9c0bd79fa623c17f3c1f58ff08eeef80c6588

data/README.md

@@ -1,20 +1,13 @@
 # PpSql
 
-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:
+Replace standard `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. Example output:
 
-```
-# was
-User.all # => 
-"SELECT `users`. * FROM `users`"
-
-# thus
-# =>
-SELECT
-    `users`. *
-  FROM
-    `users`
-```
+![log](http://savepic.ru/12566050.png)
+
+Or in console
+
+![console] (http://savepic.ru/12578341.png)
 
 ## Require
 
@@ -38,7 +31,7 @@ and use formatter with any String.
 
 add in Gemfile
 ```
-gem 'pp_sql', group :development
+gem 'pp_sql', group: :development
 ```
 
 And then execute:

data/lib/pp_sql/version.rb

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

data/lib/pp_sql.rb

@@ -22,11 +22,41 @@ module PpSql
       puts to_sql
     end
   end
+  module Rails5PpSqlPort
+    # export from Rails 5 with for Rails 4.2+ versions
+    def colorize_payload_name(name, payload_name)
+      if payload_name.blank? || payload_name == "SQL" # SQL vs Model Load/Exists
+        color(name, ActiveSupport::LogSubscriber::MAGENTA, true)
+      else
+        color(name, ActiveSupport::LogSubscriber::CYAN, true)
+      end
+    end
+
+    def sql_color(sql)
+      case sql
+        when /\A\s*rollback/mi
+          ActiveSupport::LogSubscriber::RED
+        when /select .*for update/mi, /\A\s*lock/mi
+          ActiveSupport::LogSubscriber::WHITE
+        when /\A\s*select/i
+          ActiveSupport::LogSubscriber::BLUE
+        when /\A\s*insert/i
+          ActiveSupport::LogSubscriber::GREEN
+        when /\A\s*update/i
+          ActiveSupport::LogSubscriber::YELLOW
+        when /\A\s*delete/i
+          ActiveSupport::LogSubscriber::RED
+        when /transaction\s*\Z/i
+          ActiveSupport::LogSubscriber::CYAN
+        else
+          ActiveSupport::LogSubscriber::MAGENTA
+      end
+    end
+  end
   module LogSubscriberPrettyPrint
     include Formatter
     def sql(event)
       return unless logger.debug?
-
       self.class.runtime += event.duration
 
       payload = event.payload
@@ -38,7 +68,9 @@ module PpSql
       binds = nil
 
       unless (payload[:binds] || []).empty?
-        binds = "  " + payload[:binds].map { |attr| render_bind(attr) }.inspect
+        binds = "  " + payload[:binds].map do |*args|
+          method(:render_bind).arity.one? ? render_bind(args.first) : render_bind(*args)
+        end.inspect
       end
 
       name = colorize_payload_name(name, payload[:name])
@@ -53,6 +85,7 @@ module PpSql
       ActiveSupport.on_load(:active_record) do
         ActiveRecord::Relation.send(:prepend, ToSqlBeautify)
         ActiveRecord::LogSubscriber.send(:prepend, LogSubscriberPrettyPrint)
+        ActiveRecord::LogSubscriber.send(:include, Rails5PpSqlPort) if Rails::VERSION::MAJOR <= 4
       end
     end
   end

metadata

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