rules_engine 0.2.0 → 0.3.0

data/README.textile

@@ -4,115 +4,50 @@ h4. More detailed documentation at "www.r3ef.com":http://www.r3ef.com
 
 h2. Installation Guide
 
-h3. 1. Install the Gem
+h3. 1. Create the Rails App
 
 <pre>
-sudo gem install rules_engine
-sudo gem install rspec cucumber
-</pre>
-
-h3. 2. Create the Rails App
-
-<pre>
-rails MyCoolNewApp	
+rails new MyCoolNewApp --skip-test-unit
 cd MyCoolNewApp
 rm ./public/index.html
-
-./script/generate rspec
-./script/generate cucumber --rspec
-
-./script/generate rules_engine
-
-rake db:migrate	
 </pre>
 
-h3. 3. Setup the Rails Environments
+h3. 2. Add & Install the gems
 
-./config/environment.rb
+./Gemfile
 
 <pre>
-Rails::Initializer.run do |config|
-  ...
-  config.gem 'rules_engine'
-  config.gem 'will_paginate'
-  config.gem 'acts_as_list'
-  ...
-  config.active_record.observers = :re_workflow_activated_observer
-  ...
-end
-
-RulesEngine::Discovery.discover!
-</pre>
+gem 'rules_engine', '>= 0.3.0'
+gem 'will_paginate', '>= 3.0.pre2'
+gem 'acts_as_list', '>= 0.1.2'
 
-./config/environments/production.rb<br/>
-./config/environments/development.rb
+group :development, :test do
+  gem "rspec-rails", ">= 2.0.0.beta.22"
+  gem "webrat"
+  
+  gem 'faker'
+  gem 'machinist'  
+end
 
-<pre>
-RulesEngine::Cache.cache_store = :mem_cache_store, "localhost:11210"
-  #   RulesEngine::Cache.cache_store = :memory_store
-  #   RulesEngine::Cache.cache_store = :file_store, "/path/to/cache/directory"
-  #   RulesEngine::Cache.cache_store = :drb_store, "druby://localhost:9192"
-  #   RulesEngine::Cache.cache_store = :mem_cache_store, "localhost"
-  #   RulesEngine::Cache.cache_store = MyOwnStore.new("parameter")
+bundle install
 </pre>
 
-./config/environments/test.rb <br/>
-./config/environments/cucumber.rb
+h3. 3. Set a Root Path 
 
-<pre>
-  config.gem "rspec",             :version => '>=1.3.0', :lib => false
-  config.gem "rspec-rails",       :version => '>=1.3.2', :lib => false
-  config.gem "faker",             :version => '>=0.3.1', :lib => false
-
-  config.gem "machinist",         :version => '>=1.0.6', :lib => false
-  config.gem 'rcov',              :version => '>=0.9.8', :lib => false
-  config.gem 'remarkable_rails',  :version => '>=3.1.13', :lib => false
-
-  require 'machinist/active_record'
-  require 'sham'
-  require 'faker'
-  require 'remarkable_rails'
-</pre>
-
-h3. 4. Install the Required Gems
+./config/routes.rb
 
 <pre>
-rake gems:install
-rake gems:install RAILS_ENV=test  	
+root :to => "re_plans#index"
 </pre>
 
-h3. 5. Add the Routes
-
-./config/routes.rb
+h3. 4. Generate the Code 
 
 <pre>
-ActionController::Routing::Routes.draw do |map|
-  ...
-  ### remove map.root if already defined
-  map.root :controller => 're_workflows', :action => 'template'
-  ### map.preview '/preview', :controller => 're_workflows', :action => 'template'
-  map.resources :re_workflows, 
-                        :collection => {:lookup => :get, 
-                                        :activate_all => :put}, 
-                        :member => {:change => :get, 
-                                        :activate => :put, 
-                                        :deactivate => :put, 
-                                        :revert => :put} do |re_workflow|  
-  re_workflow.resources :re_rules, 
-                            :controller => :re_workflow_rules, 
-                            :collection => {:help => :get, :error => :get}, 
-                            :member => {:move_up => :put, :move_down => :put}
-    re_workflow.resources :re_processs, 
-                            :controller => :re_workflow_processs, 
-                            :only => [:index]
-  end
-
-  map.resources :re_processs, :only => [:index, :show]
-  ...
-end  
+script/rails generate rspec:install
+script/rails generate rules_engine:install
 </pre>
 
-h3. 6. Define the Access Levels
+h3. 5. Define the Access Levels 
 
 ./app/controllers/application_controller.rb
 
@@ -148,34 +83,40 @@ class ApplicationController < ActionController::Base
   end
 </pre>
 
-h3. 7. Create a Simple Rule
+h3. 6. Migrate the Database
+
+<pre>
+rake db:migrate
+rake db:migrate RAILS_ENV=test
+</pre>
+
+h3. 7. Create the Rule Scaffolds
+
+Simple Rule
 
 <pre>
-./script/generate rules_engine simple my_simple_rule
+script/rails generate rules_engine:rule simple my_simple_rule
 </pre>
 
-h3. 8. Create a more Complex Rule
+Complex Rule
 
 <pre>
-./script/generate rules_engine complex another_complex_rule
+script/rails generate rules_engine:rule complex my_complex_rule
 </pre>
 
-h3. 9. Run the Tests
+h3. 8. Run the Tests
 
 <pre>
 rake spec
-rake spec:rcov
-rake cucumber
-open coverage/index.html
 </pre>
 
-h3. 10. Start the Server
+h3. 9. Start the Server
 
 <pre>
-./script/server
-open http://localhost:3000/re_workflows
+script/rails server
+open http://localhost:3000/re_pipelines
 </pre>
 
-h3. 11. Create Workflows and Rules
+h3. 10. Create Workflows and Rules
 
 Watch the demo at "TODO":http://www.r3ef.com/

data/VERSION

@@ -1 +1 @@
-0.2.0
+0.3.0

data/{rails_generators/templates/app → app}/controllers/re_history_controller.rb

@@ -1,6 +1,6 @@
 class ReHistoryController < ApplicationController    
   helper :rules_engine 
-  layout 'rules_engine'
+  layout RulesEngineView::Config.layout || 'rules_engine'
 
   # before_filter :login_required
   before_filter :rules_engine_reader_access_required,  :only => [:index, :show]

data/{rails_generators/templates/app → app}/controllers/re_plan_workflow_rules_controller.rb

@@ -1,6 +1,6 @@
 class RePlanWorkflowRulesController < ApplicationController    
   helper :rules_engine 
-  layout 'rules_engine'
+  layout RulesEngineView::Config.layout || 'rules_engine'
   
   # before_filter :login_required
   before_filter :rules_engine_editor_access_required, :except => [:help, :error]
@@ -25,7 +25,7 @@ class RePlanWorkflowRulesController < ApplicationController
       render :error
     else
       @rule = @rule_class.new  
-    end      
+    end
   end  
   
   def error

data/{rails_generators/templates/app → app}/controllers/re_plan_workflows_controller.rb

@@ -1,6 +1,6 @@
 class RePlanWorkflowsController < ApplicationController    
   helper :rules_engine 
-  layout 'rules_engine'
+  layout RulesEngineView::Config.layout || 'rules_engine'
   
   # before_filter :login_required
   before_filter :rules_engine_editor_access_required,  :only => [:new, :create, :edit, :update, :destroy, :change, :default, :add, :remove, :copy, :duplicate]
@@ -54,7 +54,7 @@ class RePlanWorkflowsController < ApplicationController
       
       respond_to do |format|
         format.html do          
-          redirect_to(change_re_workflow_path(@re_workflow))
+          redirect_to(change_re_plan_workflow_path(@re_plan, @re_workflow))
         end  
         format.js do
           render :action => "update"
@@ -149,5 +149,5 @@ class RePlanWorkflowsController < ApplicationController
        render :action => "copy"  
     end  
   end
-  
+
 end

data/{rails_generators/templates/app → app}/controllers/re_plans_controller.rb

@@ -1,6 +1,6 @@
 class RePlansController < ApplicationController    
   helper :rules_engine 
-  layout 'rules_engine'
+  layout RulesEngineView::Config.layout || 'rules_engine'
 
   # before_filter :login_required
   before_filter :rules_engine_editor_access_required,  :only => [:new, :create, :edit, :update, :destroy, :change, :publish, :revert, :copy, :duplicate]
@@ -12,7 +12,7 @@ class RePlansController < ApplicationController
 
   def index    
     klass = RePlan
-    klass = klass.order_title
+    @re_plans = klass.order_title
     @re_plans = klass.find(:all)
   end
 

data/{rails_generators/templates/app → app}/controllers/re_publications_controller.rb

@@ -1,6 +1,6 @@
 class RePublicationsController < ApplicationController    
   helper :rules_engine 
-  layout 'rules_engine'
+  layout RulesEngineView::Config.layout || 'rules_engine'
 
   # before_filter :login_required
   before_filter :rules_engine_reader_access_required,  :only => [:show]

data/{rails_generators/templates/app → app}/controllers/re_workflow_rules_controller.rb

@@ -1,6 +1,6 @@
 class ReWorkflowRulesController < ApplicationController    
   helper :rules_engine 
-  layout 'rules_engine'
+  layout RulesEngineView::Config.layout || 'rules_engine'
   
   # before_filter :login_required
   before_filter :rules_engine_editor_access_required, :except => [:help, :error]

data/{rails_generators/templates/app → app}/controllers/re_workflows_controller.rb

@@ -1,6 +1,6 @@
 class ReWorkflowsController < ApplicationController    
   helper :rules_engine 
-  layout 'rules_engine'
+  layout RulesEngineView::Config.layout || 'rules_engine'
   
   # before_filter :login_required
   before_filter :rules_engine_editor_access_required,  :only => [:new, :create, :edit, :update, :destroy, :change, :copy, :duplicate]

data/{rails_generators/templates/app → app}/models/re_plan.rb

@@ -11,8 +11,8 @@ class RePlan < ActiveRecord::Base
   validates_presence_of   :title
   validates_uniqueness_of :code, :case_sensitive => false, :message=>"alread taken."
   
-  named_scope :order_code,  :order => 'code ASC'
-  named_scope :order_title, :order => 'title ASC'
+  scope :order_code,  order('code ASC')
+  scope :order_title, order('title ASC')
   
   before_create :before_create_plan
   before_save :before_save_plan

data/app/models/re_plan_workflow.rb

@@ -0,0 +1,10 @@
+class RePlanWorkflow < ActiveRecord::Base
+  default_scope :order => 'position'
+  belongs_to :re_plan
+  belongs_to :re_workflow
+  acts_as_list :scope => :re_plan 
+
+  scope :order_plan_title, order('re_plans.title ASC')
+  scope :by_workflow_id, lambda { |workflow_id| where("re_workflow_id = ?", workflow_id) }
+  
+end

data/{rails_generators/templates/app → app}/models/re_rule.rb

@@ -4,7 +4,8 @@ class ReRule < ActiveRecord::Base
       
   validates_associated  :re_workflow
   validates_presence_of :rule_class_name
-
+  validate :validate_rule
+  
   default_scope :order => 're_rules.position ASC'
   
   before_save    :before_save_rule
@@ -30,7 +31,7 @@ class ReRule < ActiveRecord::Base
     rule.before_destroy() unless rule.nil?
   end
 
-  def validate
+  def validate_rule
     if self.rule.nil?
       errors.add("rule_class", "not found")
     elsif !self.rule.valid?

data/{rails_generators/templates/app → app}/models/re_workflow.rb

@@ -7,8 +7,8 @@ class ReWorkflow < ActiveRecord::Base
   validates_presence_of   :title
   validates_uniqueness_of :code, :case_sensitive => false, :message=>"alread taken."
   
-  named_scope :order_code,  :order => 're_workflows.code ASC'
-  named_scope :order_title, :order => 're_workflows.title ASC'
+  scope :order_code,  order('re_workflows.code ASC')
+  scope :order_title, order('re_workflows.title ASC')
   
   before_save    :before_save_workflow
   before_destroy :before_destroy_workflow

data/{rails_generators/templates/app → app}/views/layouts/rules_engine.html.erb

@@ -4,18 +4,23 @@
 	<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
 	<title> <%= (page_title = yield :defer_page_title) ? page_title : controller.controller_name.humanize %> </title>
 
-  <link rel="stylesheet" href="/stylesheets/blueprint/screen.css" type="text/css" media="screen, projection">
-  <link rel="stylesheet" href="/stylesheets/blueprint/print.css" type="text/css" media="print">
+  <link rel="stylesheet" href="/stylesheets/rules_engine/blueprint/screen.css" type="text/css" media="screen, projection">
+  <link rel="stylesheet" href="/stylesheets/rules_engine/blueprint/print.css" type="text/css" media="print">
   <!--[if lt IE 8]>
-    <link rel="stylesheet" href="/stylesheets/blueprint/ie.css" type="text/css" media="screen, projection">
+    <link rel="stylesheet" href="/stylesheets/rules_engine/blueprint/ie.css" type="text/css" media="screen, projection">
   <![endif]-->
 
-  <%= javascript_include_tag 'jquery-1.4.2.min', 'jquery.blockUI', 'jquery.autocomplete.pack', 'jquery.fancybox-1.3.1',
+  <%= javascript_include_tag 'rules_engine/jquery-1.4.2.min', 
+															'rules_engine/jquery.blockUI', 
+															'rules_engine/jquery.autocomplete.pack', 
+															'rules_engine/jquery.fancybox-1.3.1',
 															'rules_engine/re_view', 
 															'application', 
 															:cache => true %>
 
-  <%= stylesheet_link_tag 'rules_engine/screen',  'jquery.autocomplete', 'fancybox/jquery.fancybox-1.3.1',
+  <%= stylesheet_link_tag 'rules_engine/screen', 'rules_engine/rules_engine',  
+													'rules_engine/jquery.autocomplete', 
+													'rules_engine/fancybox/jquery.fancybox-1.3.1',
 													'application', 
 													:cache => true %>    
                         

data/{rails_generators/templates/app → app}/views/re_history/_show.html.erb

@@ -23,7 +23,7 @@
 				<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") %>
+		<%= re_button_link_orange('Close', re_history_path, :id => "re_history_show_close") %>
     <div class="clear top-5"></div>
   </div>  
 </div>

data/{rails_generators/templates/app → app}/views/re_history/index.html.erb

@@ -1,6 +1,6 @@
 <% set_re_javascript_include ['rules_engine/re_history_index', 'rules_engine/re_history_show'] %>
 <% set_re_breadcrumbs link_to("All Plans", re_plans_path, :class => "re-bc-plan-list"), 
-											'<span class="re-bc-history-list">Process History</span>' %>
+											'<span class="re-bc-history-list">Process History</span>'.html_safe %>
 
 <div class="prepend-1 span-22 append-1">      
   <div class="re-infobox">

data/{rails_generators/templates/app → app}/views/re_history/show.html.erb

@@ -1,6 +1,6 @@
 <% set_re_breadcrumbs link_to("All Plans", re_plans_path, :class => "re-bc-plan-list"), 
-											link_to("Process History", re_history_index_path, :class => "re-bc-history-list"), 
-											'<span class="re-bc-history-list">Process Audit</span>' %>
+											link_to("Process History", re_history_path, :class => "re-bc-history-list"), 
+											'<span class="re-bc-history-list">Process Audit</span>'.html_safe %>
 
 <div class="span-22 prepend-1 append-1">      
 	<%= render '/re_history/show' %>

data/{rails_generators/templates/app → app}/views/re_plan_workflow_rules/edit.html.erb

@@ -1,7 +1,7 @@
 <% set_re_breadcrumbs link_to("All Plans", re_plans_path, :class => "re-bc-plan-list"), 
 											link_to("Edit Plan", change_re_plan_path(@re_plan), :class => "re-bc-plan-change"),
 											link_to("Edit Workflow", change_re_plan_workflow_path(@re_plan, @re_workflow), :class => "re-bc-workflow-change"), 
-											'<span class="re-bc-rule-edit">Edit Rule</span>' %>
+											'<span class="re-bc-rule-edit">Edit Rule</span>'.html_safe %>
 																	
 <div class="prepend-1 span-20 append-1">      
   <div class="re-infobox">

data/{rails_generators/templates/app/views/re_workflow_rules → app/views/re_plan_workflow_rules}/error.html.erb

@@ -1,7 +1,7 @@
 <% set_re_breadcrumbs link_to("All Workflows", re_workflows_path, :class => "re-bc-workflow-list"), 
 											link_to("View Workflows", re_workflow_path(@re_workflow), :class => "re-bc-workflow-show"), 
 											link_to("Edit Workflow", change_re_workflow_path(@re_workflow), :class => "re-bc-workflow-change"), 
-											'<span class="re-bc-rule-error">Rule Error</span>' %>
+											'<span class="re-bc-rule-error">Rule Error</span>'.html_safe %>
 
 <div class="prepend-1 span-20 append-1">      
   <div class="re-infobox">

data/{rails_generators/templates/app → app}/views/re_plan_workflow_rules/help.html.erb

@@ -1,7 +1,7 @@
 <% set_re_breadcrumbs link_to("All Plans", re_plans_path, :class => "re-bc-plan-list"), 
 											link_to("Edit Plan", change_re_plan_path(@re_plan), :class => "re-bc-plan-change"),
 											link_to("Edit Workflow", change_re_plan_workflow_path(@re_plan, @re_workflow), :class => "re-bc-workflow-change"), 
-											'<span class="re-bc-rule-help">Rule Help</span>' %>
+											'<span class="re-bc-rule-help">Rule Help</span>'.html_safe %>
 
 <div class="prepend-3 span-13 append-1">      
   <div class="re-infobox">