rails-flog 1.3.0 → 1.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7573566571c52550bd3a1fdaf222159101caabb3
-  data.tar.gz: 3e19ae5c1197155f93264ac7e28614bbd22596b6
+  metadata.gz: 37349e66f4eac2a3c918f1f5dd3a0575be741be1
+  data.tar.gz: 44b49c742fcf58e324a7406fa151c9b8248b0dde
 SHA512:
-  metadata.gz: 1a196d239d1af127143e19eefb1e8526de7d32684baab1b301cbd4d16aacde126ef35235103cb0546b5fe6a17d5b3c4d207234c6de0d25e467032a964564e206
-  data.tar.gz: b0b4ac38af5542776ea16fe73aa28efa774e2bee3b21618044c91c25de4d54ab13541099722039f4411f20dab9417874f7a22f92c36a49502c1b60ec661f116e
+  metadata.gz: 79f8fa25feaae28b230481ead671bdcfb8e4a6b7c367ddf255dd76e6e047e3f320b62f179e920aae46d9c96edc5aaf6501e59dc8d15260410c8b40e450a17de8
+  data.tar.gz: a51ab46561f273ffd74fe9c2cd50e1ac11e3e5c9e20a6af8b81721397a47531ef50b739568596a4aca7a4135e86297e7d14e997dd96ff92a3a95577fc9cdba45

data/README.md

@@ -115,7 +115,8 @@ 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    |
 |:------------------|:----------|
@@ -143,4 +144,4 @@ If you put a file to `<rails_app>/tmp` direcotry, `rails-flog` will disable form
 - v1.1.1  (2013-12-06 JST):  Change to alias_method_change from alias for method aliasing
 - 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

data/lib/flog/params_formattable.rb

@@ -41,10 +41,18 @@ class ActionController::LogSubscriber
   def formattable?(event)
     return false unless Flog::Status.params_formattable?
 
-    if Flog.config.force_on_nested_params?
-      return true if 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?
+
+    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
     threshold += 1 if event.payload[:params].keys.include?("controller")
     threshold += 1 if event.payload[:params].keys.include?("action")

data/lib/flog/sql_formattable.rb

@@ -33,10 +33,16 @@ class ActiveRecord::LogSubscriber
   def formattable?(event)
     return false unless Flog::Status.sql_formattable?
 
-    if event.payload[:name] == "CACHE" && Flog.config.ignore_cached_query?
-      return false
-    end
+    return false if ignore_by_cached_query?(event)
+
+    duration_over?(event)
+  end
+
+  def ignore_by_cached_query?(event)
+    event.payload[:name] == "CACHE" && Flog.config.ignore_cached_query?
+  end
 
+  def duration_over?(event)
     event.duration >= Flog.config.query_duration_threshold.to_f
   end
 end

data/lib/flog/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rails-flog
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.3.1
 platform: ruby
 authors:
 - pinzolo