Changeset 1051

Timestamp:

11/25/07 19:10:03 (1 year ago)

Author:

e.@brainspl.at

Message:

adds skip_beofre and skip_after for beofre and after filter chains. Thanks CptOatmeal?

Files:

• trunk/lib/merb/abstract_controller.rb (modified) (3 diffs)
• trunk/lib/merb/request.rb (modified) (4 diffs)
• trunk/spec/merb/controller_filters_spec.rb (modified) (4 diffs)

trunk/lib/merb/abstract_controller.rb

@@ -184 +184 @@
-    # 
-    def self.before(filter, opts={})
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-    end
-    
@@ -208 +194 @@
-    # gain access to the response body like so: after Proc.new {|c|
-    # Tidy.new(c.body) }, :only => :index
+    
-    def self.after(filter, opts={})
+      add_filter((self.after_filters ||= []), filter, opts)
+    end
+    
+    # Call #skip_before to remove an already declared (before) filter from your controller.
+    # 
+    # Example:
+    #   class Application < Merb::Controller
+    #     before :require_login
+    #   end
+    #
+    #   class Login < Merb::Controller
+    #     skip_before :require_login  # Users shouldn't have to be logged in to log in
+    #   end
+    
+    def self.skip_before(filter)
+      skip_filter((self.before_filters || []), filter)
+    end
+    
+    # Exactly like #skip_before, but for after filters
+    
+    def self.skip_after(filter)
+      skip_filter((self.after_filters || []), filter)
+    end
+    
+    def self.default_thrown_content
+      Hash.new{ |hash, key| hash[key] = "" }
+    end
+    
+    # Set here to respond when rendering to cover the provides syntax of setting the content_type
+    def content_type_set?
+      false
+    end
+
+    def content_type
+      params[:format] || :html
+    end
+    
+  private
+
+    def self.add_filter(filters, filter, opts={})
-      raise(ArgumentError,
-        "You can specify either :only or :exclude but 
-         not both at the same time for the same filter."
-      ) if opts.has_key?(:only) && opts.has_key?(:exclude)
-  
+
-      opts = shuffle_filters!(opts)
-  
+
-      case filter
-      when Symbol, Proc, String
-
+
+
+
+
+
-      else
-        raise(ArgumentError, 
-After f
+F
-        )        
-      end
-    end
-    
+    def self.skip_filter(filters, filter)
+      raise(ArgumentError, 
+        'You can only skip filters that have a String or Symbol name.'
+      ) unless [Symbol, String].include? filter.class
+
+      MERB_LOGGER.warn("Filter #{filter} was not found in your filter chain."
+      ) unless filters.reject! {|f| f.first.to_s[filter.to_s] }
+    end
+
+    # Ensures that the passed in hash values are always arrays.
+    #
+    #   shuffle_filters!(:only => :new) #=> {:only => [:new]}   
+
-    def self.shuffle_filters!(opts={})
-      if opts[:only] && opts[:only].is_a?(Symbol)
@@ -236 +280 @@
-    end
-    
-    def self.default_thrown_content
-      Hash.new{ |hash, key| hash[key] = "" }
-    end
-    
-    # Set here to respond when rendering to cover the provides syntax of setting the content_type
-    def content_type_set?
-      false
-    end
-    
-
-    def content_type
-      params[:format] || :html
-    end
-  end  
-  

trunk/lib/merb/request.rb

@@ -23 +23 @@
-          request_method
-        when :post
-
+
+
+
+
+
-          m.downcase! if m
-          METHODS.include?(m) ? m.to_sym : :post
@@ -66 +70 @@
-        h = query_params
-        h.merge!(body_params) if body_params
-
+.to_mash
-      end
-    end
@@ -74 +78 @@
-        begin
-          if Merb::Const::MULTIPART_REGEXP =~ content_type
-
+
+
+
+
+
-          end
-        rescue ControllerExceptions::MultiPartParseError => e
@@ -102 +110 @@
-    def params
-      @params ||= begin
-to_mash.
+
-        h.merge!(multipart_params) if self.class.parse_multipart_params && multipart_params
-        h.merge!(json_params) if self.class.parse_json_params && json_params

trunk/spec/merb/controller_filters_spec.rb

@@ -5 +5 @@
-  before :filter1
-  before :will_halt, :only => :four
+  
+  before :overwrite_before_filter, :only => :two
+  after  :overwrite_after_filter, :exclude => :four
+  
+  after  :after_will_be_skipped
+  before :before_will_be_skipped
+
-  before Proc.new {|c| c.one }, :exclude => [:one, :three, :uses_params]
-  after  Proc.new {|c| c.five }, :exclude => [:one, :three, :uses_params]  
-  after  :filter2
-  before :modifies_param, :only => :uses_params
-
-
+
+
+
+
+
+
+
+
+
-  
-  def will_halt
@@ -38 +52 @@
-    @filter2='called'
-  end
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-  def one
-    session.data.should == {}
@@ -90 +122 @@
-  end
-  
-
+
+
-describe "Dispatch and before/after filters" do
-  
@@ -185 +218 @@
-    end
-  end
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+