rules_engine 0.0.7 → 0.0.8

data/VERSION

@@ -1 +1 @@
-0.0.7
+0.0.8

data/lib/rules_engine/rule_outcome.rb

@@ -1,5 +1,10 @@
 module RulesEngine  
   class RuleOutcome
+    
+    def initialize(outcome, pipeline_code = nil)
+      @outcome = outcome
+      @pipeline_code = pipeline_code
+    end
 
     OUTCOME_NEXT  =            0
     OUTCOME_STOP_SUCCESS  =    1

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

@@ -106,24 +106,19 @@ class <%=rule_class%>Rule < RulesEngine::Rule
     
     words.each do |word|
       if /#{word}/i =~ sentence        
-        job.audit("Match Found #{word}", ReJobAudit::AUDIT_INFO)                        
+        job.audit("#{title} Found #{word}", ReJobAudit::AUDIT_INFO)
         data[:match] = word
         
-        rule_outcome = RulesEngine::RuleOutcome.new        
-        
         case pipeline_action
         when 'stop_success'
-          rule_outcome.outcome = RulesEngine::RuleOutcome::OUTCOME_STOP_SUCCESS
+          return RulesEngine::RuleOutcome.new(RulesEngine::RuleOutcome::OUTCOME_STOP_SUCCESS)
         when 'stop_failure'
-          rule_outcome.outcome = RulesEngine::RuleOutcome::OUTCOME_STOP_FAILURE
+          return RulesEngine::RuleOutcome.new(RulesEngine::RuleOutcome::OUTCOME_STOP_FAILURE)
         when 'start_pipeline'
-          rule_outcome.outcome = RulesEngine::RuleOutcome::OUTCOME_START_PIPELINE
-          rule_outcome.pipeline_code = pipeline  
+          return RulesEngine::RuleOutcome.new(RulesEngine::RuleOutcome::OUTCOME_START_PIPELINE, pipeline)
         else #'next'
-          rule_outcome.outcome = RulesEngine::RuleOutcome::OUTCOME_NEXT
+          return RulesEngine::RuleOutcome.new(RulesEngine::RuleOutcome::OUTCOME_NEXT)
         end
-        
-        return rule_outcome
       end
     end
         

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

@@ -71,7 +71,10 @@ class <%=rule_class%>Rule < RulesEngine::Rule
   # execute the rule
   # this rule does nothing
   def process(job, data)
-    # job.audit("<%=rule_class%>", ReJobAudit::AUDIT_INFO)                        
-    return nil
+    job.audit("Inside Rule #{title}", ReJobAudit::AUDIT_INFO)                        
+    # RulesEngine::RuleOutcome.new(RulesEngine::RuleOutcome::OUTCOME_STOP_SUCCESS)
+    # RulesEngine::RuleOutcome.new(RulesEngine::RuleOutcome::OUTCOME_STOP_FAILURE)
+    # RulesEngine::RuleOutcome.new(RulesEngine::RuleOutcome::OUTCOME_START_PIPELINE, 'next_pipeline')
+    RulesEngine::RuleOutcome.new(RulesEngine::RuleOutcome::OUTCOME_NEXT)
   end  
 end

data/rails_generators/templates/app/views/re_jobs/_empty.html.erb

@@ -1,11 +1,11 @@
 <% local_hide = local_assigns[:hide] && hide  %>
 
 <div id="re_job_list_empty" style="<%= local_hide ?  'display:none' : '' %>">
-  <!-- <div class="re-redbox-header"><h4 class="white">No jobs have been run</h4></div>    -->
+  <!-- <div class="re-redbox-header"><h5 class="white">No jobs have been run</h5></div>    -->
   <div class="re-redbox">
-    <h4 class="left-5 red">
+    <h5 class="left-5 red">
 			No Jobs have been run.
-		</h4>
+		</h5>
 		
   </div>    
   <div class="clear"></div>    

data/rails_generators/templates/app/views/re_jobs/_show.html.erb

@@ -1,14 +1,14 @@
 <div class="re-job-show span-18">
 
 		<div class="float-left">
-			<h4>
+			<h5>
 				<span class="blue">Job Id :</span> <%= @re_job.id %>
-			</h4>	
+			</h5>	
 		</div>	
 		<div class="float-right">
-			<h4>
+			<h5>
 				<span class="blue">Created :</span> <%= @re_job.created_at.strftime('%d %b %Y - %H:%M:%S') %>
-			</h4>
+			</h5>
 		</div>	
 	<div class="clear"></div>
 	<table width="100%" border="0" cellpadding="0" cellspacing="0" class="data" id="re_job_audit_table">

data/rails_generators/templates/app/views/re_jobs/index.html.erb

@@ -1,5 +1,6 @@
 <% set_re_javascript_include ['re_job_index'] %>
-<% set_re_breadcrumbs link_to("All Pipelines", re_pipelines_path, :class => "re-pipeline-list"), '<span class="re-job-list">Pipeline Job Audit</span>' %>
+<% set_re_breadcrumbs link_to("All Pipelines", re_pipelines_path, :class => "re-pipeline-list"), 
+											'<span class="re-job-list">Pipeline Job Audit</span>' %>
 
 <div class="prepend-1 span-22 append-1">      
 	

data/rails_generators/templates/app/views/re_pipeline_rules/_change.html.erb

@@ -4,7 +4,7 @@
 
 <div class="span-15 last re-rule-change" id="re_rule_change_<%= re_rule.id %>">
   <div class="<%= rule_error.blank? ? 're-bluebox' : 're-redbox' %> re-rule-status-<%= rule_error.blank? ? 'valid' : 'verify' %>">
-    <h3 class="float-left"><%= re_rule.title %></h3>
+    <h4 class="float-left"><%=h re_rule.title %></h4>
     <div class="float-right">
       <%= link_to("<span>Edit</span>", "##{@re_pipeline.id}|#{re_rule.id}", :class => "re-rule-edit") %>
       <%= link_to("<span>Delete</span>", "##{@re_pipeline.id}|#{re_rule.id}", :class => "re-rule-delete") %>
@@ -16,7 +16,7 @@
   <div class="<%= rule_error.blank? ? 're-bluebox' : 're-redbox' %> no-top"> 
       <div class="span-9">
         <p class="top-5 left-10">
-          <%= re_rule.summary %>
+          <%=h re_rule.summary %>
         </p>
       </div>
       

data/rails_generators/templates/app/views/re_pipeline_rules/_edit.html.erb

@@ -1,5 +1,5 @@
 <div class="clear prepend-1 span-18">
-  <h2 class="re-rule-edit"> Edit <%= @re_rule.rule.options[:display_name] %></h2>
+  <h3 class="re-rule-edit"> Edit <%= @re_rule.rule.options[:display_name] %></h3>
   <div class="clear top-10"></div>
 
   <% re_form_for(@re_rule, :url => re_pipeline_re_rule_path(@re_pipeline, @re_rule), :method => :post, :span => "3x13", :html => {:id => "re_rule_edit_form"}) do |f| %>

data/rails_generators/templates/app/views/re_pipeline_rules/_empty.html.erb

@@ -1,8 +1,8 @@
 <div id="re_rules_empty" style="<%= re_pipeline.re_rules.empty? ?  '' : 'display:none' %>">
-  <div class="re-redbox-header"><h3 class="white">No Pipeline Rules</h3></div>   
+  <div class="re-redbox-header"><h4 class="white">No Pipeline Rules</h4></div>   
   <div class="re-redbox no-top">
-    <div class="clear top-5 prepend-1 append-1">
-      <h4>Add rules to the pipeline.</h4>
+    <div class="clear top-5">
+      <h5>Add rules to the pipeline.</h5>
 			<p class="left-10">Rules are the unique decisions made within a pipeline.</p> 
     </div>  
   </div>    

data/rails_generators/templates/app/views/re_pipeline_rules/_error.html.erb

@@ -1,5 +1 @@
-Rule Not Found - <%= params[:rule_class].blank? ? 'param :rule_class missing' : params[:rule_class]  %>
-
-TODO
-<br/>
-Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.
+<h2>Rule Not Found - <span class="red"><%= params[:rule_class_name].blank? ? 'param :rule_class_name missing' : params[:rule_class_name]  %></span></h2>

data/rails_generators/templates/app/views/re_pipeline_rules/_help.html.erb

@@ -1,5 +1,5 @@
 <div class="clear span-12">
-  <h2 class="re-rule-class-help"> Help : <%= @rule_class.options[:display_name] %></h2>
+  <h3 class="re-rule-class-help"> Help : <%= @rule_class.options[:display_name] %></h3>
   <div class="clear top-10"></div>
 
   <% re_whitebox do %>      

data/rails_generators/templates/app/views/re_pipeline_rules/_index.html.erb

@@ -8,9 +8,9 @@
 <% end %>
 
 <div class="span-6 <%= local_new_row ? 'left-20' : 'left-10' %> re-rule-show">
-  <div class="<%= re_rule_error.blank? ? 're-bluebox' : 're-redbox' %> re-rule-status-<%= re_rule_error.blank? ? 'valid' : 'verify' %>"><%= re_rule.title %></div>
+  <div class="<%= re_rule_error.blank? ? 're-bluebox' : 're-redbox' %> re-rule-status-<%= re_rule_error.blank? ? 'valid' : 'verify' %>"><%=h re_rule.title %></div>
   <div class="<%= re_rule_error.blank? ? 're-bluebox' : 're-redbox' %> no-top"> 
-      <p class="top-5"><%= re_rule.summary %></p>	
+      <p class="top-5"><%=h re_rule.summary %></p>	
       <div class="top-10 float-right">
         <% if re_rule.re_rule_expected_outcomes.empty? %>
           <div class="re-rule-continue">Continue</div>

data/rails_generators/templates/app/views/re_pipeline_rules/_new.html.erb

@@ -1,5 +1,5 @@
 <div class="clear span-18">
-  <h2 class="re-rule-class-new"> New : <%= @re_rule.rule.options[:display_name] %></h2>
+  <h3 class="re-rule-class-new"> New : <%= @re_rule.rule.options[:display_name] %></h3>
   <div class="clear top-10"></div>
 
   <% re_form_for(@re_rule, :url => re_pipeline_re_rules_path(@re_pipeline), :method => :post, :span => "3x15", :html => {:id => "re_rule_new_form"}) do |f| %>

data/rails_generators/templates/app/views/re_pipeline_rules/_show.html.erb

@@ -4,7 +4,7 @@
 
 <div class="span-15 last re-rule-change" id="re_rule_change_<%= re_rule.id %>">
   <div class="<%= re_rule_error.blank? ? 're-bluebox' : 're-redbox' %> re-rule-status-<%= re_rule_error.blank? ? 'valid' : 'verify' %>">
-    <h3 class="float-left"><%= re_rule.title %></h3>
+    <h4 class="float-left"><%=h re_rule.title %></h4>
     <div class="float-right">
 			<!-- NO ACTIONS ON THE RULE	 -->
 			<p class="red smalltext"><%= re_rule_error %></p>
@@ -14,7 +14,7 @@
   <div class="<%= re_rule_error.blank? ? 're-bluebox' : 're-redbox' %> no-top"> 
       <div class="span-9">
         <p class="top-5 left-10">
-          <%= re_rule.summary %>
+          <%=h re_rule.summary %>
         </p>
       </div>
       

data/rails_generators/templates/app/views/re_pipelines/_change.html.erb

@@ -4,7 +4,7 @@
 <div class="span-16">
   <div class="re-infobox">
     <div class="span-9" id="re_pipeline_code">
-      <h3 class="re-pipeline-status-<%= @pipeline_error.blank? ? re_pipeline_status : 'verify' %>"><%=h @re_pipeline.code%></h3>
+      <h4 class="re-pipeline-status-<%= @pipeline_error.blank? ? re_pipeline_status : 'verify' %>"><%=h @re_pipeline.code%></h4>
     </div>  
     <div class="span-6 last">      
       <% if pipeline_error.blank? %>
@@ -17,7 +17,7 @@
     <div class="clear"></div>
 
     <div class="span-14 prepend-1 last">
-      <h5 id="re_pipeline_title"> <%=h @re_pipeline.title%></h5>
+      <h6 id="re_pipeline_title"> <%=h @re_pipeline.title%></h6>
     </div>    
     <div class="clear"></div>
   

data/rails_generators/templates/app/views/re_pipelines/_change_actions.html.erb

@@ -1,34 +1,34 @@
 <% changed_status = @re_pipeline.changed_status %>
 
-<h3 class="re-pipeline-edit clear">
-  <%= link_to("Edit Pipeline Details", "##{@re_pipeline.id}", :id => "re_pipeline_edit") %>
-</h3>
+<h4 class="re-pipeline-edit clear">
+  <%= link_to("Edit Details", "##{@re_pipeline.id}", :id => "re_pipeline_edit") %>
+</h4>
 
 <% if changed_status == RePipelineBase::CHANGED_STATUS_DRAFT && !@re_pipeline.pipeline_error %>
-  <h3 class="re-pipeline-activate float-left clear">
+  <h4 class="re-pipeline-activate float-left clear">
     <%= link_to("Activate Pipeline", "##{@re_pipeline.id}", :id => "re_pipeline_activate") %>
-  </h3>    
+  </h4>    
 <% end %>  
 <% if changed_status == RePipelineBase::CHANGED_STATUS_CHANGED && !@re_pipeline.pipeline_error %>
-  <h3 class="re-pipeline-activate float-left clear">
-    <%= link_to("Activate Pipeline Changes", "##{@re_pipeline.id}", :id => "re_pipeline_activate") %>
-  </h3>    
+  <h4 class="re-pipeline-activate float-left clear">
+    <%= link_to("Activate Changes", "##{@re_pipeline.id}", :id => "re_pipeline_activate") %>
+  </h4>    
 <% end %>  
 
 <% if changed_status != RePipelineBase::CHANGED_STATUS_DRAFT && changed_status != RePipelineBase::CHANGED_STATUS_CHANGED %>
-  <h3 class="re-pipeline-deactivate float-left clear">
+  <h4 class="re-pipeline-deactivate float-left clear">
     <%= link_to("Deactivate Pipeline", "##{@re_pipeline.id}", :id => "re_pipeline_deactivate") %>
-  </h3>    
+  </h4>    
 <% end %>  
 
 <% if changed_status == RePipelineBase::CHANGED_STATUS_CHANGED %>
-  <h3 class="re-pipeline-revert float-left clear">
-    <%= link_to("Discard Pipeline Changes", "##{@re_pipeline.id}", :id => "re_pipeline_revert") %>
-  </h3>    
+  <h4 class="re-pipeline-revert float-left clear">
+    <%= link_to("Discard Changes", "##{@re_pipeline.id}", :id => "re_pipeline_revert") %>
+  </h4>    
 <% end %>  
 
 <% if changed_status == RePipelineBase::CHANGED_STATUS_DRAFT %>
-  <h3 class="re-pipeline-delete float-left clear">
+  <h4 class="re-pipeline-delete float-left clear">
     <%= link_to("Delete Pipeline", "##{@re_pipeline.id}", :id => "re_pipeline_delete") %>
-  </h3>    
+  </h4>    
 <% end %>  

data/rails_generators/templates/app/views/re_pipelines/_confirm.html.erb

@@ -2,7 +2,7 @@
   <div id="re_pipeline_action_confirm">
     <div class="span-14 last">
       <% re_whitebox do %>    
-        <h2 class="re-pipeline-alert red" id="re_pipeline_action_title"></h2>    
+        <h3 class="re-pipeline-alert red" id="re_pipeline_action_title"></h3>
         <div class="clear top-5"></div>
         <hr/>
         <div class="clear top-5"></div>
@@ -12,7 +12,7 @@
         <div class="clear"></div>
 
         <div class="span-12 prepend-1 last">
-          <h5 id="re_pipeline_action_content_title"></h5>
+          <h6 id="re_pipeline_action_content_title"></h6>
         </div>    
         <div class="clear"></div>
         <%= re_button_link_green('Action', "#", :id => "re_pipeline_action_ok") %>
@@ -24,10 +24,10 @@
   <div id="re_rule_delete_confirm">
     <div class="span-11 last">
       <% re_whitebox do %>    
-        <h2 class="re-pipeline-delete red">Confirm Delete</h2>    
+        <h3 class="re-pipeline-delete red">Confirm Delete</h3>    
         <div class="clear top-5"></div>
         <hr/>
-        <h5 class="float-left"><strong>This cannot be undone !!!</strong></h5>
+        <h6 class="float-left"><strong>This cannot be undone !!!</strong></h6>
         <%= re_button_link_green('Delete', "#", :id => "re_rule_delete_ok") %>
         <%= re_button_link_orange('Cancel', "#", :id => "re_rule_delete_cancel") %>
         <div class="clear"></div>

data/rails_generators/templates/app/views/re_pipelines/_edit.html.erb

@@ -1,5 +1,5 @@
 <div class="clear prepend-1 span-18">
-  <h2 class="re-pipeline-edit">Edit Pipeline Details</h2>
+  <h3 class="re-pipeline-edit">Edit Pipeline Details</h3>
   <div class="clear top-10"></div>
   
   <% re_form_for(@re_pipeline, :url => re_pipeline_path(@re_pipeline), :method => :post, :span => "3x13", :html => {:id => "re_pipeline_edit_form"}) do |f| %>

data/rails_generators/templates/app/views/re_pipelines/_empty.html.erb

@@ -1,10 +1,10 @@
 <% local_hide = local_assigns[:hide] && hide  %>
 
 <div class="span-16" id="re_pipelines_empty" style="<%= local_hide ?  'display:none' : '' %>">
-  <div class="re-redbox-header"><h3 class="white">No Pipelines Defined</h3></div>   
+  <div class="re-redbox-header"><h4 class="white">No Pipelines Defined</h4></div>   
   <div class="re-redbox no-top">
-    <div class="clear top-5 prepend-1 append-1">
-      <h4>Create a new pipeline and define the rules.</h4>
+    <div class="clear top-5">
+      <h5>Create a new pipeline and define the rules.</h5>
 			<p class="left-10">Pipelines are groups of rules that are executed in succession.</p> 
     </div>  
   </div>    

data/rails_generators/templates/app/views/re_pipelines/_index.html.erb

@@ -5,14 +5,14 @@
 <div class="span-16" id="re_pipeline_index_<%= re_pipeline.id %>" style="<%= local_hide ?  'display:none' : '' %>">
   <div class="re-infobox">
     <div class="span-10">
-      <h3 class="re-pipeline-status-<%= re_pipeline_error.blank? ? re_pipeline_status : 'verify' %>"><%=h re_pipeline.code %></h3>
+      <h4 class="re-pipeline-status-<%= re_pipeline_error.blank? ? re_pipeline_status : 'verify' %>"><%=h re_pipeline.code %></h4>
     </div>  
     <div class="span-5 last">
       <div>
 				<% if rules_engine_editor? %>
-        	<h3 class="re-pipeline-change float-right"><%= link_to("Edit", change_re_pipeline_path(re_pipeline)) %></h3>    
+        	<h4 class="re-pipeline-change float-right"><%= link_to("Edit", change_re_pipeline_path(re_pipeline)) %></h4>    
 				<% end %>
-        <h3 class="re-pipeline-show float-right"><%= link_to("View", re_pipeline_path(re_pipeline)) %></h3>    
+        <h4 class="re-pipeline-show float-right"><%= link_to("View", re_pipeline_path(re_pipeline)) %></h4>    
       </div>
     </div>  
     <div class="clear"></div>
@@ -28,7 +28,7 @@
 			</a>	
     </div>
     <div class="span-9">
-      <h5 class="left-20"> <%=h re_pipeline.title%></h5>
+      <h6 class="left-20"> <%=h re_pipeline.title%></h6>
     </div>  
     <div class="span-5 last">
       <% if re_pipeline_error.blank? %>

data/rails_generators/templates/app/views/re_pipelines/_new.html.erb

@@ -1,5 +1,5 @@
 <div class="clear prepend-1 span-18">
-  <h2 class="re-pipeline-new"> New Pipeline</h2>
+  <h3 class="re-pipeline-new"> New Pipeline</h3>
   <div class="clear top-10"></div>
   
   <% re_form_for(@re_pipeline, :url => re_pipelines_path, :method => :post, :span => "3x13", :html => {:id => "re_pipeline_new_form"}) do |f| %>

data/rails_generators/templates/app/views/re_pipelines/_show.html.erb

@@ -4,16 +4,16 @@
 <div class="span-16">
   <div class="re-infobox">
     <div class="span-10">
-      <h3 class="re-pipeline-status-<%= re_pipeline_error.blank? ? re_pipeline_status : 'verify' %>"><%=h @re_pipeline.code %></h3>
+      <h4 class="re-pipeline-status-<%= re_pipeline_error.blank? ? re_pipeline_status : 'verify' %>"><%=h @re_pipeline.code %></h4>
     </div>  
     <div class="span-5 last">			
 			<% if rules_engine_editor? %>
-       <h3 class="re-pipeline-change float-right"><%= link_to("Edit", change_re_pipeline_path(@re_pipeline)) %></h3>
+       <h4 class="re-pipeline-change float-right"><%= link_to("Edit", change_re_pipeline_path(@re_pipeline)) %></h4>
 			<% end %>
     </div>  
     <div class="clear"></div>
     <div class="span-9 prepend-1">
-      <h5> <%=h @re_pipeline.title%></h5>
+      <h6> <%=h @re_pipeline.title%></h6>
     </div>  
     <div class="span-5 last">
       <% if re_pipeline_error.blank? %>

data/rails_generators/templates/app/views/re_pipelines/index.html.erb

@@ -17,20 +17,20 @@
 </div>
 <div class="span-7 last">      
 	<% if rules_engine_editor? && !@re_pipelines.empty? %>
-	  <h3 class="re-pipeline-activate-all float-left clear">
+	  <h4 class="re-pipeline-activate-all float-left clear">
 	    <%= link_to("Activate All Pipelines", "#", :id => "re_pipeline_activate_all") %>
-	  </h3>    
+	  </h4>    
 		<div class="clear top-50"></div>
 	<% end %>
 	
-	<h3 class="re-job-list">
+	<h4 class="re-job-list">
 		<%= link_to("Pipeline Job Audit", re_jobs_path) %>
-	</h3>
+	</h4>
 	
   <%= render '/re_jobs/empty', :hide => true %>
 	
 	<div id="re_job_list_pending" class="re-infobox">
-		<h3 class="left-20">Updating Job List</h3>
+		<h4 class="left-20">Updating Job List</h4>
 	</div>	
 
 	<div id="re_job_list">
@@ -45,19 +45,10 @@
   <div id="re_pipeline_activate_all_confirm">
     <div class="span-14 last">
       <% re_whitebox do %>    
-        <h2 class="re-pipeline-activate-all red" id="re_pipeline_action_title">Confirm : Activate All Pipelines</h2>    
+        <h3 class="re-pipeline-activate-all red" id="re_pipeline_action_title">Confirm : Activate All Pipelines</h3>
         <div class="clear top-5"></div>
         <hr/>
         <div class="clear top-5"></div>
-  
-        <div class="span-13 last" id="re_pipeline_action_content_code">
-        </div>  
-        <div class="clear"></div>
-
-        <div class="span-12 prepend-1 last">
-          <h5 id="re_pipeline_action_content_title"></h5>
-        </div>    
-        <div class="clear"></div>
         <%= re_button_link_green('Activate All Pipelines', "#", :id => "re_pipeline_activate_all_ok") %>
         <%= re_button_link_orange('Cancel', "#", :id => "re_pipeline_activate_all_cancel") %>
       <% end %>  

data/rails_generators/templates/app/views/re_pipelines/show.html.erb

@@ -18,14 +18,14 @@
 <div class="span-7 last">      
 	<div class="top-5"></div>
 	
-	<h3 class="re-job-list">
+	<h4 class="re-job-list">
 		<%= link_to("Pipeline Job Audit", re_pipeline_re_jobs_path(@re_pipeline)) %>
-	</h3>
+	</h4>
 	
   <%= render '/re_jobs/empty', :hide => true %>
 	
 	<div id="re_job_list_pending" class="re-infobox">
-		<h3 class="left-20">Updating Job List</h3>
+		<h4 class="left-20">Updating Job List</h4>
 		<a id="re_job_list_pipeline" href="#<%= @re_pipeline.id %>"></a>
 	</div>	
 

data/rails_generators/templates/app/views/re_pipelines/template.html.erb

@@ -100,7 +100,7 @@
   <%= re_password_field("PASSWORD FIELD", "text_field_1", "text_field_1")%>
   <%= re_check_box "CHECKBOX FIELD", 'accept'%>
   <%= re_check_box "CHECKBOX FIELD", 'accept', "1", "1", :required => true %>
-  <%= re_select "SELECT FIELD",  "people", "<option>David</option>" %>
+  <%= re_select "SELECT FIELD",  "people", "<option>David</option><option>John</option><option>Mary</option>" %>
   <%= re_text_area "TEXT AREA FIELD",  "text_area", "", :size => "30x10"  %> 
 
 

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

@@ -10,7 +10,8 @@ task :rules_engine => :environment do
   job = RulesEngine::Job.create
   # job = RulesEngine::Job.open(job.re_job.id)
       
-  result = job.run(data[:pipeline_code], data)
+  success = job.run(data[:pipeline_code], data)
   
-  puts "rule completed : data = #{data.inspect}"
-end  
+  puts "rule #{success ? 'succeeded' : 'failed'} : data = #{data.inspect}"
+end
+

data/rails_generators/templates/public/stylesheets/re_view.css

@@ -3,7 +3,6 @@ html, body {
   margin: 0px;
   padding: 0px;
   font-size: 14px;
-/*  color: #000;*/
   color: #222;
   background: #2F323C;
   font-family: "Lucida Grande","Lucida Sans Unicode",verdana,arial,helvetica,sans-serif;
@@ -16,52 +15,37 @@ html, body {
 
 h1, h2, h3, h4, h5, h6 {
   font-weight:normal;
-/*  color:#111;*/
   color: #222;
 }
 h1 {
   font-size:36px;
   line-height:42px;
-  padding-top:6px;
-  padding-bottom:3px; 
   margin: 0px 6px;
 }
 h2 {
-  font-size:24px;
-  line-height:28px;
-  padding-top:6px;
-  padding-bottom:3px; 
+  font-size:30px;
+  line-height:36px;
   margin: 0px 6px;
 }
 h3 {
-  font-size:18px;
-  line-height:25px;
-  padding-top:6px;
-  padding-bottom:3px; 
+  font-size:24px;
+  line-height:30px;
   margin: 0px 6px;
 }
 h4 {
-  font-size:16px;
-  line-height:18px;
-  font-weight:bold;
-  padding-top:4px;
-  padding-bottom:3px; 
-  margin: 0px 3px;
+  font-size:20px;
+  line-height:24px;
+  margin: 0px 6px;
 }
 h5 {
-  font-size:16px;
-  line-height:16px;
-  padding-top:6px;
-  padding-bottom:3px; 
-  margin: 0px 3px;
+  font-size:18px;
+  line-height:22px;
+  margin: 0px 6px;
 }
 h6 {
-  font-size:12px;
-  line-height:14px;
-  font-weight:bold;
-  padding-top:4px;
-  padding-bottom:3px; 
-  margin: 0px 3px;
+  font-size:16px;
+  line-height:20px;
+  margin: 0px 6px;
 }
 p {
   font-size:14px;

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

@@ -21,63 +21,59 @@
 }
 
 /* sub headers*/
-h2.re-pipeline-alert {
-	background: transparent url('./rules_engine/re_pipeline/alert-25.png') no-repeat left top;
-  padding: 0px 0 0 28px;
+h3.re-pipeline-alert {
+	background: transparent url('./rules_engine/re_pipeline/alert-25.png') no-repeat left 2px;
+  padding: 0 0 0 28px;
 }
-h2.re-pipeline-list {
-	background: transparent url('./rules_engine/re_pipeline/list-25.png') no-repeat left top;
-  padding: 0px 0 0 28px;
+h3.re-pipeline-new {
+	background: transparent url('./rules_engine/re_pipeline/new-25.png') no-repeat left 2px;
+  padding: 0 0 0 28px;
 }
-h2.re-pipeline-new {
-	background: transparent url('./rules_engine/re_pipeline/new-25.png') no-repeat left top;
-  padding: 0px 0 0 28px;
+h3.re-pipeline-edit {
+	background: transparent url('./rules_engine/re_pipeline/edit-25.png') no-repeat left 2px;
+  padding: 0 0 0 28px;
 }
-h2.re-pipeline-edit {
-	background: transparent url('./rules_engine/re_pipeline/edit-25.png') no-repeat left top;
-  padding: 0px 0 0 28px;
+h3.re-pipeline-change {
+	background: transparent url('./rules_engine/re_pipeline/change-25.png') no-repeat left 2px;
+  padding: 0 0 0 28px;
 }
-h2.re-pipeline-change {
-	background: transparent url('./rules_engine/re_pipeline/change-25.png') no-repeat left top;
-  padding: 0px 0 0 28px;
+h3.re-pipeline-activate-all {
+	background: transparent url('./rules_engine/re_pipeline/activate-25.png') no-repeat left 2px;
+  padding: 0 0 0 28px;
 }
-h2.re-pipeline-activate-all {
-	background: transparent url('./rules_engine/re_pipeline/activate-25.png') no-repeat left top;
-  padding: 0px 0 0 28px;
+h3.re-pipeline-activate {
+	background: transparent url('./rules_engine/re_pipeline/activate-25.png') no-repeat left 2px;
+  padding: 0 0 0 28px;
 }
-h2.re-pipeline-activate {
-	background: transparent url('./rules_engine/re_pipeline/activate-25.png') no-repeat left top;
-  padding: 0px 0 0 28px;
-}
-h2.re-pipeline-deactivate {
-	background: transparent url('./rules_engine/re_pipeline/deactivate-25.png') no-repeat left top;
-  padding: 0px 0 0 28px;
+h3.re-pipeline-deactivate {
+	background: transparent url('./rules_engine/re_pipeline/deactivate-25.png') no-repeat left 2px;
+  padding: 0 0 0 28px;
 }
-h2.re-pipeline-revert {
-	background: transparent url('./rules_engine/re_pipeline/revert-25.png') no-repeat left top;
-  padding: 0px 0 0 28px;
+h3.re-pipeline-revert {
+	background: transparent url('./rules_engine/re_pipeline/revert-25.png') no-repeat left 2px;
+  padding: 0 0 0 28px;
 }
-h2.re-pipeline-delete {
-	background: transparent url('./rules_engine/re_pipeline/destroy-25.png') no-repeat left top;
-  padding: 0px 0 0 28px;
+h3.re-pipeline-delete {
+	background: transparent url('./rules_engine/re_pipeline/destroy-25.png') no-repeat left 2px;
+  padding: 0 0 0 28px;
 }
 
 /* pipeline-status*/
-h3.re-pipeline-status-draft {
+h4.re-pipeline-status-draft {
 	background: transparent url('./rules_engine/re_pipeline/draft-25.png') no-repeat left top;
-  padding: 0px 0 0 28px;
+  padding: 0 0 0 28px;
 }
-h3.re-pipeline-status-changed {
+h4.re-pipeline-status-changed {
 	background: transparent url('./rules_engine/re_pipeline/changed-25.png') no-repeat left top;
-  padding: 0px 0 0 28px;
+  padding: 0 0 0 28px;
 }
-h3.re-pipeline-status-current {
+h4.re-pipeline-status-current {
 	background: transparent url('./rules_engine/re_pipeline/current-25.png') no-repeat left top;
-  padding: 0px 0 0 28px;
+  padding: 0 0 0 28px;
 }
-h3.re-pipeline-status-verify {
+h4.re-pipeline-status-verify {
 	background: transparent url('./rules_engine/re_pipeline/verify-25.png') no-repeat left top;
-  padding: 0px 0 0 28px;
+  padding: 0 0 0 28px;
 }
 /* pipeline status text  */
 em.re-pipeline-status-draft {
@@ -94,126 +90,126 @@ em.re-pipeline-status-verify {
 }
 
 /* pipeline actions */
-h3.re-pipeline-new  {
+h4.re-pipeline-new  {
   padding: 0 0 4px 0;
 }
-h3.re-pipeline-new a {
+h4.re-pipeline-new a {
 	background: transparent url('./rules_engine/re_pipeline/new-25.png') no-repeat left -1px;
-  padding: 0px 0 0 28px;
+  padding: 0 0 0 28px;
   color: #218868;
   text-decoration: none;
 }
-h3.re-pipeline-new a:hover {
+h4.re-pipeline-new a:hover {
   text-decoration: underline;
 }
-h3.re-job-list  {
+h4.re-job-list  {
   padding: 0 0 4px 0;
 }
-h3.re-job-list a {
+h4.re-job-list a {
 	background: transparent url('./rules_engine/re_job/list-25.png') no-repeat left -1px;
-  padding: 0px 0 0 28px;
+  padding: 0 0 0 28px;
   color: #244A9F;
   text-decoration: none;
 }
-h3.re-job-list a:hover {
+h4.re-job-list a:hover {
   text-decoration: underline;
 }
-h3.re-pipeline-show  {
+h4.re-pipeline-show  {
 /*  padding: 0 0 4px 0;*/
   padding: 0;
 }
-h3.re-pipeline-show a {
+h4.re-pipeline-show a {
 	background: transparent url('./rules_engine/re_pipeline/show-25.png') no-repeat left -1px;
-  padding: 0px 0 0 28px;
+  padding: 0 0 0 28px;
   color: #92b83c;
   text-decoration: none;
 }
-h3.re-pipeline-show a:hover {
+h4.re-pipeline-show a:hover {
   text-decoration: underline;
 }
-h3.re-pipeline-change  {
+h4.re-pipeline-change  {
 /*  padding: 0 0 4px 0;*/
   padding: 0;
 }
-h3.re-pipeline-change a {
+h4.re-pipeline-change a {
 	background: transparent url('./rules_engine/re_pipeline/change-25.png') no-repeat left -1px;
-  padding: 0px 0 0 28px;
+  padding: 0 0 0 28px;
   color: #218868;
   text-decoration: none;
 }
-h3.re-pipeline-change a:hover {
+h4.re-pipeline-change a:hover {
   text-decoration: underline;
 }
-h3.re-pipeline-edit  {
+h4.re-pipeline-edit  {
   padding: 0 0 4px 0;
 }
-h3.re-pipeline-edit a {
+h4.re-pipeline-edit a {
 	background: transparent url('./rules_engine/re_pipeline/edit-25.png') no-repeat left -1px;
-  padding: 0px 0 0 28px;
+  padding: 0 0 0 28px;
   color: #218868;
   text-decoration: none;
 }
-h3.re-pipeline-edit a:hover {
+h4.re-pipeline-edit a:hover {
   text-decoration: underline;
 }
-h3.re-pipeline-activate-all  {
+h4.re-pipeline-activate-all  {
   padding: 0 0 4px 0;
 }
-h3.re-pipeline-activate-all a {
+h4.re-pipeline-activate-all a {
 	background: transparent url('./rules_engine/re_pipeline/activate-25.png') no-repeat left -1px;
-  padding: 0px 0 0 28px;
+  padding: 0 0 0 28px;
   color: #218868;
   text-decoration: none;
 }
-h3.re-pipeline-activate-all a:hover {
+h4.re-pipeline-activate-all a:hover {
   text-decoration: underline;
 }
-h3.re-pipeline-activate  {
+h4.re-pipeline-activate  {
   padding: 0 0 4px 0;
 }
-h3.re-pipeline-activate a {
+h4.re-pipeline-activate a {
 	background: transparent url('./rules_engine/re_pipeline/activate-25.png') no-repeat left -1px;
-  padding: 0px 0 0 28px;
+  padding: 0 0 0 28px;
   color: #92b83c;
   text-decoration: none;
 }
-h3.re-pipeline-activate a:hover {
+h4.re-pipeline-activate a:hover {
   text-decoration: underline;
 }
-h3.re-pipeline-deactivate {
+h4.re-pipeline-deactivate {
   padding: 0 0 4px 0;
 }
-h3.re-pipeline-deactivate a {
+h4.re-pipeline-deactivate a {
 	background: transparent url('./rules_engine/re_pipeline/deactivate-25.png') no-repeat left -1px;
-  padding: 0px 0 0 28px;
+  padding: 0 0 0 28px;
   color: #b43838;
   text-decoration: none;
 }
-h3.re-pipeline-deactivate a:hover {
+h4.re-pipeline-deactivate a:hover {
   text-decoration: underline;
 }
-h3.re-pipeline-revert {
+h4.re-pipeline-revert {
   padding: 0 0 4px 0;
 }
-h3.re-pipeline-revert a {
+h4.re-pipeline-revert a {
 	background: transparent url('./rules_engine/re_pipeline/revert-25.png') no-repeat left -1px;
-  padding: 0px 0 0 28px;
+  padding: 0 0 0 28px;
   color: #b43838;
   text-decoration: none;
 }
-h3.re-pipeline-revert a:hover {
+h4.re-pipeline-revert a:hover {
   text-decoration: underline;
 }
-h3.re-pipeline-delete {
+h4.re-pipeline-delete {
   padding: 0 0 4px 0;
 }
-h3.re-pipeline-delete a {
+h4.re-pipeline-delete a {
 	background: transparent url('./rules_engine/re_pipeline/destroy-25.png') no-repeat left -1px;
-  padding: 0px 0 0 28px;
+  padding: 0 0 0 28px;
   color: #b43838;
   text-decoration: none;
 }
-h3.re-pipeline-delete a:hover {
+h4.re-pipeline-delete a:hover {
   text-decoration: underline;
 }
 
@@ -233,17 +229,17 @@ div.re-pipeline-rule-list-down {
 }
 
 /* rules */
-h2.re-rule-class-new {
-	background: transparent url('./rules_engine/re_rule_class/new-25.png') no-repeat left top;
-  padding: 0px 0 0 28px;  
+h3.re-rule-class-new {
+	background: transparent url('./rules_engine/re_rule_class/new-25.png') no-repeat left 2px;
+  padding: 0 0 0 28px;  
 }
-h2.re-rule-class-help {
-	background: transparent url('./rules_engine/re_rule_class/help-25.png') no-repeat left top;
-  padding: 0px 0 0 28px;  
+h3.re-rule-class-help {
+	background: transparent url('./rules_engine/re_rule_class/help-25.png') no-repeat left 2px;
+  padding: 0 0 0 28px;  
 }
-h2.re-rule-edit {
-	background: transparent url('./rules_engine/re_rule/edit-25.png') no-repeat left top;
-  padding: 0px 0 0 28px;  
+h3.re-rule-edit {
+	background: transparent url('./rules_engine/re_rule/edit-25.png') no-repeat left 2px;
+  padding: 0 0 0 28px;  
 }
 
 .re-rule-show  p{
@@ -268,7 +264,7 @@ h2.re-rule-edit {
 }
 .re-rule-change div.re-rule-status-valid {
 	background: transparent url('./rules_engine/re_rule/valid-25.png') no-repeat 2px 2px;
-  padding: 2px 0 4px 31px;
+  padding: 2px 0 4px 24px;
 }
 .re-rule-change div.re-rule-status-verify {
 	background: #FBE3E4 url('./rules_engine/re_rule/verify-25.png') no-repeat 2px 2px;
@@ -424,17 +420,17 @@ a.re-rule-class-help span {
 }
 
 /* jobs */
-#re_job_list h3 {
+#re_job_list h4 {
   color: #244A9F;
   background: transparent url('./rules_engine/re_job/list-25.png') no-repeat 0px 4px;
   padding: 5px 0 5px 32px;
 }
-.re-job-show h3 {
+.re-job-show h4 {
   background: transparent url('./rules_engine/re_job/list-25.png') no-repeat 0px 0px;
   padding: 0px 0 5px 32px;
 }
 
-#re_job_list_empty h3 {
+#re_job_list_empty h4 {
   font-size:16px;
   line-height:18px;
   font-weight:normal;
@@ -443,7 +439,7 @@ a.re-rule-class-help span {
   margin: 0px 3px;
 }
 
-#re_job_list_empty h4 {
+#re_job_list_empty h5 {
   font-size:16px;
   line-height:18px;
   font-weight:normal;
@@ -456,7 +452,7 @@ a.re-rule-class-help span {
   background: transparent url('./rules_engine/re_job/loadingAnimation.gif') no-repeat 20px 10px;
   padding : 20px 0px 5px 15px;  
 }
-#re_job_list_pending h3 {
+#re_job_list_pending h4 {
   background: transparent url('./rules_engine/re_job/list-25.png') no-repeat 0px 4px;
   padding: 5px 0 5px 32px;
   color: #bbb;

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: rules_engine
 version: !ruby/object:Gem::Version 
-  hash: 17
+  hash: 15
   prerelease: false
   segments: 
   - 0
   - 0
-  - 7
-  version: 0.0.7
+  - 8
+  version: 0.0.8
 platform: ruby
 authors: 
 - Chris Douglas
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-06-24 00:00:00 +10:00
+date: 2010-06-25 00:00:00 +10:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency