controller_filter_logging 0.0.5 → 0.0.6

data/Gemfile

@@ -2,3 +2,7 @@ source "http://rubygems.org"
 
 # Specify your gem's dependencies in controller_filter_logging.gemspec
 gemspec
+
+gem 'rspec'
+gem 'mocha'
+gem 'rails'

data/lib/controller_filter_logging.rb

@@ -1,12 +1,8 @@
+require 'abstract_controller'
+
 module AbstractController::Callbacks::ClassMethods
   def before_filter_with_logging(*args, &block)
-    if block_given?
-      Rails.logger.debug("Can't log filters with blocks: #{caller[0..3].join("\n")}")
-      before_filter_without_logging *args, &block
-    else
-      filter_name = args.shift
-      before_filter_without_logging create_logging_filter(filter_name), *args
-    end
+    handle_filter(:before_filter, *args, &block)
   end
   alias_method_chain :before_filter, :logging
 
@@ -15,16 +11,22 @@ module AbstractController::Callbacks::ClassMethods
   end
   alias_method_chain :skip_before_filter, :logging
 
-  def prepend_before_filter_with_logging(filter_name, *args, &block)
+  def prepend_before_filter_with_logging(*args, &block)
+    handle_filter(:prepend_before_filter, *args, &block)
+  end
+  alias_method_chain :prepend_before_filter, :logging
+
+  private
+  def handle_filter(type, *args, &block)
+    method = "#{type}_without_logging"
     if block_given?
       Rails.logger.debug("Can't log filters with blocks: #{caller[0..3].join("\n")}")
-      prepend_before_filter_without_logging filter_name, *args, &block
+      send(method, *args, &block)
     else
-      create_logging_filter(filter_name)
-      prepend_before_filter_without_logging("#{filter_name}_with_logging".to_sym, *args)
+      filter_name = args.shift
+      send(method, create_logging_filter(filter_name), *args)
     end
   end
-  alias_method_chain :prepend_before_filter, :logging
 
   def create_logging_filter(filter_name)
     name = "#{filter_name.to_s.gsub(%r{[?!]}, '')}_with_logging"
@@ -40,4 +42,5 @@ module AbstractController::Callbacks::ClassMethods
     end
     name.to_sym
   end
+
 end

data/lib/controller_filter_logging/version.rb

@@ -1,3 +1,3 @@
 module ControllerFilterLogging
-  VERSION = "0.0.5"
+  VERSION = "0.0.6"
 end

data/spec/lib/controller_filter_logging_spec.rb

@@ -0,0 +1,48 @@
+require 'spec_helper'
+require 'action_controller'
+
+require 'controller_filter_logging'
+
+describe 'controller_filter_logging' do
+  describe '#before_filter_with_logging' do
+    context 'with block' do
+      it "should warn and pass through to the block" do
+        Rails.logger.expects(:debug).once
+
+        controller = Class.new(ActionController::Base) do
+          attr_reader :called
+
+          before_filter do
+            @called = true
+          end
+        end.new
+
+        controller.run_callbacks(:process_action)
+        controller.called.should be_true
+      end
+
+      it "should run the block and log the results" do
+        result = 12345
+
+        Rails.logger.expects(:debug).with("Entering before_filter: test")
+        Rails.logger.expects(:debug).with(" result: #{result}")
+
+        controller = Class.new(ActionController::Base) do
+          attr_reader :called
+
+          before_filter :test
+          
+          private
+          def test
+            @called = 12345
+          end
+        end.new
+
+        controller.run_callbacks(:process_action)
+        controller.called.should == result
+        controller.methods.should include(:test_with_logging)
+      end
+    end
+  end
+end
+

data/spec/spec_helper.rb

@@ -0,0 +1,11 @@
+require 'rails'
+
+RSpec.configure do |c|
+  c.mock_with :mocha
+
+  c.before do
+    @logs = StringIO.new
+    Rails.logger = (@logger = Logger.new(@logs))
+  end
+end
+

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: controller_filter_logging
 version: !ruby/object:Gem::Version 
-  hash: 21
+  hash: 19
   prerelease: false
   segments: 
   - 0
   - 0
-  - 5
-  version: 0.0.5
+  - 6
+  version: 0.0.6
 platform: ruby
 authors: 
 - Jon Moses
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-25 00:00:00 -04:00
+date: 2011-06-10 00:00:00 -04:00
 default_executable: 
 dependencies: []
 
@@ -37,6 +37,8 @@ files:
 - init.rb
 - lib/controller_filter_logging.rb
 - lib/controller_filter_logging/version.rb
+- spec/lib/controller_filter_logging_spec.rb
+- spec/spec_helper.rb
 has_rdoc: true
 homepage: ""
 licenses: []
@@ -71,5 +73,6 @@ rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Bring back controller filter logging to rails 3
-test_files: []
-
+test_files: 
+- spec/lib/controller_filter_logging_spec.rb
+- spec/spec_helper.rb