specstar-controllers 0.0.6 → 0.0.7

data/lib/specstar/controllers.rb

@@ -25,7 +25,19 @@ module Specstar
         }
       end
 
-      def has_skip_before_filter?(controller, filter, actions)
+      def has_before_filter_for_action?(controller, filter, action=nil)
+        controller._process_action_callbacks.any? { |callback|
+          callback.chain.any? { |chain|
+	    if action
+              chain.kind == :before && chain.filter.to_s == filter.to_s && chain.per_key[:if].any? { |item| item.include? "action_name == '#{action}'" }
+	    else
+              chain.kind == :before && chain.filter.to_s == filter.to_s
+	    end
+          }
+        }
+      end
+
+      def has_skip_before_filter?(controller, filter, actions=[])
         if actions.present?
 	  actions.all? { |action| has_skip_before_filter_for_action?(controller, filter, action) }
 	else
@@ -33,22 +45,21 @@ module Specstar
 	end
       end
 
-      def has_before_filter?(controller, filter, action=nil)
-        callbacks = controller.is_a?(ApplicationController) ? controller._process_action_callbacks : controller._dispatch_callbacks
-        callbacks.select { |callback|
-          callback.chain.select { |chain|
-            chain.kind == :before && chain.filter.to_s == filter.to_s && (action.nil? || chain.per_key[:if].include?("action_name == '#{action}'"))
-          }.size > 0
-        }.size > 0
+      def has_before_filter?(controller, filter, actions=[])
+        if actions.present?
+	  actions.all? { |action| has_before_filter_for_action?(controller, filter, action) }
+	else
+	  has_before_filter_for_action?(controller, filter)
+	end
       end
 
       RSpec::Matchers.define :have_skip_before_filter do |filter|
         chain :only do |actions|
-          @action = *actions
+          @actions = *actions
         end
 
         match do |controller|
-          has_skip_before_filter?(controller, filter, @action)
+          has_skip_before_filter?(controller, filter, @actions)
         end
 
     	failure_message_for_should do |controller|
@@ -65,12 +76,12 @@ module Specstar
       end
 
       RSpec::Matchers.define :have_before_filter do |filter|
-        chain :only do |action|
-          @action = action
+        chain :only do |actions|
+          @actions = *actions
         end
 
         match do |controller|
-          has_before_filter?(controller, filter, @action)
+          has_before_filter?(controller, filter, @actions)
         end
 
     	failure_message_for_should do |controller|
@@ -87,4 +98,4 @@ module Specstar
       end
     end
   end
-end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: specstar-controllers
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-30 00:00:00.000000000 Z
+date: 2013-01-24 00:00:00.000000000 Z
 dependencies: []
 description: 
 email: sujoyg@gmail.com