rules_engine 0.2.0 → 0.3.0

data/lib/rules_engine_view/model_loader.rb

@@ -23,16 +23,10 @@ module RulesEngineView
     if model == nil
       flash[:error] = "Unable to load #{model_name.to_s.camelcase}."
       redirect_path = model_index_path(model_name, options)
-      respond_to do |format|
-        format.html { 
-                      redirect_to(redirect_path) 
-                    }
-        format.js   { 
-                      render :update do |page| 
-                        page << "window.location.href = '#{redirect_path}';"
-                      end
-                    }
-      end
+      respond_to do |format|  
+        format.html { redirect_to(redirect_path) }
+        format.js   { render :text => "window.location.href = '#{redirect_path}';" }  
+      end  
     end
   end  
 
@@ -67,9 +61,4 @@ module RulesEngineView
       end
     end
   end  
-end
-
-
-ActionController::Base.class_eval do
-  include RulesEngineView::ModelLoader
 end

data/lib/rules_engine_view/navigate.rb

@@ -3,40 +3,38 @@ module RulesEngineView
     
     def re_breadcrumbs *links
       return if links.empty?
-      result = ''
-      result << '<div class="re-breadcrumbs">'
+      result = ''.html_safe
+      result << '<div class="re-breadcrumbs">'.html_safe
       links[0 ... -1].each do |link|
         result << link
-        result << "<span class='re-breadcrumbs-seperator'>></span>"
+        result << "<span class='re-breadcrumbs-seperator'>></span>".html_safe
       end
-      result << "<em>"
-      result << "#{links[-1]}"
-      result << "</em>"
+      result << "<em>".html_safe
+      result << links[-1]
+      result << "</em>".html_safe
       # result << "<span class='re-breadcrumbs-seperator'>></span>" if links[-1] == links[0]
-      result << '</div>'
+      result << '</div>'.html_safe
       result
     end
     
     def re_breadcrumbs_right *links
       return if links.empty?
-      result = ''
-      result << '<div class="re-breadcrumbs">'
+      result = ''.html_safe
+      result << '<div class="re-breadcrumbs">'.html_safe
       links[0 ... -2].each do |link|
         result << link
-        result << "<span class='re-breadcrumbs-seperator'>></span>"
+        result << "<span class='re-breadcrumbs-seperator'>></span>".html_safe
       end
-      result << "<em>"
-      result << "#{links[-2]}"
-      result << "</em>"
+      result << "<em>".html_safe
+      result << links[-2]
+      result << "</em>".html_safe
       # result << "<span class='re-breadcrumbs-seperator'>></span>" if links[-2] == links[0]
         
-      result << "<div class='re-breadcrumb-right'>#{links[-1]}</div>"
-      result << '</div>'      
+      result << "<div class='re-breadcrumb-right'>".html_safe
+      result << links[-1]
+      result << "</div>".html_safe
+      result << '</div>'.html_safe
       result            
     end
   end  
 end
-
-ActionView::Base.class_eval do
-  include RulesEngineView::Navigate
-end

data/{rails_generators/templates/spec → spec}/controllers/re_application_controller_spec.rb

@@ -1,41 +1,45 @@
 require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
 
-class MockRulesEngineController < ApplicationController
-  before_filter :rules_engine_editor_access_required,  :only => [:editor]
-  before_filter :rules_engine_reader_access_required,  :only => [:reader]
-  
-  def editor    
-  end
-  
-  def reader    
-  end
-end
+describe "ReApplicationController"  do
 
-describe "ReApplicationController", :type => :controller  do
-  controller_name 'MockRulesEngine'
+  controller(ApplicationController) do
+    
+    before_filter do |controller|
+      controller.rules_engine_editor_access_required if params[:editor]
+      controller.rules_engine_reader_access_required if params[:reader] 
+    end
+    
+    def index    
+      render :text => 'index_content'
+    end
+    
+    def root_path
+      "/root_path"
+    end  
+  end  
   
   describe "editor" do
     describe "editor access enabled" do
       it "should be successfull with rules_engine_editor true" do
         controller.stub(:cookies).and_return(:rules_engine_editor => 'true')
-        get :editor
+        get :index, :editor => true
         response.should be_success
-        response.should render_template('editor')
+        response.body.should =~ /index_content/
       end
 
       it "should be successfull with rules_engine_editor nil" do
         controller.stub(:cookies).and_return({})
-        get :editor
+        get :index, :editor => true
         response.should be_success
-        response.should render_template('editor')
+        response.body.should =~ /index_content/
       end          
     end
     
     describe "editor access disabled" do
       it "should redirect to the root path" do
         controller.stub(:cookies).and_return(:rules_engine_editor => 'false')
-        get :editor
-        response.should redirect_to(root_path)
+        get :index, :editor => true
+        response.should redirect_to("/root_path")
       end
     end  
   end  
@@ -44,24 +48,24 @@ describe "ReApplicationController", :type => :controller  do
     describe "reder access enabled" do
       it "should be successfull with rules_engine_reader true" do
         controller.stub(:cookies).and_return(:rules_engine_reader => 'true')
-        get :reader
+        get :index, :reader => true
         response.should be_success
-        response.should render_template('reader')
+        response.body.should =~ /index_content/
       end
 
       it "should be successfull with rules_engine_reader nil" do
         controller.stub(:cookies).and_return({})
-        get :reader
+        get :index, :reader => true
         response.should be_success
-        response.should render_template('reader')
+        response.body.should =~ /index_content/
       end          
     end
     
     describe "reader access disabled" do
       it "should redirect to the root path" do
         controller.stub(:cookies).and_return(:rules_engine_reader => 'false')
-        get :reader
-        response.should redirect_to(root_path)
+        get :index, :reader => true
+        response.should redirect_to("/root_path")
       end
     end  
   end    

data/{rails_generators/templates/spec → spec}/controllers/re_history_controller_spec.rb

@@ -3,7 +3,7 @@ require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
 describe ReHistoryController do
   extend RulesEngineMacros
   
-  integrate_views
+  render_views
   
   before(:each) do
     controller.instance_eval { flash.stub!(:sweep) }
@@ -17,10 +17,10 @@ describe ReHistoryController do
       runner = mock('runner')
       RulesEngine::Process.stub!(:runner).and_return(runner)
       
-      re_history = {:history => "none"}
+      re_history = {"history" => "none"}
       runner.should_receive(:history).with(nil, anything()).and_return(re_history)
       get :index
-      assigns[:re_history].should == re_history
+      assigns(:re_history).should == re_history
     end
   end
 
@@ -31,11 +31,11 @@ describe ReHistoryController do
       auditor = mock('auditor')
       RulesEngine::Process.stub!(:auditor).and_return(auditor)
       
-      re_audit_history = {:history => "none"}
-      auditor.should_receive(:history).with("123").and_return(re_audit_history)
+      re_audit_history = {"history" => "none"}
+      auditor.should_receive(:history).with(123).and_return(re_audit_history)
       
       get :show, :id => 123
-      assigns[:re_audit_history].should == re_audit_history
+      assigns(:re_audit_history).should == re_audit_history
     end
   end
 end

data/{rails_generators/templates/spec → spec}/controllers/re_plan_workflow_rules_controller_spec.rb

@@ -3,7 +3,7 @@ require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
 describe RePlanWorkflowRulesController do
   extend RulesEngineMacros
   
-  integrate_views
+  render_views
   
   before(:each) do
     controller.instance_eval { flash.stub!(:sweep) }
@@ -12,38 +12,23 @@ describe RePlanWorkflowRulesController do
     
     @re_plan = RePlan.make
     @re_workflow = ReWorkflow.make(:re_plans => [@re_plan])
-    
-    @rule_class = RulesEngine::Rule::Definition
-    @rule_class.options = {
-          :group => 'Mock',
-          :display_name => 'Mock Rule',    
-          :help_partial => '/mock_rule/help',
-          :new_partial => '/mock_rule/new',
-          :edit_partial => '/mock_rule/edit'
-        }           
-    
-    RulesEngine::Discovery.stub!(:rule_class).and_return(@rule_class)        
   end  
 
   describe "help" do
     it_should_require_rules_engine_reader_access(:help, :re_plan_id => 123, :workflow_id => 456, :rule_class_name => 'mock_rule')
     
-    before(:each) do
-      controller.stub!(:render).with('/mock_rule/help')
-    end
-    
     describe "rule class exists" do
       it "should get the rule record with the rule_class_name" do
         get :help, :re_plan_id => @re_plan.id, :workflow_id => @re_workflow.id, :rule_class_name => 'mock_rule'
         assigns[:re_plan].should == @re_plan
         assigns[:re_workflow].should == @re_workflow
-        assigns[:rule_class].should == @rule_class
+        assigns[:rule_class].should == RulesEngine::Rule::MockRule
       end
       
       it "should render the help partial" do
-        controller.should_receive(:render).with('/mock_rule/help')
         get :help, :re_plan_id => @re_plan.id, :workflow_id => @re_workflow.id, :rule_class_name => 'mock_rule'
         response.should render_template(:help)
+        response.body.should =~ /Mock Rule Help Partial/
       end
     end        
     
@@ -68,10 +53,6 @@ describe RePlanWorkflowRulesController do
   describe "new" do
     it_should_require_rules_engine_editor_access(:new, :re_plan_id => 123, :workflow_id => 456)
     
-    before(:each) do
-      controller.stub!(:render).with('/mock_rule/new')
-    end
-    
     it "should assign a new rule record" do
       get :new, :re_plan_id => @re_plan.id, :workflow_id => @re_workflow.id
       assigns[:re_rule].should be_instance_of(ReRule)
@@ -79,9 +60,9 @@ describe RePlanWorkflowRulesController do
     
     describe "the rule class exists" do
       it "should render the new partial" do
-        controller.should_receive(:render).with('/mock_rule/new')
         get :new, :re_plan_id => @re_plan.id, :workflow_id => @re_workflow.id, :rule_class_name => 'mock_rule'
         response.should render_template(:new)
+        response.body.should =~ /Mock Rule New Partial/
       end      
     end
     
@@ -98,7 +79,7 @@ describe RePlanWorkflowRulesController do
     it_should_require_rules_engine_editor_access(:create, :re_plan_id => 123, :workflow_id => 456, :rule_class_name => 'mock_rule')
   
     before do
-      @re_rule = ReRule.make(:re_workflow => @re_workflow)
+      @re_rule = ReRule.new(:re_workflow => @re_workflow, :rule_class_name => 'mock_rule')
       ReRule.stub!(:new).and_return(@re_rule) 
     end
     
@@ -128,18 +109,13 @@ describe RePlanWorkflowRulesController do
       end
   
       it "should render the 'new' template" do
-        controller.should_receive(:render).with('/mock_rule/new')
         post :create, :re_plan_id => @re_plan.id, :workflow_id => @re_workflow.id, :rule_class_name => 'mock_rule', :rule_attibutes => 'mock attributes'
         response.should render_template(:new)
+        response.body.should =~ /Mock Rule New Partial/
       end      
     end
     
     describe "the rule is valid" do
-      before(:each) do
-        @re_rule.stub!(:valid?).and_return(true)
-        @re_rule.stub!(:save).and_return(true)
-      end
-  
       it "should add the rule to the workflow" do
         post :create, :re_plan_id => @re_plan.id, :workflow_id => @re_workflow.id, :rule_class_name => 'mock_rule', :rule_attibutes => 'mock attributes'
         @re_workflow.re_rules.should include(@re_rule)
@@ -163,11 +139,10 @@ describe RePlanWorkflowRulesController do
   end
   
   describe "edit" do
-    it_should_require_rules_engine_editor_access(:edit, :re_plan_id => 123, :workflow_id => 456)
+    it_should_require_rules_engine_editor_access(:edit, :re_plan_id => 123, :workflow_id => 456, :id => 789)
     
     before(:each) do
-      controller.stub!(:render).with('/mock_rule/edit')
-      @re_rule = ReRule.make(:re_workflow => @re_workflow)
+      @re_rule = ReRule.make(:re_workflow => @re_workflow, :rule_class_name => 'mock_rule')
     end
     
     it "should assign a the rule record" do
@@ -177,9 +152,9 @@ describe RePlanWorkflowRulesController do
     
     describe "the rule class exists" do
       it "should render the edit partial" do
-        controller.should_receive(:render).with('/mock_rule/edit')
         get :edit, :re_plan_id => @re_plan.id, :workflow_id => @re_workflow.id, :id => @re_rule.id
         response.should render_template(:edit)
+        response.body.should =~ /Mock Rule Edit Partial/
       end      
     end
     
@@ -193,14 +168,14 @@ describe RePlanWorkflowRulesController do
   end
     
   describe "update" do
-    it_should_require_rules_engine_editor_access(:update, :re_plan_id => 123, :workflow_id => 456, :id => 456, :rule_attibutes => 'mock attributes')
+    it_should_require_rules_engine_editor_access(:update, :re_plan_id => 123, :workflow_id => 456, :id => 789, :rule_attibutes => 'mock attributes')
   
     before do
-      @re_rule = ReRule.make(:re_workflow => @re_workflow)
+      @re_rule = ReRule.make(:re_workflow => @re_workflow, :rule_class_name => 'mock_rule')
     end
   
     it "should get the rule record with the ID" do 
-      ReRule.should_receive(:find).with("123").and_return(@re_rule)
+      ReRule.should_receive(:find).with(123).and_return(@re_rule)
       put :update, :re_plan_id => @re_plan.id, :workflow_id => @re_workflow.id, :id => 123, :rule_attibutes => 'mock attributes'
       assigns[:re_rule].should == @re_rule
     end
@@ -229,9 +204,9 @@ describe RePlanWorkflowRulesController do
       end
     
       it "should render the 'edit' template" do
-        controller.should_receive(:render).with('/mock_rule/edit')
         put :update, :re_plan_id => @re_plan.id, :workflow_id => @re_workflow.id, :id => @re_rule.id, :rule_attibutes => 'mock attributes'
         response.should render_template(:edit)
+        response.body.should =~ /Mock Rule Edit Partial/
       end      
     end
     
@@ -262,12 +237,12 @@ describe RePlanWorkflowRulesController do
     it_should_require_rules_engine_editor_access(:destroy, :re_plan_id => 123, :workflow_id => 456, :id => 456)
   
     before do
-      @re_rule = ReRule.make(:re_workflow => @re_workflow)
+      @re_rule = ReRule.make(:re_workflow => @re_workflow, :rule_class_name => 'mock_rule')
       ReRule.stub!(:find).and_return(@re_rule) 
     end
       
     it "should get the rule record with the ID" do
-      ReRule.should_receive(:find).with("123").and_return(@re_rule)
+      ReRule.should_receive(:find).with(123).and_return(@re_rule)
       delete :destroy, :re_plan_id => @re_plan.id, :workflow_id => @re_workflow.id, :id => 123
       assigns[:re_rule].should == @re_rule
     end
@@ -297,7 +272,7 @@ describe RePlanWorkflowRulesController do
     it_should_require_rules_engine_editor_access(:move_up, :re_plan_id => 123, :workflow_id => 456, :id => 456)
     
     before(:each) do
-      @re_rule = ReRule.make(:re_workflow => @re_workflow)
+      @re_rule = ReRule.make(:re_workflow => @re_workflow, :rule_class_name => 'mock_rule')
     end
     
     it "should get the rule record with the ID" do
@@ -327,7 +302,7 @@ describe RePlanWorkflowRulesController do
     it_should_require_rules_engine_editor_access(:move_down, :re_plan_id => 123, :workflow_id => 456, :id => 456)
     
     before(:each) do
-      @re_rule = ReRule.make(:re_workflow => @re_workflow)
+      @re_rule = ReRule.make(:re_workflow => @re_workflow, :rule_class_name => 'mock_rule')
     end
     
     it "should get the rule record with the ID" do

data/{rails_generators/templates/spec → spec}/controllers/re_plan_workflows_controller_spec.rb

@@ -3,7 +3,7 @@ require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
 describe RePlanWorkflowsController do
   extend RulesEngineMacros
   
-  integrate_views
+  render_views
   
   before(:each) do
     controller.instance_eval { flash.stub!(:sweep) }
@@ -113,7 +113,7 @@ describe RePlanWorkflowsController do
     end
   
     it "should get the workflow record with the ID" do 
-      ReWorkflow.should_receive(:find).with("123").and_return(@re_workflow)
+      ReWorkflow.should_receive(:find).with(123).and_return(@re_workflow)
       put :update, :re_plan_id => @re_plan.id, :id => 123, :re_workflow => { :title => "value" }      
       assigns[:re_workflow].should == @re_workflow
     end
@@ -151,7 +151,7 @@ describe RePlanWorkflowsController do
       
       it "should redirect to the change re_workflow page for HTML" do
         put :update, :re_plan_id => @re_plan.id, :id => @re_workflow.id, :re_workflow => { :title => "name" }
-        response.should redirect_to(change_re_workflow_path(@re_workflow))
+        response.should redirect_to(change_re_plan_workflow_path(@re_plan, @re_workflow))
       end
   
       it "should render 'update' template for JAVASCRIPT" do        
@@ -170,7 +170,7 @@ describe RePlanWorkflowsController do
     end
       
     it "should get the workflow record with the ID" do
-      ReWorkflow.should_receive(:find).with("123").and_return(@re_workflow)
+      ReWorkflow.should_receive(:find).with(123).and_return(@re_workflow)
       delete :destroy, :re_plan_id => @re_plan.id, :id => 123
       assigns[:re_workflow].should == @re_workflow
     end
@@ -361,4 +361,117 @@ describe RePlanWorkflowsController do
       end
     end
   end
+  
+  # describe "publish" do
+  #   it_should_require_rules_engine_editor_access(:publish, :id => 123)
+  # 
+  #   before do
+  #     @re_plan = RePlan.make
+  #     @re_plan.stub!(:plan_error).and_return(nil)
+  #     RePlan.stub!(:find).and_return(@re_plan) 
+  #     
+  #     @publisher = mock('publisher')
+  #     @publisher.stub!(:publish)
+  #     RulesEngine::Publish.stub!(:publisher).and_return(@publisher)
+  #   end
+  #   
+  #   describe "tag is blank" do
+  #     it "should display a flash error message" do
+  #       put :publish, :id => 123, :tag => ""
+  #       flash[:error].should_not be_blank
+  #     end
+  #   end
+  # 
+  #   it "should publish the plan" do
+  #     @publisher.should_receive(:publish).with(@re_plan.code, "publish tag", @re_plan.publish)
+  #     put :publish, :id => 123, :tag => "publish tag"
+  #   end
+  # 
+  #   it "should update the plan to published" do
+  #     put :publish, :id => 123, :tag => "publish tag"
+  #     @re_plan.plan_status.should == RePlan::PLAN_STATUS_PUBLISHED
+  #   end
+  # 
+  #   it "should display a flash success message" do
+  #     put :publish, :id => 123, :tag => "publish tag"
+  #     flash[:success].should_not be_blank
+  #   end
+  #   
+  #   it "should redirect to the change_re_plan page for HTML" do
+  #     put :publish, :id => 123, :tag => "publish tag"
+  #     response.should redirect_to(change_re_plan_path(@re_plan))
+  #   end
+  # 
+  #   it "should render the update page for JAVASCRIPT" do
+  #     xhr :put, :publish, :id => 123, :tag => "publish tag"
+  #     response.should render_template(:update)
+  #   end    
+  # end
+  
+  # describe "revert" do
+  #   it_should_require_rules_engine_editor_access(:revert, :id => 123)
+  # 
+  #   before do
+  #     @publisher = mock('publisher')
+  #     @publisher.stub!(:get)
+  #     RulesEngine::Publish.stub!(:publisher).and_return(@publisher)
+  #     
+  #     @re_plan = RePlan.make
+  #     RePlan.stub!(:find).and_return(@re_plan) 
+  #   end
+  # 
+  #   it "should get the plan record with the ID" do
+  #     RePlan.should_receive(:find).with(123).and_return(@re_plan)
+  #     put :revert, :id => 123
+  #     assigns[:re_plan].should == @re_plan
+  #   end
+  #   
+  #   it "should get the plan from the publisher" do
+  #     @publisher.should_receive(:get).with(@re_plan.code)
+  #     put :revert, :id => 123
+  #   end
+  #       
+  #   describe "the publisher does not have the plan" do
+  #     it "should set an error message" do
+  #       put :revert, :id => 123
+  #       flash[:error].should_not be_blank
+  #     end          
+  #   end
+  #   
+  #   describe "the publisher has the plan" do
+  #     before(:each) do
+  #       @plan = {:code => 'mock plan'}
+  #       @publisher.stub!(:get).and_return(@plan)
+  #       @publisher.stub!(:revert!)
+  #       @re_plan.stub!(:save!)
+  #     end
+  #     
+  #     it "should revert the plan" do
+  #       @re_plan.should_receive(:revert!).with(@plan)
+  #       put :revert, :id => 123
+  #     end
+  # 
+  #     it "should save the plan" do
+  #       @re_plan.should_receive(:save!)
+  #       put :revert, :id => 123
+  #     end
+  #         
+  #     it "should display a flash success message" do
+  #       put :revert, :id => 123
+  #       flash[:success].should_not be_blank
+  #     end
+  #   end
+  #   
+  #   it "should redirect to the change re_plan page for HTML" do
+  #     put :revert, :id => 123
+  #     response.should redirect_to(change_re_plan_path(@re_plan))
+  #   end
+  # 
+  #   it "should render 'update' template for JAVASCRIPT" do
+  #     xhr :put, :revert, :id => 123
+  #     response.should render_template(:update)
+  #   end    
+  # end
+  # 
+  
 end