1 files changed, 24 insertions, 12 deletions
diff --git a/actionpack/lib/action_view/helpers/cache_helper.rb b/actionpack/lib/action_view/helpers/cache_helper.rb
index 8693f4f0e4..932a5fa65a 100644
--- a/actionpack/lib/action_view/helpers/cache_helper.rb
+++ b/actionpack/lib/action_view/helpers/cache_helper.rb
@@ -110,15 +110,8 @@ module ActionView
       #   <%= some_helper_method(person) %>
       #
       # Now all you'll have to do is change that timestamp when the helper method changes.
-      #
-      # ==== Conditional caching
-      #
-      # You can pass :if and :unless options, to conditionally perform or skip the cache.
-      #
-      #   <%= cache @model, if: some_condition(@model) do %>
-      #
       def cache(name = {}, options = nil, &block)
-        if controller.perform_caching && conditions_match?(options)
+        if controller.perform_caching
           safe_concat(fragment_for(cache_fragment_name(name, options), options, &block))
         else
           yield
@@ -127,6 +120,29 @@ module ActionView
         nil
       end
 
+      #Chache fragments of a view if +condition+ is true
+      #
+      #=== Example
+      #   <%= cache_if admin?, project do %>
+      #     <b>All the topics on this project</b>
+      #     <%= render project.topics %>
+      #   <% end %>
+      def cache_if(condition, name = {}, options = nil, &block)
+        if condition
+          cache(name, options, &block)
+        else
+          yield
+        end
+
+        nil
+      end
+
+      #Chache fragments of a view unless +condition+ is true
+      #(see +cache_if+ for a example)
+      def cache_unless(condition, name = {}, options = nil, &block)
+        cache_if !condition, name, options, &block
+      end
+
       # This helper returns the name of a cache key for a given fragment cache
       # call. By supplying skip_digest: true to cache, the digestion of cache
       # fragments can be manually bypassed. This is useful when cache fragments
@@ -144,10 +160,6 @@ module ActionView
 
     private
 
-      def conditions_match?(options)
-        !(options && (!options.fetch(:if, true) || options.fetch(:unless, false)))
-      end
-
       def fragment_name_with_digest(name) #:nodoc:
         if @virtual_path
           [