rules_engine 0.2.0 → 0.3.0

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

@@ -3,7 +3,7 @@ require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
 describe RePlansController do
   extend RulesEngineMacros
   
-  integrate_views
+  render_views
   
   before(:each) do
     controller.instance_eval { flash.stub!(:sweep) }
@@ -114,7 +114,7 @@ describe RePlansController do
     end
   
     it "should get the plan record with the ID" do
-      RePlan.should_receive(:find).with("123").and_return(@re_plan)
+      RePlan.should_receive(:find).with(123).and_return(@re_plan)
       put :update, :id => 123, :re_plan => { :title => "value" }
       assigns[:re_plan].should == @re_plan
     end
@@ -171,7 +171,7 @@ describe RePlansController do
     end
   
     it "should get the plan record with the ID" do
-      RePlan.should_receive(:find).with("123").and_return(@re_plan)
+      RePlan.should_receive(:find).with(123).and_return(@re_plan)
       delete :destroy, :id => 123
       assigns[:re_plan].should == @re_plan
     end
@@ -219,11 +219,15 @@ describe RePlansController do
   
   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
@@ -232,28 +236,20 @@ describe RePlansController do
         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
 
-    describe "plan is valid" do
-      before(:each) do
-        @publisher = mock('publisher')
-        @publisher.stub!(:publish)
-        RulesEngine::Publish.stub!(:publisher).and_return(@publisher)
-      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 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 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
@@ -280,7 +276,7 @@ describe RePlansController do
     end
   
     it "should get the plan record with the ID" do
-      RePlan.should_receive(:find).with("123").and_return(@re_plan)
+      RePlan.should_receive(:find).with(123).and_return(@re_plan)
       put :revert, :id => 123
       assigns[:re_plan].should == @re_plan
     end
@@ -309,7 +305,7 @@ describe RePlansController 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
@@ -341,13 +337,13 @@ describe RePlansController do
       runner = mock('runner')
       RulesEngine::Process.stub!(:runner).and_return(runner)
       
-      re_history = {:history => "none"}
+      re_history = {"history" => "none"}
       runner.should_receive(:history).with("mock_code", anything()).and_return(re_history)
       get :history, :id => re_plan.id
       assigns[:re_history].should == re_history
     end        
   end
-
+  
   describe "copy" do
     it_should_require_rules_engine_editor_access(:copy, :id => 123)
     
@@ -364,7 +360,7 @@ describe RePlansController do
   
   describe "duplicate" do
     it_should_require_rules_engine_editor_access(:duplicate, :id => 123)
-
+  
     before(:each) do
       @re_plan = RePlan.make
       RePlan.stub!(:find).and_return(@re_plan) 
@@ -409,7 +405,7 @@ describe RePlansController do
       before(:each) do
         @re_plan_copy.stub!(:save).and_return(false)
       end  
-
+  
       it "should render the 'copy' template" do
         post :duplicate, :id => 1234, :re_plan => {:title => 'new title'}
         response.should render_template(:copy)

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

@@ -3,7 +3,7 @@ require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
 describe RePublicationsController do
   extend RulesEngineMacros
   
-  integrate_views
+  render_views
   
   before(:each) do
     controller.instance_eval { flash.stub!(:sweep) }
@@ -19,7 +19,7 @@ describe RePublicationsController do
       publisher = mock('publisher')
       RulesEngine::Publish.stub!(:publisher).and_return(publisher)
       
-      re_publications = {:history => "none"}
+      re_publications = {"history" => "none"}
       publisher.should_receive(:history).with("mock_code", anything).and_return(re_publications)
       
       get :show, :id => re_plan.id

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

@@ -3,7 +3,7 @@ require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
 describe ReWorkflowRulesController do
   extend RulesEngineMacros
   
-  integrate_views
+  render_views
   
   before(:each) do
     controller.instance_eval { flash.stub!(:sweep) }
@@ -11,37 +11,22 @@ describe ReWorkflowRulesController do
     controller.stub!(:rules_engine_editor_access_required).and_return(true)
     
     @re_workflow = ReWorkflow.make
-    
-    @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_workflow_id => 123, :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_workflow_id => @re_workflow.id, :rule_class_name => 'mock_rule'
         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_workflow_id => @re_workflow.id, :rule_class_name => 'mock_rule'
         response.should render_template(:help)
+        response.body.should =~ /Mock Rule Help Partial/
       end
     end        
     
@@ -66,10 +51,6 @@ describe ReWorkflowRulesController do
   describe "new" do
     it_should_require_rules_engine_editor_access(:new, :re_workflow_id => 123)
     
-    before(:each) do
-      controller.stub!(:render).with('/mock_rule/new')
-    end
-    
     it "should assign a new rule record" do
       get :new, :re_workflow_id => @re_workflow.id
       assigns[:re_rule].should be_instance_of(ReRule)
@@ -77,9 +58,9 @@ describe ReWorkflowRulesController 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_workflow_id => @re_workflow.id, :rule_class_name => 'mock_rule'
         response.should render_template(:new)
+        response.body.should =~ /Mock Rule New Partial/
       end      
     end
     
@@ -96,7 +77,7 @@ describe ReWorkflowRulesController do
     it_should_require_rules_engine_editor_access(:create, :re_workflow_id => 123, :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
     
@@ -126,18 +107,13 @@ describe ReWorkflowRulesController do
       end
 
       it "should render the 'new' template" do
-        controller.should_receive(:render).with('/mock_rule/new')
         post :create, :re_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_workflow_id => @re_workflow.id, :rule_class_name => 'mock_rule', :rule_attibutes => 'mock attributes'
         @re_workflow.re_rules.should include(@re_rule)
@@ -161,11 +137,10 @@ describe ReWorkflowRulesController do
   end
 
   describe "edit" do
-    it_should_require_rules_engine_editor_access(:edit, :re_workflow_id => 123)
+    it_should_require_rules_engine_editor_access(:edit, :re_workflow_id => 123, :id => 456)
     
     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
@@ -175,9 +150,9 @@ describe ReWorkflowRulesController 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_workflow_id => @re_workflow.id, :id => @re_rule.id
         response.should render_template(:edit)
+        response.body.should =~ /Mock Rule Edit Partial/
       end      
     end
     
@@ -194,11 +169,11 @@ describe ReWorkflowRulesController do
     it_should_require_rules_engine_editor_access(:update, :re_workflow_id => 123, :id => 456, :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_workflow_id => @re_workflow.id, :id => 123, :rule_attibutes => 'mock attributes'
       assigns[:re_rule].should == @re_rule
     end
@@ -227,9 +202,9 @@ describe ReWorkflowRulesController do
       end
     
       it "should render the 'edit' template" do
-        controller.should_receive(:render).with('/mock_rule/edit')
         put :update, :re_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
     
@@ -260,12 +235,12 @@ describe ReWorkflowRulesController do
     it_should_require_rules_engine_editor_access(:destroy, :re_workflow_id => 123, :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_workflow_id => @re_workflow.id, :id => 123
       assigns[:re_rule].should == @re_rule
     end
@@ -295,7 +270,7 @@ describe ReWorkflowRulesController do
     it_should_require_rules_engine_editor_access(:move_up, :re_workflow_id => 123, :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
@@ -325,7 +300,7 @@ describe ReWorkflowRulesController do
     it_should_require_rules_engine_editor_access(:move_down, :re_workflow_id => 123, :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_workflows_controller_spec.rb

@@ -3,7 +3,7 @@ require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
 describe ReWorkflowsController do
   extend RulesEngineMacros
   
-  integrate_views
+  render_views
   
   before(:each) do
     controller.instance_eval { flash.stub!(:sweep) }
@@ -115,7 +115,7 @@ describe ReWorkflowsController 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, :id => 123, :re_workflow => { :title => "value" }
       assigns[:re_workflow].should == @re_workflow
     end
@@ -177,7 +177,7 @@ describe ReWorkflowsController 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, :id => 123
       assigns[:re_workflow].should == @re_workflow
     end
@@ -226,7 +226,7 @@ describe ReWorkflowsController do
     
     it "should get the workflow record with the ID" do
       re_workflow = ReWorkflow.make
-      ReWorkflow.should_receive(:find).with("123").and_return(re_workflow)
+      ReWorkflow.should_receive(:find).with(123).and_return(re_workflow)
       get :preview, :id => 123
       assigns[:re_workflow].should == re_workflow
     end

data/spec/{rules_engine → lib/rules_engine}/cache_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
+require File.expand_path(File.dirname(__FILE__) + '/../../spec_helper')
 
 describe "RulesEngine::Cache" do
   before(:each) do

data/spec/{rules_engine → lib/rules_engine}/discovery_spec.rb

@@ -1,8 +1,8 @@
-require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
+require File.expand_path(File.dirname(__FILE__) + '/../../spec_helper')
 
 describe "RulesEngine::Discovery" do
   before(:each) do
-    Dir.stub!(:glob).and_return(["#{RAILS_ROOT}/app/rules/mock_rule.rb"])
+    Dir.stub!(:glob).and_return(["#{Rails.root}/app/rules/mock_rule.rb"])
   end
 
   describe "setting the rules path" do
@@ -17,9 +17,9 @@ describe "RulesEngine::Discovery" do
       RulesEngine::Discovery.rules_path.should =='dummy'
     end
     
-    it "should return the \#{RAILS_ROOT}/app/rules" do
+    it "should return the \#{Rails.root}/app/rules" do
       RulesEngine::Discovery.rules_path = nil
-      RulesEngine::Discovery.rules_path.should == "#{RAILS_ROOT}/app/rules"
+      RulesEngine::Discovery.rules_path.should == "#{Rails.root}/app/rules"
     end
 
     it "should throw an exception if not using rails" do
@@ -32,8 +32,8 @@ describe "RulesEngine::Discovery" do
   end
   
   describe "rules path not defined" do
-    it "should find all of the rules ruby files in the \#{RAILS_ROOT}/app/rules directory " do
-      Dir.should_receive(:glob).with(/^#{RAILS_ROOT}\/app\/rules\/\*\*\/\*.rb$/).and_return([])
+    it "should find all of the rules ruby files in the \#{Rails.root}/app/rules directory " do
+      Dir.should_receive(:glob).with(/^#{Rails.root}\/app\/rules\/\*\*\/\*.rb$/).and_return([])
       RulesEngine::Discovery.discover!
     end
   end
@@ -45,10 +45,10 @@ describe "RulesEngine::Discovery" do
 
   it "should undefine an existing the rule class" do
     RulesEngine::Discovery.discover! 
-    RulesEngine::Discovery.rule_class('RulesEngine::Rule::MockRule').options.should == {:group=>"mock group"}
-    RulesEngine::Discovery.rule_class('RulesEngine::Rule::MockRule').options[:name] = "test"
+    RulesEngine::Discovery.rule_class('mock_rule').options[:group].should == "mock group"
+    RulesEngine::Discovery.rule_class('mock_rule').options[:group] = "test"
     RulesEngine::Discovery.discover! 
-    RulesEngine::Discovery.rule_class('RulesEngine::Rule::MockRule').options.should == {:group=>"mock group"}
+    RulesEngine::Discovery.rule_class('mock_rule').options[:group].should == "mock group"
   end
 
   it "should add the rule to the rule group" do
@@ -58,7 +58,7 @@ describe "RulesEngine::Discovery" do
   
   it "should return the class that matches the name" do
     RulesEngine::Discovery.discover!      
-    RulesEngine::Discovery.rule_class('RulesEngine::Rule::MockRule').should == RulesEngine::Rule::MockRule
+    RulesEngine::Discovery.rule_class('mock_rule').should == RulesEngine::Rule::MockRule
   end
 
   it "should return nil if the class is unknown" do
@@ -69,8 +69,8 @@ describe "RulesEngine::Discovery" do
   describe "the rule class" do
     it "should have a matching rule_class_name" do
       RulesEngine::Discovery.discover!      
-      rule = RulesEngine::Discovery.rule_class('RulesEngine::Rule::MockRule')
-      rule.rule_class_name.should == 'RulesEngine::Rule::MockRule'
+      rule = RulesEngine::Discovery.rule_class('mock_rule')
+      rule.rule_class_name.should == 'mock_rule'
     end        
   end
   

data/spec/{rules_engine → lib/rules_engine}/process/auditor/db_auditor_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path(File.dirname(__FILE__) + '/../../../spec_helper')
+require File.expand_path(File.dirname(__FILE__) + '/../../../../spec_helper')
 
 describe "RulesEngine::Process::ReProcessAudit" do
   before(:each) do

data/spec/{rules_engine → lib/rules_engine}/process/auditor_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path(File.dirname(__FILE__) + '/../../spec_helper')
+require File.expand_path(File.dirname(__FILE__) + '/../../../spec_helper')
 
 describe "RulesEngine::Process::Runner" do