silencer 0.2.0 → 0.3.0

data/.travis.yml

@@ -0,0 +1,8 @@
+rvm:
+  - 1.8.7
+  - 1.9.2
+  - 1.9.3
+  - jruby
+  - rbx
+  - ree
+  - ruby-head

data/README.md

@@ -1,17 +1,17 @@
-Silencer
-========
+# Silencer [![Build Status](https://secure.travis-ci.org/spagalloco/silencer.png?branch=master)][travis] [![Dependency Status](https://gemnasium.com/spagalloco/silencer.png?travis)][gemnasium]
+
+[travis]: http://travis-ci.org/spagalloco/silencer
+[gemnasium]: https://gemnasium.com/spagalloco/silencer
 
 Silencer is a simple rack-middleware for Rails that can selectively disable logging on per-action basis.  It's based on a [blog post](http://dennisreimann.de/blog/silencing-the-rails-log-on-a-per-action-basis/) by Dennis Reimann.
 
-Installation
-------------
+## Installation
 
 Just add silencer to your Gemfile:
 
     gem 'silencer'
 
-Usage
------
+## Usage
 
 In your production environment (presumably):
 
@@ -27,8 +27,7 @@ Or if you'd prefer, you can pass it regular expressions:
 
 Silencer's logger will serve as a drop-in replacement for Rails' default logger.  It will not suppress any logging by default, simply pass it an array of urls via the options hash.  You can also send it a 'X-SILENCE-LOGGER' header (with any value) with your request and that will also produce the same behavior.
 
-Note on Patches/Pull Requests
------------------------------
+## Note on Patches/Pull Requests
 
 * Fork the project.
 * Make your feature addition or bug fix.
@@ -38,7 +37,6 @@ Note on Patches/Pull Requests
   (if you want to have your own version, that is fine but bump version in a commit by itself I can ignore when I pull)
 * Send me a pull request. Bonus points for topic branches.
 
-Copyright
----------
+## Copyright
 
-Copyright (c) 2012 Steve Agalloco. See [LICENSE](https://github.com/spagalloco/silencer/blob/master/LICENSE.md) for details.
+Copyright (c) 2012 Steve Agalloco. See [LICENSE](https://github.com/spagalloco/silencer/blob/master/LICENSE.md) for details.

data/lib/silencer/logger.rb

@@ -1,18 +1,18 @@
 require 'rails/rack/logger'
+require 'active_support/core_ext/array/wrap'
 
 module Silencer
   class Logger < Rails::Rack::Logger
     def initialize(app, opts = {})
       @app = app
-      @opts = opts
-      @opts[:silence] ||= []
+      @silence = Array.wrap(opts[:silence])
     end
 
     def call(env)
-      old_logger_level = Rails.logger.level
+      old_logger_level   = Rails.logger.level
       Rails.logger.level = ::Logger::ERROR if silence_request?(env)
 
-      @app.call(env)
+      super
     ensure
       # Return back to previous logging level
       Rails.logger.level = old_logger_level
@@ -21,19 +21,7 @@ module Silencer
     private
 
     def silence_request?(env)
-      silent_header?(env) || silent_request_path?(env) || silent_request_match?(env)
-    end
-
-    def silent_header?(env)
-      env['X-SILENCE-LOGGER']
-    end
-
-    def silent_request_path?(env)
-      @opts[:silence].include?(env['PATH_INFO'])
-    end
-
-    def silent_request_match?(env)
-      @opts[:silence].select { |s| s.kind_of?(Regexp) }.any? { |s| s =~ env['PATH_INFO'] }
+      env['X-SILENCE-LOGGER'] || @silence.any? { |s| s === env['PATH_INFO'] }
     end
   end
 end

data/lib/silencer/version.rb

@@ -1,3 +1,3 @@
 module Silencer
-  VERSION = "0.2.0"
+  VERSION = "0.3.0"
 end

data/silencer.gemspec

@@ -10,15 +10,15 @@ Gem::Specification.new do |gem|
   gem.description   = 'Selectively quiet your Rails logger on a per-action basis'
   gem.summary       = gem.description
 
-  gem.add_development_dependency('rake', '~> 0.9')
-  gem.add_development_dependency('rspec', '~> 2.6')
-  gem.add_development_dependency('yard', '~> 0.7')
-  gem.add_development_dependency('rdiscount', '~> 1.6')
-  gem.add_development_dependency('simplecov', '~> 0.5')
-  gem.add_development_dependency('guard', '~> 0.8')
-  gem.add_development_dependency('guard-rspec', '~> 0.5')
+  gem.add_development_dependency 'rake'
+  gem.add_development_dependency 'rspec'
+  gem.add_development_dependency 'yard'
+  gem.add_development_dependency 'rdiscount'
+  gem.add_development_dependency 'simplecov'
+  gem.add_development_dependency 'guard'
+  gem.add_development_dependency 'guard-rspec'
 
-  gem.add_dependency 'railties', '~> 3'
+  gem.add_dependency 'railties', '>= 3'
 
   gem.files         = `git ls-files`.split("\n")
   gem.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")

data/spec/silencer_spec.rb

@@ -7,6 +7,7 @@ describe Silencer::Logger do
     Rails.logger = stub('ActiveSupport::BufferedLogger').tap do |l|
       l.stub(:level).and_return(::Logger::INFO)
       l.stub(:level=).and_return(true)
+      l.stub(:info)
     end
   end
 
@@ -17,21 +18,18 @@ describe Silencer::Logger do
   end
 
   it 'quiets the log when configured with a silenced path' do
-    Rails.logger.should_not_receive(:info)
     Rails.logger.should_receive(:level=).with(::Logger::ERROR).once
 
     Silencer::Logger.new(@app, :silence => ['/']).call(Rack::MockRequest.env_for("/"))
   end
 
   it 'quiets the log when configured with a regex' do
-    Rails.logger.should_not_receive(:info)
     Rails.logger.should_receive(:level=).with(::Logger::ERROR).once
 
     Silencer::Logger.new(@app, :silence => [/assets/]).call(Rack::MockRequest.env_for("/assets/application.css"))
   end
 
   it 'quiets the log when passed a custom header "X-SILENCE-LOGGER"' do
-    Rails.logger.should_not_receive(:info)
     Rails.logger.should_receive(:level=).with(::Logger::ERROR).once
 
     Silencer::Logger.new(@app).call(Rack::MockRequest.env_for("/", 'X-SILENCE-LOGGER' => 'true'))

data/spec/spec_helper.rb

@@ -1,4 +1,10 @@
-require 'simplecov'
+unless ENV['CI']
+  require 'simplecov'
+  SimpleCov.start do
+    add_group 'Silencer', 'lib/silencer'
+    add_group 'Specs', 'spec'
+  end
+end
 
 $LOAD_PATH.unshift(File.dirname(__FILE__))
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: silencer
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,126 +9,126 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-03 00:00:00.000000000 Z
+date: 2012-09-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0.9'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0.9'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: '2.6'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: '2.6'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0.7'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0.7'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rdiscount
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: '1.6'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: '1.6'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0.5'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0.5'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: guard
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0.8'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0.8'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: guard-rspec
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0.5'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0.5'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: railties
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '3'
   type: :runtime
@@ -136,7 +136,7 @@ dependencies:
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '3'
 description: Selectively quiet your Rails logger on a per-action basis
@@ -149,7 +149,7 @@ files:
 - .gemtest
 - .gitignore
 - .rspec
-- .simplecov
+- .travis.yml
 - .yardopts
 - Gemfile
 - Guardfile
@@ -176,7 +176,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3081853794874572743
+      hash: -4285288290975348200
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -185,7 +185,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3081853794874572743
+      hash: -4285288290975348200
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24

data/.simplecov

@@ -1 +0,0 @@
-SimpleCov.start