rails-flog 1.3.2 → 1.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9fbf46665254484f9fb2fcf9d209b46a8303e028
-  data.tar.gz: b2bdd9a21547bf84cbbbba6ebd7d54dc5baef4e1
+  metadata.gz: 6650571abd225e7e4de159b193338aa05d1e33da
+  data.tar.gz: 286f33b58393fa72e15228392f0ef93c8d2387e2
 SHA512:
-  metadata.gz: d737e91d22762f40a7b0b08e844408f92e8c17879e985ec07555c5eda8608650042770e1f6c5ab1c54f023c258753a22efa95a7defca591a0e6e45b589155556
-  data.tar.gz: 67d28e57171f04d269539e8405e874eff4c35e7ba80596a8e8484c03903a5ca987d3373f94a3b5ee8c36be7289dd40e78d0fee93c3ba8cfba546065e3c06d1ce
+  metadata.gz: 49ce57b4524083e836d98b099d3032bed05da5e12b113a9bc67fab3230109002e4dbabbcb1152b0e01956abcfc2bd96cec60e8e1550009801f09f1aa2dcb0d72
+  data.tar.gz: d6b9cdda04e030a197d70bb13b8e47687b5005605ef9af121012bea7182dd4b18d0bc76adf163795340c903603af6c0f3475a1f9de3c8f55741364b9787d3bae

data/.travis.yml

@@ -1,9 +1,11 @@
 language: ruby
 rvm:
   - 1.9.3
-  - 2.0.0
-  - 2.1.0
+  - 2.0
+  - 2.1
+  - 2.2
 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

data/README.md

@@ -126,8 +126,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: 1.9.3, 2.0.x, 2.1.x, 2.2.x
+- Rails: 3.2.x, 4.0.x, 4.1.x, 4.2.x
 
 ## Contributing
 
@@ -146,3 +146,4 @@ 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

data/gemfiles/rails_3_2_x.gemfile

@@ -1,7 +1,10 @@
 source "https://rubygems.org"
 
-gem "rails", "~>3.2.0"
-gem "anbt-sql-formatter"
-gem "awesome_print"
+gem "rails", "~> 3.2.0"
+
+group :test do
+  gem "minitest", "~> 4.7.5"
+  gem "test-unit", "~> 3.0"
+end
 
 gemspec :path => "../"

data/gemfiles/rails_4_0_x.gemfile

@@ -1,7 +1,5 @@
 source "https://rubygems.org"
 
 gem "rails", "~>4.0.0"
-gem "anbt-sql-formatter"
-gem "awesome_print"
 
 gemspec :path => "../"

data/gemfiles/rails_4_1_x.gemfile

@@ -1,8 +1,6 @@
 source "https://rubygems.org"
 
 gem "rails", "~>4.1.0"
-gem "anbt-sql-formatter"
-gem "awesome_print"
 
 gemspec :path => "../"
 

data/gemfiles/rails_4_2_x.gemfile

@@ -0,0 +1,6 @@
+source "https://rubygems.org"
+
+gem "rails", "~>4.2.0"
+
+gemspec :path => "../"
+

data/lib/flog/status.rb

@@ -25,9 +25,21 @@ module Flog
       true
     end
 
+    def self.switch_file_base_path
+      if Rails.root && Rails.root.exist?
+        Rails.root
+      else
+        Pathname.new(File.expand_path(File.dirname(__FILE__) + "../../"))
+      end
+    end
+
+    def self.switch_file_dir_path
+      switch_file_base_path.join("tmp")
+    end
+
     private
     def self.switch_file_exists?(file_name)
-      File.exist?(Rails.root.join("tmp", file_name).to_s)
+      switch_file_dir_path.join(file_name).exist?
     end
   end
 end

data/lib/flog/version.rb

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

data/rails-flog.gemspec

@@ -21,8 +21,8 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "bundler", "~> 1.3"
   spec.add_development_dependency "rake"
   spec.add_development_dependency "sqlite3"
+  spec.add_development_dependency "minitest"
   spec.add_development_dependency "coveralls"
-  spec.add_development_dependency "mocha"
 
   spec.add_dependency "rails", ">=3.2.0"
   spec.add_dependency "anbt-sql-formatter"

data/test/test_helper.rb

@@ -7,10 +7,8 @@ SimpleCov.start do
   add_filter '/bundle/'
 end
 
-Bundler.require
 require "flog"
 require "minitest/autorun"
-require "mocha/api"
 
 class TestLogger
   attr_accessor :debugs, :infos, :errors
@@ -30,14 +28,14 @@ class TestLogger
   end
 
   def debug(message)
-    @debugs += message.split("\n")
+    @debugs += message.split("\n") if message
   end
 
   def info(message)
-    @infos += message.split("\n")
+    @infos += message.split("\n") if message
   end
 
   def error(message)
-    @errors += message.split("\n")
+    @errors += message.split("\n") if message
   end
 end

data/test/unit/params_formattable_test.rb

@@ -61,25 +61,29 @@ class ParamsFormattableTest < ActionController::TestCase
   end
 
   def test_not_colorized_on_colorize_loggin_is_false
-    get :show, foo: "foo_value", bar: "bar_value"
-    assert_logger do |logger|
-      assert_nil /\e\[(\d+;)*\d+m/.match(logger.infos.join())
+    Flog::Status.stub(:enabled?, true) do
+      get :show, foo: "foo_value", bar: "bar_value"
+      assert_logger do |logger|
+        assert_nil /\e\[(\d+;)*\d+m/.match(logger.infos.join())
+      end
     end
   end
 
   def test_parameters_log_is_not_formatted_when_enabled_is_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"}))
+    Flog::Status.stub(:enabled?, false) do
+      get :show, foo: "foo_value", bar: "bar_value"
+      assert_logger do |logger|
+        assert logger.infos[1].include?(%(Parameters: {"foo"=>"foo_value", "bar"=>"bar_value"}))
+      end
     end
   end
 
   def test_parameters_log_is_not_formatted_when_params_formattable_is_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"}))
+    Flog::Status.stub(:params_formattable?, false) do
+      get :show, foo: "foo_value", bar: "bar_value"
+      assert_logger do |logger|
+        assert logger.infos[1].include?(%(Parameters: {"foo"=>"foo_value", "bar"=>"bar_value"}))
+      end
     end
   end
 

data/test/unit/sql_formattable_test.rb

@@ -39,7 +39,7 @@ class SqlFormattableTest < ActiveSupport::TestCase
       assert_equal %{    FROM}                               , logs[3]
       assert_equal %{        "books"}                        , logs[4]
       assert_equal %{    WHERE}                              , logs[5]
-      assert_equal %{        "books" . "category" = 'comics'}, logs[6]
+      assert logs[6].start_with?(%{        "books" . "category" = })
     end
   end
 
@@ -59,18 +59,20 @@ class SqlFormattableTest < ActiveSupport::TestCase
   end
 
   def test_sql_is_not_formatted_when_enabled_is_false
-    Flog::Status.stubs(:enabled?).returns(false)
-    Book.where(category: "comics").to_a
-    assert_logger do |logger|
-      assert_one_line_sql logger.debugs.first
+    Flog::Status.stub(:enabled?, false) do
+      Book.where(category: "comics").to_a
+      assert_logger do |logger|
+        assert_one_line_sql logger.debugs.first
+      end
     end
   end
 
   def test_sql_is_not_formatted_when_sql_formattable_is_false
-    Flog::Status.stubs(:sql_formattable?).returns(false)
-    Book.where(category: "comics").to_a
-    assert_logger do |logger|
-      assert_one_line_sql logger.debugs.first
+    Flog::Status.stub(:sql_formattable?, false) do
+      Book.where(category: "comics").to_a
+      assert_logger do |logger|
+        assert_one_line_sql logger.debugs.first
+      end
     end
   end
 

data/test/unit/status_test.rb

@@ -19,83 +19,95 @@ class StatusTest < ActiveSupport::TestCase
   end
 
   def test_enabled_is_false_when_switch_file_exists
-    Rails.expects(:root).at_most(2).returns(@test_root)
-    create_switch_file
-    assert_equal false, Flog::Status.enabled?
+    Rails.stub(:root, @test_root) do
+      create_switch_file
+      assert_equal false, Flog::Status.enabled?
+    end
   end
 
   def test_enabled_is_true_when_error_is_raised_in_process
-    Rails.expects(:root).returns(nil) # For raise NoMethodError
-    create_switch_file
-    assert Flog::Status.enabled?
+    Rails.stub(:root, nil) do # For raise NoMethodError
+      create_switch_file
+      assert Flog::Status.enabled?
+    end
   end
 
   def test_sql_formattable_is_true_when_enable_and_sql_switch_file_does_not_exist
-    Rails.expects(:root).at_most(2).returns(@test_root)
-    delete_switch_file
-    delete_sql_switch_file
-    assert Flog::Status.sql_formattable?
+    Rails.stub(:root, @test_root) do
+      delete_switch_file
+      delete_sql_switch_file
+      assert Flog::Status.sql_formattable?
+    end
   end
 
   def test_sql_formattable_is_false_when_enable_and_sql_switch_file_exists
-    Rails.expects(:root).at_most(2).returns(@test_root)
-    delete_switch_file
-    create_sql_switch_file
-    assert_equal false, Flog::Status.sql_formattable?
+    Rails.stub(:root, @test_root) do
+      delete_switch_file
+      create_sql_switch_file
+      assert_equal false, Flog::Status.sql_formattable?
+    end
   end
 
   def test_sql_formattable_is_false_when_disable_and_sql_switch_file_not_exist
-    Rails.expects(:root).at_most(2).returns(@test_root)
-    create_switch_file
-    delete_sql_switch_file
-    assert_equal false, Flog::Status.sql_formattable?
+    Rails.stub(:root, @test_root) do
+      create_switch_file
+      delete_sql_switch_file
+      assert_equal false, Flog::Status.sql_formattable?
+    end
   end
 
   def test_sql_formattable_is_true_when_error_is_raised_in_process
-    Rails.expects(:root).at_most(2).returns(nil) # For raise NoMethodError
-    create_sql_switch_file
-    assert Flog::Status.sql_formattable?
+    Rails.stub(:root, nil) do # For raise NoMethodError
+      create_sql_switch_file
+      assert Flog::Status.sql_formattable?
+    end
   end
 
   def test_sql_formattable_is_false_when_disable_and_sql_switch_file_exists
-    Rails.expects(:root).at_most(2).returns(@test_root)
-    create_switch_file
-    create_sql_switch_file
-    assert_equal false, Flog::Status.sql_formattable?
+    Rails.stub(:root, @test_root) do
+      create_switch_file
+      create_sql_switch_file
+      assert_equal false, Flog::Status.sql_formattable?
+    end
   end
 
   def test_params_formattable_is_true_when_enable_and_params_switch_file_does_not_exist
-    Rails.expects(:root).at_most(2).returns(@test_root)
-    delete_switch_file
-    delete_params_switch_file
-    assert Flog::Status.params_formattable?
+    Rails.stub(:root, @test_root) do
+      delete_switch_file
+      delete_params_switch_file
+      assert Flog::Status.params_formattable?
+    end
   end
 
   def test_params_formattable_is_false_when_enable_and_params_switch_file_exists
-    Rails.expects(:root).at_most(2).returns(@test_root)
-    delete_switch_file
-    create_params_switch_file
-    assert_equal false, Flog::Status.params_formattable?
+    Rails.stub(:root, @test_root) do
+      delete_switch_file
+      create_params_switch_file
+      assert_equal false, Flog::Status.params_formattable?
+    end
   end
 
   def test_params_formattable_is_false_when_disable_and_params_switch_file_not_exist
-    Rails.expects(:root).at_most(2).returns(@test_root)
-    create_switch_file
-    delete_params_switch_file
-    assert_equal false, Flog::Status.params_formattable?
+    Rails.stub(:root, @test_root) do
+      create_switch_file
+      delete_params_switch_file
+      assert_equal false, Flog::Status.params_formattable?
+    end
   end
 
   def test_params_formattable_is_false_when_disable_and_params_switch_file_exists
-    Rails.expects(:root).at_most(2).returns(@test_root)
-    create_switch_file
-    create_params_switch_file
-    assert_equal false, Flog::Status.params_formattable?
+    Rails.stub(:root, @test_root) do
+      create_switch_file
+      create_params_switch_file
+      assert_equal false, Flog::Status.params_formattable?
+    end
   end
 
   def test_params_formattable_is_true_when_error_is_raised_in_process
-    Rails.expects(:root).at_most(2).returns(nil) # For raise NoMethodError
-    create_params_switch_file
-    assert Flog::Status.params_formattable?
+    Rails.stub(:root, nil) do # For raise NoMethodError
+      create_params_switch_file
+      assert Flog::Status.params_formattable?
+    end
   end
 
   private
@@ -128,8 +140,6 @@ class StatusTest < ActiveSupport::TestCase
   end
 
   def delete_file(file_path)
-    if File.exist?(file_path)
-      File.delete(file_path)
-    end
+    File.delete(file_path) if File.exist?(file_path)
   end
 end

metadata

@@ -1,125 +1,125 @@
 --- !ruby/object:Gem::Specification
 name: rails-flog
 version: !ruby/object:Gem::Version
-  version: 1.3.2
+  version: 1.3.3
 platform: ruby
 authors:
 - pinzolo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-28 00:00:00.000000000 Z
+date: 2015-11-16 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'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: coveralls
+  name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: mocha
+  name: coveralls
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 3.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 3.2.0
 - !ruby/object:Gem::Dependency
   name: anbt-sql-formatter
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: awesome_print
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: This formats parameters and sql in rails log.
@@ -129,9 +129,9 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .coveralls.yml
-- .gitignore
-- .travis.yml
+- ".coveralls.yml"
+- ".gitignore"
+- ".travis.yml"
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -139,6 +139,7 @@ files:
 - gemfiles/rails_3_2_x.gemfile
 - gemfiles/rails_4_0_x.gemfile
 - gemfiles/rails_4_1_x.gemfile
+- gemfiles/rails_4_2_x.gemfile
 - lib/flog.rb
 - lib/flog/configuration.rb
 - lib/flog/params_formattable.rb
@@ -163,17 +164,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.14
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Rails log formatter for parameters and sql