kiss 1.8.2 → 1.8.3

data/Rakefile

@@ -7,7 +7,7 @@ spec = Gem::Specification.new do |s|
     s.name      =   'kiss'
     s.version   =   File.read('VERSION').chomp
     s.author    =   'Shawn Van Ittersum'
-    s.email     =   'shawn @nospam@ multiwidget.com'
+    s.email     =   'shawn @nospam@ appjudo.com'
     s.homepage  =   'http://www.rubykiss.org'
     s.rubyforge_project = 'kiss'
     s.summary   =   'An MVC web application framework using Rack, Sequel, and Erubis.'

data/VERSION

@@ -1 +1 @@
-1.8.2
+1.8.3

data/lib/kiss/form/field.rb

@@ -194,10 +194,6 @@ class Kiss
         @_currency.to_s + input_tag_html(attrs) + tip_html(attrs)
       end
       
-      def table_row_html
-        form.component_html(self)
-      end
-      
       def tip_html(attrs)
         (tip = attrs.has_key?(:tip) ? attrs[:tip] : @_tip) ? " <small>#{tip}</small>" : ''
       end

data/lib/kiss/form.rb

@@ -42,24 +42,54 @@ class Kiss
         @_form = form
         @_components = []
       end
+    
+      # Renders HTML for specified form field.
+      def component_table_row_html(field)
+        field = fields[field.to_s] if (field.is_a?(Symbol) || field.is_a?(String))
+        return field.element_html if field.is_a?(HiddenField)
+      
+        type = field.class.type
+        prompt = field.prompt
+        label = field.label
+        errors = field.errors_html
+        required = field.required ? %Q(<span class="kiss_form_required">#{@_form.mark_required}</span> ) : ''
+      
+        parts = [
+      	  prompt ? %Q(<tr class="kiss_form_prompt"><td class="kiss_form_label">#{required}</td><td>#{prompt.to_s}</td></tr>) : '',
+          %Q(<tr class="kiss_form_#{type}"><td class="kiss_form_label#{errors ? ' error' : ''}">),
+          !prompt ? (required + (label.blank? ? '' : label.to_s + ':' )) : '',
+      	  %Q(</td><td class="kiss_form_#{type}">),
+      		field.element_html, "</td></tr>"
+      	]
+      	if errors
+      	  parts += [
+        	  '<tr class="kiss_form_error_row"><td class="kiss_form_required"></td><td>',
+        	  errors,
+        	  '</td></tr>'
+        	]
+      	end
+      	parts.join
+      end
       
       # Renders HTML for form fields.
       def components_html
         @_components.map do |component|
-          form.component_html(component)
+          component_table_row_html(component)
         end.join
       end
       alias_method :fields_html, :components_html
       
       # Renders open of form table.
-      def table_html_open
+      def table_opening_html
         %Q(<table class="kiss_form_column" border=0 cellspacing=0><tbody>)
       end
+      alias_method :table_html_open, :table_opening_html
     
       # Renders close of form table.
-      def table_html_close
+      def table_closing_html
         '</tbody></table>'
       end
+      alias_method :table_html_close, :table_closing_html
       
       def html
         [
@@ -314,23 +344,61 @@ class Kiss
     end
     
     def validate_uniqueness_of(column_set)
-      column_set_labels_values = column_set.map do |column_name|
-        (field = fields[column_name.to_s]) ? 
-          [field.label, field.value] : 
-          [column_name.to_s.sub(/_id\Z/, '').titlecase, object[column_name]]
+      conditions = column_set.last.is_a?(Hash) ? column_set.pop : {}
+      
+      nouns = []
+      true_adjectives = []
+      false_adjectives = []
+      
+      column_set.each do |column_name|
+        key = column_name.to_sym
+        column_name = column_name.to_s
+        
+        field = fields[column_name]
+        label, value = field ?
+          [field.label.downcase, field.value] : 
+          [column_name.sub(/_id\Z/, '').downcase, object[column_name.to_sym]]
+        conditions[key] = value
+        
+        if column_name =~ /\Ais_/ || column_name =~ /_at\Z/
+          if value.zero? || value.nil?
+            false_adjectives
+          else
+            true_adjectives
+          end
+        else
+          nouns
+        end << label
       end
-      conditions = column_set.zip column_set_labels_values.map {|lv| lv[1] }
       
       dataset = @_object.model.filter(conditions)
-      unless (@_object.new? ? dataset : dataset.exclude(@_object.pk_hash)).empty?
-        labels = column_set_labels_values.map {|lv| lv[0] }
-        message = "There is already another #{@_object.model.name.singularize.gsub('_', ' ')} with the same #{labels.conjoin}."
-        return (
-          (column_set.length == 1) && 
-          (field_name = column_set[0].to_str) &&
-          fields[field_name]
-        ) ? add_error(field_name, message) : add_error(message)
+      dataset = dataset.exclude(@_object.pk_hash) unless @_object.new?
+      return nil if dataset.empty?
+      
+      true_adjective_string = true_adjectives.empty? ? '' :
+        (true_adjectives.join(', ') + ' ')
+      humanized_object_class_name = @_object.model.name.singularize.gsub('_', ' ')
+      false_adjective_string = false_adjectives.empty? ? '' : 
+        ", not #{false_adjectives.conjoin('or')},"
+      with_clause = nouns.empty? ? '' : " with the same #{nouns.conjoin}"
+      message = [
+        'There is already another ',
+        true_adjective_string,
+        humanized_object_class_name,
+        false_adjective_string,
+        with_clause,
+        '.'
+      ].join
+      
+      # Add error to a single field if appropriate.
+      if column_set.length == 1
+        field_name = column_set[0].to_str
+        if field_name && fields[field_name]
+          return add_error(field_name, message)
+        end
       end
+      # Else add to top of form.
+      return add_error(message)
     end
     
     # Checks whether form was submitted and accepted by user and, if so,
@@ -467,6 +535,11 @@ class Kiss
     end
     alias_method :accepted, :accepted?
     
+    # Renders current action using form's HTML as action render content.
+    def render(options = {})
+      @_delegate.render options.merge(:content => html)
+    end
+    
     # Renders error HTML block for top of form, and returns as string.
     def errors_html
       return nil unless has_errors?
@@ -485,35 +558,64 @@ class Kiss
       %Q(<table class="kiss_form_errors"><tr><td>#{content}</td></tr></table>)
     end
     
-    # Renders current action using form's HTML as action render content.
-    def render(options = {})
-      @_delegate.render options.merge(:content => html)
-    end
-    
     def form_name_hidden_tag_html
       %Q(<input type=hidden name="form" value="#{@_name}">)
     end
     
-    # Renders beginning of form (form open tag and form/field/error styles).
-    def html_open
-      @_error_class ||= 'kiss_form_error_message'
-      @_field_error_class ||= @_error_class
-      
-      # form tag
-      form_attrs = ['id', 'method', 'enctype', 'class', 'style'].map do |attr|
-        next if (value = send attr).blank?
-        "#{attr}=\"#{send attr}\""
-      end
-      if @_html
-        @_html.each_pair do |k, v|
-          form_attrs.push("#{k}=\"#{v}\"")
-        end
+    # Renders HTML for form sections.
+    def sections_html
+      sections.map do |section|
+        section.html
+      end.join
+    end
+    alias_method :components_html, :sections_html
+    alias_method :fields_html, :sections_html
+    
+    def required_legend_html
+      (@_has_required_fields && @_mark_required) ?
+        %Q( <tr><td class="kiss_form_help">Required fields marked by <span class="kiss_form_required">*</span></td></tr> ) : ''
+    end
+    
+    # Renders form submit buttons.
+    def submit_html
+      if @_submit
+        prompt = @_submit.prompt ? (@_submit.prompt + '<br/>') : ''
+        [
+          '<tr class="kiss_form_submit"><td>',
+          prompt,
+          @_submit.element_html,
+          '<br/></td></tr>'
+        ].join
+      else
+        ''
       end
-      form_tag = %Q(<form action="#{@_action}" #{form_attrs.join(' ')}>#{form_name_hidden_tag_html})
-      
-      # style tag
+    end
+    
+    # Renders open of form table.
+    def table_opening_html
+      %Q(<table class="kiss_form" border=0 cellspacing=0><tbody>)
+    end
+    alias_method :table_html_open, :table_opening_html
+    
+    # Renders close of form table.
+    def table_closing_html
+      '</tbody></table>'
+    end
+    alias_method :table_html_close, :table_closing_html
+    
+    def table_html
+      [
+        table_opening_html,
+        required_legend_html,
+        sections_html,
+        submit_html,
+        table_closing_html
+      ].flatten.join
+    end
+    
+    def style_html
       styles = []
-      styles.push( <<-EOT
+      styles << <<-EOT
 table.kiss_form {
   border: 0;
   border-collapse: collapse;
@@ -610,10 +712,9 @@ table.kiss_form_column > tbody > tr > td {
   text-align: center;
 }
 EOT
-      )
       
       if @_error_class == 'kiss_form_error_message'
-        styles.push( <<-EOT
+        styles << <<-EOT
 .kiss_form_error_message {
   padding: 1px 4px;
   border: 1px solid #db4;
@@ -643,91 +744,47 @@ tr.kiss_form_error_row .kiss_form_error_message {
   margin-bottom: 0;
 }
 EOT
-        )
       end
-      style_tag = styles.size == 0 ? '' : "<style>" + styles.join('') + "</style>"
+      styles.empty? ? '' : ["<style>", styles, "</style>"].flatten.join
+    end
+    
+    # Renders beginning of form (form open tag and form/field/error styles).
+    def opening_html
+      @_error_class ||= 'kiss_form_error_message'
+      @_field_error_class ||= @_error_class
+      
+      # form tag
+      form_attrs = ['id', 'method', 'enctype', 'class', 'style'].map do |attr|
+        next if (value = send attr).blank?
+        "#{attr}=\"#{send attr}\""
+      end
+      if @_html
+        @_html.each_pair do |k, v|
+          form_attrs.push("#{k}=\"#{v}\"")
+        end
+      end
+      form_tag = %Q(<form action="#{@_action}" #{form_attrs.join(' ')}>#{form_name_hidden_tag_html})
       
       # combine
-      return %Q(#{@_prepend_html}#{form_tag}#{style_tag}<div class="kiss_form">#{errors_html})
+      [
+        style_html,
+        @_prepend_html,
+        form_tag,
+        '<div class="kiss_form">',
+        errors_html
+      ].join
     end
+    alias_method :html_open, :opening_html
     
     # Renders end of form (form close tag).
-    def html_close
-      "</div></form>#{@_append_html}"
-    end
-    
-    # Renders HTML for form sections.
-    def sections_html
-      sections.map do |section|
-        section.html
-      end.join
-    end
-    
-    # Renders HTML for form fields.
-    def components_html
-      @_components.map do |component|
-        component_html(component)
-      end.join
-    end
-    alias_method :fields_html, :components_html
-    
-    # Renders open of form table.
-    def table_html_open
-      %Q(<table class="kiss_form" border=0 cellspacing=0><tbody>)
-    end
-    
-    def required_legend_html
-      (@_has_required_fields && @_mark_required) ?
-        %Q( <tr><td class="kiss_form_help">Required fields marked by <span class="kiss_form_required">*</span></td></tr> ) : ''
-    end
-    
-    # Renders close of form table.
-    def table_html_close
-      '</tbody></table>'
-    end
-    
-    # Renders form submit buttons.
-    def submit_html
-      @_submit ? %Q(<tr class="kiss_form_submit"><td>#{@_submit.element_html}</td></tr>) : ''
+    def closing_html
+      '</div></form>' + @_append_html
     end
+    alias_method :html_close, :closing_html
     
     # Renders complete form HTML.
     def html
-      return [
-        html_open,
-        table_html_open,
-        required_legend_html,
-        sections_html,
-        submit_html,
-        table_html_close,
-        html_close
-      ].flatten.join
+      [opening_html, table_html, closing_html].join
     end
-    
-    # Renders HTML for specified form field.
-    def component_html(field)
-      field = fields[field.to_s] if (field.is_a?(Symbol) || field.is_a?(String))
-      return field.element_html if field.is_a?(HiddenField)
-      
-      type = field.class.type
-      prompt = field.prompt
-      label = field.label
-      errors = field.errors_html
-      required = field.required ? %Q(<span class="kiss_form_required">#{@_mark_required}</span> ) : ''
-      
-      ([
-    	  prompt ? %Q(<tr class="kiss_form_prompt"><td class="kiss_form_label">#{required}</td><td>#{prompt.to_s}</td></tr>) : '',
-    	  
-        %Q(<tr class="kiss_form_#{type}"><td class="kiss_form_label#{errors ? ' error' : ''}">),
-        !prompt ? (required + (label.blank? ? '' : label.to_s + ':' )) : '',
-    	  %Q(</td><td class="kiss_form_#{type}">),
-    		field.element_html, "</td></tr>"
-    	] + (errors ? [
-    	  '<tr class="kiss_form_error_row"><td class="kiss_form_required"></td><td>',
-    	  errors,
-    	  '</td></tr>'
-    	] : [])).join
-    end
-    alias_method :field_html, :component_html
   end
 end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 1
   - 8
-  - 2
-  version: 1.8.2
+  - 3
+  version: 1.8.3
 platform: ruby
 authors: 
 - Shawn Van Ittersum
@@ -82,7 +82,7 @@ dependencies:
   type: :runtime
   version_requirements: *id005
 description: 
-email: shawn @nospam@ multiwidget.com
+email: shawn @nospam@ appjudo.com
 executables: 
 - kiss
 extensions: []