rails-flog 1.5.0 → 1.6.0

data/test/unit/sql_formattable_test.rb

@@ -1,7 +1,9 @@
-require "active_record"
-require "test_helper"
+# frozen_string_literal: true
 
-ActiveRecord::Base.establish_connection(adapter: "sqlite3", database: ":memory:")
+require 'active_record'
+require 'test_helper'
+
+ActiveRecord::Base.establish_connection(adapter: 'sqlite3', database: ':memory:')
 
 ActiveRecord::Schema.define version: 0 do
   create_table :books, force: true do |t|
@@ -12,7 +14,7 @@ end
 
 class Book < ActiveRecord::Base; end
 
-class SqlFormattableTest < ActiveSupport::TestCase
+module SqlFormattableTestHelper
   def setup
     # default configuration
     Flog.configure do |config|
@@ -29,36 +31,68 @@ class SqlFormattableTest < ActiveSupport::TestCase
     ActiveRecord::Base.logger = @old_logger
   end
 
+  def configure(pairs)
+    Flog.configure do |config|
+      pairs.each do |key, value|
+        meth = "#{key}="
+        config.send(meth, value) if config.respond_to?(meth)
+      end
+    end
+  end
+
+  def prepare_for_query_cache
+    Book.cache do
+      Book.where(category: 'comics').to_a
+      Book.where(category: 'comics').to_a
+    end
+  end
+
+  def assert_logger(&block)
+    raise ActiveRecord::Base.logger.errors.first if ActiveRecord::Base.logger.errors.present?
+
+    block.call(ActiveRecord::Base.logger)
+  end
+
+  def assert_one_line_sql(sql)
+    assert sql.include?('SELECT')
+    assert sql.include?('FROM')
+    assert sql.include?('WHERE')
+  end
+end
+
+class SqlFormattableTest < ActiveSupport::TestCase
+  include SqlFormattableTestHelper
+
   def test_sql_is_formatted
-    Book.where(category: "comics").to_a
+    Book.where(category: 'comics').to_a
     assert_logger do |logger|
-      assert_equal %{\tSELECT}       , logger.debugs[1]
-      assert_equal %{\t\t"books" . *}, logger.debugs[2]
-      assert_equal %{\tFROM}         , logger.debugs[3]
-      assert_equal %{\t\t"books"}    , logger.debugs[4]
-      assert_equal %{\tWHERE}        , logger.debugs[5]
-      assert logger.debugs[6].start_with?(%{\t\t"books" . "category" = })
+      assert_equal %(\tSELECT)       , logger.debugs[1]
+      assert_equal %(\t\t"books" . *), logger.debugs[2]
+      assert_equal %(\tFROM)         , logger.debugs[3]
+      assert_equal %(\t\t"books")    , logger.debugs[4]
+      assert_equal %(\tWHERE)        , logger.debugs[5]
+      assert logger.debugs[6].start_with?(%(\t\t"books"."category" = ))
     end
   end
 
   def test_colorized_on_colorize_loggin_is_true
     ActiveSupport::LogSubscriber.colorize_logging = true
-    Book.where(category: "comics").to_a
+    Book.where(category: 'comics').to_a
     assert_logger do |logger|
-      assert match_color_seq(logger.debugs.join())
+      assert match_color_seq(logger.debugs.join)
     end
   end
 
   def test_not_colorized_on_colorize_loggin_is_false
-    Book.where(category: "comics").to_a
+    Book.where(category: 'comics').to_a
     assert_logger do |logger|
-      assert_nil match_color_seq(logger.debugs.join())
+      assert_nil match_color_seq(logger.debugs.join)
     end
   end
 
   def test_sql_is_not_formatted_when_enabled_is_false
     Flog::Status.stub(:enabled?, false) do
-      Book.where(category: "comics").to_a
+      Book.where(category: 'comics').to_a
       assert_logger do |logger|
         assert_one_line_sql logger.debugs.first
       end
@@ -67,7 +101,7 @@ class SqlFormattableTest < ActiveSupport::TestCase
 
   def test_sql_is_not_formatted_when_sql_formattable_is_false
     Flog::Status.stub(:sql_formattable?, false) do
-      Book.where(category: "comics").to_a
+      Book.where(category: 'comics').to_a
       assert_logger do |logger|
         assert_one_line_sql logger.debugs.first
       end
@@ -75,120 +109,111 @@ class SqlFormattableTest < ActiveSupport::TestCase
   end
 
   def test_sql_is_not_formatted_on_cached_query
-    Book.cache do
-      Book.where(category: "comics").to_a
-      Book.where(category: "comics").to_a
-    end
+    prepare_for_query_cache
     assert_logger do |logger|
       logger.debugs.each do |log|
-        assert_one_line_sql log if log.include?("CACHE")
+        assert_one_line_sql log if log.include?('CACHE')
       end
     end
   end
 
   def test_sql_is_formatted_on_cached_query_when_ignore_cached_query_configration_is_false
-    Flog.configure do |config|
-      config.ignore_cached_query = false
-    end
-    Book.cache do
-      Book.where(category: "comics").to_a
-      Book.where(category: "comics").to_a
+    configure(ignore_cached_query: false)
+    prepare_for_query_cache
+    assert_logger do |logger|
+      logger.debugs.each do |log|
+        assert_equal log.include?('SELECT'), false if log.include?('CACHE')
+      end
     end
+  end
+
+  def test_sql_is_not_formatted_on_cached_query_when_ignore_query_configuration_is_true
+    configure(ignore_cached_query: false, ignore_query: true)
+    prepare_for_query_cache
     assert_logger do |logger|
       logger.debugs.each do |log|
-        assert_equal log.include?("SELECT"), false if log.include?("CACHE")
+        assert_one_line_sql log if log.include?('CACHE')
       end
     end
   end
 
-  def test_sql_is_not_formatted_when_duration_is_under_threshold
-    Flog.configure do |config|
-      config.query_duration_threshold = 100.0
+  def test_sql_is_not_formatted_when_ignore_query_configuration_is_true
+    configure(ignore_query: true)
+    Book.where(category: 'comics').to_a
+    assert_logger do |logger|
+      assert_one_line_sql logger.debugs.first
     end
-    Book.where(category: "comics").to_a
+  end
+
+  def test_sql_is_not_formatted_when_duration_is_under_threshold
+    configure(query_duration_threshold: 100.0)
+    Book.where(category: 'comics').to_a
     assert_logger do |logger|
       assert_one_line_sql logger.debugs.first
     end
   end
 
   def test_2space_indent
-    Flog.configure do |config|
-      config.sql_indent = "  "
-    end
-    Book.where(category: "comics").to_a
+    configure(sql_indent: '  ')
+    Book.where(category: 'comics').to_a
     assert_logger do |logger|
-      assert_equal %{  SELECT}       , logger.debugs[1]
-      assert_equal %{    "books" . *}, logger.debugs[2]
-      assert_equal %{  FROM}         , logger.debugs[3]
-      assert_equal %{    "books"}    , logger.debugs[4]
-      assert_equal %{  WHERE}        , logger.debugs[5]
-      assert logger.debugs[6].start_with?(%{    "books" . "category" = })
+      assert_equal %(  SELECT)       , logger.debugs[1]
+      assert_equal %(    "books" . *), logger.debugs[2]
+      assert_equal %(  FROM)         , logger.debugs[3]
+      assert_equal %(    "books")    , logger.debugs[4]
+      assert_equal %(  WHERE)        , logger.debugs[5]
+      assert logger.debugs[6].start_with?(%(    "books"."category" = ))
     end
   end
+end
+
+class SqlFormattableInValuesTest < ActiveSupport::TestCase
+  include SqlFormattableTestHelper
 
   def test_default_in_values_num
     Book.where(id: (1..10).to_a).to_a
     assert_logger do |logger|
-      assert_equal %{\tSELECT}               , logger.debugs[1]
-      assert_equal %{\t\t"books" . *}        , logger.debugs[2]
-      assert_equal %{\tFROM}                 , logger.debugs[3]
-      assert_equal %{\t\t"books"}            , logger.debugs[4]
-      assert_equal %{\tWHERE}                , logger.debugs[5]
-      assert_equal %{\t\t"books" . "id" IN (}, logger.debugs[6]
+      assert_equal %(\tSELECT)               , logger.debugs[1]
+      assert_equal %(\t\t"books" . *)        , logger.debugs[2]
+      assert_equal %(\tFROM)                 , logger.debugs[3]
+      assert_equal %(\t\t"books")            , logger.debugs[4]
+      assert_equal %(\tWHERE)                , logger.debugs[5]
+      assert_equal %{\t\t"books"."id" IN (}, logger.debugs[6]
       (8..16).each do |l|
-        assert_equal 1, logger.debugs[l].count(",")
+        assert_equal 1, logger.debugs[l].count(',')
       end
       assert logger.debugs[17].start_with?(%{\t\t)})
     end
   end
 
   def test_in_values_num_set
-    Flog.configure do |config|
-      config.sql_in_values_num = 5
-    end
+    configure(sql_in_values_num: 5)
     Book.where(id: (1..10).to_a).to_a
     assert_logger do |logger|
-      assert_equal %{\tSELECT}               , logger.debugs[1]
-      assert_equal %{\t\t"books" . *}        , logger.debugs[2]
-      assert_equal %{\tFROM}                 , logger.debugs[3]
-      assert_equal %{\t\t"books"}            , logger.debugs[4]
-      assert_equal %{\tWHERE}                , logger.debugs[5]
-      assert_equal %{\t\t"books" . "id" IN (}, logger.debugs[6]
-      assert_equal 4, logger.debugs[7].count(",")
-      assert_equal 5, logger.debugs[8].count(",")
+      assert_equal %(\tSELECT)               , logger.debugs[1]
+      assert_equal %(\t\t"books" . *)        , logger.debugs[2]
+      assert_equal %(\tFROM)                 , logger.debugs[3]
+      assert_equal %(\t\t"books")            , logger.debugs[4]
+      assert_equal %(\tWHERE)                , logger.debugs[5]
+      assert_equal %{\t\t"books"."id" IN (}, logger.debugs[6]
+      assert_equal 4, logger.debugs[7].count(',')
+      assert_equal 5, logger.debugs[8].count(',')
       assert logger.debugs[9].start_with?(%{\t\t)})
     end
   end
 
   def test_oneline_in_values
-    Flog.configure do |config|
-      config.sql_in_values_num = Flog::ONELINE_IN_VALUES_NUM
-    end
+    configure(sql_in_values_num: Flog::ONELINE_IN_VALUES_NUM)
     Book.where(id: (1..10).to_a).to_a
     assert_logger do |logger|
-      assert_equal %{\tSELECT}               , logger.debugs[1]
-      assert_equal %{\t\t"books" . *}        , logger.debugs[2]
-      assert_equal %{\tFROM}                 , logger.debugs[3]
-      assert_equal %{\t\t"books"}            , logger.debugs[4]
-      assert_equal %{\tWHERE}                , logger.debugs[5]
-      assert_equal %{\t\t"books" . "id" IN (}, logger.debugs[6]
-      assert_equal 9, logger.debugs[7].count(",")
+      assert_equal %(\tSELECT)               , logger.debugs[1]
+      assert_equal %(\t\t"books" . *)        , logger.debugs[2]
+      assert_equal %(\tFROM)                 , logger.debugs[3]
+      assert_equal %(\t\t"books")            , logger.debugs[4]
+      assert_equal %(\tWHERE)                , logger.debugs[5]
+      assert_equal %{\t\t"books"."id" IN (}, logger.debugs[6]
+      assert_equal 9, logger.debugs[7].count(',')
       assert logger.debugs[8].start_with?(%{\t\t)})
     end
   end
-
-  private
-  def assert_logger(&block)
-    if ActiveRecord::Base.logger.errors.present?
-      fail ActiveRecord::Base.logger.errors.first
-    else
-      block.call(ActiveRecord::Base.logger)
-    end
-  end
-
-  def assert_one_line_sql(sql)
-    assert sql.include?("SELECT")
-    assert sql.include?("FROM")
-    assert sql.include?("WHERE")
-  end
 end

data/test/unit/status_test.rb

@@ -1,9 +1,47 @@
-require "rails"
-require "test_helper"
+# frozen_string_literal: true
+
+require 'rails'
+require 'test_helper'
+
+module StatusTestHelper
+  def create_switch_file
+    create_file(@test_root.join('tmp', Flog::Status::SWITCH_FILE_NAME))
+  end
+
+  def delete_switch_file
+    delete_file(@test_root.join('tmp', Flog::Status::SWITCH_FILE_NAME))
+  end
+
+  def create_sql_switch_file
+    create_file(@test_root.join('tmp', Flog::Status::SQL_SWITCH_FILE_NAME))
+  end
+
+  def delete_sql_switch_file
+    delete_file(@test_root.join('tmp', Flog::Status::SQL_SWITCH_FILE_NAME))
+  end
+
+  def create_params_switch_file
+    create_file(@test_root.join('tmp', Flog::Status::PARAMS_SWITCH_FILE_NAME))
+  end
+
+  def delete_params_switch_file
+    delete_file(@test_root.join('tmp', Flog::Status::PARAMS_SWITCH_FILE_NAME))
+  end
+
+  def create_file(file_path)
+    File.open(file_path, 'w').close
+  end
+
+  def delete_file(file_path)
+    File.delete(file_path) if File.exist?(file_path)
+  end
+end
 
 class StatusTest < ActiveSupport::TestCase
+  include StatusTestHelper
+
   def setup
-    @test_root = Pathname.new(File.expand_path(File.dirname(__FILE__) + "../../"))
+    @test_root = Pathname.new(File.expand_path(File.dirname(__FILE__) + '../../'))
   end
 
   def teardown
@@ -108,37 +146,4 @@ class StatusTest < ActiveSupport::TestCase
       assert Flog::Status.params_formattable?
     end
   end
-
-  private
-  def create_switch_file
-    create_file(@test_root.join("tmp", Flog::Status::SWITCH_FILE_NAME))
-  end
-
-  def delete_switch_file
-    delete_file(@test_root.join("tmp", Flog::Status::SWITCH_FILE_NAME))
-  end
-
-  def create_sql_switch_file
-    create_file(@test_root.join("tmp", Flog::Status::SQL_SWITCH_FILE_NAME))
-  end
-
-  def delete_sql_switch_file
-    delete_file(@test_root.join("tmp", Flog::Status::SQL_SWITCH_FILE_NAME))
-  end
-
-  def create_params_switch_file
-    create_file(@test_root.join("tmp", Flog::Status::PARAMS_SWITCH_FILE_NAME))
-  end
-
-  def delete_params_switch_file
-    delete_file(@test_root.join("tmp", Flog::Status::PARAMS_SWITCH_FILE_NAME))
-  end
-
-  def create_file(file_path)
-    File.open(file_path, "w").close
-  end
-
-  def delete_file(file_path)
-    File.delete(file_path) if File.exist?(file_path)
-  end
 end

metadata

@@ -1,31 +1,31 @@
 --- !ruby/object:Gem::Specification
 name: rails-flog
 version: !ruby/object:Gem::Version
-  version: 1.5.0
+  version: 1.6.0
 platform: ruby
 authors:
 - pinzolo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-12-19 00:00:00.000000000 Z
+date: 2019-07-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: coveralls
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -39,7 +39,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: sqlite3
+  name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -53,7 +53,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: minitest
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -67,7 +67,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: coveralls
+  name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -81,19 +81,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rails
+  name: sqlite3
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.2.0
-  type: :runtime
+        version: 1.3.0
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.2.0
+        version: 1.3.0
 - !ruby/object:Gem::Dependency
   name: anbt-sql-formatter
   requirement: !ruby/object:Gem::Requirement
@@ -122,6 +122,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rails
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 4.2.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 4.2.0
 description: This formats parameters and sql in rails log.
 email:
 - pinzolo@gmail.com
@@ -131,6 +145,7 @@ extra_rdoc_files: []
 files:
 - ".coveralls.yml"
 - ".gitignore"
+- ".rubocop.yml"
 - ".travis.yml"
 - Gemfile
 - LICENSE.txt
@@ -173,8 +188,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 3.0.1
 signing_key: 
 specification_version: 4
 summary: Rails log formatter for parameters and sql