lib/ttl_memoizeable.rb in ttl_memoizeable-0.3.0 vs lib/ttl_memoizeable.rb in ttl_memoizeable-0.4.0

@@ -7,18 +7,30 @@
 
 module TTLMemoizeable
   TTLMemoizationError = Class.new(StandardError)
   SetupMutex = Mutex.new
 
+  @ttl_index = 0
+  @disabled = false
+
+  def self.disable!
+    @disabled = true
+  end
+
+  def self.reset!
+    @ttl_index += 1
+  end
+
   def ttl_memoized_method(method_name, ttl: 1000)
     raise TTLMemoizationError, "Method not defined: #{method_name}" unless method_defined?(method_name) || private_method_defined?(method_name)
 
     ivar_name = method_name.to_s.gsub(/\??/, "") # remove trailing question marks
     time_based_ttl = ttl.is_a?(ActiveSupport::Duration)
     expired_ttl = time_based_ttl ? 1.year.ago : 1
 
     ttl_variable_name = :"@_ttl_for_#{ivar_name}"
+    ttl_index_variable_name = :"@_ttl_index_for_#{ivar_name}"
     mutex_variable_name = :"@_mutex_for_#{ivar_name}"
     value_variable_name = :"@_value_for_#{ivar_name}"
 
     reset_memoized_value_method_name = :"reset_memoized_value_for_#{method_name}"
     setup_memoization_method_name = :"_setup_memoization_for_#{method_name}"
@@ -58,10 +70,12 @@
 
         instance_variable_set(ttl_variable_name, instance_variable_get(ttl_variable_name) - 1)
       end
 
       define_method ttl_exceeded_method_name do
+        return true if TTLMemoizeable.instance_variable_get(:@disabled)
+        return true if TTLMemoizeable.instance_variable_get(:@ttl_index) != instance_variable_get(ttl_index_variable_name)
         return true unless instance_variable_defined?(value_variable_name)
 
         compared_to = time_based_ttl ? ttl.ago : 0
         instance_variable_get(ttl_variable_name) <= compared_to
       end
@@ -82,9 +96,12 @@
         instance_variable_get(mutex_variable_name).synchronize do
           send(decrement_ttl_method_name)
 
           if send(ttl_exceeded_method_name)
             send(extend_ttl_method_name)
+
+            # Synchronize the ttl index to match the module's value
+            instance_variable_set(ttl_index_variable_name, TTLMemoizeable.instance_variable_get(:@ttl_index))
 
             # Refresh value from the original method
             instance_variable_set(value_variable_name, super())
           end
         end