rails-flog 1.3.2 → 1.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 9fbf46665254484f9fb2fcf9d209b46a8303e028
-  data.tar.gz: b2bdd9a21547bf84cbbbba6ebd7d54dc5baef4e1
+SHA256:
+  metadata.gz: ce762dd557d5f1894942ea6e1c2ce4a8c368d270881fb6ef83a9565330613bde
+  data.tar.gz: 5df9080511dcc817399c3080fdf7278204986f280c54c3b27945cfa51a8be222
 SHA512:
-  metadata.gz: d737e91d22762f40a7b0b08e844408f92e8c17879e985ec07555c5eda8608650042770e1f6c5ab1c54f023c258753a22efa95a7defca591a0e6e45b589155556
-  data.tar.gz: 67d28e57171f04d269539e8405e874eff4c35e7ba80596a8e8484c03903a5ca987d3373f94a3b5ee8c36be7289dd40e78d0fee93c3ba8cfba546065e3c06d1ce
+  metadata.gz: b92c5ae0ae5aaaf554f5b94bfda53bf90cde1e9ff44f0a31510fdfa08fd289db89b3e531635d62247fe98f2cf6db9f1a0b3ebf2d8c43be5bd085fc1f4f95337b
+  data.tar.gz: 4d22a90f56f4ff337c08bb18bdfda1e5ab0a11f43f0dd82dc7d1a5ffcf973b3cdb82ace1db3d8fe8ca66a21f5dfa3d5f88b21209f8c2834e9a5261608ccc382d

data/.gitignore

@@ -16,3 +16,5 @@ test/tmp
 test/version_tmp
 tmp
 vendor/bundle
+
+.idea

data/.rubocop.yml

@@ -0,0 +1,25 @@
+# Current style is easy to confirm SQL.
+Layout/SpaceBeforeComma:
+  Exclude:
+    - 'test/unit/sql_formattable_test.rb'
+
+Metrics/AbcSize:
+  Exclude:
+    - 'test/**/*'
+
+# 80 is too restrict.
+Metrics/LineLength:
+  Max: 120
+
+Metrics/MethodLength:
+  Exclude:
+    - 'test/**/*'
+
+# This is test code not production.
+Security/Eval:
+  Exclude:
+    - 'test/unit/params_formattable_test.rb'
+
+# method having '?' suffix should return boolean, double negation is very useful.
+Style/DoubleNegation:
+  Enabled: false

data/.travis.yml

@@ -1,9 +1,28 @@
 language: ruby
+sudo: false
+branches:
+  only:
+    - master
 rvm:
-  - 1.9.3
-  - 2.0.0
-  - 2.1.0
+  - 2.3
+  - 2.4
+  - 2.5
+  - 2.6
 gemfile:
-  - gemfiles/rails_3_2_x.gemfile
-  - gemfiles/rails_4_0_x.gemfile
-  - gemfiles/rails_4_1_x.gemfile
+  - gemfiles/rails_4_2_x.gemfile
+  - gemfiles/rails_5_0_x.gemfile
+  - gemfiles/rails_5_1_x.gemfile
+  - gemfiles/rails_5_2_x.gemfile
+  - gemfiles/rails_6_0_x.gemfile
+matrix:
+  exclude:
+    # FIXME: will remove on dropping Rails 4.2 support
+    - gemfile: gemfiles/rails_4_2_x.gemfile
+      rvm: 2.6
+    - gemfile: gemfiles/rails_6_0_x.gemfile
+      rvm: 2.3
+    - gemfile: gemfiles/rails_6_0_x.gemfile
+      rvm: 2.4
+before_install:
+  - gem uninstall -v '>= 2' -i $(rvm gemdir)@global -ax bundler || true
+  - gem install bundler -v '< 2'

data/Gemfile

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 source 'https://rubygems.org'
 
 # Specify your gem's dependencies in rails-flog.gemspec

data/README.md

@@ -101,6 +101,10 @@ Flog.configure do |config|
   config.params_key_count_threshold = 2
   # If this value is true, nested Hash parameter is formatted coercively in any situation
   config.force_on_nested_params = false
+  # If this value is true, not format query
+  config.ignore_query = true
+  # If this value is true, not format parameters
+  config.ignore_params = true
 end
 ```
 
@@ -112,6 +116,8 @@ end
 |query_duration_threshold   |float     |0.0           |
 |params_key_count_threshold |integer   |1             |
 |force_on_nested_params     |boolean   |true          |
+|ignore_query               |boolean   |false         |
+|ignore_params              |boolean   |false         |
 
 ## Disable temporary
 
@@ -126,8 +132,8 @@ Priority of this feature is higher than configurations.
 
 ## Supported versions
 
-- Ruby: 1.9.3, 2.0.0, 2.1.0
-- Rails: 3.2.x, 4.0.x, 4.1.x
+- Ruby: 2.3.x, 2.4.x, 2.5.x, 2.6.x
+- Rails: 4.2.x, 5.0.x, 5.1.x, 5.2.x, 6.0.x
 
 ## Contributing
 
@@ -146,3 +152,8 @@ Priority of this feature is higher than configurations.
 - v1.3.0  (2014-01-26 JST):  Add configuration
 - v1.3.1  (2014-01-27 JST):  Refactored
 - v1.3.2  (2014-04-28 JST):  Confirm with Rails 4.1
+- v1.3.3  (2015-11-16 JST):  Confirm with Rails 4.2
+- v1.4.0  (2017-10-01 JST):  Compatible for Rails 5.0 and Rails 5.1, and dropped Ruby 1.9.3 support
+- v1.5.0  (2018-12-19 JST):  Add `sql_indent` and `sql_in_values_num` options, and dropped eol rails versions.
+- v1.6.0  (2019-07-26 JST):  Add `ignore_query` and `ignore_params` options (Thanks @mothule)
+- v1.6.1  (2021-01-13 JST):  Use amazing_print instead of awesome_print

data/Rakefile

@@ -1,9 +1,11 @@
-require "bundler/gem_tasks"
-require "rake/testtask"
+# frozen_string_literal: true
 
-task :default => :test
+require 'bundler/gem_tasks'
+require 'rake/testtask'
+
+task default: :test
 
 Rake::TestTask.new do |t|
-  t.libs << "test"
-  t.test_files = Dir.glob("test/unit/*_test.rb")
+  t.libs << 'test'
+  t.test_files = Dir.glob('test/unit/*_test.rb')
 end

data/gemfiles/rails_4_2_x.gemfile

@@ -0,0 +1,8 @@
+# frozen_string_literal: true
+
+source 'https://rubygems.org'
+
+gem 'rails', '~> 4.2.0'
+gem 'sqlite3', '~> 1.3.0'
+
+gemspec path: '../'

data/gemfiles/rails_5_0_x.gemfile

@@ -0,0 +1,8 @@
+# frozen_string_literal: true
+
+source 'https://rubygems.org'
+
+gem 'rails', '~>5.0.0'
+gem 'sqlite3', '~> 1.3.0'
+
+gemspec path: '../'

data/gemfiles/rails_5_1_x.gemfile

@@ -0,0 +1,8 @@
+# frozen_string_literal: true
+
+source 'https://rubygems.org'
+
+gem 'rails', '~>5.1.0'
+gem 'sqlite3', '~> 1.4.0'
+
+gemspec path: '../'

data/gemfiles/rails_5_2_x.gemfile

@@ -0,0 +1,8 @@
+# frozen_string_literal: true
+
+source 'https://rubygems.org'
+
+gem 'rails', '~>5.2.0'
+gem 'sqlite3', '~> 1.4.0'
+
+gemspec path: '../'

data/gemfiles/rails_6_0_x.gemfile

@@ -0,0 +1,8 @@
+# frozen_string_literal: true
+
+source 'https://rubygems.org'
+
+gem 'rails', '~>6.0.0'
+gem 'sqlite3', '~> 1.4.0'
+
+gemspec path: '../'

data/lib/flog.rb

@@ -1,7 +1,7 @@
-# coding: utf-8
-require "flog/version"
-require "flog/status"
-require "flog/configuration"
-require "flog/sql_formattable"
-require "flog/params_formattable"
+# frozen_string_literal: true
 
+require 'flog/version'
+require 'flog/status'
+require 'flog/configuration'
+require 'flog/sql_formattable'
+require 'flog/params_formattable'

data/lib/flog/configuration.rb

@@ -1,30 +1,54 @@
-# coding: utf-8
+# frozen_string_literal: true
+
+require 'anbt-sql-formatter/rule'
+
+# Flog is root module of this gem
 module Flog
+  ONELINE_IN_VALUES_NUM = ::AnbtSql::Rule::ONELINE_IN_VALUES_NUM
+
+  # Configuration of this gem.
+  # Call `configure` to setup.
   class Configuration
-    attr_writer :ignore_cached_query, :force_on_nested_params
-    attr_accessor :query_duration_threshold, :params_key_count_threshold
+    attr_writer :ignore_cached_query, :force_on_nested_params, :ignore_query, :ignore_params
+    attr_accessor :query_duration_threshold, :params_key_count_threshold, :sql_indent, :sql_in_values_num
 
     def initialize
       @ignore_cached_query = true
       @query_duration_threshold = 0.0
       @params_key_count_threshold = 1
       @force_on_nested_params = true
+      @sql_indent = "\t"
+      @sql_in_values_num = 1
+      @ignore_query = false
+      @ignore_params = false
     end
 
     def ignore_cached_query?
-      !!@ignore_cached_query
+      !!@ignore_cached_query || @ignore_query
     end
 
     def force_on_nested_params?
       !!@force_on_nested_params
     end
-  end
 
-  def self.config
-    @@config ||= Flog::Configuration.new
+    def ignore_query?
+      !!@ignore_query
+    end
+
+    def ignore_params?
+      !!@ignore_params
+    end
   end
 
-  def self.configure
-    yield(config) if block_given?
+  class << self
+    def config
+      @config ||= Flog::Configuration.new
+    end
+
+    def configure
+      cfg = Flog::Configuration.new
+      yield(cfg) if block_given?
+      @config = cfg
+    end
   end
 end

data/lib/flog/params_formattable.rb

@@ -1,60 +1,70 @@
-# coding: utf-8
-require "action_controller/log_subscriber"
-require "awesome_print"
-require "flog/payload_value_shuntable"
+# frozen_string_literal: true
 
-class ActionController::LogSubscriber
-  include Flog::PayloadValueShuntable
+require 'action_controller/log_subscriber'
+require 'amazing_print'
+require 'flog/payload_value_shuntable'
 
-  def start_processing_with_flog(event)
-    return start_processing_without_flog(event) unless formattable?(event)
-
-    replaced = replace_params(event.payload[:params])
+module Flog
+  # Overrides `inspect` method for formatting itself
+  module ParamsInspectOverridable
+    def inspect
+      "\n#{ai(plain: !ActionController::LogSubscriber.colorize_logging)}"
+    end
+  end
 
-    shunt_payload_value(event.payload, :params, replaced) do
-      start_processing_without_flog(event)
+  # Overrides `except` method for formatting ecepted params.
+  module ParamsExceptOverridable
+    def except(*keys)
+      excepted = super(*keys)
+      excepted.singleton_class.prepend(ParamsInspectOverridable)
+      excepted
     end
   end
-  alias_method_chain :start_processing, :flog
-
-  private
-  def replace_params(params)
-    return params if params.empty? || !params.respond_to?(:ai)
-
-    replaced = params.dup
-    class << replaced
-      alias :original_except :except
-
-      def except(*keys)
-        excepted = original_except(*keys)
-        class << excepted
-          def inspect
-            "\n#{ai(plain: !ActionController::LogSubscriber.colorize_logging)}"
-          end
-        end
-        excepted
+
+  # ParamsFormattable enables to format request parameters in log.
+  module ParamsFormattable
+    include Flog::PayloadValueShuntable
+    def start_processing(event)
+      return super(event) unless formattable?(event)
+
+      replaced = replace_params(event.payload[:params])
+
+      shunt_payload_value(event.payload, :params, replaced) do
+        super(event)
       end
     end
-    replaced
-  end
 
-  def formattable?(event)
-    return false unless Flog::Status.params_formattable?
+    private
 
-    return true if force_format_by_nested_params?(event)
+    def replace_params(params)
+      return params if params.empty? || !params.respond_to?(:ai)
 
-    key_count_over?(event)
-  end
+      replaced = params.dup
+      replaced.singleton_class.prepend(ParamsExceptOverridable)
+      replaced
+    end
 
-  def force_format_by_nested_params?(event)
-    return false unless Flog.config.force_on_nested_params?
+    def formattable?(event)
+      return false if Flog.config.ignore_params?
+      return false unless Flog::Status.params_formattable?
 
-    event.payload[:params].values.any? { |value| value.is_a?(Hash) }
-  end
+      return true if force_format_by_nested_params?(event)
+
+      key_count_over?(event)
+    end
+
+    def force_format_by_nested_params?(event)
+      return false unless Flog.config.force_on_nested_params?
 
-  def key_count_over?(event)
-    threshold = Flog.config.params_key_count_threshold.to_i
-    params = event.payload[:params].except(*INTERNAL_PARAMS)
-    params.keys.size > threshold
+      event.payload[:params].values.any? { |value| value.is_a?(Hash) }
+    end
+
+    def key_count_over?(event)
+      threshold = Flog.config.params_key_count_threshold.to_i
+      params = event.payload[:params].except(*ActionController::LogSubscriber::INTERNAL_PARAMS)
+      params.keys.size > threshold
+    end
   end
 end
+
+ActionController::LogSubscriber.prepend(Flog::ParamsFormattable)

data/lib/flog/payload_value_shuntable.rb

@@ -1,21 +1,33 @@
-# coding: utf-8
+# frozen_string_literal: true
+
 module Flog
+  # PayloadValueShuntable enables to shunt value in payload
   module PayloadValueShuntable
     def shunt_payload_value(payload, key, temp_value, &block)
       return unless block
 
-      key_exists = payload.key?(key)
+      if payload.key?(key)
+        shunt_if_key_already_exists(payload, key, temp_value, block)
+      else
+        shunt_if_key_not_exist(payload, key, temp_value, block)
+      end
+    end
+
+    def shunt_if_key_already_exists(payload, key, temp_value, block)
       base_value = payload[key]
       begin
         payload[key] = temp_value
         block.call
       ensure
-        if key_exists
-          payload[key] = base_value
-        else
-          payload.delete(key)
-        end
+        payload[key] = base_value
       end
     end
+
+    def shunt_if_key_not_exist(payload, key, temp_value, block)
+      payload[key] = temp_value
+      block.call
+    ensure
+      payload.delete(key)
+    end
   end
 end

data/lib/flog/sql_formattable.rb

@@ -1,48 +1,56 @@
-# coding: utf-8
-require "active_record/log_subscriber"
-require "flog/payload_value_shuntable"
+# frozen_string_literal: true
 
-class ActiveRecord::LogSubscriber
-  include Flog::PayloadValueShuntable
+require 'active_record/log_subscriber'
+require 'flog/payload_value_shuntable'
 
-  def sql_with_flog(event)
-    return sql_without_flog(event) unless formattable?(event)
+module Flog
+  # SqlFormattable enables to format SQL log
+  module SqlFormattable
+    include Flog::PayloadValueShuntable
 
-    formatted = format_sql(event.payload[:sql])
+    def sql(event)
+      return super(event) unless formattable?(event)
 
-    shunt_payload_value(event.payload, :sql, "\n\t#{formatted}") do
-      sql_without_flog(event)
+      formatted = format_sql(event.payload[:sql])
+
+      shunt_payload_value(event.payload, :sql, "\n#{Flog.config.sql_indent}#{formatted}") do
+        super(event)
+      end
     end
-  end
-  alias_method_chain :sql, :flog
 
-  private
-  def format_sql(sql)
-    return sql if sql.blank?
+    private
+
+    def format_sql(sql)
+      return sql if sql.blank?
 
-    require "anbt-sql-formatter/formatter"
-    rule = AnbtSql::Rule.new
-    rule.keyword = AnbtSql::Rule::KEYWORD_UPPER_CASE
-    %w(count sum).each do |function_name|
-      rule.function_names << function_name
+      require 'anbt-sql-formatter/formatter'
+      rule = AnbtSql::Rule.new
+      rule.keyword = AnbtSql::Rule::KEYWORD_UPPER_CASE
+      rule.indent_string = Flog.config.sql_indent
+      rule.in_values_num = Flog.config.sql_in_values_num
+      %w[count sum].each do |function_name|
+        rule.function_names << function_name
+      end
+      AnbtSql::Formatter.new(rule).format(sql.squeeze(' '))
     end
-    rule.indent_string = "\t"
-    AnbtSql::Formatter.new(rule).format(sql.squeeze(" "))
-  end
 
-  def formattable?(event)
-    return false unless Flog::Status.sql_formattable?
+    def formattable?(event)
+      return false if Flog.config.ignore_query?
+      return false unless Flog::Status.sql_formattable?
 
-    return false if ignore_by_cached_query?(event)
+      return false if ignore_by_cached_query?(event)
 
-    duration_over?(event)
-  end
+      duration_over?(event)
+    end
 
-  def ignore_by_cached_query?(event)
-    event.payload[:name] == "CACHE" && Flog.config.ignore_cached_query?
-  end
+    def ignore_by_cached_query?(event)
+      (event.payload[:name] == 'CACHE' || event.payload[:cached]) && Flog.config.ignore_cached_query?
+    end
 
-  def duration_over?(event)
-    event.duration >= Flog.config.query_duration_threshold.to_f
+    def duration_over?(event)
+      event.duration >= Flog.config.query_duration_threshold.to_f
+    end
   end
 end
+
+ActiveRecord::LogSubscriber.prepend(Flog::SqlFormattable)