rules_engine 0.1.10 → 0.2.0

data/VERSION

@@ -1 +1 @@
-0.1.10
+0.2.0

data/rails_generators/manifests/rules_engine.rb

@@ -6,10 +6,10 @@ class RulesEngineManifest
       app/helpers
       app/models
       app/views/layouts
+      app/views/re_history
       app/views/re_plan_workflow_rules
       app/views/re_plan_workflows
       app/views/re_plans
-      app/views/re_processes
       app/views/re_publications
       app/views/re_workflow_rules
       app/views/re_workflows
@@ -41,8 +41,8 @@ class RulesEngineManifest
       public/stylesheets/rules_engine/images/re_view_navigate
       public/stylesheets/rules_engine/images/rules_engine
       public/stylesheets/rules_engine/images/rules_engine/re_common
+      public/stylesheets/rules_engine/images/rules_engine/re_history
       public/stylesheets/rules_engine/images/rules_engine/re_plan
-      public/stylesheets/rules_engine/images/rules_engine/re_process
       public/stylesheets/rules_engine/images/rules_engine/re_publication
       public/stylesheets/rules_engine/images/rules_engine/re_rule
       public/stylesheets/rules_engine/images/rules_engine/re_workflow
@@ -55,10 +55,10 @@ class RulesEngineManifest
     end
 
     %W(
+      app/controllers/re_history_controller.rb
       app/controllers/re_plan_workflow_rules_controller.rb
       app/controllers/re_plan_workflows_controller.rb
       app/controllers/re_plans_controller.rb
-      app/controllers/re_processes_controller.rb
       app/controllers/re_publications_controller.rb
       app/controllers/re_workflow_rules_controller.rb
       app/controllers/re_workflows_controller.rb
@@ -68,6 +68,13 @@ class RulesEngineManifest
       app/models/re_rule.rb
       app/models/re_workflow.rb
       app/views/layouts/rules_engine.html.erb
+      app/views/re_history/_index_prepare.html.erb
+      app/views/re_history/_index_update.html.erb
+      app/views/re_history/_show.html.erb
+      app/views/re_history/index.html.erb
+      app/views/re_history/index.js.erb
+      app/views/re_history/show.html.erb
+      app/views/re_history/show.js.erb
       app/views/re_plan_workflow_rules/edit.html.erb
       app/views/re_plan_workflow_rules/edit.js.erb
       app/views/re_plan_workflow_rules/error.html.erb
@@ -104,24 +111,17 @@ class RulesEngineManifest
       app/views/re_plans/create.js.erb
       app/views/re_plans/edit.html.erb
       app/views/re_plans/edit.js.erb
+      app/views/re_plans/history.html.erb
+      app/views/re_plans/history.js.erb
       app/views/re_plans/index.html.erb
       app/views/re_plans/index.js.erb
       app/views/re_plans/new.html.erb
       app/views/re_plans/new.js.erb
       app/views/re_plans/preview.html.erb
       app/views/re_plans/preview.js.erb
-      app/views/re_plans/re_process.html.erb
-      app/views/re_plans/re_process.js.erb
       app/views/re_plans/show.html.erb
       app/views/re_plans/template.html.erb
       app/views/re_plans/update.js.erb
-      app/views/re_processes/_index_prepare.html.erb
-      app/views/re_processes/_index_update.html.erb
-      app/views/re_processes/_show.html.erb
-      app/views/re_processes/index.html.erb
-      app/views/re_processes/index.js.erb
-      app/views/re_processes/show.html.erb
-      app/views/re_processes/show.js.erb
       app/views/re_publications/_show_prepare.html.erb
       app/views/re_publications/_show_update.html.erb
       app/views/re_publications/show.html.erb
@@ -190,11 +190,11 @@ class RulesEngineManifest
       public/javascripts/jquery.autocomplete.pack.js
       public/javascripts/jquery.blockUI.js
       public/javascripts/jquery.fancybox-1.3.1.js
+      public/javascripts/rules_engine/re_history_index.js
+      public/javascripts/rules_engine/re_history_show.js
       public/javascripts/rules_engine/re_plan_change.js
       public/javascripts/rules_engine/re_plan_new.js
       public/javascripts/rules_engine/re_plan_preview.js
-      public/javascripts/rules_engine/re_process_index.js
-      public/javascripts/rules_engine/re_process_show.js
       public/javascripts/rules_engine/re_publication_show.js
       public/javascripts/rules_engine/re_view.js
       public/javascripts/rules_engine/re_workflow_add.js
@@ -294,6 +294,10 @@ class RulesEngineManifest
       public/stylesheets/rules_engine/images/rules_engine/re_common/status-verify-14.png
       public/stylesheets/rules_engine/images/rules_engine/re_common/status-verify-18.png
       public/stylesheets/rules_engine/images/rules_engine/re_common/status-verify-25.png
+      public/stylesheets/rules_engine/images/rules_engine/re_history/error-14.png
+      public/stylesheets/rules_engine/images/rules_engine/re_history/info-14.png
+      public/stylesheets/rules_engine/images/rules_engine/re_history/list-25.png
+      public/stylesheets/rules_engine/images/rules_engine/re_history/success-14.png
       public/stylesheets/rules_engine/images/rules_engine/re_plan/alert-25.png
       public/stylesheets/rules_engine/images/rules_engine/re_plan/change-25.png
       public/stylesheets/rules_engine/images/rules_engine/re_plan/copy-25.png
@@ -307,10 +311,6 @@ class RulesEngineManifest
       public/stylesheets/rules_engine/images/rules_engine/re_plan/show-25.png
       public/stylesheets/rules_engine/images/rules_engine/re_plan/title-plural.png
       public/stylesheets/rules_engine/images/rules_engine/re_plan/title-single.png
-      public/stylesheets/rules_engine/images/rules_engine/re_process/error-14.png
-      public/stylesheets/rules_engine/images/rules_engine/re_process/info-14.png
-      public/stylesheets/rules_engine/images/rules_engine/re_process/list-25.png
-      public/stylesheets/rules_engine/images/rules_engine/re_process/success-14.png
       public/stylesheets/rules_engine/images/rules_engine/re_publication/show-25.png
       public/stylesheets/rules_engine/images/rules_engine/re_rule/add-14.png
       public/stylesheets/rules_engine/images/rules_engine/re_rule/alert-25.png
@@ -355,7 +355,14 @@ class RulesEngineManifest
       public/stylesheets/rules_engine/images/rules_engine/re_workflow/title-plural.png
       public/stylesheets/rules_engine/images/rules_engine/re_workflow/title-single.png
       public/stylesheets/rules_engine/screen.css
+      spec/controllers/re_application_controller_spec.rb
+      spec/controllers/re_history_controller_spec.rb
+      spec/controllers/re_plan_workflow_rules_controller_spec.rb
+      spec/controllers/re_plan_workflows_controller_spec.rb
       spec/controllers/re_plans_controller_spec.rb
+      spec/controllers/re_publications_controller_spec.rb
+      spec/controllers/re_workflow_rules_controller_spec.rb
+      spec/controllers/re_workflows_controller_spec.rb
       spec/helpers/rules_engine_helper_spec.rb
       spec/models/re_plan_spec.rb
       spec/models/re_plan_workflow_spec.rb

data/rails_generators/manifests/rules_engine.yml

@@ -5,7 +5,7 @@ contents :
   - app/views/re_workflows
   - app/views/re_workflow_rules
   - app/views/re_publications
-  - app/views/re_processes
+  - app/views/re_history
 
   - public/stylesheets/fancybox
   - public/stylesheets/blueprint
@@ -27,7 +27,7 @@ files :
   - app/controllers/re_workflows_controller.rb
   - app/controllers/re_workflow_rules_controller.rb
   - app/controllers/re_publications_controller.rb
-  - app/controllers/re_processes_controller.rb
+  - app/controllers/re_history_controller.rb
 
   - app/helpers/rules_engine_helper.rb
 
@@ -61,7 +61,14 @@ files :
   - spec/models/re_rule_spec.rb                  
   - spec/models/re_workflow_spec.rb
 
-  - spec/controllers/re_plans_controller_spec.rb
+  - spec/controllers/re_application_controller_spec.rb
+  - spec/controllers/re_history_controller_spec.rb
+  - spec/controllers/re_plan_workflow_rules_controller_spec.rb        
+  - spec/controllers/re_plan_workflows_controller_spec.rb        
+  - spec/controllers/re_plans_controller_spec.rb        
+  - spec/controllers/re_publications_controller_spec.rb
+  - spec/controllers/re_workflow_rules_controller_spec.rb
+  - spec/controllers/re_workflows_controller_spec.rb
   
   - features/step_definitions/common/re_debug_steps.rb
   - features/step_definitions/common/re_error_steps.rb      

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

@@ -0,0 +1,15 @@
+class ReHistoryController < ApplicationController    
+  helper :rules_engine 
+  layout 'rules_engine'
+
+  # before_filter :login_required
+  before_filter :rules_engine_reader_access_required,  :only => [:index, :show]
+
+  def index
+    @re_history = RulesEngine::Process.runner.history(nil, :page => params[:page] || 1, :per_page => 5)
+  end
+
+  def show
+    @re_audit_history = RulesEngine::Process.auditor.history(params[:id])
+  end
+end

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

@@ -17,11 +17,6 @@ class RePlanWorkflowsController < ApplicationController
     controller.re_load_model :re_workflow, {:redirect_path => :change_re_plan_path}
   end    
 
-  def index    
-    klass = ReWorkflow
-    @re_workflows = klass.find(:all)
-  end
-  
   def show
   end
 
@@ -103,11 +98,8 @@ class RePlanWorkflowsController < ApplicationController
   end
 
   def add
-    if @re_plan.add_workflow(@re_workflow)    
-      flash[:success] = 'Workflow Added.'
-    else
-      flash[:error] = 'Cannot Add Workflow.'
-    end  
+    @re_plan.add_workflow(@re_workflow)    
+    flash[:success] = 'Workflow Added.'
 
     respond_to do |format|
       format.html do
@@ -120,11 +112,8 @@ class RePlanWorkflowsController < ApplicationController
   end
 
   def remove    
-    if @re_plan.remove_workflow(@re_workflow)
-      flash[:success] = 'Workflow Removed.'
-    else
-      flash[:error] = 'Cannot Remove Workflow.'
-    end  
+    @re_plan.remove_workflow(@re_workflow)
+    flash[:success] = 'Workflow Removed.'
 
     respond_to do |format|
       format.html do
@@ -137,23 +126,23 @@ class RePlanWorkflowsController < ApplicationController
   end
   
   def copy
-    @re_workflow_new = ReWorkflow.new
+    @re_workflow_copy = ReWorkflow.new
   end
 
   def duplicate
-    @re_workflow_new = ReWorkflow.new
-    @re_workflow_new.revert!(@re_workflow.publish)
-    @re_workflow_new.attributes = params[:re_workflow]
+    @re_workflow_copy = ReWorkflow.new
+    @re_workflow_copy.revert!(@re_workflow.publish)
+    @re_workflow_copy.attributes = params[:re_workflow]
 
-    if @re_workflow_new.save   
-      @re_plan.add_workflow(@re_workflow_new) 
+    if @re_workflow_copy.save   
+      @re_plan.add_workflow(@re_workflow_copy) 
       flash[:success] = 'Workflow Duplicated.'
       respond_to do |format|
         format.html do
-          redirect_to(change_re_plan_workflow_path(@re_plan, @re_workflow_new))
+          redirect_to(change_re_plan_workflow_path(@re_plan, @re_workflow_copy))
         end  
         format.js do
-          render :inline => "window.location.href = '#{change_re_plan_workflow_path(@re_plan, @re_workflow_new)}';"
+          render :inline => "window.location.href = '#{change_re_plan_workflow_path(@re_plan, @re_workflow_copy)}';"
         end
       end
     else

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

@@ -4,9 +4,9 @@ class RePlansController < ApplicationController
 
   # before_filter :login_required
   before_filter :rules_engine_editor_access_required,  :only => [:new, :create, :edit, :update, :destroy, :change, :publish, :revert, :copy, :duplicate]
-  before_filter :rules_engine_reader_access_required,  :only => [:index, :show, :preview, :re_process]
+  before_filter :rules_engine_reader_access_required,  :only => [:index, :show, :preview, :history]
 
-  before_filter :only => [:show, :edit, :update, :destroy, :change, :preview, :publish, :revert, :re_process, :copy, :duplicate] do |controller|
+  before_filter :only => [:show, :edit, :update, :destroy, :change, :preview, :publish, :revert, :history, :copy, :duplicate] do |controller|
     controller.re_load_model :re_plan
   end    
 
@@ -125,27 +125,27 @@ class RePlansController < ApplicationController
     end
   end
   
-  def re_process
-    @re_processes = RulesEngine::Process.runner.history(@re_plan.code, :page => params[:page] || 1, :per_page => 5)    
+  def history
+    @re_history = RulesEngine::Process.runner.history(@re_plan.code, :page => params[:page] || 1, :per_page => 5)    
   end
 
   def copy
-    @re_plan_new = RePlan.new
+    @re_plan_copy = RePlan.new
   end
 
   def duplicate
-    @re_plan_new = RePlan.new
-    @re_plan_new.revert!(@re_plan.publish)
-    @re_plan_new.attributes = params[:re_plan]
+    @re_plan_copy = RePlan.new
+    @re_plan_copy.revert!(@re_plan.publish)
+    @re_plan_copy.attributes = params[:re_plan]
 
-    if @re_plan_new.save    
+    if @re_plan_copy.save    
       flash[:success] = 'Plan Duplicated.'
       respond_to do |format|
         format.html do
-          redirect_to(change_re_plan_path(@re_plan_new))
+          redirect_to(change_re_plan_path(@re_plan_copy))
         end  
         format.js do
-          render :inline => "window.location.href = '#{change_re_plan_path(@re_plan_new)}';"
+          render :inline => "window.location.href = '#{change_re_plan_path(@re_plan_copy)}';"
         end
       end
     else

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

@@ -16,6 +16,7 @@ class ReWorkflowRulesController < ApplicationController
   
   def help
     @rule_class = RulesEngine::Discovery.rule_class(params[:rule_class_name])
+    
     if @rule_class.nil?
       flash[:error] = "#{params[:rule_class]} : class not found."
       render :error
@@ -37,7 +38,7 @@ class ReWorkflowRulesController < ApplicationController
   
   def create
     @re_rule = ReRule.new(:re_workflow_id => @re_workflow.id, :rule_class_name => params[:rule_class_name])
-    if @re_rule.rule.nil? 
+    if @re_rule.rule.nil?       
       render :action => "error"
       return      
     end

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

@@ -95,22 +95,22 @@ class ReWorkflowsController < ApplicationController
   end
   
   def copy
-    @re_workflow_new = ReWorkflow.new
+    @re_workflow_copy = ReWorkflow.new
   end
 
   def duplicate
-    @re_workflow_new = ReWorkflow.new
-    @re_workflow_new.revert!(@re_workflow.publish)
-    @re_workflow_new.attributes = params[:re_workflow]
+    @re_workflow_copy = ReWorkflow.new
+    @re_workflow_copy.revert!(@re_workflow.publish)
+    @re_workflow_copy.attributes = params[:re_workflow]
 
-    if @re_workflow_new.save    
+    if @re_workflow_copy.save    
       flash[:success] = 'Workflow Duplicated.'
       respond_to do |format|
         format.html do
-          redirect_to(change_re_workflow_path(@re_workflow_new))
+          redirect_to(change_re_workflow_path(@re_workflow_copy))
         end  
         format.js do
-          render :inline => "window.location.href = '#{change_re_workflow_path(@re_workflow_new)}';"
+          render :inline => "window.location.href = '#{change_re_workflow_path(@re_workflow_copy)}';"
         end
       end
     else

data/rails_generators/templates/app/helpers/rules_engine_helper.rb

@@ -16,7 +16,7 @@ module RulesEngineHelper
     "Ver.#{re_plan.plan_version}"    
   end
   
-  def re_process_status process_status
+  def re_history_status process_status
     case process_status.to_i
     when RulesEngine::Process::PROCESS_STATUS_RUNNING
       'running'

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

@@ -62,7 +62,7 @@ class RePlan < ActiveRecord::Base
     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(:code => workflow_code)
+      re_workflow = ReWorkflow.find_by_code(workflow_code) || ReWorkflow.new
       re_workflow.revert!(workflow_data)
       orig_re_workflows << re_workflow
       

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

@@ -41,8 +41,7 @@ class ReRule < ActiveRecord::Base
   end
 
   def publish
-    { "uuid" => id,
-      "rule_class_name" => rule_class_name, 
+    { "rule_class_name" => rule_class_name, 
       "title" => title, 
       "summary" => summary,
       "data" => data

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

@@ -40,15 +40,7 @@ class ReWorkflow < ActiveRecord::Base
     self.title = rule_data["title"]
     self.description = rule_data["description"]
     
-    # self.re_rules = (rule_data["rules"] || []).map { |rule| ReRule.new.revert!(rule) }
-    orig_re_rules = []
-    (rule_data["rules"] || []).each do |rule| 
-      re_rule = ReRule.find_by_id(rule["uuid"]) || ReRule.new
-      re_rule.revert!(rule)
-      orig_re_rules << re_rule
-    end
-    
-    self.re_rules = orig_re_rules    
+    self.re_rules = (rule_data["rules"] || []).map { |rule| ReRule.new.revert!(rule) }
     self
   end  
 

data/rails_generators/templates/app/views/re_history/_index_prepare.html.erb

@@ -0,0 +1,12 @@
+<h4>
+	<div class="re-menu-history-list" id="re_menu_process_list_<%= re_plan_id %>">Process History</div>	
+</h4>
+
+<div class="clear top-5"></div>
+<div id="re_history_list_pending">
+	<div class="re-xtra-history-list-pending">
+		Updating Processes
+	</div>	
+</div>
+<div id="re_history_list">
+</div>

data/rails_generators/templates/app/views/re_history/_index_update.html.erb

@@ -0,0 +1,20 @@
+<% if @re_history.nil? || @re_history["processes"].nil? || @re_history["processes"].empty? %>
+	<h6 class="left-50 red"><em>Not Processed</em></h6>
+<% else %>
+	<% @re_history["processes"].each do |re_process| %>
+		<div class="clear top-2"></div>
+		<div class="left-10 right-5">
+			<a class="re-code-small float-left re-xtra-history-show re-xtra-history-<%= re_history_status(re_process["process_status"]) %>" href="#<%= re_process["process_id"] %>">
+				<%= re_process["plan_code"] %> <span class="blue">V.<%= re_process["plan_version"] %></span>
+			</a>	
+			<div class="smalltext float-right right-5">	
+				<%= re_process["started_at"].nil? ? '' : Time.parse(re_process["started_at"]).strftime('%d %b %Y - %H:%M') %>
+			</div>	
+			<hr/>	
+		</div>		
+	<% end %>		
+	<% if !@re_history["processes"].empty? && (@re_history["next_page"] || @re_history["previous_page"]) %>
+		<a class="re-xtra-history-next-<%= @re_history["next_page"] ? 'enabled' : 'disabled' %>" href='#<%= @re_history["next_page"] || '1' %>'></a>
+		<a class="re-xtra-history-prev-<%= @re_history["previous_page"] ? 'enabled' : 'disabled' %>" href='#<%= @re_history["previous_page"] || '1' %>'></a>
+	<% end %>
+<% end %>

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

@@ -0,0 +1,30 @@
+<div class="clear span-18">
+  <div class="re-infobox">
+	  <h3 class="re-hdr-history-show"> Process Audit</h3>
+	  <div class="clear top-10"></div>
+		<% if @re_audit_history.nil? || @re_audit_history["audits"].nil? || @re_audit_history["audits"].empty? %>
+			<h6 class="left-50 red"><em>No Audit History</em></h6>
+		<% else %>
+			<% @re_audit_history["audits"].each do |re_audit| %>
+				<div class="clear top-2"></div>
+				<div class="left-10 right-5">
+					<div class="re-code-small float-left re-xtra-history-audit-<%= re_audit_status(re_audit["code"]) %>">
+						<%= re_audit["message"] %>
+					</div>	
+					<div class="smalltext float-right right-5">	
+						<%= re_audit["created_at"].nil? ? '' : Time.parse(re_audit["created_at"]).strftime('%d %b %Y - %H:%M') %>
+					</div>	
+					<hr/>	
+				</div>		
+		
+			<% end %>		
+			<% if !@re_audit_history["audits"].empty? && (@re_audit_history["next_page"] || @re_audit_history["previous_page"]) %>
+				<a class="re-xtra-history-next-<%= @re_audit_history["next_page"] ? 'enabled' : 'disabled' %>" href='#<%= @re_audit_history["next_page"] || '1' %>'></a>
+				<a class="re-xtra-history-prev-<%= @re_audit_history["previous_page"] ? 'enabled' : 'disabled' %>" href='#<%= @re_audit_history["previous_page"] || '1' %>'></a>
+			<% end %>
+		<% end %>
+		<%= re_button_link_orange('Close', re_history_index_path, :id => "re_history_show_close") %>
+    <div class="clear top-5"></div>
+  </div>  
+</div>
+<div class="clear"></div>