rules_engine 0.2.0 → 0.3.0

data/lib/rules_engine/rule/definition.rb

@@ -6,22 +6,17 @@ module RulesEngine
       end
 
       module ClassMethods  
+        attr_accessor :options
+        
         def rule_class_name
           self.name.classify
         end
       end
 
-      ##################################################################
-      # class options
-      class_inheritable_accessor :options
-      @@options = {
-        # :group          => "The group the rule belongs to",
-        # :display_name   => "name to use on forms and views",
-        # :help_partial   => "the help html.erb template",
-        # :new_partial    => "the new html.erb template",
-        # :edit_partial   => "the edit html.erb template"
-      }
-
+      def options
+        self.class.options
+      end
+      
       ##################################################################
       # set the rule data
       def data= data      

data/lib/rules_engine_view.rb

@@ -1,14 +1,16 @@
-require File.expand_path(File.dirname(__FILE__) + "/rules_engine_view/form_styles")
-require File.expand_path(File.dirname(__FILE__) + "/rules_engine_view/form_fields")
-require File.expand_path(File.dirname(__FILE__) + "/rules_engine_view/form_builder")
+require 'rules_engine_view/config'
 
-require File.expand_path(File.dirname(__FILE__) + "/rules_engine_view/buttons")
+require 'rules_engine_view/form_styles'
+require 'rules_engine_view/form_fields'
+require 'rules_engine_view/form_builder'
 
-require File.expand_path(File.dirname(__FILE__) + "/rules_engine_view/boxes")
-require File.expand_path(File.dirname(__FILE__) + "/rules_engine_view/navigate")
+require 'rules_engine_view/buttons'
 
-require File.expand_path(File.dirname(__FILE__) + "/rules_engine_view/alerts")
+require 'rules_engine_view/boxes'
+require 'rules_engine_view/navigate'
 
-require File.expand_path(File.dirname(__FILE__) + "/rules_engine_view/defer")
+require 'rules_engine_view/alerts'
 
-require File.expand_path(File.dirname(__FILE__) + "/rules_engine_view/model_loader")
+require 'rules_engine_view/defer'
+
+require 'rules_engine_view/model_loader'

data/lib/rules_engine_view/alerts.rb

@@ -2,31 +2,31 @@ module RulesEngineView
   module Alerts
     
     def re_alert
-      result = '<div id="re_alert">'
+      result = '<div id="re_alert">'.html_safe
       
       unless flash[:error].blank?
-        result << '<div class="error"><strong>Error : </strong><span>'
+        result << '<div class="error"><strong>Error : </strong><span>'.html_safe
         result << flash.delete(:error)
-        result << '</span><a class="re-alert-close" href="#">Close</a></div>'
+        result << '</span><a class="re-alert-close" href="#">Close</a></div>'.html_safe
 
         flash.delete(:success)
         flash.delete(:notice)
       end
 
       unless flash[:success].blank?
-        result << '<div class="success"><strong>Success : </strong><span>'
+        result << '<div class="success"><strong>Success : </strong><span>'.html_safe
         result << flash.delete(:success)
-        result << '</span><a class="re-alert-close" href="#">Close</a></div>'
+        result << '</span><a class="re-alert-close" href="#">Close</a></div>'.html_safe
 
         flash.delete(:notice)
       end      
 
       unless flash[:notice].blank?
-        result << '<div class="notice"><strong>Warning : </strong><span>'
+        result << '<div class="notice"><strong>Warning : </strong><span>'.html_safe
         result << flash.delete(:notice)
-        result << '</span><a class="re-alert-close" href="#">Close</a></div>'
+        result << '</span><a class="re-alert-close" href="#">Close</a></div>'.html_safe
       end      
-      result << '</div>'      
+      result << '</div>'.html_safe
       
       return result
     end    
@@ -35,21 +35,17 @@ module RulesEngineView
       unless flash[:error].blank?  
         flash.delete(:success)
         flash.delete(:notice)
-        return "$.re_error_message('" + escape_javascript(flash.delete(:error)) + "');"
+        return "$.re_error_message('".html_safe + escape_javascript(flash.delete(:error)) + "');".html_safe
       end
       unless flash[:success].blank?
         flash.delete(:notice)
-        return "$.re_success_message('" + escape_javascript(flash.delete(:success)) + "');"
+        return "$.re_success_message('".html_safe + escape_javascript(flash.delete(:success)) + "');".html_safe
       end      
       unless flash[:notice].blank?
-        return "$.re_notice_message('" + escape_javascript(flash.delete(:notice)) + "');"
+        return "$.re_notice_message('".html_safe + escape_javascript(flash.delete(:notice)) + "');".html_safe
       end    
     end  
 
     
   end
 end
-
-ActionView::Base.class_eval do
-  include RulesEngineView::Alerts
-end

data/lib/rules_engine_view/boxes.rb

@@ -1,32 +1,25 @@
 module RulesEngineView
   module Boxes
     def re_whitebox(&block)
-      result = ''
-      result << '<div class="re-whitebox">' 
-      result << '<div class="re-whitebox-content">'
+      result = ''.html_safe
+      result << '<div class="re-whitebox">'.html_safe
+      result << '<div class="re-whitebox-content">'.html_safe
       result << capture(&block)
-      result << '<div class="clear"></div>'
-      result << '</div>'
-      result << '</div>'
-   
-      concat result
+      result << '<div class="clear"></div>'.html_safe
+      result << '</div>'.html_safe
+      result << '</div>'.html_safe
+      result
     end
     
     def re_shadowbox(&block)
-      result = ''
-      result << '<div class="re-shadowbox-outer">' 
-      result << '<div class="re-shadowbox-inner">'
+      result = ''.html_safe
+      result << '<div class="re-shadowbox-outer">'.html_safe
+      result << '<div class="re-shadowbox-inner">'.html_safe
       result << capture(&block)
-      result << '<div class="clear"></div>'
-      result << '</div>'
-      result << '</div>'
-   
-      concat result
+      result << '<div class="clear"></div>'.html_safe
+      result << '</div>'.html_safe
+      result << '</div>'.html_safe
+      result
     end
-    
   end  
 end
-
-ActionView::Base.class_eval do
-  include RulesEngineView::Boxes
-end

data/lib/rules_engine_view/buttons.rb

@@ -3,11 +3,11 @@ module RulesEngineView
 
     def re_button_submit(title, color, options ={})
       klass = "re-form-button-#{color} #{options[:class]}"
-      result = "<div class='re-form-button"
+      result = "<div class='re-form-button".html_safe
       result << " span-#{options[:span]}" unless options[:span].blank?
-      result << "'>"
+      result << "'>".html_safe
       result << submit_tag(title, options.merge(:class=> klass).except(:span))      
-      result << "</div>"
+      result << "</div>".html_safe
       result
     end
 
@@ -34,11 +34,11 @@ module RulesEngineView
 
     def re_button_link(title, url, color, options = {})
       klass = "re-form-button-#{color} #{options[:class]}"
-      result = "<div class='re-form-button"
+      result = "<div class='re-form-button".html_safe
       result << " span-#{options[:span]}" unless options[:span].blank?
-      result << "'>"
-      result << link_to("<span>#{title}</span>", url, options.merge(:class=> klass).except(:span))      
-      result << "</div>"
+      result << "'>".html_safe
+      result << link_to("<span>".html_safe + title + "</span>".html_safe, url, options.merge(:class=> klass).except(:span))      
+      result << "</div>".html_safe
       result
     end
     
@@ -66,14 +66,14 @@ module RulesEngineView
     ############################## 
     # nested buttons
     def re_add_link(title, id) 
-      link_to("#{title}", "#", :class => 're-add-link', :id => "#{id}")
+      link_to(title, "#", :class => 're-add-link', :id => "#{id}")
     end  
 
     def re_remove_link(title, object_name, id)
       return "" if id == 0
       
       builder_id = object_name.gsub('[', '_').gsub(']', '')    
-      link_to("#{title}", "#", :class => 're-remove-link', :id => "#{builder_id}_remove")
+      link_to(title, "#", :class => 're-remove-link', :id => "#{builder_id}_remove")
     end
 
     def re_remove_field(object_name, id)
@@ -108,11 +108,6 @@ module RulesEngineView
     def re_button_unchecked url, options = {}
       klass = "re-button-unchecked #{options[:class]}"
       link_to("", url, options.merge(:class => klass))
-    end
-    
+    end    
   end      
 end
-
-ActionView::Base.class_eval do
-  include RulesEngineView::Buttons
-end

data/lib/rules_engine_view/config.rb

@@ -0,0 +1,21 @@
+module RulesEngineView
+  module Config
+    
+    @prefix_breadcrumbs = nil
+    def self.prefix_breadcrumbs
+      @prefix_breadcrumbs
+    end
+    def self.prefix_breadcrumbs=(prefix)  
+      @prefix_breadcrumbs = prefix  
+    end
+
+    @layout = nil
+    def self.layout
+      @layout
+    end
+    def self.layout=(layout)  
+      @layout = layout
+    end
+    
+  end    
+end

data/lib/rules_engine_view/defer.rb

@@ -1,14 +1,6 @@
 module RulesEngineView
   module Defer
     
-    @prefix_breadcrumbs = nil
-    def self.prefix_breadcrumbs
-      @prefix_breadcrumbs
-    end
-    def self.prefix_breadcrumbs=(prefix)  
-      @prefix_breadcrumbs = prefix  
-    end
-    
     def set_re_javascript_include(javascript_include_or_array)
       content_for :defer_re_javascript_include do
         javascript_include_tag(javascript_include_or_array)
@@ -17,8 +9,8 @@ module RulesEngineView
 
     def set_re_breadcrumbs(*crumbs)
       content_for :defer_re_breadcrumbs do
-        if RulesEngineView::Defer.prefix_breadcrumbs
-          re_breadcrumbs(*([RulesEngineView::Defer.prefix_breadcrumbs] << crumbs).flatten)
+        if RulesEngineView::Config.prefix_breadcrumbs
+          re_breadcrumbs(*([RulesEngineView::Config.prefix_breadcrumbs] << crumbs).flatten)
         else  
           re_breadcrumbs(*crumbs)
         end  
@@ -27,8 +19,8 @@ module RulesEngineView
 
     def set_re_breadcrumbs_right(*crumbs)
       content_for :defer_re_breadcrumbs do
-        if RulesEngineView::Defer.prefix_breadcrumbs
-          re_breadcrumbs_right(*([RulesEngineView::Defer.prefix_breadcrumbs] + crumbs).flatten)
+        if RulesEngineView::Config.prefix_breadcrumbs
+          re_breadcrumbs_right(*([RulesEngineView::Config.prefix_breadcrumbs] + crumbs).flatten)
         else  
           re_breadcrumbs_right(*crumbs)
         end  
@@ -36,8 +28,3 @@ module RulesEngineView
     end
   end    
 end
-
-
-ActionView::Base.class_eval do
-  include RulesEngineView::Defer
-end

data/lib/rules_engine_view/form_builder.rb

@@ -10,7 +10,8 @@ module RulesEngineView
         def #{method}(method, *args)
           options = args.extract_options!           
           
-          error = @template.error_message_on(object || object_name, method)
+          error = @object && @object.respond_to?(:errors) ? @object.errors[method.to_sym] : nil
+          # @template.error_message_on(object || object_name, method)
           options.reverse_merge!(:error => error) unless error.blank?
           options.reverse_merge!(:span => @options[:span]) unless @options.nil? || @options[:span].blank?
           
@@ -23,23 +24,26 @@ module RulesEngineView
       module_eval src, __FILE__, __LINE__
     end  
     
-    src = <<-END_SRC
-      alias_method :orig_check_box, :check_box
+    alias_method :orig_check_box, :check_box
+    
+    def check_box(method, options = {}, checked_value = "1", unchecked_value = "0")
+      error = @object && @object.respond_to?(:errors) ? @object.errors[method.to_sym] : nil
+
+      options.reverse_merge!(:error => error) unless error.blank?
+      options.reverse_merge!(:span => @options[:span]) unless @options.nil? || @options[:span].blank?
       
-      def check_box(method, options = {}, checked_value = "1", unchecked_value = "0")
-  
-        error = @template.error_message_on(object || object_name, method)
-        options.reverse_merge!(:error => error) unless error.blank?
-        options.reverse_merge!(:span => @options[:span]) unless @options.nil? || @options[:span].blank?
-        
-        field_label = options[:label] || method.to_s.titleize        
-        form_label = re_build_form_label('&nbsp;', options.except(:required).merge(:span => re_label_span(options)))
-        form_data_label = re_build_form_label(label(method, field_label, re_options_exclude(options)), re_options_exclude(options).merge(:required => options[:required]))        
-        form_data = re_build_form_data(orig_check_box(method, re_options_exclude(options), checked_value, unchecked_value),  options.merge(:text => form_data_label, :class=>'re-form-field-checkbox', :span => re_data_span(options))) 
-        re_build_form_field(form_label + form_data, options.merge(:span => re_field_span(options)))
-      end
-    END_SRC
-    module_eval src, __FILE__, __LINE__
+      field_label = options[:label] || method.to_s.titleize        
+      form_label = re_build_form_label("&nbsp;".html_safe, options.except(:required).merge(:span => re_label_span(options)))
+      form_data_label = re_build_form_label(label(method, field_label, re_options_exclude(options)), re_options_exclude(options).merge(:required => options[:required]))        
+      form_data = re_build_form_data(orig_check_box(method, re_options_exclude(options), checked_value, unchecked_value),  options.merge(:text => form_data_label, :class=>'re-form-field-checkbox', :span => re_data_span(options))) 
+      re_build_form_field(form_label + form_data, options.merge(:span => re_field_span(options)))
+    end
+    
+    def re_error_on(message)
+      return '' unless @object && @object.respond_to?(:errors)
+      return '' if @object.errors.empty?
+      re_error_on_tag(message)
+    end
   end  
   
   module FormBuilderView
@@ -55,9 +59,4 @@ module RulesEngineView
       module_eval src, __FILE__, __LINE__
     end  
   end      
-end
-
-
-ActionView::Base.class_eval do
-  include RulesEngineView::FormBuilderView
 end

data/lib/rules_engine_view/form_fields.rb

@@ -15,7 +15,7 @@ module RulesEngineView
     end
       
     def re_check_box(label, name, value = "1", checked = false, options = {})        
-      form_label = re_build_form_label(' ', options.except(:required).merge(:span => re_label_span(options)))
+      form_label = re_build_form_label(" ".html_safe, options.except(:required).merge(:span => re_label_span(options)))
       form_data_label = re_build_form_label(label_tag(name, label, re_options_exclude(options)), re_options_exclude(options).merge(:required => options[:required]))
       form_data = re_build_form_data(check_box_tag(name, value, checked, re_options_exclude(options)), options.merge(:text => form_data_label, :class=>'re-form-field-checkbox', :span => re_data_span(options))) 
       re_build_form_field(form_label + form_data, options.merge(:span => re_field_span(options)))
@@ -28,14 +28,14 @@ module RulesEngineView
     end
   
     def re_form_blank(options = {})
-      form_label = re_build_form_label(" ", options.merge(:span => re_label_span(options)))
-      form_data = re_build_form_data(" ", options.merge(:span => re_data_span(options))) 
+      form_label = re_build_form_label(" ".html_safe, options.merge(:span => re_label_span(options)))
+      form_data = re_build_form_data(" ".html_safe, options.merge(:span => re_data_span(options))) 
       re_build_form_field(form_label + form_data, options.merge(:span => re_field_span(options)))
     end
 
+    def re_error_on(model, message)
+      return '' if model.errors.empty?
+      re_error_on_tag(message)
+    end  
   end      
 end
-
-ActionView::Base.class_eval do
-  include RulesEngineView::FormFields
-end

data/lib/rules_engine_view/form_styles.rb

@@ -2,40 +2,40 @@ module RulesEngineView
   module FormStyles
     
     def re_build_form_field(value, options = {})
-      result = ''
-      result << "<div class='re-form-field"
+      result = ''.html_safe
+      result << "<div class='re-form-field".html_safe
       result << " re-form-disabled" if options.include?(:disabled) && options[:disabled]
       result << " #{options[:class]}" if options.include?(:class)
       result << " span-#{options[:span] || '12'}"
       result << " clear'"
       result << " id='form_field_#{options[:id]}'" unless options[:id].blank?
-      result << ">"          
-      result << "#{value}"
-      result << "</div>"
+      result << ">".html_safe
+      result << value
+      result << "</div>".html_safe
       result      
     end
     
     def re_build_form_label value, options = {}
-      result = "<div class='re-form-label"
+      result = "<div class='re-form-label".html_safe
       result << "-error" if options.include?(:error) && !options[:error].blank?
       result << " re-form-disabled" if options.include?(:disabled) && options[:disabled]
       result << " #{options[:class]}" if options.include?(:class)
       result << " span-#{options[:span] || '4'}"
       result << "'"
       result << " id='re_form_label_#{options[:id]}'" unless options[:id].blank?
-      result << ">"
-      result << "#{value}"
+      result << ">".html_safe
+      result << value
       if options.include?(:required) && options[:required]
-        result << "<span class='re-form-required"
+        result << "<span class='re-form-required".html_safe
         result << " re-form-disabled" if options.include?(:disabled) && options[:disabled]
-        result << "'>*</span>"
+        result << "'>*</span>".html_safe
       end  
-      result << "</div>"
+      result << "</div>".html_safe
       result
     end
     
     def re_build_form_data value, options = {}
-      result = "<div class='re-form-data"
+      result = "<div class='re-form-data".html_safe
       result << "-error" if options.include?(:error) && !options[:error].blank?
       result << " re-form-disabled" if options.include?(:disabled) && options[:disabled]
       result << " #{options[:class]}" if options.include?(:class)
@@ -43,24 +43,24 @@ module RulesEngineView
       result << " last"
       result << "'" 
       result << " id='form_data_#{options[:id]}'" if options.include?(:id)
-      result << ">"
-      result << "#{value}"
+      result << ">".html_safe
+      result << value
       if options.include?(:text) && !options[:text].blank?
-        result << "<span class='form-text'>"
+        result << "<span class='form-text'>".html_safe
         result << options[:text]
-        result << "</span>"
+        result << "</span>".html_safe
       end
       if options.include?(:hint) && !options[:hint].blank? && (!options.include?(:error) || options[:error].blank?)
-        result << "<span class='form-hint'>"
+        result << "<span class='form-hint'>".html_safe
         result << options[:hint]
-        result << "</span>"
+        result << "</span>".html_safe
       end
       if options.include?(:error) && !options[:error].blank?
-        result << "<span class='form-error-message'>"
+        result << "<span class='form-error-message'>".html_safe
         result << options[:error]
-        result << "</span>"
+        result << "</span>".html_safe
       end
-      result << "</div>"
+      result << "</div>".html_safe
       result      
     end
     
@@ -99,9 +99,14 @@ module RulesEngineView
     def re_field_span(options)
       re_label_span(options) + re_data_span(options)
     end    
+    
+    def re_error_on_tag(message)
+      result = ''.html_safe
+      result << '<div class="re-error"><p>'.html_safe
+      result << message
+      result << '</p></div>'.html_safe
+      result
+    end      
   end
 end
 
-ActionView::Base.class_eval do
-  include RulesEngineView::FormStyles
-end