rules_engine 0.1.7 → 0.1.8

data/rails_generators/templates/app/rules/simple.rb

@@ -9,9 +9,9 @@ module RulesEngine
         {
           :group => 'General',
           :display_name => 'Simple',    
-          :help_partial => '/re_rule_definitions/<%=rule_name%>/help',
-          :new_partial => '/re_rule_definitions/<%=rule_name%>/new',
-          :edit_partial => '/re_rule_definitions/<%=rule_name%>/edit'
+          :help_partial => '/re_rules/<%=rule_name%>/help',
+          :new_partial => '/re_rules/<%=rule_name%>/new',
+          :edit_partial => '/re_rules/<%=rule_name%>/edit'
         } 
   
       ##################################################################
@@ -74,7 +74,7 @@ module RulesEngine
       ##################################################################
       # execute the rule
       # this rule does nothing
-      def process(process_id, data)
+      def process(process_id, plan, data)
         RulesEngine::Process.auditor.audit(process_id, "Inside Rule #{title}", RulesEngine::Process::AUDIT_INFO)                        
         # RulesEngine::Rule::Outcome.new(RulesEngine::Rule::Outcome::STOP_SUCCESS)
         # RulesEngine::Rule::Outcome.new(RulesEngine::Rule::Outcome::STOP_FAILURE)

data/rails_generators/templates/app/views/re_plan_workflows/edit.js.erb

@@ -6,3 +6,5 @@ $("#re_workflow_edit_form").submit(function() { return false; });
 
 $.re_unblock();
 $.fancybox({ href: '#re_content'});
+
+$('#re_workflow_title').focus();

data/rails_generators/templates/app/views/re_plan_workflows/new.js.erb

@@ -7,3 +7,5 @@ $("#re_workflow_new_form").submit(function() { return false; });
 $.re_unblock();
 $.fancybox.resize();
 $.fancybox({ href: '#re_content'});
+
+$('#re_workflow_code').focus();

data/rails_generators/templates/app/views/re_plans/_menu.html.erb

@@ -1,14 +1,12 @@
 <% plan_status = @re_plan.plan_status %>
 
-<% if plan_status == RePlan::PLAN_STATUS_DRAFT && !@re_plan.plan_error %>
+<% if plan_status == RePlan::PLAN_STATUS_DRAFT || plan_status == RePlan::PLAN_STATUS_CHANGED %>
   <h4>
-    <%= link_to("Publish Plan", "##{@re_plan.id}", :id => "re_plan_publish", :class => "re-menu-plan-publish") %>
-  </h4>    
-	<div class="clear top-5"></div>
-<% end %>  
-<% if plan_status == RePlan::PLAN_STATUS_CHANGED && !@re_plan.plan_error %>
-  <h4>
-    <%= link_to("Publish Changes", "##{@re_plan.id}", :id => "re_plan_publish", :class => "re-menu-plan-publish") %>
+		<% if @re_plan.plan_error %>
+    	<%= link_to("Publish Plan", "##{@re_plan.id}", :id => "re_plan_publish_with_errors", :class => "re-menu-plan-publish") %>
+		<% else %>
+    	<%= link_to("Publish Plan", "##{@re_plan.id}", :id => "re_plan_publish", :class => "re-menu-plan-publish") %>
+		<% end %>
   </h4>    
 	<div class="clear top-5"></div>
 <% end %>  

data/rails_generators/templates/app/views/re_plans/change.html.erb

@@ -89,6 +89,7 @@
       <% re_whitebox do %>    
         <h3 class="re-hdr-plan-alert"><span class="red">Confirm :</span> Publish Plan</h3>
         <div class="clear top-5"></div>
+				<div class="red prepend-1" id="re_plan_publish_warning"></div>
         <hr/>
         <div class="clear top-5"></div>
   

data/rails_generators/templates/app/views/re_plans/edit.js.erb

@@ -6,3 +6,5 @@ $("#re_plan_edit_form").submit(function() { return false; });
 
 $.re_unblock();
 $.fancybox({ href: '#re_content'});
+
+$('#re_plan_title').focus();

data/rails_generators/templates/app/views/re_plans/new.js.erb

@@ -6,3 +6,5 @@ $("#re_plan_new_form").submit(function() { return false; });
 
 $.re_unblock();
 $.fancybox({ href: '#re_content'});
+
+$('#re_plan_code').focus();

data/rails_generators/templates/app/views/re_rules/complex/_edit.html.erb

@@ -0,0 +1 @@
+<%%= render '/re_rules/<%=rule_name%>/form', :f => f %>

data/rails_generators/templates/app/views/{re_rule_definitions → re_rules}/complex/_form.html.erb

@@ -1,14 +1,14 @@
 <%% javascript_tag do %>
-  var new_<%=rule_name%> = '<%%=escape_javascript(render("/re_rule_definitions/<%=rule_name%>/form_word"))%>'  
+  var new_<%=rule_name%> = '<%%=escape_javascript(render("/re_rules/<%=rule_name%>/form_word"))%>'  
   
   var update<%=rule_class%>WorkflowAction = function() {
     if ($('#<%=rule_name%>_workflow_action').attr('value') == "start_workflow")
     {
-      $('#<%=rule_name%>_workflow').re_form_enable();
-      $('#<%=rule_name%>_workflow').removeAttr("disabled");      
+      $('#<%=rule_name%>_workflow_code').re_form_enable();
+      $('#<%=rule_name%>_workflow_code').removeAttr("disabled");      
     } else {
-      $('#<%=rule_name%>_workflow').re_form_disable();
-      $('#<%=rule_name%>_workflow').attr("disabled", true); 
+      $('#<%=rule_name%>_workflow_code').re_form_disable();
+      $('#<%=rule_name%>_workflow_code').attr("disabled", true); 
     }      
   }
 
@@ -35,15 +35,15 @@
 
 <!-- WORDS -->
 <%% position = 0 %>
-<%% (@re_rule.rule.words || []).each do | word | %>  
+<%% (@re_rule.rule.match_words || []).each do | word | %>  
   <%% f.fields_for :rule_data, {:first => false} do |frd| %>
-    <%%= render '/re_rule_definitions/<%=rule_name%>/form_word', :f => frd, :position => position, :word => word %>
+    <%%= render '/re_rules/<%=rule_name%>/form_word', :f => frd, :position => position, :word => word %>
     <%% position += 1 %>        
   <%% end %>
 <%% end %>  
 <%% if position == 0 %>
   <%% f.fields_for :rule_data, {:first => false} do |frd| %>
-    <%%= render '/re_rule_definitions/<%=rule_name%>/form_word', :f => frd, :position => position %>      
+    <%%= render '/re_rules/<%=rule_name%>/form_word', :f => frd, :position => position %>      
   <%% end %>
 <%% end %>
 
@@ -67,10 +67,10 @@
 																		:required => true %>
 </div>
 <div class="prepend-1 span-7 last">
-  <%%= re_text_field "Workflow Code", "<%=rule_name%>_workflow", @re_rule.rule.workflow || params[:<%=rule_name%>_workflow], 
+  <%%= re_text_field "Workflow Code", "<%=rule_name%>_workflow_code", @re_rule.rule.workflow_code || params[:<%=rule_name%>_workflow_code], 
 																		:size => 20, 
 																		:required => true, 
 																		:span => '3x5',
-																		:error => @re_rule.rule.errors[:<%=rule_name%>_workflow] %>
+																		:error => @re_rule.rule.errors[:<%=rule_name%>_workflow_code] %>
 </div>
 

data/rails_generators/templates/app/views/{re_rule_definitions → re_rules}/complex/_form_word.html.erb

@@ -1,7 +1,7 @@
 <%% id = local_assigns[:position] ? position : 'NEW_RECORD'  %>
 
 <div id="<%=rule_name%>_<%%=id%>">
-  <%%= re_text_field "Words to match", "<%=rule_name%>_words[#{id}][word]",  
+  <%%= re_text_field "Words to match", "<%=rule_name%>_match_words[#{id}][word]",  
                                             local_assigns[:word] ? word : '',
                                             :size => 25, 
                                             :required => id == 0, 

data/rails_generators/templates/app/views/re_rules/complex/_new.html.erb

@@ -0,0 +1 @@
+<%%= render '/re_rules/<%=rule_name%>/form', :f => f %>

data/rails_generators/templates/app/views/re_rules/simple/_edit.html.erb

@@ -0,0 +1 @@
+<%%= render '/re_rules/<%=rule_name%>/form' %>

data/rails_generators/templates/app/views/re_rules/simple/_new.html.erb

@@ -0,0 +1 @@
+<%%= render '/re_rules/<%=rule_name%>/form' %>

data/rails_generators/templates/app/views/re_workflows/edit.js.erb

@@ -6,3 +6,5 @@ $("#re_workflow_edit_form").submit(function() { return false; });
 
 $.re_unblock();
 $.fancybox({ href: '#re_content'});
+
+$('#re_workflow_title').focus();

data/rails_generators/templates/app/views/re_workflows/new.js.erb

@@ -2,4 +2,6 @@ $('#re_content').html('<%=escape_javascript(render('/re_workflows/new', :create_
 
 $('#re_workflow_new_insert').closest('div.re-form-button').re_form_button(); 
 
-$("#re_workflow_new_form").submit(function() { return false; });
+$("#re_workflow_new_form").submit(function() { return false; });
+
+$('#re_workflow_code').focus();

data/rails_generators/templates/lib/tasks/rules_engine.rake

@@ -15,19 +15,19 @@ task :rules_engine do
         
   RulesEngine::Publish.publisher = :db_publisher
   RulesEngine::Process.runner = :db_runner
-  # RulesEngine::Process.auditor = :db_auditor
-  # RulesEngine::Process.auditor.audit_level = RulesEngine::Process::AUDIT_INFO
+  RulesEngine::Process.auditor = :db_auditor
+  RulesEngine::Process.auditor.audit_level = RulesEngine::Process::AUDIT_INFO
   RulesEngine::Discovery.rules_path = File.expand_path(File.join(File.dirname(__FILE__), '/../../app/rules'))
   RulesEngine::Discovery.discover! 
   
   plan = RulesEngine::Publish.publisher.get(ENV['re_plan'])
   if plan.nil?
-    raise "published plan \"ENV['re_plan']\" not found"
+    raise "published plan \"#{ENV['re_plan']}\" not found"
   end    
     
   data = ENV.inject({}){ |data, value| data[value[0].sub(/^re_/, '').to_sym] = value[1] if value[0] =~ /^re_/; data }  
   process_id = RulesEngine::Process.runner.create  
-  success = RulesEngine::Process.runner.run(process_id, plan, data)
+  success = RulesEngine::Process.runner.run_plan(process_id, plan, data)
   
   # process = RulesEngine::Process.open(process.re_process.id)
       

data/rails_generators/templates/public/javascripts/rules_engine/re_plan_change.js

@@ -50,7 +50,19 @@ $(document).ready(function() {
     return false;
   });
 
-  $('a#re_plan_publish').live('click', function() {    
+  $('a#re_plan_publish').live('click', function() {  
+    $('#re_plan_publish_warning').html('');
+    $('#re_plan_publish_form #tag').attr('value', '')
+    $('#re_plan_publish_tag').attr('value', '')
+    $('#re_plan_publish_tag').re_form_valid();
+    $('#re_plan_publish_tag').closest('#re_plan_publish_confirm').find('.form-error-message').remove();
+    $.fancybox({ 'href': '#re_plan_publish_confirm' });          
+    
+  	return false;  
+  });  
+
+  $('a#re_plan_publish_with_errors').live('click', function() {  
+    $('#re_plan_publish_warning').html('Warning! The plan you are publishing has errors!');
     $('#re_plan_publish_form #tag').attr('value', '')
     $('#re_plan_publish_tag').attr('value', '')
     $('#re_plan_publish_tag').re_form_valid();

data/rails_generators/templates/public/stylesheets/rules_engine/screen.css

@@ -736,8 +736,8 @@ p.re-xtra-rule-name {
   font-size: 14px;
   line-height: 18px;
   width: 180px;
-  height: 16px;
-  overflow: hidden;
+/*  height: 16px;*/
+/*  overflow: hidden;*/
 }
 
 /* ************************************* */

data/rails_generators/templates/spec/controllers/re_plans_controller_spec.rb

@@ -237,14 +237,6 @@ describe RePlansController do
       RePlan.stub!(:find).and_return(@re_plan) 
     end
     
-    describe "plan has errors" do
-      it "should display a flash error message" do
-        @re_plan.should_receive(:plan_error).and_return('error')
-        put :publish, :id => 123, :tag => "publish tag"
-        flash[:error].should_not be_blank
-      end
-    end
-
     describe "tag is blank" do
       it "should display a flash error message" do
         put :publish, :id => 123, :tag => ""

data/rails_generators/templates/spec/lib/rules/complex_spec.rb

@@ -9,7 +9,7 @@ describe RulesEngine::Rule::<%=rule_class%> do
   def valid_attributes
     {
       :<%=rule_name%>_title => 'Another Title',
-      :<%=rule_name%>_words => {
+      :<%=rule_name%>_match_words => {
                     "1" => { "word" => 'first word'  },
                     "2" => { "word" => 'second word' }
                   }
@@ -29,16 +29,16 @@ describe RulesEngine::Rule::<%=rule_class%> do
       RulesEngine::Rule::<%=rule_class%>.options[:display_name].should == "<%=rule_class%>"
     end
 
-    it "should have the help template of '/re_rule_definitions/<%=rule_name%>/help'" do
-      RulesEngine::Rule::<%=rule_class%>.options[:help_partial].should == '/re_rule_definitions/<%=rule_name%>/help'
+    it "should have the help template of '/re_rules/<%=rule_name%>/help'" do
+      RulesEngine::Rule::<%=rule_class%>.options[:help_partial].should == '/re_rules/<%=rule_name%>/help'
     end
 
-    it "should have the new template of '/re_rule_definitions/<%=rule_name%>/new'" do
-      RulesEngine::Rule::<%=rule_class%>.options[:new_partial].should == '/re_rule_definitions/<%=rule_name%>/new'
+    it "should have the new template of '/re_rules/<%=rule_name%>/new'" do
+      RulesEngine::Rule::<%=rule_class%>.options[:new_partial].should == '/re_rules/<%=rule_name%>/new'
     end
 
-    it "should have the edit view partial template of '/re_rule_definitions/<%=rule_name%>/edit'" do
-      RulesEngine::Rule::<%=rule_class%>.options[:edit_partial].should == '/re_rule_definitions/<%=rule_name%>/edit'
+    it "should have the edit view partial template of '/re_rules/<%=rule_name%>/edit'" do
+      RulesEngine::Rule::<%=rule_class%>.options[:edit_partial].should == '/re_rules/<%=rule_name%>/edit'
     end
   end
   
@@ -57,8 +57,8 @@ describe RulesEngine::Rule::<%=rule_class%> do
         @<%=rule_name%>.title.should == "Rule Title"        
       end
 
-      it "should set the words" do
-        @<%=rule_name%>.words.should == ["word one", "word two"]
+      it "should set the match_words" do
+        @<%=rule_name%>.match_words.should == ["word one", "word two"]
       end
 
       it "should set the workflow_action" do
@@ -66,7 +66,7 @@ describe RulesEngine::Rule::<%=rule_class%> do
       end
 
       it "should set the workflow" do
-        @<%=rule_name%>.workflow.should == "Other Workflow"
+        @<%=rule_name%>.workflow_code.should == "Other Workflow"
       end        
     end
 
@@ -77,10 +77,10 @@ describe RulesEngine::Rule::<%=rule_class%> do
         @<%=rule_name%>.title.should be_nil
       end
       
-      it "should set the words to nil" do
-        @<%=rule_name%>.words.should_not be_nil
+      it "should set the match_words to nil" do
+        @<%=rule_name%>.match_words.should_not be_nil
         @<%=rule_name%>.data = nil
-        @<%=rule_name%>.words.should be_nil
+        @<%=rule_name%>.match_words.should be_nil
       end
 
       it "should se the workflow action to 'continue'" do
@@ -90,23 +90,23 @@ describe RulesEngine::Rule::<%=rule_class%> do
       end
       
       it "should set the 'workflow' to nil" do
-        @<%=rule_name%>.workflow.should_not be_nil
+        @<%=rule_name%>.workflow_code.should_not be_nil
         @<%=rule_name%>.data = nil
-        @<%=rule_name%>.workflow.should be_nil
+        @<%=rule_name%>.workflow_code.should be_nil
       end              
     end
   end
   
   describe "the summary" do
-    it "should be singluar if there is one word" do
+    it "should be singluar if there is one match_word" do
       <%=rule_name%> = RulesEngine::Rule::<%=rule_class%>.new
-      <%=rule_name%>.stub!(:words).and_return(["one"])
+      <%=rule_name%>.stub!(:match_words).and_return(["one"])
       <%=rule_name%>.summary.should == "Match the word one"
     end
 
-    it "should be plural if there are multiple words" do
+    it "should be plural if there are multiple match_words" do
       <%=rule_name%> = RulesEngine::Rule::<%=rule_class%>.new
-      <%=rule_name%>.stub!(:words).and_return(["one", "two", "three"])
+      <%=rule_name%>.stub!(:match_words).and_return(["one", "two", "three"])
       <%=rule_name%>.summary.should == "Match the words one, two, three"
     end        
   end
@@ -115,9 +115,9 @@ describe RulesEngine::Rule::<%=rule_class%> do
     it "should be converted to a json string" do
       <%=rule_name%> = RulesEngine::Rule::<%=rule_class%>.new
       <%=rule_name%>.should_receive(:title).and_return("mock title")
-      <%=rule_name%>.should_receive(:words).and_return(["one", "two"])
+      <%=rule_name%>.should_receive(:match_words).and_return(["one", "two"])
       <%=rule_name%>.should_receive(:workflow_action).and_return("workflow action")
-      <%=rule_name%>.should_receive(:workflow).and_return("workflow")
+      <%=rule_name%>.should_receive(:workflow_code).and_return("workflow")
       <%=rule_name%>.data.should == '["mock title",["one","two"],"workflow action","workflow"]'
     end
   end
@@ -125,32 +125,33 @@ describe RulesEngine::Rule::<%=rule_class%> do
   describe "the expected_outcomes" do
     it "should be next" do
       <%=rule_name%> = RulesEngine::Rule::<%=rule_class%>.new
-      <%=rule_name%>.should_receive(:workflow_action).and_return('next')
-      <%=rule_name%>.expected_outcomes.should == [:outcome => RulesEngine::Rule::Outcome::NEXT]
+      <%=rule_name%>.stub!(:workflow_action).and_return('next')
+      <%=rule_name%>.expected_outcomes[0][:outcome].should == RulesEngine::Rule::Outcome::NEXT
     end
     
     it "should be stop success" do
       <%=rule_name%> = RulesEngine::Rule::<%=rule_class%>.new
-      <%=rule_name%>.should_receive(:workflow_action).and_return('stop_success')
-      <%=rule_name%>.expected_outcomes.should == [:outcome => RulesEngine::Rule::Outcome::STOP_SUCCESS]
+      <%=rule_name%>.stub!(:workflow_action).and_return('stop_success')
+      <%=rule_name%>.expected_outcomes[0][:outcome].should == RulesEngine::Rule::Outcome::STOP_SUCCESS
     end
     
     it "should be stop failure" do
       <%=rule_name%> = RulesEngine::Rule::<%=rule_class%>.new
-      <%=rule_name%>.should_receive(:workflow_action).and_return('stop_failure')
-      <%=rule_name%>.expected_outcomes.should == [:outcome => RulesEngine::Rule::Outcome::STOP_FAILURE]
+      <%=rule_name%>.stub!(:workflow_action).and_return('stop_failure')
+      <%=rule_name%>.expected_outcomes[0][:outcome].should == RulesEngine::Rule::Outcome::STOP_FAILURE      
     end
     
     it "should be start workflow" do
       <%=rule_name%> = RulesEngine::Rule::<%=rule_class%>.new
-      <%=rule_name%>.should_receive(:workflow_action).and_return('start_workflow')
-      <%=rule_name%>.should_receive(:workflow).and_return('mock workflow')
-      <%=rule_name%>.expected_outcomes.should == [:outcome => RulesEngine::Rule::Outcome::START_WORKFLOW, :workflow_code => "mock workflow"]
+      <%=rule_name%>.stub!(:workflow_action).and_return('start_workflow')
+      <%=rule_name%>.stub!(:workflow_code).and_return('workflow_code')
+      <%=rule_name%>.expected_outcomes[0][:outcome].should == RulesEngine::Rule::Outcome::START_WORKFLOW
+      <%=rule_name%>.expected_outcomes[0][:title].should == "Start Workflow : workflow_code"
     end
     
     it "should be next be default" do
       <%=rule_name%> = RulesEngine::Rule::<%=rule_class%>.new
-      <%=rule_name%>.should_receive(:workflow_action).and_return('this is not valid')
+      <%=rule_name%>.stub!(:workflow_action).and_return('this is not valid')
       <%=rule_name%>.expected_outcomes.should == [:outcome => RulesEngine::Rule::Outcome::NEXT]
     end
     
@@ -185,38 +186,38 @@ describe RulesEngine::Rule::<%=rule_class%> do
       end                
     end
 
-    describe "setting the <%=rule_name%>_words" do
-      it "should set the words" do
+    describe "setting the <%=rule_name%>_match_words" do
+      it "should set the match_words" do
         @<%=rule_name%>.attributes = valid_attributes
-        @<%=rule_name%>.words.should == ['first word', 'second word']
+        @<%=rule_name%>.match_words.should == ['first word', 'second word']
       end            
     
-      it "should not be valid if the '<%=rule_name%>_words' attribute is missing" do
-        @<%=rule_name%>.attributes = valid_attributes.except(:<%=rule_name%>_words)
+      it "should not be valid if the '<%=rule_name%>_match_words' attribute is missing" do
+        @<%=rule_name%>.attributes = valid_attributes.except(:<%=rule_name%>_match_words)
         @<%=rule_name%>.should_not be_valid
-        @<%=rule_name%>.errors.should include(:<%=rule_name%>_words)      
+        @<%=rule_name%>.errors.should include(:<%=rule_name%>_match_words)      
       end            
     
-      it "should not be valid if the '<%=rule_name%>_words' is not a hash" do
-        @<%=rule_name%>.attributes = valid_attributes.merge(:<%=rule_name%>_words => "<%=rule_name%> word")
+      it "should not be valid if the '<%=rule_name%>_match_words' is not a hash" do
+        @<%=rule_name%>.attributes = valid_attributes.merge(:<%=rule_name%>_match_words => "<%=rule_name%> word")
         @<%=rule_name%>.should_not be_valid
-        @<%=rule_name%>.errors.should include(:<%=rule_name%>_words)
+        @<%=rule_name%>.errors.should include(:<%=rule_name%>_match_words)
       end                
 
-      it "should not be valid if the '<%=rule_name%>_words' is empty" do
-        @<%=rule_name%>.attributes = valid_attributes.merge(:<%=rule_name%>_words => {})
+      it "should not be valid if the '<%=rule_name%>_match_words' is empty" do
+        @<%=rule_name%>.attributes = valid_attributes.merge(:<%=rule_name%>_match_words => {})
         @<%=rule_name%>.should_not be_valid
-        @<%=rule_name%>.errors.should include(:<%=rule_name%>_words)
+        @<%=rule_name%>.errors.should include(:<%=rule_name%>_match_words)
       end                
       
       it "should not include parameters that are marked for deletion" do
-        @<%=rule_name%>.attributes = valid_attributes.merge(:<%=rule_name%>_words => {
+        @<%=rule_name%>.attributes = valid_attributes.merge(:<%=rule_name%>_match_words => {
                                                                               "1" => { "word" => 'first word', "_delete" => '1'  },
                                                                               "2" => { "word" => 'second word' }
                                                                             }         
          )
         @<%=rule_name%>.should be_valid
-        @<%=rule_name%>.words.should == ['second word']
+        @<%=rule_name%>.match_words.should == ['second word']
       end
           
     end
@@ -234,29 +235,29 @@ describe RulesEngine::Rule::<%=rule_class%> do
         @<%=rule_name%>.workflow_action.should == 'continue'
       end
 
-      it "should set the workflow" do
-        @<%=rule_name%>.attributes = valid_attributes.merge(:<%=rule_name%>_workflow => "mock workflow")        
+      it "should set the workflow_code" do
+        @<%=rule_name%>.attributes = valid_attributes.merge(:<%=rule_name%>_workflow_code => "mock workflow")        
         @<%=rule_name%>.should be_valid
-        @<%=rule_name%>.workflow.should == 'mock workflow'
+        @<%=rule_name%>.workflow_code.should == 'mock workflow'
       end
           
       describe "workflow action is start_workflow" do
         it "should be valid with valid '<%=rule_name%>_workflow'" do
-          @<%=rule_name%>.attributes = valid_attributes.merge(:<%=rule_name%>_workflow_action => "start_workflow", :<%=rule_name%>_workflow => "mock workflow")        
+          @<%=rule_name%>.attributes = valid_attributes.merge(:<%=rule_name%>_workflow_action => "start_workflow", :<%=rule_name%>_workflow_code => "mock workflow")        
           @<%=rule_name%>.should be_valid
-          @<%=rule_name%>.workflow.should == 'mock workflow'
+          @<%=rule_name%>.workflow_code.should == 'mock workflow'
         end            
         
         it "should not be valid if the '<%=rule_name%>_workflow' attribute is missing" do
-          @<%=rule_name%>.attributes = valid_attributes.merge(:<%=rule_name%>_workflow_action => "start_workflow").except(:<%=rule_name%>_workflow)        
+          @<%=rule_name%>.attributes = valid_attributes.merge(:<%=rule_name%>_workflow_action => "start_workflow").except(:<%=rule_name%>_workflow_code)        
           @<%=rule_name%>.should_not be_valid
-          @<%=rule_name%>.errors.should include(:<%=rule_name%>_workflow)
+          @<%=rule_name%>.errors.should include(:<%=rule_name%>_workflow_code)
         end            
 
         it "should not be valid if the '<%=rule_name%>_workflow' attribute is blank" do
-          @<%=rule_name%>.attributes = valid_attributes.merge(:<%=rule_name%>_workflow_action => "start_workflow", :<%=rule_name%>_workflow => "")        
+          @<%=rule_name%>.attributes = valid_attributes.merge(:<%=rule_name%>_workflow_action => "start_workflow", :<%=rule_name%>_workflow_code => "")        
           @<%=rule_name%>.should_not be_valid
-          @<%=rule_name%>.errors.should include(:<%=rule_name%>_workflow)
+          @<%=rule_name%>.errors.should include(:<%=rule_name%>_workflow_code)
         end            
       end    
     end
@@ -277,15 +278,15 @@ describe RulesEngine::Rule::<%=rule_class%> do
   describe "processing the rule" do
     before(:each) do
       @<%=rule_name%> = RulesEngine::Rule::<%=rule_class%>.new
-      @<%=rule_name%>.stub!(:words).and_return(["found", "word"])
+      @<%=rule_name%>.stub!(:match_words).and_return(["found", "word"])
     end
     
     it "should do nothing if there is no tweet" do      
-      @<%=rule_name%>.process(1001, {}).outcome.should == RulesEngine::Rule::Outcome::NEXT
+      @<%=rule_name%>.process(1001, {:plan => "plan"}, {:data => "data"}).outcome.should == RulesEngine::Rule::Outcome::NEXT
     end        
   
     it "should do nothing if there is no match" do
-      @<%=rule_name%>.process(@job, {:tweet => "not here"}).outcome.should == RulesEngine::Rule::Outcome::NEXT
+      @<%=rule_name%>.process(@job, {:plan => "plan"}, {:tweet => "not here"}).outcome.should == RulesEngine::Rule::Outcome::NEXT
     end        
     
     describe "a match found" do
@@ -294,7 +295,7 @@ describe RulesEngine::Rule::<%=rule_class%> do
       end
       
       it "should add the match to the data" do              
-        @<%=rule_name%>.process(@job, @matched_data)
+        @<%=rule_name%>.process(@job, {:plan => "plan"}, @matched_data)
         @matched_data[:tweet_match].should == "word"
       end        
       
@@ -303,29 +304,29 @@ describe RulesEngine::Rule::<%=rule_class%> do
           process_id.should == 1001
           message.should =~ /word$/
         end
-        @<%=rule_name%>.process(1001, @matched_data)
+        @<%=rule_name%>.process(1001, {:plan => "plan"}, @matched_data)
       end        
       
       describe "matching workflow actions" do
         it "should return next" do
           @<%=rule_name%>.should_receive(:workflow_action).and_return('next')
-          @<%=rule_name%>.process(1001, @matched_data).outcome.should == RulesEngine::Rule::Outcome::NEXT
+          @<%=rule_name%>.process(1001, {:plan => "plan"}, @matched_data).outcome.should == RulesEngine::Rule::Outcome::NEXT
         end
 
         it "should return stop_success" do
           @<%=rule_name%>.should_receive(:workflow_action).and_return('stop_success')
-          @<%=rule_name%>.process(1001, @matched_data).outcome.should == RulesEngine::Rule::Outcome::STOP_SUCCESS
+          @<%=rule_name%>.process(1001, {:plan => "plan"}, @matched_data).outcome.should == RulesEngine::Rule::Outcome::STOP_SUCCESS
         end
 
         it "should return stop_failure" do
           @<%=rule_name%>.should_receive(:workflow_action).and_return('stop_failure')
-          @<%=rule_name%>.process(1001, @matched_data).outcome.should == RulesEngine::Rule::Outcome::STOP_FAILURE
+          @<%=rule_name%>.process(1001, {:plan => "plan"}, @matched_data).outcome.should == RulesEngine::Rule::Outcome::STOP_FAILURE
         end
         
         it "should return start workflow with the workflow_code" do
           @<%=rule_name%>.should_receive(:workflow_action).and_return('start_workflow')
-          @<%=rule_name%>.should_receive(:workflow).and_return('mock_workflow')
-          <%=rule_name%>_outcome = @<%=rule_name%>.process(1001, @matched_data)
+          @<%=rule_name%>.should_receive(:workflow_code).and_return('mock_workflow')
+          <%=rule_name%>_outcome = @<%=rule_name%>.process(1001, {:plan => "plan"}, @matched_data)
           <%=rule_name%>_outcome.outcome.should == RulesEngine::Rule::Outcome::START_WORKFLOW
           <%=rule_name%>_outcome.workflow_code.should == "mock_workflow"
         end        
@@ -362,9 +363,9 @@ describe ReWorkflowRulesController, :type => :controller  do
         get :new, :rule_class_name => "RulesEngine::Rule::<%=rule_class%>"
         response.should have_tag("form#re_rule_new_form") do
           with_tag("input#<%=rule_name%>_title")     
-          with_tag("input#<%=rule_name%>_words_0_word")
+          with_tag("input#<%=rule_name%>_match_words_0_word")
           with_tag("select#<%=rule_name%>_workflow_action")
-          with_tag("input#<%=rule_name%>_workflow")
+          with_tag("input#<%=rule_name%>_workflow_code")
         end  
       end
     end
@@ -379,10 +380,10 @@ describe ReWorkflowRulesController, :type => :controller  do
         get :edit, :re_workflow_id => @re_workflow.id, :re_rule_id => 1001, :rule_class_name => "RulesEngine::Rule::<%=rule_class%>"
         response.should have_tag("form#re_rule_edit_form") do
           with_tag("input#<%=rule_name%>_title", :value => 'Rule Title')     
-          with_tag("input#<%=rule_name%>_words_0_word", :value => 'word one')
-          with_tag("input#<%=rule_name%>_words_1_word", :value => 'word two')
+          with_tag("input#<%=rule_name%>_match_words_0_word", :value => 'word one')
+          with_tag("input#<%=rule_name%>_match_words_1_word", :value => 'word two')
           with_tag("select#<%=rule_name%>_workflow_action", :value => 'start_workflow')
-          with_tag("input#<%=rule_name%>_workflow", :value => 'Other Workflow')
+          with_tag("input#<%=rule_name%>_workflow_code", :value => 'Other Workflow')
         end  
       end
     end