rules_engine 0.0.5 → 0.0.6

data/VERSION

@@ -1 +1 @@
-0.0.5
+0.0.6

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

@@ -89,11 +89,15 @@ class RePipelinesController < ApplicationController
     klass = RePipeline
     @re_pipelines = klass.find(:all)
     
-    @re_pipelines.each do |re_pipeline|
-      re_pipeline.activate!
+    if @re_pipelines.any? { | re_pipeline| !re_pipeline.valid? }
+      flash[:error] = 'Cannot Activate Pipelines.'
+    else
+      @re_pipelines.each do |re_pipeline|
+        re_pipeline.activate!
+      end
+      flash[:success] = 'All Pipelines Activated.'
     end
-    flash[:success] = 'All Pipelines Activated.'
-
+      
     respond_to do |format|
       format.html do
         redirect_to(re_pipelines_path)

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

@@ -61,26 +61,26 @@ class ReRule < ActiveRecord::Base
   end
   
   def rule_attributes=params
-    raise 'rule class not found' if rule.nil?
+    raise 'rule class not found' if rule.nil?    
     rule.attributes = params
   end
 
   def before_save_rule
-    raise 'rule class not found' if rule.nil?
+    return if rule.nil?
     self.title = rule.title
     self.summary = rule.summary
     self.data = rule.data
     
-    self.re_rule_expected_outcomes = (rule.expected_outcomes).map { |expected_outcome| ReRuleExpectedOutcome.new(expected_outcome) }
+    self.re_rule_expected_outcomes = (rule.expected_outcomes || []).map { |expected_outcome| ReRuleExpectedOutcome.new(expected_outcome) }
   end
 
   def after_create_rule
-    # raise 'rule class not found' if rule.nil?
+    return if rule.nil?
     rule.after_add_to_pipeline(self.re_pipeline_id, self.id)
   end
 
   def before_destroy_rule
-    # raise 'rule class not found' if rule.nil?
+    return if rule.nil?
     rule.before_remove_from_pipeline(self.re_pipeline_id, self.id)
   end
 

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

@@ -5,7 +5,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>
-    <div class="float-right top-5">
+    <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") %>
       <%= link_to("<span>Move Down</span>", "##{@re_pipeline.id}|#{re_rule.id}", :class => "#{local_last_rule ? 're-rule-move-down-off' : 're-rule-move-down'}") %>

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

@@ -8,11 +8,11 @@
       <div class="re-rule-class-list hide" id="re_rule_class_name_<%= name.downcase.gsub(/[^a-z0-9]+/i, '_') %>">
         <% rule_classes.each do |rule_class| %>
  					<div class="re-yellowbox">
-						<h5>
-							<%= rule_class.options[:display_name] %>          
-						</h5>
 						<a href="#<%=@re_pipeline.id%>|<%= rule_class %>" class="re-rule-class-new"> <span>Add</span> </a>
 						<a href="#<%=@re_pipeline.id%>|<%= rule_class %>" class="re-rule-class-help"> <span>Help</span> </a>
+						<div class="float-left">
+							<%= rule_class.options[:display_name] %>          
+						</div>
 						<div class="clear"></div>
 		      </div>      
 		      <div class="clear top-5"></div>
@@ -23,11 +23,11 @@
 		<div class="re-rule-class-list" id="re_rule_class_name_all">
     	<% RulesEngine::Discovery.rule_classes.each do |rule_class| %>    
 	      <div class="re-yellowbox">
-	        <h5>
+       		<a href="#<%=@re_pipeline.id%>|<%= rule_class %>" class="re-rule-class-new"> <span>Add</span> </a>
+       		<a href="#<%=@re_pipeline.id%>|<%= rule_class %>" class="re-rule-class-help"> <span>Help</span> </a>
+	        <div class="float-left">
 	          <%= rule_class.options[:display_name] %>          
-	        </h5>
-	        <a href="#<%=@re_pipeline.id%>|<%= rule_class %>" class="re-rule-class-new"> <span>Add</span> </a>
-	        <a href="#<%=@re_pipeline.id%>|<%= rule_class %>" class="re-rule-class-help"> <span>Help</span> </a>
+	        </div>
 	        <div class="clear"></div>
 	      </div>      
 	      <div class="clear top-5"></div>

data/rails_generators/templates/public/javascripts/re_pipeline_change.js

@@ -72,7 +72,7 @@ $(document).ready(function() {
       return false;
 
     $.re_block();
-    $.get('/re_pipelines/' + values[0] + '/re_pipeline_rules/new?rule_class_name=' + values[1], null, null, 'script');
+    $.get('/re_pipelines/' + values[0] + '/re_rules/new?rule_class_name=' + values[1], null, null, 'script');
   	return false;  
   });  
 
@@ -94,7 +94,7 @@ $(document).ready(function() {
       return false;
 
     $.re_block();
-    $.get('/re_pipelines/' + values[0] + '/re_pipeline_rules/' + values[1] + '/edit', null, null, 'script');
+    $.get('/re_pipelines/' + values[0] + '/re_rules/' + values[1] + '/edit', null, null, 'script');
   	return false;  
   });  
 
@@ -170,7 +170,7 @@ $(document).ready(function() {
       return false;
     
     $.re_block();
-    $.get('/re_pipelines/' + values[0] + '/re_pipeline_rules/help?rule_class_name=' + values[1], null, null, 'script');
+    $.get('/re_pipelines/' + values[0] + '/re_rules/help?rule_class_name=' + values[1], null, null, 'script');
    return false;  
   });  
 

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

@@ -3,7 +3,8 @@ html, body {
   margin: 0px;
   padding: 0px;
   font-size: 14px;
-  color: #000;
+/*  color: #000;*/
+  color: #222;
   background: #2F323C;
   font-family: "Lucida Grande","Lucida Sans Unicode",verdana,arial,helvetica,sans-serif;
 }
@@ -15,7 +16,8 @@ html, body {
 
 h1, h2, h3, h4, h5, h6 {
   font-weight:normal;
-  color:#111;
+/*  color:#111;*/
+  color: #222;
 }
 h1 {
   font-size:36px;

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

@@ -11,7 +11,8 @@ a.re-alert-close {
   padding-left: 24px;
 }
 a.re-alert-close:hover {
-  color: #000;
+/*  color: #000;*/
+  color: #222;
   text-decoration: underline;
 }
 

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

@@ -40,7 +40,8 @@
   display:block;
   float:left;
 	font-size: 16px;
-	color: #000;
+	/*color: #000;*/
+	color: #222;
 	margin-top: 6px;
   padding-left: 5px;
   padding-right: 5px;

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

@@ -1,8 +1,3 @@
-/* CHANGE THE RULES MENU */
-/*.re-rule-menu .shadowbox-outer{*/
-/*  padding-bottom: 15px;*/
-/*}*/
-
 /* breadcrumb title items */
 .re-breadcrumbs .re-pipeline-list {
 	background: transparent url('./rules_engine/re_pipeline/list-25.png') no-repeat 0 6px;
@@ -251,18 +246,26 @@ h2.re-rule-edit {
   padding: 0px 0 0 28px;  
 }
 
+.re-rule-show  p{
+  font-size: 13px;
+}
 .re-rule-show div.re-rule-status-valid {
 	background: transparent url('./rules_engine/re_rule/valid-18.png') no-repeat 2px 2px;
   padding: 2px 0 4px 24px;
+  font-weight: bold;
 }
 .re-rule-show div.re-rule-status-verify {
 	background: #FBE3E4 url('./rules_engine/re_rule/verify-18.png') no-repeat 2px 2px;
   padding: 2px 0 4px 24px;
+  font-weight: bold;
 }
 .re-rule-change h3 { 
   margin: 0;
   padding: 0;
 }
+.re-rule-change  p{
+  font-size: 13px;
+}
 .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;
@@ -511,7 +514,8 @@ a.re-rule-class-help span {
 }
 
 a.re-job-detail {
-  color: #000;
+/*  color: #000;*/
+  color: #222;
   text-decoration: none;
   background-color: #222;
 }

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

@@ -269,8 +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!(:activate!)
       @re_pipeline_2 = mock_model(RePipeline)
+      @re_pipeline_2.stub!(:valid?).and_return(true)
       @re_pipeline_2.stub!(:activate!)
       RePipeline.stub!(:find).and_return([@re_pipeline_1, @re_pipeline_2])
     end
@@ -281,15 +283,41 @@ describe RePipelinesController do
       assigns[:re_pipelines].should == [@re_pipeline_1, @re_pipeline_2]
     end
     
-    it "should activate all of the re_pipeline" do
-      @re_pipeline_1.should_receive(:activate!)
-      @re_pipeline_2.should_receive(:activate!)
-      put :activate_all
+    describe "all of the pipelines are valid" do
+      it "should activate all of the re_pipeline" do
+        @re_pipeline_1.should_receive(:activate!)
+        @re_pipeline_2.should_receive(:activate!)
+        put :activate_all
+      end
+       
+      it "should display a flash success message" do
+        put :activate_all
+        flash[:success].should_not be_blank
+      end
     end
+
+    describe "one of the pipelines is invalid" do
+      before(:each) do
+        @re_pipeline_2.stub!(:valid?).and_return(false)  
+        @re_pipeline_2.stub!(:valid?).and_return(false)  
+      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?)
+        put :activate_all
+      end
+      
+      it "should not activate the pipelines" do
+        @re_pipeline_1.should_not_receive(:activate!)
+        @re_pipeline_2.should_not_receive(:activate!)
+        put :activate_all
+      end
        
-    it "should display a flash success message" do
-      put :activate_all
-      flash[:success].should_not be_blank
+      it "should display a flash error message" do
+        put :activate_all
+        flash[:error].should_not be_blank
+      end
     end
     
     it "should redirect to the re_pipeline index page for HTML" do

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: rules_engine
 version: !ruby/object:Gem::Version 
-  hash: 21
+  hash: 19
   prerelease: false
   segments: 
   - 0
   - 0
-  - 5
-  version: 0.0.5
+  - 6
+  version: 0.0.6
 platform: ruby
 authors: 
 - Chris Douglas