silencer 0.4.0 → 0.5.0

data/.travis.yml

@@ -1,8 +1,14 @@
+bundler_args: --without development
+language: ruby
 rvm:
+  - jruby-18mode
+  - jruby-19mode
+  - rbx-18mode
+  - rbx-19mode
   - 1.8.7
   - 1.9.2
   - 1.9.3
-  - jruby
-  - rbx
-  - ree
-  - ruby-head
+  - 2.0.0
+matrix:
+  allow_failures:
+    - rvm: 2.0.0

data/Gemfile

@@ -1,4 +1,16 @@
 source 'http://rubygems.org'
 
-# Specify your gem's dependencies in quietus.gemspec
+gem 'rake'
+gem 'yard'
+
+group :development do
+  gem 'kramdown'
+end
+
+group :test do
+  gem 'rspec'
+  gem 'simplecov'
+  gem 'guard-rspec'
+end
+
 gemspec

data/README.md

@@ -23,7 +23,7 @@ In your production environment (presumably):
 Or if you'd prefer, you can pass it regular expressions:
 
 
-    config.middleware.swap Rails::Rack::Logger, Silencer::Logger, :silence => [/assets/]
+    config.middleware.swap Rails::Rack::Logger, Silencer::Logger, :silence => [%r{^/assets/}]
 
 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.
 
@@ -31,7 +31,7 @@ Silencer's logger will serve as a drop-in replacement for Rails' default logger.
 
 Rails 2.3.x introduced a tagged logging feature.  If you are using tagged logging with Rails 2.3 you can also pass taggers via the middleware:
 
-    config.middleware.swap Rails::Rack::Logger, Silencer::Logger, config.log_tags, :silence => [/assets/]
+    config.middleware.swap Rails::Rack::Logger, Silencer::Logger, config.log_tags, :silence => [%r{^/assets/}]
 
 ## Note on Patches/Pull Requests
 

data/lib/silencer/logger.rb

@@ -5,8 +5,8 @@ module Silencer
   class Logger < Rails::Rack::Logger
     def initialize(app, *taggers)
       @app = app
-      @taggers = taggers
-      opts = @taggers.extract_options!
+      opts = taggers.extract_options!
+      @taggers = taggers.flatten
       @silence = Array.wrap(opts[:silence])
     end
 

data/lib/silencer/version.rb

@@ -1,3 +1,3 @@
 module Silencer
-  VERSION = "0.4.0"
+  VERSION = "0.5.0"
 end

data/silencer.gemspec

@@ -10,14 +10,6 @@ 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'
-  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.files         = `git ls-files`.split("\n")

data/spec/silencer_spec.rb

@@ -11,33 +11,48 @@ describe Silencer::Logger do
     end
   end
 
-  it 'allows log writing when not implemented' do
+  def should_silence_logger
+    Rails.logger.should_receive(:level=).with(::Logger::ERROR).once
+  end
+  def should_not_silence_logger
     Rails.logger.should_not_receive(:level=).with(::Logger::ERROR)
+  end
 
-    Silencer::Logger.new(@app).call(Rack::MockRequest.env_for("/"))
+  it 'by default does not silence any requests or use any taggers' do
+    should_not_silence_logger
+    logger = Silencer::Logger.new(@app)
+    logger.instance_variable_get(:@taggers).should == []
+    logger.call(Rack::MockRequest.env_for("/"))
   end
 
+  let(:log_tags) { [:uuid, :queue] }
   it 'instantiates with an optional taggers array' do
-    Rails.logger.should_not_receive(:level=).with(::Logger::ERROR).once
+    should_silence_logger
+    logger = Silencer::Logger.new(@app, log_tags, :silence => ['/'])
+    logger.instance_variable_get(:@taggers).should == log_tags
+    logger.call(Rack::MockRequest.env_for("/"))
+  end
 
-    Silencer::Logger.new(@app, :uuid, :queue, :silence => ['/']).call(Rack::MockRequest.env_for("/"))
+  # Note: initially this test used a splat on log_tags but it fails on 1.8
+  it 'instantiates with an optional taggers array passed as args' do
+    should_silence_logger
+    logger = Silencer::Logger.new(@app, :uuid, :queue, :silence => ['/'])
+    logger.instance_variable_get(:@taggers).should == log_tags
+    logger.call(Rack::MockRequest.env_for("/"))
   end
 
   it 'quiets the log when configured with a silenced path' do
-    Rails.logger.should_receive(:level=).with(::Logger::ERROR).once
-
+    should_silence_logger
     Silencer::Logger.new(@app, :silence => ['/']).call(Rack::MockRequest.env_for("/"))
   end
 
   it 'quiets the log when configured with a regex' do
-    Rails.logger.should_receive(:level=).with(::Logger::ERROR).once
-
+    should_silence_logger
     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_receive(:level=).with(::Logger::ERROR).once
-
+    should_silence_logger
     Silencer::Logger.new(@app).call(Rack::MockRequest.env_for("/", 'X-SILENCE-LOGGER' => 'true'))
   end
 

data/spec/spec_helper.rb

@@ -1,15 +1,13 @@
 unless ENV['CI']
   require 'simplecov'
   SimpleCov.start do
+    add_filter '.bundle'
     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'))
-
 require 'rack'
 require 'rails'
 require 'silencer'
-require 'rspec'
+require 'rspec'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: silencer
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.5.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,120 +9,8 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-16 00:00:00.000000000 Z
+date: 2013-01-30 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'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: rspec
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: yard
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: rdiscount
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: simplecov
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: guard
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: guard-rspec
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: railties
   requirement: !ruby/object:Gem::Requirement
@@ -174,12 +62,18 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: -4507938339127293314
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: -4507938339127293314
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23