lib/phenomenal_rails/middleware.rb in phenomenal_rails-1.2.4 vs lib/phenomenal_rails/middleware.rb in phenomenal_rails-1.2.5

@@ -2,28 +2,36 @@
   def initialize(app)
     @app=app
     @activation_conditions=Array.new
     Phenomenal::Feature.middleware=self
   end
-  
+
   def add_condition(feature,&block)
     @activation_conditions.push([feature,block])
+    sort_activation_conditions
   end
-  
+
   def clear_activition_conditions
     @activation_conditions.clear
   end
-  
+
   def call(env)
     before_call(env)
     @app.call(env)
   end
-  
+
   def before_call(env)
     @activation_conditions.each do |feature_block|
       feature,block = feature_block
       if feature.active?
         block.call(env)
       end
     end
   end
+
+  private
+  def sort_activation_conditions
+    @activation_conditions.sort! do |a,b|
+      Phenomenal::Manager.instance.conflict_policy(a[0],b[0])
+    end
+  end 
 end