specstar-controllers 0.1.1 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 307878cf1e13e950b35b328ce0bf7fbe6eb250f4
-  data.tar.gz: 439b8adff7ba7bd37e3ce7646b700c6b39fc5e78
+  metadata.gz: f7a385633a32305657451773a60dd9db36ca7bd9
+  data.tar.gz: f9f514f12b7ee4bb1f90553ee4ea4cdae3b929a4
 SHA512:
-  metadata.gz: 91badea2d8592b29942131730a3498b44acf4ab1d4b3b1871d70ecec2ffcc433badb189726187bbbda5ce81f448f7fd2bc6b740a5608e94909600b31f97cf0de
-  data.tar.gz: 34b50ab2fca0ab630de5f939a5e89d2aeb86bc4cddb6a357aef82567e597368b41cea018796df4a93c9fe510ff653c3ecc664ada44edd8d26a335a45fe19f0c2
+  metadata.gz: fb321f8f6dc9e08bfbcbfe0dd367a517eabbd4fe8ca95593fa61dfca30c45bf5d17830fa106b71d7a13e21b01573685d6467f3baa2ba1be337b4f0fa9f3431a1
+  data.tar.gz: ea8687d07dc2782fe49df70d67d51aa3b82149155c8c905f11f9cab3c77e2b998d6f93e40d10334e351567d58364a01b416c27edd2b92fb0f126344a7ed5be2e

data/lib/specstar/controllers.rb

@@ -35,16 +35,6 @@ module Specstar
         }
       end
 
-      def has_before_filter_for_action?(controller, filter, action=nil)
-        controller._process_action_callbacks.any? { |callback|
-          if action
-            callback.kind == :before && callback.filter.to_s == filter.to_s && callback.per_key[:if].any? { |item| item.include? "action_name == '#{action}'" }
-          else
-            callback.kind == :before && callback.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) }
@@ -53,14 +43,42 @@ module Specstar
         end
       end
 
-      def has_before_filter?(controller, filter, actions=[])
-        if actions.present?
-          actions.all? { |action| has_before_filter_for_action?(controller, filter, action) }
+      def callback_matches?(callback, condition, actions)
+        field = "@#{condition}"
+
+        if actions.size > 0
+          actions.all? { |a|
+            callback.instance_variable_get(field).any? { |item| item.include? "action_name == '#{a}'" }
+          }
         else
-          has_before_filter_for_action?(controller, filter)
+          callback.instance_variable_get(field).empty?
         end
       end
 
+      def has_before_filter?(controller, filter, options={})
+        result = true
+
+        if options.include?(:only)
+          result = controller._process_action_callbacks.any? { |callback|
+            callback.kind == :before && callback.filter.to_s == filter.to_s && callback_matches?(callback, :if, options[:only])
+          }
+        end
+
+        if result && options.include?(:except)
+          result = controller._process_action_callbacks.any? { |callback|
+            callback.kind == :before && callback.filter.to_s == filter.to_s && callback_matches?(callback, :unless, options[:except])
+          }
+        end
+
+        if result && options.blank?
+          result = controller._process_action_callbacks.any? { |callback|
+            callback.kind == :before && callback.filter.to_s == filter.to_s
+          }
+        end
+
+        result
+      end
+
       RSpec::Matchers.define :have_skip_before_filter do |filter|
         chain :only do |actions|
           @actions = *actions
@@ -83,21 +101,25 @@ module Specstar
         end
       end
 
-      RSpec::Matchers.define :have_before_filter do |filter|
-        chain :only do |actions|
-          @actions = *actions
-        end
-
+      RSpec::Matchers.define :have_before_filter do |filter, options={}|
         match do |controller|
-          has_before_filter?(controller, filter, @actions)
+          has_before_filter?(controller, filter, options)
         end
 
         failure_message do |controller|
-          "Expected #{controller.class.name} to have a before filter '#{filter}'."
+          if options
+            "Expected #{controller.class.name} to have a before_filter #{filter} with #{options}."
+          else
+            "Expected #{controller.class.name} to have a before_filter #{filter}."
+          end
         end
 
         failure_message_when_negated do |controller|
-          "Expected #{controller.class.name} not to have a before filter '#{filter}'."
+          if options
+            "Expected #{controller.class.name} not to have a before_filter #{filter} with #{options}."
+          else
+            "Expected #{controller.class.name} not to have a before_filter #{filter}."
+          end
         end
 
         description do

metadata

@@ -1,27 +1,27 @@
 --- !ruby/object:Gem::Specification
 name: specstar-controllers
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.0
 platform: ruby
 authors:
 - Sujoy Gupta
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-26 00:00:00.000000000 Z
+date: 2015-06-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec-core
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '3.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '3.1'
 description: 
@@ -40,17 +40,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.1.4
+rubygems_version: 2.4.6
 signing_key: 
 specification_version: 4
 summary: RSpec helpers for controllers.