rules_engine 0.0.6 → 0.0.7

data/VERSION

@@ -1 +1 @@
-0.0.6
+0.0.7

data/lib/rules_engine/job.rb

@@ -37,7 +37,11 @@ module RulesEngine
         
         activated_pipeline = RePipelineActivated.find_by_code(pipeline_code)
         unless activated_pipeline
-          audit("Activated Pipleine : #{pipeline_code} not found", ReJobAudit::AUDIT_FAILURE) 
+          if RePipeline.find_by_code(pipeline_code)
+            audit("Pipleine : #{pipeline_code} not activated", ReJobAudit::AUDIT_FAILURE) 
+          else
+            audit("Pipleine : #{pipeline_code} not found", ReJobAudit::AUDIT_FAILURE) 
+          end  
           error = done = true 
           next
         end  

data/rails_generators/manifests/rules_engine.rb

@@ -122,7 +122,7 @@ class RulesEngineManifest
       features/step_definitions/common/re_view_steps.rb
       features/support/blueprint_re_pipelines.rb
       features/support/rules_engine.rb
-      lib/tasks/re_execute.rake
+      lib/tasks/rules_engine.rake
       public/javascripts/jquery-1.4.2.min.js
       public/javascripts/jquery.autocomplete.pack.js
       public/javascripts/jquery.blockUI.js

data/rails_generators/manifests/rules_engine.yml

@@ -39,7 +39,7 @@ files :
 
   - app/views/layouts/rules_engine.html.erb
   
-  - lib/tasks/re_execute.rake
+  - lib/tasks/rules_engine.rake
       
   - db/migrate/20100308225008_create_re_pipelines.rb
   

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

@@ -89,7 +89,7 @@ class RePipelinesController < ApplicationController
     klass = RePipeline
     @re_pipelines = klass.find(:all)
     
-    if @re_pipelines.any? { | re_pipeline| !re_pipeline.valid? }
+    if @re_pipelines.any? { | re_pipeline| re_pipeline.pipeline_error }
       flash[:error] = 'Cannot Activate Pipelines.'
     else
       @re_pipelines.each do |re_pipeline|
@@ -109,8 +109,12 @@ class RePipelinesController < ApplicationController
   end
   
   def activate
-    @re_pipeline.activate!
-    flash[:success] = 'Pipeline Activated.'
+    if @re_pipeline.pipeline_error
+      flash[:error] = 'Cannot Activate Pipelines.'
+    else  
+      @re_pipeline.activate!
+      flash[:success] = 'Pipeline Activated.'
+    end  
 
     respond_to do |format|
       format.html do

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

@@ -40,7 +40,13 @@ class ReJob < ActiveRecord::Base
           'start_date' => job_audit.audit_date,
           'start_data' => job_audit.audit_message, 
         })
-      end  
+      else
+        result.merge!({
+          'start_date' => Time.parse(result['job_date']).utc,
+          'start_data' => ""
+        })          
+      end
+        
       
       if result['job_status'].to_i != ReJob::JOB_STATUS_RUNNING
         job_audit = ReJobAudit.find(:all, :conditions => ["re_job_id = ?", result['job_id']], :order => "audit_date DESC", :limit => 1).first

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

@@ -4,12 +4,12 @@ class RePipelineActivated < RePipelineBase
   def self.find_by_code(code)
     return find_by_code_without_caching(code) unless RulesEngine::Cache.perform_caching?
 
-    code.gsub!(/[^a-zA-Z0-9]+/i, '_')
-    re_pipeline = RulesEngine::Cache.cache_store.read("activated_pipeline_#{code}")
+    cache_code = code.gsub(/[^a-zA-Z0-9]+/i, '_')
+    re_pipeline = RulesEngine::Cache.cache_store.read("activated_pipeline_#{cache_code}")
     if (re_pipeline.nil?)
-      re_pipeline = find_by_code_without_caching(code)
+      re_pipeline = find_by_code_without_caching(cache_code)
 
-      RulesEngine::Cache.cache_store.write("activated_pipeline_#{code}", re_pipeline)
+      RulesEngine::Cache.cache_store.write("activated_pipeline_#{cache_code}", re_pipeline)
     end    
 
     re_pipeline
@@ -22,8 +22,8 @@ class RePipelineActivated < RePipelineBase
   def self.reset_cache(code)
     return unless RulesEngine::Cache.perform_caching?
 
-    code.gsub!(/[^a-zA-Z0-9]+/i, '_')
-    RulesEngine::Cache.cache_store.delete("activated_pipeline_#{code}")
+    cache_code = code.gsub(/[^a-zA-Z0-9]+/i, '_')
+    RulesEngine::Cache.cache_store.delete("activated_pipeline_#{cache_code}")
   end
 
 end

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

@@ -52,12 +52,7 @@ class RePipelineBase < ActiveRecord::Base
   
   def pipeline_error
     return 'rules required' if re_rules.empty?
-    
-    re_rules.each do |re_rule|
-      error = re_rule.rule_error
-      return error unless error.blank?
-    end
-    
+    return 'error within rules' if re_rules.any? { | re_rule | re_rule.rule_error }    
     nil
   end
 

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

@@ -4,7 +4,7 @@ class ReRule < ActiveRecord::Base
 
   has_many  :re_rule_expected_outcomes, :dependent => :destroy, :order => "outcome ASC"
   has_many  :re_job_audits
-    
+      
   validates_associated  :re_pipeline
   validates_presence_of :rule_class_name
 
@@ -86,16 +86,16 @@ class ReRule < ActiveRecord::Base
 
   def rule_error
     return "#{title} class #{rule_class_name} invalid" if rule.nil?
-    return "#{title} invalid" unless rule.valid?
+    return "#{rule.errors.values.join(', ')}" unless rule.valid?
 
     re_rule_expected_outcomes.each do |re_rule_expected_outcome|
       next if re_rule_expected_outcome.pipeline_code.blank?      
 
-      re_pipeline_activated = RePipelineActivated.find_by_code(re_rule_expected_outcome.pipeline_code)
-      return "#{re_rule_expected_outcome.pipeline_code} not activated" if re_pipeline_activated.nil?
+      re_pipeline = RePipeline.find_by_code(re_rule_expected_outcome.pipeline_code)
+      return "#{re_rule_expected_outcome.pipeline_code} missing" if re_pipeline.nil?
       
-      pipeline_error = re_pipeline_activated.pipeline_error
-      return "#{re_rule_expected_outcome.pipeline_code} invalid" unless re_pipeline_activated.pipeline_error.blank?
+      pipeline_error = re_pipeline.pipeline_error
+      return "#{re_rule_expected_outcome.pipeline_code} invalid" unless re_pipeline.pipeline_error.blank?
     end
     
     nil

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

@@ -4,7 +4,6 @@
 	     <tr class="<%= cycle('', 'odd') %>">
 	       <td class="no-border-right">
 <%  
-					job_date =  re_job['start_date']
 					case re_job['job_status'].to_i
 						when ReJob::JOB_STATUS_NONE, ReJob::JOB_STATUS_RUNNING
 							job_class = 'job-running' 
@@ -23,7 +22,7 @@
 				<td  class="no-border-left text-right">
 					<a class="re-job-detail" href='#<%= re_job['job_id'] %>'>
 						<div>
-							<%= job_date.strftime('%d %b %Y - %H:%M:%S') %>
+							<%= re_job['start_date'].strftime('%d %b %Y - %H:%M:%S') %>
 						</div>
 					</a>		
 				</td>

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

@@ -10,8 +10,7 @@
 <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' %> no-top"> 
-      <p class="top-5"><%= re_rule.summary %></p>
-
+      <p class="top-5"><%= 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/_show.html.erb

@@ -7,6 +7,7 @@
     <h3 class="float-left"><%= re_rule.title %></h3>
     <div class="float-right">
 			<!-- NO ACTIONS ON THE RULE	 -->
+			<p class="red smalltext"><%= re_rule_error %></p>
     </div>
     <div class="clear"></div>    
   </div>

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

@@ -4,12 +4,12 @@
   <%= link_to("Edit Pipeline Details", "##{@re_pipeline.id}", :id => "re_pipeline_edit") %>
 </h3>
 
-<% if changed_status == RePipelineBase::CHANGED_STATUS_DRAFT %>
+<% if changed_status == RePipelineBase::CHANGED_STATUS_DRAFT && !@re_pipeline.pipeline_error %>
   <h3 class="re-pipeline-activate float-left clear">
     <%= link_to("Activate Pipeline", "##{@re_pipeline.id}", :id => "re_pipeline_activate") %>
   </h3>    
 <% end %>  
-<% if changed_status == RePipelineBase::CHANGED_STATUS_CHANGED %>
+<% 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>    

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

@@ -0,0 +1,16 @@
+desc "run a rules pipeline with the complex rule"   
+task :rules_engine => :environment do
+
+  if ENV['re_pipeline_code'].blank?
+    raise "usage: rake rules_engine re_pipeline_code=[pipeline code] re_param='[value]'"
+  end    
+    
+  data = ENV.inject({}){ |data, value| data[value[0].sub(/^re_/, '').to_sym] = value[1] if value[0] =~ /^re_/; data }
+  
+  job = RulesEngine::Job.create
+  # job = RulesEngine::Job.open(job.re_job.id)
+      
+  result = job.run(data[:pipeline_code], data)
+  
+  puts "rule completed : data = #{data.inspect}"
+end  

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

@@ -269,10 +269,10 @@ describe RePipelinesController do
 
     before do
       @re_pipeline_1 = mock_model(RePipeline)
-      @re_pipeline_1.stub!(:valid?).and_return(true)
+      @re_pipeline_1.stub!(:pipeline_error).and_return(nil)
       @re_pipeline_1.stub!(:activate!)
       @re_pipeline_2 = mock_model(RePipeline)
-      @re_pipeline_2.stub!(:valid?).and_return(true)
+      @re_pipeline_2.stub!(:pipeline_error).and_return(nil)
       @re_pipeline_2.stub!(:activate!)
       RePipeline.stub!(:find).and_return([@re_pipeline_1, @re_pipeline_2])
     end
@@ -283,7 +283,7 @@ describe RePipelinesController do
       assigns[:re_pipelines].should == [@re_pipeline_1, @re_pipeline_2]
     end
     
-    describe "all of the pipelines are valid" do
+    describe "no errors in the pipelines" do
       it "should activate all of the re_pipeline" do
         @re_pipeline_1.should_receive(:activate!)
         @re_pipeline_2.should_receive(:activate!)
@@ -296,15 +296,15 @@ describe RePipelinesController do
       end
     end
 
-    describe "one of the pipelines is invalid" do
+    describe "one of the pipelines has errors" do
       before(:each) do
-        @re_pipeline_2.stub!(:valid?).and_return(false)  
-        @re_pipeline_2.stub!(:valid?).and_return(false)  
+        @re_pipeline_2.stub!(:pipeline_error).and_return("you bet")  
+        @re_pipeline_2.stub!(:pipeline_error).and_return("you bet")  
       end
 
       it "should stop checking at the first invalid pipeline" do
-        @re_pipeline_1.should_receive(:valid?).and_return(false)
-        @re_pipeline_2.should_not_receive(:valid?)
+        @re_pipeline_1.should_receive(:pipeline_error).and_return("you bet")
+        @re_pipeline_2.should_not_receive(:pipeline_error)
         put :activate_all
       end
       
@@ -336,7 +336,8 @@ describe RePipelinesController do
 
     before do
       @re_pipeline = mock_model(RePipeline)
-      @re_pipeline.stub!(:activate!)
+      @re_pipeline.stub!(:pipeline_error).and_return(nil)  
+      @re_pipeline.stub!(:activate!)      
       RePipeline.stub!(:find).and_return(@re_pipeline) 
     end
 
@@ -346,14 +347,32 @@ describe RePipelinesController do
       assigns[:re_pipeline].should == @re_pipeline
     end
     
-    it "should activate the re_pipeline" do
-      @re_pipeline.should_receive(:activate!)
-      put :activate, :id => 123
-    end
+    describe "the pipeline is valid" do
+      it "should activate the re_pipeline" do
+        @re_pipeline.should_receive(:activate!)
+        put :activate, :id => 123
+      end
    
-    it "should display a flash success message" do
-      put :activate, :id => 123
-      flash[:success].should_not be_blank
+      it "should display a flash success message" do
+        put :activate, :id => 123
+        flash[:success].should_not be_blank
+      end
+    end
+    
+    describe "the pipeline is invalid" do
+      before(:each) do
+        @re_pipeline.stub!(:pipeline_error).and_return("you bet")  
+      end
+
+      it "should not activate the pipeline" do
+        @re_pipeline.should_not_receive(:activate!)
+        put :activate, :id => 123
+      end
+       
+      it "should display a flash error message" do
+        put :activate, :id => 123
+        flash[:error].should_not be_blank
+      end
     end
     
     it "should redirect to the change re_pipeline page for HTML" do
@@ -475,5 +494,4 @@ describe RePipelinesController do
     end    
   end
 
-  
 end

data/rails_generators/templates/spec/models/re_pipeline_base_spec.rb

@@ -24,31 +24,31 @@ describe RePipelineBase do
   end  
 
   it "should replace any nonprint cahracters with an _" do
-    src = RePipelineBase.new(valid_attributes.merge(:code => "my code"))
-    src.save!
-    src.code.should == "my_code"
+    re_pipeline = RePipelineBase.new(valid_attributes.merge(:code => "my code"))
+    re_pipeline.save!
+    re_pipeline.code.should == "my_code"
   end
     
 
   it "should change the code to lower case when creating" do
-    src = RePipelineBase.new(valid_attributes.merge(:code => "My code"))
-    src.save!
-    src.code.should == "my_code"
+    re_pipeline = RePipelineBase.new(valid_attributes.merge(:code => "My code"))
+    re_pipeline.save!
+    re_pipeline.code.should == "my_code"
   end
     
   describe "code cannot be changed after creation" do
     it "should save the code with a new record" do
-      src = RePipelineBase.new(valid_attributes.merge(:code => "my code"))
-      src.save!
-      src.code.should == "my_code"
+      re_pipeline = RePipelineBase.new(valid_attributes.merge(:code => "my code"))
+      re_pipeline.save!
+      re_pipeline.code.should == "my_code"
     end
     
     it "should ignore the code attribute for an existing record" do
-      src = RePipelineBase.new(valid_attributes.merge(:code => "my code"))
-      src.save!
-      src.code = "new_code"
-      src.save!
-      src.code.should == "my_code"
+      re_pipeline = RePipelineBase.new(valid_attributes.merge(:code => "my code"))
+      re_pipeline.save!
+      re_pipeline.code = "new_code"
+      re_pipeline.save!
+      re_pipeline.code.should == "my_code"
     end            
   end
 
@@ -103,8 +103,8 @@ describe RePipelineBase do
         @re_pipeline_2 = RePipeline.new(valid_attributes)
         @re_pipeline_1.stub!(:re_rules).and_return([@rule_1, @rule_2])
         @re_pipeline_2.stub!(:re_rules).and_return([@rule_1, @rule_2])
-        
       end
+      
       it "should not compare the rules if the the number is different" do
         @re_pipeline_2.stub!(:re_rules).and_return([@rule_1])
       
@@ -155,10 +155,10 @@ describe RePipelineBase do
     end
 
     it "should stop on the first rule error" do
-      @re_rule1.should_receive(:rule_error).at_least(:once).and_return("invalid rule")
+      @re_rule1.should_receive(:rule_error).at_least(:once).and_return("oops")
       @re_rule2.should_not_receive(:rule)
       
-      @re_pipeline.pipeline_error.should == "invalid rule"
+      @re_pipeline.pipeline_error.should == "error within rules"
     end
   end
 end

data/rails_generators/templates/spec/models/re_rule_spec.rb

@@ -318,30 +318,23 @@ describe ReRule do
       @re_rule.rule_error.should be_nil
     end
 
-    it "should validate the rule is present and activated" do
+    it "should validate the pipeline is present and activated" do
       re_rule_expected_outcome = mock_model(ReRuleExpectedOutcome, :pipeline_code => "mock_pipeline_code", :outcome => RulesEngine::RuleOutcome::OUTCOME_START_PIPELINE)
-      RePipelineActivated.should_receive(:find_by_code).and_return(mock("RePipelineActivated", :pipeline_error => nil))      
+      RePipeline.should_receive(:find_by_code).and_return(mock("RePipeline", :pipeline_error => nil))      
       @re_rule.stub!(:re_rule_expected_outcomes).and_return([re_rule_expected_outcome])
       @re_rule.rule_error.should be_nil
     end
       
-    it "should return '[pipeline_code] not activated' if the required pipeline is missing" do
+    it "should return '[pipeline_code] missing' if the required pipeline is missing" do
       re_rule_expected_outcome = mock_model(ReRuleExpectedOutcome, :pipeline_code => "mock_pipeline_code", :outcome => RulesEngine::RuleOutcome::OUTCOME_START_PIPELINE)
-      RePipelineActivated.should_receive(:find_by_code).and_return(nil)
+      RePipeline.should_receive(:find_by_code).and_return(nil)
       @re_rule.stub!(:re_rule_expected_outcomes).and_return([re_rule_expected_outcome])
-      @re_rule.rule_error.should == "mock_pipeline_code not activated"
-    end
-    
-    it "should return '[pipeline_code] not activated' if the required pipeline has not been activated" do
-      re_rule_expected_outcome = mock_model(ReRuleExpectedOutcome, :pipeline_code => "mock_pipeline_code", :outcome => RulesEngine::RuleOutcome::OUTCOME_START_PIPELINE)
-      RePipelineActivated.should_receive(:find_by_code).and_return(nil)
-      @re_rule.stub!(:re_rule_expected_outcomes).and_return([re_rule_expected_outcome])
-      @re_rule.rule_error.should == "mock_pipeline_code not activated"
+      @re_rule.rule_error.should == "mock_pipeline_code missing"
     end
     
     it "should return '[pipeline_code] invalid' if the required pipeline has errors" do
       re_rule_expected_outcome = mock_model(ReRuleExpectedOutcome, :pipeline_code => "mock_pipeline_code", :outcome => RulesEngine::RuleOutcome::OUTCOME_START_PIPELINE)
-      RePipelineActivated.should_receive(:find_by_code).and_return(mock("RePipelineActivated", :pipeline_error => "pipeline error"))      
+      RePipeline.should_receive(:find_by_code).and_return(mock("RePipeline", :pipeline_error => "pipeline error"))      
       @re_rule.stub!(:re_rule_expected_outcomes).and_return([re_rule_expected_outcome])
       @re_rule.rule_error.should == "mock_pipeline_code invalid"
     end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: rules_engine
 version: !ruby/object:Gem::Version 
-  hash: 19
+  hash: 17
   prerelease: false
   segments: 
   - 0
   - 0
-  - 6
-  version: 0.0.6
+  - 7
+  version: 0.0.7
 platform: ruby
 authors: 
 - Chris Douglas
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-06-23 00:00:00 +10:00
+date: 2010-06-24 00:00:00 +10:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -159,7 +159,7 @@ files:
 - rails_generators/templates/features/step_definitions/common/re_view_steps.rb
 - rails_generators/templates/features/support/blueprint_re_pipelines.rb
 - rails_generators/templates/features/support/rules_engine.rb
-- rails_generators/templates/lib/tasks/re_execute.rake
+- rails_generators/templates/lib/tasks/rules_engine.rake
 - rails_generators/templates/public/javascripts/jquery-1.4.2.min.js
 - rails_generators/templates/public/javascripts/jquery.autocomplete.pack.js
 - rails_generators/templates/public/javascripts/jquery.blockUI.js

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

@@ -1,19 +0,0 @@
-namespace :re do
-  
-  desc "run a rules pipeline with the complex rule"   
-  task :execute => :environment do
-
-    if ENV['re_pipeline_code'].blank?
-      raise "usage: rake re:execute re_pipeline_code=[pipeline code] re_param='[value]'"
-    end    
-      
-    data = ENV.inject({}){ |data, value| data[value[0].sub(/^re_/, '').to_sym] = value[1] if value[0] =~ /^re_/; data }
-    
-    job = RulesEngine::Job.create
-    # job = RulesEngine::Job.open(job.re_job.id)
-        
-    result = job.run(data[:pipeline_code], data)
-    
-    puts "rule completed : data = #{data.inspect}"
-  end  
-end