rails-flog 1.3.1 → 1.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 37349e66f4eac2a3c918f1f5dd3a0575be741be1
-  data.tar.gz: 44b49c742fcf58e324a7406fa151c9b8248b0dde
+  metadata.gz: 9fbf46665254484f9fb2fcf9d209b46a8303e028
+  data.tar.gz: b2bdd9a21547bf84cbbbba6ebd7d54dc5baef4e1
 SHA512:
-  metadata.gz: 79f8fa25feaae28b230481ead671bdcfb8e4a6b7c367ddf255dd76e6e047e3f320b62f179e920aae46d9c96edc5aaf6501e59dc8d15260410c8b40e450a17de8
-  data.tar.gz: a51ab46561f273ffd74fe9c2cd50e1ac11e3e5c9e20a6af8b81721397a47531ef50b739568596a4aca7a4135e86297e7d14e997dd96ff92a3a95577fc9cdba45
+  metadata.gz: d737e91d22762f40a7b0b08e844408f92e8c17879e985ec07555c5eda8608650042770e1f6c5ab1c54f023c258753a22efa95a7defca591a0e6e45b589155556
+  data.tar.gz: 67d28e57171f04d269539e8405e874eff4c35e7ba80596a8e8484c03903a5ca987d3373f94a3b5ee8c36be7289dd40e78d0fee93c3ba8cfba546065e3c06d1ce

data/.travis.yml

@@ -6,4 +6,4 @@ rvm:
 gemfile:
   - gemfiles/rails_3_2_x.gemfile
   - gemfiles/rails_4_0_x.gemfile
-#  - gemfiles/rails_4_1_x.gemfile
+  - gemfiles/rails_4_1_x.gemfile

data/README.md

@@ -5,7 +5,7 @@
 
 rails-flog provides feature that formats parameters Hash and SQL in Rails log file.
 
-## Before and after (Sampla app: Redmine)
+## Before and after (Sample app: Redmine)
 
 ### Before (Default)
 
@@ -99,7 +99,7 @@ Flog.configure do |config|
   config.query_duration_threshold = 2.0
   # If key count of parameters is under this value, not format
   config.params_key_count_threshold = 2
-  # If this value is true, force format in any situation
+  # If this value is true, nested Hash parameter is formatted coercively in any situation
   config.force_on_nested_params = false
 end
 ```
@@ -115,7 +115,7 @@ end
 
 ## Disable temporary
 
-If you put a file to `<rails_app>/tmp` direcotry, `rails-flog` will disable format.  
+If you put a file to `<rails_app>/tmp` direcotry, `rails-flog` will disable format.
 Priority of this feature is higher than configurations.
 
 |File name          |Feature    |
@@ -127,7 +127,7 @@ 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
+- Rails: 3.2.x, 4.0.x, 4.1.x
 
 ## Contributing
 
@@ -145,3 +145,4 @@ Priority of this feature is higher than configurations.
 - v1.2.0  (2014-01-14 JST):  Add feature that disables format partially by no-flog-sql.txt and no-flog-params.txt
 - 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

data/Rakefile

@@ -1,5 +1,6 @@
 require "bundler/gem_tasks"
 require "rake/testtask"
+
 task :default => :test
 
 Rake::TestTask.new do |t|

data/lib/flog/params_formattable.rb

@@ -54,8 +54,7 @@ class ActionController::LogSubscriber
 
   def key_count_over?(event)
     threshold = Flog.config.params_key_count_threshold.to_i
-    threshold += 1 if event.payload[:params].keys.include?("controller")
-    threshold += 1 if event.payload[:params].keys.include?("action")
-    event.payload[:params].keys.size > threshold
+    params = event.payload[:params].except(*INTERNAL_PARAMS)
+    params.keys.size > threshold
   end
 end

data/lib/flog/version.rb

@@ -1,4 +1,4 @@
 # coding: utf-8
 module Flog
-  VERSION = "1.3.1"
+  VERSION = "1.3.2"
 end

data/test/test_helper.rb

@@ -9,8 +9,8 @@ end
 
 Bundler.require
 require "flog"
-require "test/unit"
-require "mocha/setup"
+require "minitest/autorun"
+require "mocha/api"
 
 class TestLogger
   attr_accessor :debugs, :infos, :errors

data/test/unit/params_formattable_test.rb

@@ -68,7 +68,7 @@ class ParamsFormattableTest < ActionController::TestCase
   end
 
   def test_parameters_log_is_not_formatted_when_enabled_is_false
-    Flog::Status.expects(:enabled?).returns(false)
+    Flog::Status.stubs(:enabled?).returns(false)
     get :show, foo: "foo_value", bar: "bar_value"
     assert_logger do |logger|
       assert logger.infos[1].include?(%(Parameters: {"foo"=>"foo_value", "bar"=>"bar_value"}))
@@ -76,7 +76,7 @@ class ParamsFormattableTest < ActionController::TestCase
   end
 
   def test_parameters_log_is_not_formatted_when_params_formattable_is_false
-    Flog::Status.expects(:params_formattable?).returns(false)
+    Flog::Status.stubs(:params_formattable?).returns(false)
     get :show, foo: "foo_value", bar: "bar_value"
     assert_logger do |logger|
       assert logger.infos[1].include?(%(Parameters: {"foo"=>"foo_value", "bar"=>"bar_value"}))

data/test/unit/sql_formattable_test.rb

@@ -59,18 +59,18 @@ class SqlFormattableTest < ActiveSupport::TestCase
   end
 
   def test_sql_is_not_formatted_when_enabled_is_false
-    Flog::Status.expects(:enabled?).returns(false)
+    Flog::Status.stubs(:enabled?).returns(false)
     Book.where(category: "comics").to_a
     assert_logger do |logger|
-      assert logger.debugs.first.include?(%(SELECT "books".* FROM "books" WHERE "books"."category" = 'comics'))
+      assert_one_line_sql logger.debugs.first
     end
   end
 
   def test_sql_is_not_formatted_when_sql_formattable_is_false
-    Flog::Status.expects(:sql_formattable?).returns(false)
+    Flog::Status.stubs(:sql_formattable?).returns(false)
     Book.where(category: "comics").to_a
     assert_logger do |logger|
-      assert logger.debugs.first.include?(%(SELECT "books".* FROM "books" WHERE "books"."category" = 'comics'))
+      assert_one_line_sql logger.debugs.first
     end
   end
 
@@ -81,13 +81,9 @@ class SqlFormattableTest < ActiveSupport::TestCase
     end
     assert_logger do |logger|
       logs = logger.debugs.map { |log| log.gsub("\t", "    ") }
-      assert_equal %{    SELECT}                             , logs[1]
-      assert_equal %{        "books" . *}                    , logs[2]
-      assert_equal %{    FROM}                               , logs[3]
-      assert_equal %{        "books"}                        , logs[4]
-      assert_equal %{    WHERE}                              , logs[5]
-      assert_equal %{        "books" . "category" = 'comics'}, logs[6]
-      assert logs[7].include?(%(SELECT "books".* FROM "books" WHERE "books"."category" = 'comics'))
+      logs.each do |log|
+        assert_one_line_sql log if log.include?("CACHE")
+      end
     end
   end
 
@@ -101,18 +97,9 @@ class SqlFormattableTest < ActiveSupport::TestCase
     end
     assert_logger do |logger|
       logs = logger.debugs.map { |log| log.gsub("\t", "    ") }
-      assert_equal %{    SELECT}                             , logs[1]
-      assert_equal %{        "books" . *}                    , logs[2]
-      assert_equal %{    FROM}                               , logs[3]
-      assert_equal %{        "books"}                        , logs[4]
-      assert_equal %{    WHERE}                              , logs[5]
-      assert_equal %{        "books" . "category" = 'comics'}, logs[6]
-      assert_equal %{    SELECT}                             , logs[8]
-      assert_equal %{        "books" . *}                    , logs[9]
-      assert_equal %{    FROM}                               , logs[10]
-      assert_equal %{        "books"}                        , logs[11]
-      assert_equal %{    WHERE}                              , logs[12]
-      assert_equal %{        "books" . "category" = 'comics'}, logs[13]
+      logs.each do |log|
+        assert_equal log.include?("SELECT"), false if log.include?("CACHE")
+      end
     end
   end
 
@@ -122,7 +109,7 @@ class SqlFormattableTest < ActiveSupport::TestCase
     end
     Book.where(category: "comics").to_a
     assert_logger do |logger|
-      assert logger.debugs.first.include?(%(SELECT "books".* FROM "books" WHERE "books"."category" = 'comics'))
+      assert_one_line_sql logger.debugs.first
     end
   end
 
@@ -134,4 +121,10 @@ class SqlFormattableTest < ActiveSupport::TestCase
       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,5 +1,6 @@
 # coding: utf-8
 require "rails"
+require "test_helper"
 
 class StatusTest < ActiveSupport::TestCase
   def setup

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rails-flog
 version: !ruby/object:Gem::Version
-  version: 1.3.1
+  version: 1.3.2
 platform: ruby
 authors:
 - pinzolo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-25 00:00:00.000000000 Z
+date: 2014-04-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -173,7 +173,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.0.14
 signing_key: 
 specification_version: 4
 summary: Rails log formatter for parameters and sql