phenomenal_rails 1.2.4 → 1.2.5

data/lib/phenomenal_rails/engine.rb

@@ -1,20 +1,20 @@
 class PhenomenalRails::Engine < Rails::Engine
   isolate_namespace PhenomenalRails
   config.app_middleware.use(PhenomenalRails::Middleware)
-  
+
   config.before_configuration do
     Rails.configuration.autoload_paths += PhenomenalRails::Loader.autoload_paths(File.expand_path(PhenomenalRails::PATH,Rails.root))
   end
-  
+
   config.to_prepare do
     PhenomenalRails::Loader.prepare(true)
   end
-  
+
   config.after_initialize do
     ActionController::Base.prepend_view_path(PhenomenalRails::Resolver.instance)
   end
-  
+
   ActionDispatch::Callbacks.before do |*args|
     PhenomenalRails::Loader.prepare
   end
-end
+end

data/lib/phenomenal_rails/middleware.rb

@@ -4,20 +4,21 @@ class PhenomenalRails::Middleware
     @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
@@ -26,4 +27,11 @@ class PhenomenalRails::Middleware
       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

data/lib/phenomenal_rails/version.rb

@@ -1,3 +1,3 @@
 module PhenomenalRails
-  VERSION = "1.2.4"
+  VERSION = "1.2.5"
 end

data/lib/phenomenal_rails.rb

@@ -11,9 +11,10 @@ require "phenomenal_rails/path_set"
 
 # Set default feature as persistent
 phen_default_feature.persistent=true
+phen_change_conflict_policy { |a,b| priority_conflict_policy(a,b) }
 
 
-module PhenomenalRails 
+module PhenomenalRails
   # Phenomenal application folder
   PATH = "app_phenomenal"
 end

data/spec/dummy/app/views/pages/home.html.haml

@@ -1,4 +1,4 @@
-%h1 
+%h1
   HOME
   =@test_title
 %p
@@ -28,5 +28,11 @@
 =render :partial=>"shared/partial4"
 = ActionController::Base.view_paths.paths
 %br
+%p
+  Activation conditions stack
+  %br
+  =Phenomenal::Feature.class_variable_get(:@@middleware).instance_variable_get(:@activation_conditions)
 %br
+%br
+
 =Rails.env

data/spec/dummy/app_phenomenal/persistent_feature/controllers/application_controller.rb

@@ -1,7 +1,7 @@
 class ApplicationController < ActionController::Base
   protect_from_forgery
   include ApplicationHelper
-  
+
   def home
     render "pages/home"
   end

data/spec/dummy/app_phenomenal/persistent_feature/persistent_feature.rb

@@ -1,5 +1,6 @@
 feature :PersistentFeature do
   is_persistent
+  set_priority 1
   activation_condition do |env|
     if Rack::Request.new(env).params["activated"]
       activate_context :TestContext
@@ -10,3 +11,4 @@ feature :PersistentFeature do
     end
   end
 end
+

data/spec/dummy/app_phenomenal/test_feature/test_feature.rb

@@ -1 +1,7 @@
-feature :TestFeature
+feature :TestFeature do
+  set_priority 2
+  activation_condition do
+    # empty
+  end
+end
+