rules_engine 0.0.8 → 0.1.0

data/VERSION

@@ -1 +1 @@
-0.0.8
+0.1.0

data/rails_generators/manifests/rules_engine.yml

@@ -1,20 +1,19 @@
-directories :
-  list :
-    - app/views/re_jobs
-    - app/views/re_pipeline_jobs
-    - app/views/re_pipeline_rules
-    - app/views/re_pipelines
+contents :
+  - app/views/re_jobs
+  - app/views/re_pipeline_jobs
+  - app/views/re_pipeline_rules
+  - app/views/re_pipelines
 
-    - public/stylesheets/fancybox
-    - public/stylesheets/blueprint
-    - public/stylesheets/re_view_box
-    - public/stylesheets/re_view_button
-    - public/stylesheets/re_view_error
-    - public/stylesheets/re_view_navigate
-    
-    - public/stylesheets/rules_engine
+  - public/stylesheets/fancybox
+  - public/stylesheets/blueprint
+  - public/stylesheets/re_view_box
+  - public/stylesheets/re_view_button
+  - public/stylesheets/re_view_error
+  - public/stylesheets/re_view_navigate
   
-    - features/re_pipeline
+  - public/stylesheets/rules_engine
+
+  - features/re_pipeline
   
 files :  
   - doc/README.rules_engine

data/rails_generators/manifests/rules_engine_complex.yml

@@ -1,8 +1,7 @@
 directories :
-  raw:
-    - app/rules
-    - spec/lib/rules
-    - lib/tasks
+  - app/rules
+  - spec/lib/rules
+  - lib/tasks
 
 templates :
   replacements :

data/rails_generators/manifests/rules_engine_simple.yml

@@ -1,8 +1,7 @@
 directories :
-  raw:
-    - app/rules
-    - spec/lib/rules
-    - lib/tasks
+  - app/rules
+  - spec/lib/rules
+  - lib/tasks
 
 templates :
   replacements :

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

@@ -101,8 +101,10 @@ class <%=rule_class%>Rule < RulesEngine::Rule
   # it gets the data parameter :sentence
   # it sets the data parameter :match
   def process(job, data)
-    sentence = data[:sentence] || data["sentence"]
-    return nil if sentence.blank?
+    sentence = data[:sentence] || data["sentence"]    
+    if sentence.blank?
+      return RulesEngine::RuleOutcome.new(RulesEngine::RuleOutcome::OUTCOME_NEXT) 
+    end
     
     words.each do |word|
       if /#{word}/i =~ sentence        
@@ -122,7 +124,7 @@ class <%=rule_class%>Rule < RulesEngine::Rule
       end
     end
         
-    nil
+    RulesEngine::RuleOutcome.new(RulesEngine::RuleOutcome::OUTCOME_NEXT)
   end  
     
 end

data/rails_generators/templates/spec/lib/rules/complex_rule_spec.rb

@@ -282,13 +282,13 @@ describe <%=rule_class%>Rule do
     
     it "should do nothing if there is no sentance" do
       @<%=rule_name%>_rule = <%=rule_class%>Rule.new
-      @<%=rule_name%>_rule.process(@job, {}).should be_nil
+      @<%=rule_name%>_rule.process(@job, {}).outcome.should == RulesEngine::RuleOutcome::OUTCOME_NEXT
     end        
 
     it "should do nothing if there is no match" do
       @<%=rule_name%>_rule = <%=rule_class%>Rule.new
       @<%=rule_name%>_rule.stub!(:words).and_return(["no", "words"])      
-      @<%=rule_name%>_rule.process(@job, @data).should be_nil
+      @<%=rule_name%>_rule.process(@job, @data).outcome.should == RulesEngine::RuleOutcome::OUTCOME_NEXT
     end        
     
     describe "a match found" do

data/rails_generators/templates/spec/lib/rules/simple_rule_spec.rb

@@ -158,11 +158,14 @@ describe <%=rule_class%>Rule do
   describe "processing the rule" do
     before(:each) do
       @<%=rule_name%>_rule = <%=rule_class%>Rule.new
+
+      @job = mock("job")
+      @job.stub!(:audit)
     end
     
     it "should do nothing" do
       @<%=rule_name%>_rule = <%=rule_class%>Rule.new
-      @<%=rule_name%>_rule.process(101, {}).should be_nil
+      @<%=rule_name%>_rule.process(@job, {}).outcome.should == RulesEngine::RuleOutcome::OUTCOME_NEXT
     end        
   end
 end

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

@@ -19,8 +19,6 @@ describe ReJob do
     describe "jobs not started" do
       it "should not be included" do
         re_job = ReJob.new(:job_status => ReJob::JOB_STATUS_NONE)
-        re_job.re_job_audits << ReJobAudit.new(:audit_code => ReJobAudit::AUDIT_SUCCESS, :audit_date => Time.now, :re_pipeline_id => 1001)
-        re_job.re_job_audits << ReJobAudit.new(:audit_code => ReJobAudit::AUDIT_SUCCESS, :audit_date => Time.now, :re_pipeline_id => 2001)      
         re_job.save!
                 
         ReJob.find_jobs(:page => 1).length.should == 0
@@ -30,20 +28,36 @@ describe ReJob do
     describe "jobs that are running" do
       before(:each) do
         @re_job = ReJob.new(:job_status => ReJob::JOB_STATUS_RUNNING)
-        @re_job.re_job_audits << ReJobAudit.new(:audit_code => ReJobAudit::AUDIT_SUCCESS, :audit_date => Time.now, :re_pipeline_id => 1001)
-        @re_job.re_job_audits << ReJobAudit.new(:audit_code => ReJobAudit::AUDIT_SUCCESS, :audit_date => Time.now, :re_pipeline_id => 2001)      
         @re_job.save!
       end
 
-      it "should be included in the results" do
+      it "should be included in the audit results" do
         result_set = ReJob.find_jobs(:page => 1)
         result_set.length.should == 1
         result_set[0]["job_id"].to_i.should == @re_job.id
       end
 
-      it "should include the start data" do
-        result_set = ReJob.find_jobs(:page => 1)
-        result_set[0]["start_date"].should_not be_nil
+      describe "no audit entries" do
+        it "should include the start date from the job" do
+          result_set = ReJob.find_jobs(:page => 1)
+          result_set[0]["start_date"].should_not be_nil
+          # result_set[0]["start_date"].should == @re_job.created_at
+        end        
+      end
+      
+      describe "has audit entries" do
+        before(:each) do          
+          @re_audit_date = Time.parse("April 24 2010")        
+          @re_job.re_job_audits << ReJobAudit.new(:audit_code => ReJobAudit::AUDIT_SUCCESS, :audit_date => @re_audit_date, :re_pipeline_id => 1001)
+          @re_job.save!
+        end
+        
+        it "should include the start date from the audit entries" do
+          result_set = ReJob.find_jobs(:page => 1)
+          result_set[0]["start_date"].should_not be_nil
+          result_set[0]["start_date"].should == @re_audit_date.utc
+        end        
+        
       end
   
       it "should not include the end data when end not set" do
@@ -54,9 +68,12 @@ describe ReJob do
 
     describe "jobs that are finished" do
       before(:each) do
+        @re_audit_date_start = Time.parse("April 24 2010")
+        @re_audit_date_end = Time.parse("April 25 2010")
+        
         @re_job = ReJob.new(:job_status => ReJob::JOB_STATUS_SUCCESS)
-        @re_job.re_job_audits << ReJobAudit.new(:audit_code => ReJobAudit::AUDIT_SUCCESS, :audit_date => Time.now, :re_pipeline_id => 1001)
-        @re_job.re_job_audits << ReJobAudit.new(:audit_code => ReJobAudit::AUDIT_SUCCESS, :audit_date => Time.now, :re_pipeline_id => 2001)      
+        @re_job.re_job_audits << ReJobAudit.new(:audit_code => ReJobAudit::AUDIT_SUCCESS, :audit_date => @re_audit_date_start, :re_pipeline_id => 1001)
+        @re_job.re_job_audits << ReJobAudit.new(:audit_code => ReJobAudit::AUDIT_SUCCESS, :audit_date => @re_audit_date_end, :re_pipeline_id => 2001)      
         @re_job.save!
       end
 
@@ -68,47 +85,19 @@ describe ReJob do
 
       it "should include the start data" do
         result_set = ReJob.find_jobs(:page => 1)
-        result_set[0]["start_date"].should_not be_nil
+        result_set[0]["start_date"].should_not be_nil        
+        result_set[0]["start_date"].should == @re_audit_date_start.utc
       end
   
       it "should include the end date" do
         result_set = ReJob.find_jobs(:page => 1)
         result_set[0]["end_date"].should_not be_nil
+        result_set[0]["end_date"].should == @re_audit_date_end.utc
       end        
     end
   end
   
   describe "finding jobs by the pipeline" do
-  #   before(:each) do
-  #     @re_job = ReJob.new(valid_attributes)
-  #     @re_job.re_job_audits << ReJobAudit.new(:audit_code => ReJobAudit::AUDIT_SUCCESS, :audit_date => Time.now, :re_pipeline_id => 1001)
-  #     @re_job.re_job_audits << ReJobAudit.new(:audit_code => ReJobAudit::AUDIT_SUCCESS, :audit_date => Time.now, :re_pipeline_id => 2001)      
-  #     @re_job.save!
-  #   end
-  #   
-  #   it "should include jobs where the job audit has started in the pipeline" do
-  #     result_set = ReJob.find_jobs_by_pipeline(1001, :page => 1)
-  #     result_set.length.should == 1
-  #     result_set[0]["job_id"].to_i.should == @re_job.id
-  #   end
-  # 
-  #   it "should include the start data" do
-  #     result_set = ReJob.find_jobs_by_pipeline(1001, :page => 1)
-  #     result_set[0]["start_date"].should_not be_nil
-  #   end
-  # 
-  #   it "should not include the end data when end not set" do
-  #     result_set = ReJob.find_jobs_by_pipeline(1001, :page => 1)
-  #     result_set[0]["end_date"].should be_nil
-  #   end
-  # 
-  #   it "should include the end data" do
-  #     @re_job.re_job_audits << ReJobAudit.new(:audit_code => ReJobAudit::AUDIT_PIPELINE_END, :audit_date => Time.now, :re_pipeline_id => 1001)
-  # 
-  #     result_set = ReJob.find_jobs_by_pipeline(1001, :page => 1)
-  #     result_set[0]["end_date"].should_not be_nil
-  #   end        
-  # end
 
     describe "jobs not started" do
       it "should not be included" do

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: rules_engine
 version: !ruby/object:Gem::Version 
-  hash: 15
+  hash: 27
   prerelease: false
   segments: 
   - 0
+  - 1
   - 0
-  - 8
-  version: 0.0.8
+  version: 0.1.0
 platform: ruby
 authors: 
 - Chris Douglas