From 6e67dcd0305390af20a2bb47eadcc8e3b6485929 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mislav=20Marohnic=CC=81?= Date: Sat, 6 Aug 2011 14:41:33 +0200 Subject: [PATCH] trash the bloated Deprecation module that's currently unused --- lib/will_paginate/deprecation.rb | 50 -------------------- spec/spec_helper.rb | 30 ------------ spec/view_helpers/link_renderer_base_spec.rb | 4 +- 3 files changed, 1 insertion(+), 83 deletions(-) delete mode 100644 lib/will_paginate/deprecation.rb diff --git a/lib/will_paginate/deprecation.rb b/lib/will_paginate/deprecation.rb deleted file mode 100644 index d74b09a04..000000000 --- a/lib/will_paginate/deprecation.rb +++ /dev/null @@ -1,50 +0,0 @@ -# borrowed from ActiveSupport::Deprecation -module WillPaginate - module Deprecation - def self.debug() @debug; end - def self.debug=(value) @debug = value; end - self.debug = false - - # Choose the default warn behavior according to Rails.env. - # Ignore deprecation warnings in production. - BEHAVIORS = { - 'test' => Proc.new { |message, callstack| - $stderr.puts(message) - $stderr.puts callstack.join("\n ") if debug - }, - 'development' => Proc.new { |message, callstack| - logger = defined?(::RAILS_DEFAULT_LOGGER) ? ::RAILS_DEFAULT_LOGGER : Logger.new($stderr) - logger.warn message - logger.debug callstack.join("\n ") if debug - } - } - - def self.warn(message, callstack = caller) - if behavior - message = 'WillPaginate: ' + message.strip.gsub(/\s+/, ' ') - behavior.call(message, callstack) - end - end - - def self.default_behavior - if defined?(::Rails) - BEHAVIORS[::Rails.env.to_s] - else - BEHAVIORS['test'] - end - end - - # Behavior is a block that takes a message argument. - def self.behavior() @behavior; end - def self.behavior=(value) @behavior = value; end - self.behavior = default_behavior - - def self.silence - old_behavior = self.behavior - self.behavior = nil - yield - ensure - self.behavior = old_behavior - end - end -end diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb index 53ad005d9..3b48b28d2 100644 --- a/spec/spec_helper.rb +++ b/spec/spec_helper.rb @@ -1,6 +1,5 @@ require 'rspec' require File.expand_path('../view_helpers/view_example_group', __FILE__) -require 'will_paginate/deprecation' begin require 'ruby-debug' rescue LoadError @@ -21,10 +20,6 @@ def collection(params = {}) end WillPaginate::Collection.new(params[:page] || 1, params[:per_page] || 30, params[:total_entries]) end - - def have_deprecation - DeprecationMatcher.new - end end RSpec.configure do |config| @@ -54,28 +49,3 @@ def negative_failure_message "expected #{@actual.inspect} not to contain phrase #{@string.inspect}" end end - -class DeprecationMatcher - def initialize - @old_behavior = WillPaginate::Deprecation.behavior - @messages = [] - WillPaginate::Deprecation.behavior = lambda { |message, callstack| - @messages << message - } - end - - def matches?(block) - block.call - !@messages.empty? - ensure - WillPaginate::Deprecation.behavior = @old_behavior - end - - def failure_message - "expected block to raise a deprecation warning" - end - - def negative_failure_message - "expected block not to raise deprecation warnings, #{@messages.size} raised" - end -end diff --git a/spec/view_helpers/link_renderer_base_spec.rb b/spec/view_helpers/link_renderer_base_spec.rb index cbe976a29..81f0ff668 100644 --- a/spec/view_helpers/link_renderer_base_spec.rb +++ b/spec/view_helpers/link_renderer_base_spec.rb @@ -21,9 +21,7 @@ it "should have total_pages accessor" do prepare :total_pages => 42 - lambda { - @renderer.send(:total_pages).should == 42 - }.should_not have_deprecation + @renderer.send(:total_pages).should == 42 end it "should clear old cached values when prepared" do