Merge pull request #1707 from dmathieu/memoize

Allow last argument to be a boolean in memoized methods

activesupport/lib/active_support/memoizable.rb

@@ -79,7 +79,11 @@ def #{symbol}(reload = false)                                          #   def m
           else                                                                     # else
             def #{symbol}(*args)                                                   #   def mime_type(*args)
               #{memoized_ivar} ||= {} unless frozen?                               #     @_memoized_mime_type ||= {} unless frozen?
-              reload = args.pop if args.last == true || args.last == :reload       #     reload = args.pop if args.last == true || args.last == :reload
+              args_length = method(:#{original_method}).arity                      #     args_length = method(:_unmemoized_mime_type).arity
+              if args.length == args_length + 1 &&                                 #     if args.length == args_length + 1 &&
+                (args.last == true || args.last == :reload)                        #       (args.last == true || args.last == :reload)
+                reload = args.pop                                                  #       reload = args.pop
+              end                                                                  #     end
                                                                                    #
               if defined?(#{memoized_ivar}) && #{memoized_ivar}                    #     if defined?(@_memoized_mime_type) && @_memoized_mime_type
                 if !reload && #{memoized_ivar}.has_key?(args)                      #       if !reload && @_memoized_mime_type.has_key?(args)

activesupport/test/memoizable_test.rb

@@ -96,6 +96,15 @@ def fib(n)
     end
     memoize :fib
 
+    def add_or_subtract(i, j, add)
+      if add
+        i + j
+      else
+        i - j
+      end
+    end
+    memoize :add_or_subtract
+
     def counter
       @count ||= 0
       @count += 1
@@ -199,6 +208,11 @@ def test_reloadable_with_args
     assert_equal 13, @calculator.fib_calls
   end
 
+  def test_memoization_with_boolean_arg
+    assert_equal 4, @calculator.add_or_subtract(2, 2, true)
+    assert_equal 2, @calculator.add_or_subtract(4, 2, false)
+  end
+
   def test_object_memoization
     [Company.new, Company.new, Company.new].each do |company|
       company.extend ActiveSupport::Memoizable