Merge pull request #11 from airbnb/add-reset_current-method

Adds Trebuchet.reset_current!, consolidate controller trebuchets

lib/trebuchet.rb

@@ -6,6 +6,7 @@ class << self
     attr_accessor :admin_view, :admin_edit
     attr_accessor :time_zone
     attr_accessor :exception_handler
+    attr_accessor :current_block
 
     def backend
       self.backend = :memory unless @backend
@@ -40,10 +41,14 @@ def log(feature_name, result)
     attr_accessor :current
 
     def current
-      @current = @current.call if @current.is_a?(Proc)
+      @current ||= @current_block.call if @current_block.respond_to?(:call)
       @current || new(nil) # return an blank Trebuchet instance if @current is not set
     end
 
+    def reset_current!
+      @current = nil
+    end
+
   end
 
   def self.aim(feature_name, *args)

lib/trebuchet/action_controller.rb

@@ -10,7 +10,7 @@ def self.included(base)
   end
 
   def trebuchet
-    @trebuchet ||= Trebuchet.new(current_user, request)
+    Trebuchet.current
   end
 
 end

lib/trebuchet/action_controller_filter.rb

@@ -2,18 +2,21 @@ class Trebuchet::ActionControllerFilter
 
   def self.before(controller)
     Trebuchet.initialize_logs
-    
+
     if defined?(Trebuchet::Backend::RedisCached) && Trebuchet.backend.is_a?(Trebuchet::Backend::RedisCached) && Trebuchet.backend.respond_to?(:clear_cached_strategies)
       if Time.now > Trebuchet.backend.cache_cleared_at + 60.seconds
-        Trebuchet.backend.clear_cached_strategies 
+        Trebuchet.backend.clear_cached_strategies
       end
     end
-
-    Trebuchet.current = Proc.new { Trebuchet.new controller.send(:current_user), controller.request }
+
+    Trebuchet.current_block = Proc.new {
+      Trebuchet.new(controller.send(:current_user), controller.request)
+    }
   end
 
   def self.after(controller)
-  	Trebuchet.current = nil # very important
+    Trebuchet.current_block = nil
+    Trebuchet.reset_current! # very important
   end
 
 end

lib/trebuchet/version.rb

@@ -1,5 +1,5 @@
 class Trebuchet
-  
-  VERSION = "0.6.6"
-  
+
+  VERSION = "0.7.0"
+
 end