rules_engine 0.1.7 → 0.1.8

data/VERSION

@@ -1 +1 @@
-0.1.7
+0.1.8

data/lib/rules_engine/process/runner.rb

@@ -40,8 +40,32 @@ module RulesEngine
         # 0
       end
       
-      def run(process_id, plan, data = {})
-        _run_plan(process_id, plan, data)
+      def run_plan(process_id, plan, data = {})
+        RulesEngine::Process.auditor.audit(process_id, "Plan : #{plan["code"]} : started", RulesEngine::Process::AUDIT_INFO)
+
+        success = _run_plan_workflow(process_id, plan, plan["workflow"], data)
+
+        if success
+          RulesEngine::Process.auditor.audit(process_id, "Plan : #{plan["code"]} : success", RulesEngine::Process::AUDIT_SUCCESS)
+        else
+          RulesEngine::Process.auditor.audit(process_id, "Plan : #{plan["code"]} : failure", RulesEngine::Process::AUDIT_FAILURE)
+        end
+          
+        success    
+      end
+      
+      def run_workflow(process_id, plan, workflow_name, data = {})        
+        RulesEngine::Process.auditor.audit(process_id, "Workflow : #{workflow_name} : started", RulesEngine::Process::AUDIT_INFO)
+
+        success = _run_plan_workflow(process_id, plan, workflow_name, data)
+
+        if success
+          RulesEngine::Process.auditor.audit(process_id, "Workflow : #{workflow_name} : success", RulesEngine::Process::AUDIT_SUCCESS)
+        else
+          RulesEngine::Process.auditor.audit(process_id, "Workflow : #{workflow_name} : failure", RulesEngine::Process::AUDIT_FAILURE)
+        end
+          
+        success    
       end
       
       def status(process_id)
@@ -56,91 +80,73 @@ module RulesEngine
       end
       
       protected
-        def _run_plan(process_id, plan, data = {})
+        def _run_plan_workflow(process_id, plan, workflow_name, data = {})
         
-          RulesEngine::Process.auditor.audit(process_id, "Plan : #{plan["code"]} : started", RulesEngine::Process::AUDIT_INFO)
-
           workflow_count = 0
-          done = false
-          error = false
-        
-          first_workflow = plan['first_workflow']
-          if (first_workflow.blank? || plan["workflow_#{first_workflow}"].nil?)
-            RulesEngine::Process.auditor.audit(process_id, "First Workflow : #{first_workflow} : missing", RulesEngine::Process::AUDIT_FAILURE)
-            error = done = true 
-          end
-
-          current_workflow = first_workflow
-          next_workflow = ""
-          while (!done && workflow_count < @@max_workflows)
+          while (workflow_count < @@max_workflows)
             workflow_count += 1 
-        
-            RulesEngine::Process.auditor.audit(process_id, "Workflow : #{current_workflow} : started", RulesEngine::Process::AUDIT_INFO)
-          
-            workflow = plan["workflow_#{current_workflow}"]
+            
+            workflow = plan["workflow_#{workflow_name}"]
             if workflow.nil?
-              RulesEngine::Process.auditor.audit(process_id, "Workflow : #{current_workflow} : not found", RulesEngine::Process::AUDIT_FAILURE) 
-              error = done = true 
-              break 
+              RulesEngine::Process.auditor.audit(process_id, "Workflow : #{workflow_name} : not found", RulesEngine::Process::AUDIT_FAILURE) 
+              return false;
             end
-          
-            workflow["rules"].each do | workflow_rule |
-              rule_class = RulesEngine::Discovery.rule_class(workflow_rule["rule_class_name"])
-              unless rule_class
-                RulesEngine::Process.auditor.audit(process_id, "Rule : #{workflow_rule["rule_class_name"]} : not found", RulesEngine::Process::AUDIT_FAILURE) 
-                error = done = true 
-                break 
-              end  
-              rule = rule_class.new
-              rule.data = workflow_rule["data"]
             
-              RulesEngine::Process.auditor.audit(process_id, "Rule : #{rule.title} : starting")                    
-              rule_outcome = rule.process(process_id, data)
-              RulesEngine::Process.auditor.audit(process_id, "Rule : #{rule.title} : finished")
+            rule_outcome = _run_workflow_rules(process_id, plan, workflow, data)
+            
+            if rule_outcome.nil?
+              return true
+            elsif rule_outcome.outcome == RulesEngine::Rule::Outcome::STOP_SUCCESS
+              return true
+            elsif rule_outcome.outcome == RulesEngine::Rule::Outcome::STOP_FAILURE
+              return false
+            elsif rule_outcome.outcome == RulesEngine::Rule::Outcome::START_WORKFLOW
+              workflow_name = rule_outcome.workflow_code
+            else # rule_outcome.outcome == RulesEngine::Rule::Outcome::NEXT
+              return true              
+            end
+          end  
 
-              if !rule_outcome.nil? && rule_outcome.outcome == RulesEngine::Rule::Outcome::STOP_SUCCESS
-                RulesEngine::Process.auditor.audit(process_id, "Workflow : #{current_workflow} : stop success", RulesEngine::Process::AUDIT_SUCCESS)
-                done = true 
-                break
-              end
-        
-              if !rule_outcome.nil? && rule_outcome.outcome == RulesEngine::Rule::Outcome::STOP_FAILURE
-                RulesEngine::Process.auditor.audit(process_id, "Workflow : #{current_workflow} : stop failure", RulesEngine::Process::AUDIT_FAILURE)
-                error = done = true 
-                break
-              end
+          RulesEngine::Process.auditor.audit(process_id, "Maximum workflow depth #{@@max_workflows} exceeded", RulesEngine::Process::PROCESS_STATUS_FAILURE)
+          return false
+        end
         
-              if !rule_outcome.nil? && rule_outcome.outcome == RulesEngine::Rule::Outcome::START_WORKFLOW
-                RulesEngine::Process.auditor.audit(process_id, "Workflow : #{current_workflow} : start next workflow - #{rule_outcome.workflow_code}", RulesEngine::Process::AUDIT_INFO)
-                next_workflow = rule_outcome.workflow_code
-                break
-              end
-            end          
+        def _run_workflow_rules(process_id, plan, workflow, data = {})
           
-            if next_workflow.blank?
-              current_workflow = workflow["next_workflow"]
-            else
-              current_workflow = next_workflow  
-            end            
+          RulesEngine::Process.auditor.audit(process_id, "Rules For : #{workflow["code"]} : started", RulesEngine::Process::AUDIT_INFO)
           
-            if current_workflow.blank?
-              done = true 
-              break
-            end
-          end  
-
-          if workflow_count >= @@max_workflows
-            RulesEngine::Process.auditor.audit(process_id, "Plan : #{plan["code"]} : error - Maximum workflow depth #{@@max_workflows} exceeded", RulesEngine::Process::PROCESS_STATUS_FAILURE)
-            error = true
-          end
+          workflow["rules"].each do | workflow_rule |
+            rule_class = RulesEngine::Discovery.rule_class(workflow_rule["rule_class_name"])
+            unless rule_class
+              RulesEngine::Process.auditor.audit(process_id, "Rule : #{workflow_rule["rule_class_name"]} : not found", RulesEngine::Process::AUDIT_FAILURE) 
+              return RulesEngine::Rule::Outcome.new(RulesEngine::Rule::Outcome::STOP_FAILURE)
+            end  
+            
+            rule = rule_class.new
+            rule.data = workflow_rule["data"]
+          
+            RulesEngine::Process.auditor.audit(process_id, "Rule : #{rule.title} : starting")                    
+            rule_outcome = rule.process(process_id, plan, data)
+            RulesEngine::Process.auditor.audit(process_id, "Rule : #{rule.title} : finished")
 
-          if error  
-            RulesEngine::Process.auditor.audit(process_id, "Plan : #{plan["code"]} : failure", RulesEngine::Process::AUDIT_FAILURE)
-          else  
-            RulesEngine::Process.auditor.audit(process_id, "Plan : #{plan["code"]} : success", RulesEngine::Process::AUDIT_SUCCESS)
-          end
+            if !rule_outcome.nil? && rule_outcome.outcome == RulesEngine::Rule::Outcome::STOP_SUCCESS
+              RulesEngine::Process.auditor.audit(process_id, "Rules For : #{workflow["code"]} : stop success", RulesEngine::Process::AUDIT_SUCCESS)
+              return rule_outcome
+            end
       
-          !error
+            if !rule_outcome.nil? && rule_outcome.outcome == RulesEngine::Rule::Outcome::STOP_FAILURE
+              RulesEngine::Process.auditor.audit(process_id, "Rules For : #{workflow["code"]} : stop failure", RulesEngine::Process::AUDIT_FAILURE)
+              return rule_outcome
+            end
+      
+            if !rule_outcome.nil? && rule_outcome.outcome == RulesEngine::Rule::Outcome::START_WORKFLOW
+              RulesEngine::Process.auditor.audit(process_id, "Rules For  : #{workflow["code"]} : start next workflow - #{rule_outcome.workflow_code}", RulesEngine::Process::AUDIT_INFO)
+              return rule_outcome
+            end
+          end
+          
+          RulesEngine::Process.auditor.audit(process_id, "Rules For : #{workflow["code"]} : stop success", RulesEngine::Process::AUDIT_SUCCESS)
+          return RulesEngine::Rule::Outcome.new(RulesEngine::Rule::Outcome::STOP_SUCCESS)
         end
     end  
   end

data/lib/rules_engine/process/runner/db_runner.rb

@@ -31,7 +31,7 @@ module RulesEngine
         ReProcessRun.create(:process_status => RulesEngine::Process::PROCESS_STATUS_NONE).id
       end
       
-      def run(process_id, plan, data = {})
+      def run_plan(process_id, plan, data = {})
         re_process = ReProcessRun.find_by_id(process_id)
 
         if re_process.nil?
@@ -41,7 +41,7 @@ module RulesEngine
         
         re_process.update_attributes(:plan_code => plan["code"], :plan_version => plan["version"], :started_at => Time.now.utc, :process_status => RulesEngine::Process::PROCESS_STATUS_RUNNING)  
         
-        success = _run_plan(process_id, plan, data)
+        success = super(process_id, plan, data)
         
         re_process.update_attributes(:finished_at => Time.now.utc, :process_status => success ? RulesEngine::Process::PROCESS_STATUS_SUCCESS : RulesEngine::Process::PROCESS_STATUS_FAILURE)
       

data/lib/rules_engine/rule/definition.rb

@@ -76,7 +76,7 @@ module RulesEngine
       # execute the rule
       # return an RulesEngine::Rule::Outcome object to define what to do next
       # if nil to continue to the next rule
-      def process(process_id, data)
+      def process(process_id, plan, data)
         # process.audit("process #{title}", RulesEngine::Process::AUDIT_INFO)                        
         # RulesEngine::Rule::Outcome.new(RulesEngine::Rule::Outcome::STOP_SUCCESS)
         # RulesEngine::Rule::Outcome.new(RulesEngine::Rule::Outcome::STOP_FAILURE)

data/lib/rules_engine_view/alerts.rb

@@ -7,7 +7,7 @@ module RulesEngineView
       unless flash[:error].blank?
         result << '<div class="error"><strong>Error : </strong><span>'
         result << flash.delete(:error)
-        result << '</span></div>'
+        result << '</span><a class="re-alert-close" href="#">Close</a></div>'
 
         flash.delete(:success)
         flash.delete(:notice)
@@ -16,7 +16,7 @@ module RulesEngineView
       unless flash[:success].blank?
         result << '<div class="success"><strong>Success : </strong><span>'
         result << flash.delete(:success)
-        result << '</span></div>'
+        result << '</span><a class="re-alert-close" href="#">Close</a></div>'
 
         flash.delete(:notice)
       end      
@@ -24,9 +24,8 @@ module RulesEngineView
       unless flash[:notice].blank?
         result << '<div class="notice"><strong>Warning : </strong><span>'
         result << flash.delete(:notice)
-        result << '</span></div>'
+        result << '</span><a class="re-alert-close" href="#">Close</a></div>'
       end      
-
       result << '</div>'      
       
       return result

data/lib/rules_engine_view/navigate.rb

@@ -12,7 +12,7 @@ module RulesEngineView
       result << "<em>"
       result << "#{links[-1]}"
       result << "</em>"
-      result << "<span class='re-breadcrumbs-seperator'>></span>" if links[-1] == links[0]
+      # result << "<span class='re-breadcrumbs-seperator'>></span>" if links[-1] == links[0]
       result << '</div>'
       result
     end
@@ -28,7 +28,7 @@ module RulesEngineView
       result << "<em>"
       result << "#{links[-2]}"
       result << "</em>"
-      result << "<span class='re-breadcrumbs-seperator'>></span>" if links[-2] == links[0]
+      # result << "<span class='re-breadcrumbs-seperator'>></span>" if links[-2] == links[0]
         
       result << "<div class='re-breadcrumb-right'>#{links[-1]}</div>"
       result << '</div>'      

data/rails_generators/manifests/complex.rb

@@ -3,7 +3,7 @@ class ComplexManifest
 
     %W(
       app/rules
-      app/views/re_rule_definitions/#{rule_name}
+      app/views/re_rules/#{rule_name}
       spec/lib/rules
     ).each do |dirname|
       m.directory dirname
@@ -15,11 +15,11 @@ class ComplexManifest
     end
 
    m.template "app/rules/complex.rb",  "app/rules/#{rule_name}.rb"
-   m.template "app/views/re_rule_definitions/complex/_edit.html.erb",  "app/views/re_rule_definitions/#{rule_name}/_edit.html.erb"
-   m.template "app/views/re_rule_definitions/complex/_form.html.erb",  "app/views/re_rule_definitions/#{rule_name}/_form.html.erb"
-   m.template "app/views/re_rule_definitions/complex/_form_word.html.erb",  "app/views/re_rule_definitions/#{rule_name}/_form_word.html.erb"
-   m.template "app/views/re_rule_definitions/complex/_help.html.erb",  "app/views/re_rule_definitions/#{rule_name}/_help.html.erb"
-   m.template "app/views/re_rule_definitions/complex/_new.html.erb",  "app/views/re_rule_definitions/#{rule_name}/_new.html.erb"
+   m.template "app/views/re_rules/complex/_edit.html.erb",  "app/views/re_rules/#{rule_name}/_edit.html.erb"
+   m.template "app/views/re_rules/complex/_form.html.erb",  "app/views/re_rules/#{rule_name}/_form.html.erb"
+   m.template "app/views/re_rules/complex/_form_word.html.erb",  "app/views/re_rules/#{rule_name}/_form_word.html.erb"
+   m.template "app/views/re_rules/complex/_help.html.erb",  "app/views/re_rules/#{rule_name}/_help.html.erb"
+   m.template "app/views/re_rules/complex/_new.html.erb",  "app/views/re_rules/#{rule_name}/_new.html.erb"
    m.template "spec/lib/rules/complex_spec.rb",  "spec/lib/rules/#{rule_name}_spec.rb"
 
   end

data/rails_generators/manifests/complex.yml

@@ -8,13 +8,13 @@ templates :
     - Complex : rule_class
     
   directories : 
-    - app/views/re_rule_definitions/complex
+    - app/views/re_rules/complex
 
   files : 
     - app/rules/complex.rb
-    - app/views/re_rule_definitions/complex/_edit.html.erb
-    - app/views/re_rule_definitions/complex/_form_word.html.erb
-    - app/views/re_rule_definitions/complex/_form.html.erb
-    - app/views/re_rule_definitions/complex/_help.html.erb
-    - app/views/re_rule_definitions/complex/_new.html.erb
+    - app/views/re_rules/complex/_edit.html.erb
+    - app/views/re_rules/complex/_form_word.html.erb
+    - app/views/re_rules/complex/_form.html.erb
+    - app/views/re_rules/complex/_help.html.erb
+    - app/views/re_rules/complex/_new.html.erb
     - spec/lib/rules/complex_spec.rb

data/rails_generators/manifests/simple.rb

@@ -3,7 +3,7 @@ class SimpleManifest
 
     %W(
       app/rules
-      app/views/re_rule_definitions/#{rule_name}
+      app/views/re_rules/#{rule_name}
       spec/lib/rules
     ).each do |dirname|
       m.directory dirname
@@ -15,10 +15,10 @@ class SimpleManifest
     end
 
    m.template "app/rules/simple.rb",  "app/rules/#{rule_name}.rb"
-   m.template "app/views/re_rule_definitions/simple/_edit.html.erb",  "app/views/re_rule_definitions/#{rule_name}/_edit.html.erb"
-   m.template "app/views/re_rule_definitions/simple/_form.html.erb",  "app/views/re_rule_definitions/#{rule_name}/_form.html.erb"
-   m.template "app/views/re_rule_definitions/simple/_help.html.erb",  "app/views/re_rule_definitions/#{rule_name}/_help.html.erb"
-   m.template "app/views/re_rule_definitions/simple/_new.html.erb",  "app/views/re_rule_definitions/#{rule_name}/_new.html.erb"
+   m.template "app/views/re_rules/simple/_edit.html.erb",  "app/views/re_rules/#{rule_name}/_edit.html.erb"
+   m.template "app/views/re_rules/simple/_form.html.erb",  "app/views/re_rules/#{rule_name}/_form.html.erb"
+   m.template "app/views/re_rules/simple/_help.html.erb",  "app/views/re_rules/#{rule_name}/_help.html.erb"
+   m.template "app/views/re_rules/simple/_new.html.erb",  "app/views/re_rules/#{rule_name}/_new.html.erb"
    m.template "spec/lib/rules/simple_spec.rb",  "spec/lib/rules/#{rule_name}_spec.rb"
 
   end

data/rails_generators/manifests/simple.yml

@@ -8,13 +8,13 @@ templates :
     - RuleSimple : rule_class
     
   directories : 
-    - app/views/re_rule_definitions/simple
+    - app/views/re_rules/simple
 
   files : 
     - app/rules/simple.rb
-    - app/views/re_rule_definitions/simple/_edit.html.erb
-    - app/views/re_rule_definitions/simple/_form.html.erb
-    - app/views/re_rule_definitions/simple/_help.html.erb
-    - app/views/re_rule_definitions/simple/_new.html.erb
+    - app/views/re_rules/simple/_edit.html.erb
+    - app/views/re_rules/simple/_form.html.erb
+    - app/views/re_rules/simple/_help.html.erb
+    - app/views/re_rules/simple/_new.html.erb
     - spec/lib/rules/simple_spec.rb
   

data/rails_generators/templates/app/controllers/re_plans_controller.rb

@@ -86,8 +86,8 @@ class RePlansController < ApplicationController
   end
 
   def publish
-    if @re_plan.plan_error || params['tag'].blank?
-      flash[:error] = 'Cannot Publish Plan.'
+    if params['tag'].blank?
+      flash[:error] = 'Tag Required.'
     else  
       @re_plan.plan_version = RulesEngine::Publish.publisher.publish(@re_plan.code, params['tag'], @re_plan.publish)
       @re_plan.plan_status = RePlan::PLAN_STATUS_PUBLISHED

data/rails_generators/templates/app/models/re_plan.rb

@@ -38,7 +38,7 @@ class RePlan < ActiveRecord::Base
       "code" => code, 
       "title" => title, 
       "description" => description,
-      "first_workflow" => re_workflows.empty? ? '' : re_workflows[0].code,
+      "workflow" => re_workflows.empty? ? '' : re_workflows[0].code,
     }
     re_workflows.each_with_index do | re_workflow, index | 
       data["workflow_#{re_workflow.code}"] = re_workflow.publish 
@@ -59,7 +59,7 @@ class RePlan < ActiveRecord::Base
     self.description = rule_data["description"]
     
     orig_re_workflows = []
-    workflow_data = rule_data["workflow_#{rule_data["first_workflow"]}"]
+    workflow_data = rule_data["workflow_#{rule_data["workflow"]}"]
     while (workflow_data && orig_re_workflows.length < 500)
       workflow_code = workflow_data["code"]
       re_workflow = ReWorkflow.find_by_code(workflow_code) || ReWorkflow.new
@@ -93,7 +93,12 @@ class RePlan < ActiveRecord::Base
     return if self.re_workflows.empty? || self.re_workflows[0] == re_workflow
     re_plan_workflow = re_plan_workflows.detect { | re_plan_workflow | re_plan_workflow.re_workflow_id == re_workflow.id}
     return unless re_plan_workflow
+
     re_plan_workflow.move_to_top
+    
+    self.re_plan_workflows(true)
+    self.re_workflows(true)
+    
     changed!
   end
   

data/rails_generators/templates/app/models/re_workflow.rb

@@ -10,11 +10,18 @@ class ReWorkflow < ActiveRecord::Base
   named_scope :order_code,  :order => 're_workflows.code ASC'
   named_scope :order_title, :order => 're_workflows.title ASC'
   
-  before_save :before_save_workflow
+  before_save    :before_save_workflow
+  before_destroy :before_destroy_workflow
 
   def before_save_workflow
     self.changed! if changes.detect { |change| !ignore_attributes.include?(change[0])}    
   end  
+  
+  def before_destroy_workflow
+    re_plans.each do |re_plan|
+      re_plan.changed!
+    end
+  end
 
   def code=(new_code)
     self[:code] = new_code.strip.downcase.gsub(/[^a-zA-Z0-9]+/i, '_') if new_code && new_record?

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

@@ -2,9 +2,9 @@ module RulesEngine
   module Rule
     class <%=rule_class%> < RulesEngine::Rule::Definition
 
-      attr_reader :words
+      attr_reader :match_words
       attr_reader :workflow_action
-      attr_reader :workflow
+      attr_reader :workflow_code
 
       ##################################################################
       # class options
@@ -12,9 +12,9 @@ module RulesEngine
         {
           :group => 'General',
           :display_name => '<%=rule_class%>',    
-          :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'
         } 
   
       ##################################################################
@@ -22,11 +22,11 @@ module RulesEngine
       def data= data
         if data.nil?
           @title = nil
-          @words = nil
+          @match_words = nil
           @workflow_action = 'continue'
-          @workflow = nil
+          @workflow_code = nil
         else
-          @title, @words, @workflow_action, @workflow = ActiveSupport::JSON.decode(data)
+          @title, @match_words, @workflow_action, @workflow_code = ActiveSupport::JSON.decode(data)
         end  
       end
   
@@ -37,11 +37,11 @@ module RulesEngine
       end
 
       def summary
-        "Match the #{words.size == 1 ? 'word' : 'words'} #{words.join(', ')}"
+        "Match the #{match_words.size == 1 ? 'word' : 'words'} #{match_words.join(', ')}"
       end
   
       def data
-        [title, words, workflow_action, workflow].to_json
+        [title, match_words, workflow_action, workflow_code].to_json
       end
   
       def expected_outcomes
@@ -53,7 +53,7 @@ module RulesEngine
         when 'stop_failure'
           [:outcome => RulesEngine::Rule::Outcome::STOP_FAILURE]
         when 'start_workflow'
-          [:outcome => RulesEngine::Rule::Outcome::START_WORKFLOW, :title => "Start Workflow : #{workflow}"]
+          [:outcome => RulesEngine::Rule::Outcome::START_WORKFLOW, :title => "Start Workflow : #{workflow_code}"]
         else
           [:outcome => RulesEngine::Rule::Outcome::NEXT]  
         end
@@ -66,26 +66,26 @@ module RulesEngine
 
         @title = param_hash[:<%=rule_name%>_title]
     
-        @words = []
-        return if param_hash[:<%=rule_name%>_words].nil?
-        param_hash[:<%=rule_name%>_words].each do |key, values| 
+        @match_words = []
+        return if param_hash[:<%=rule_name%>_match_words].nil?
+        param_hash[:<%=rule_name%>_match_words].each do |key, values| 
           if values.is_a?(Hash)
             word_hash = values.symbolize_keys
-            @words << word_hash[:word].downcase unless word_hash[:word].blank? || word_hash[:_delete] == '1'
+            @match_words << word_hash[:word].downcase unless word_hash[:word].blank? || word_hash[:_delete] == '1'
           end  
         end
     
         @workflow_action = param_hash[:<%=rule_name%>_workflow_action] || 'continue'
-        @workflow = param_hash[:<%=rule_name%>_workflow]
+        @workflow_code = param_hash[:<%=rule_name%>_workflow_code]
       end
   
       ##################################################################
       # validation and errors
       def valid?
         @errors = {}
-        @errors[:<%=rule_name%>_words] = "At least one word must be defined" if words.nil? || words.empty?
         @errors[:<%=rule_name%>_title] = "Title required" if title.blank?    
-        @errors[:<%=rule_name%>_workflow] = "Workflow required" if workflow_action == 'start_workflow' && workflow.blank?
+        @errors[:<%=rule_name%>_match_words] = "At least one word must be defined" if match_words.nil? || match_words.empty?
+        @errors[:<%=rule_name%>_workflow_code] = "Workflow code required" if workflow_action == 'start_workflow' && workflow_code.blank?
         return @errors.empty?
       end
 
@@ -105,13 +105,13 @@ module RulesEngine
       # if a match is found procees to the expected outcome
       # it gets the data parameter :tweet
       # it sets the data parameter :match
-      def process(process_id, data)
+      def process(process_id, plan, data)
         tweet = data[:tweet] || data["tweet"]    
         if tweet.blank?
           return RulesEngine::Rule::Outcome.new(RulesEngine::Rule::Outcome::NEXT) 
         end
     
-        words.each do |word|
+        match_words.each do |word|
           if /\b#{word}\b/i =~ tweet        
             RulesEngine::Process.auditor.audit(process_id, "Found #{word}", RulesEngine::Process::AUDIT_INFO)
             data[:tweet_match] = word
@@ -122,7 +122,7 @@ module RulesEngine
             when 'stop_failure'
               return RulesEngine::Rule::Outcome.new(RulesEngine::Rule::Outcome::STOP_FAILURE)
             when 'start_workflow'
-              return RulesEngine::Rule::Outcome.new(RulesEngine::Rule::Outcome::START_WORKFLOW, workflow)
+              return RulesEngine::Rule::Outcome.new(RulesEngine::Rule::Outcome::START_WORKFLOW, workflow_code)
             else #'next'
               return RulesEngine::Rule::Outcome.new(RulesEngine::Rule::Outcome::NEXT)
             end