kiss 1.7.4 → 1.8

data/lib/kiss/form.rb

@@ -36,29 +36,70 @@ end
 
 class Kiss
   class Form
+    class Column
+      _attr_accessor :form, :components
+      def initialize(form = nil)
+        @_form = form
+        @_components = []
+      end
+      
+      # Renders HTML for form fields.
+      def components_html
+        @_components.map do |component|
+          form.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_column" border=0 cellspacing=0><tbody>)
+      end
+    
+      # Renders close of form table.
+      def table_html_close
+        '</tbody></table>'
+      end
+      
+      def html
+        [
+          '<td class="kiss_form_column">',
+          table_html_open,
+          components_html,
+          table_html_close,
+          '</td>'
+        ].join
+      end
+    end
+    
+    class Section
+      _attr_accessor :form, :columns, :current_columns
+      def initialize(form = nil)
+        @_form = form
+        @_columns = [Column.new(form)]
+      end
+      
+      def html
+        [
+          '<tr><td>',
+          '<table class="kiss_form_section"><tbody><tr>',
+          columns.map {|column| column.html}.join,
+          '</tr></tbody></table>',
+          '</td></tr>',
+        ].join
+      end
+    end
+    
     _attr_accessor :fields, :params, :submitted, :has_field_errors, :has_required_fields,
-      :delegate, :controller, :components, :form, :new_object_index
+      :delegate, :controller, :components, :form, :new_object_index, :sections,
+      :current_section, :current_columns
     dsl_accessor :name, :url, :action, :method, :enctype, :errors, :cancel, :mark_required,
       :id, :class, :style, :html, :error_class, :field_error_class, :objects_save_order,
       :object, :prepend_html, :append_html, :year, :timezone
-    
-    @@component_types = {
-      :text => TextField,
-      :hidden => HiddenField,
-      :textarea => TextAreaField,
-      :password => PasswordField,
-      :boolean => BooleanField,
-      :file => FileField,
-      :select => SelectField,
-      :radio => RadioField,
-      :checkbox => CheckboxField,
-      :multiselect => MultiSelectField,
-      :submit => SubmitField
-    }
       
     # Create DSL methods for component types
     self.class_eval(
-      @@component_types.keys.map do |type|
+      COMPONENT_TYPES.keys.map do |type|
         "def #{type}(*args, &block); add_component(:#{type}, *args, &block); end; "
       end.join
     )
@@ -94,6 +135,10 @@ class Kiss
     
       @_method ||= 'post'
       
+      @_sections = [Section.new(self)]
+      @_current_section = @_sections.first
+      @_current_column = @_current_section.columns.first
+      
       @_components = []
       @_fields = Hashay.new
       @_object_fields = {}
@@ -136,6 +181,17 @@ class Kiss
       end
     end
     
+    def column_break
+      @_current_column = Column.new(self)
+      @_current_section.columns << @_current_column
+    end
+    
+    def section_break
+      @_current_section = Section.new(self)
+      @_current_column = @_current_section.columns.first
+      @_sections << @_current_section
+    end
+    
     # Creates and adds a field to the form, according to specified attributes.
     def add_field(attrs = {}, &block)
       attrs = @_with.merge(attrs) if @_with
@@ -145,12 +201,11 @@ class Kiss
       name = @_field_name_prefix + name unless @_field_name_prefix.empty?
       
       type = attrs[:type] ? attrs[:type].to_sym : :text
-      raise "invalid field type '#{type}'" unless @@component_types.has_key?(type)
+      raise "invalid field type '#{type}'" unless COMPONENT_TYPES.has_key?(type)
       
-      field = @@component_types[type].new(self, attrs.merge(
+      field = COMPONENT_TYPES[type].new(self, attrs.merge(
         :name => name,
-        :key => key,
-        :type => type
+        :key => key
       ), &block)
       
       field.object = @_object if @_object && !field.object
@@ -169,15 +224,9 @@ class Kiss
       
       @_fields[name] = field
       @_components << field
+      @_current_column.components << field
       
-      while true
-        other_field = field.other_field
-        break unless other_field
-        other_field.form = self
-        @_other_field = @_form.create_field( { :name => @_name + '.other' }.merge(@_other) )
-      end
-      
-      @_enctype = 'multipart/form-data' if field.type == :file
+      @_enctype = 'multipart/form-data' if field.is_a?(FileField)
       
       field
     end
@@ -197,7 +246,7 @@ class Kiss
         attrs.merge!(args.pop) if args.last.is_a?(Hash)
         attrs[:options] = args if args.size > 0
         attrs = @_with.merge(attrs) if @_with
-        @_submit = @@component_types[:submit].new(self, attrs, &block)
+        @_submit = COMPONENT_TYPES[:submit].new(self, attrs, &block)
       else
         @_submit
       end
@@ -221,8 +270,8 @@ class Kiss
     def values
       @_values ||= begin
         hash = {}
-        @_fields.each {|field| hash[field.name] = field.value }
-        hash['submit'] = @_submit.value = params[@_submit.name.to_s]
+        @_fields.each {|field| field.set_value_to_hash(hash) }
+        hash['submit'] = @_submit.value = params[@_submit.name]
         hash
       end
     end
@@ -320,22 +369,14 @@ class Kiss
     
     def set_object_data(obj = @_object)
       @_object_fields[obj.object_id].values.each do |field|
-    		# ignore fields whose name starts with underscore
+    		# skip fields whose name starts with underscore
         next if field.name =~ /\A\_/
-    		# don't save 'ignore' fields to the database
-        next if field.ignore || !field.save
-        # ignore file fields
-        next if field.type == :file
+    		# skip fields with save == false
+        next unless field.save
+        # skip file fields
+        next if field.is_a?(FileField)
         
-        key = field.key.to_sym
-        value = (field.value != nil || obj.class.db_schema[key].allow_null) ?
-          field.value : (obj.class.db_schema[key][:default] ||= field.format.default)
-        
-        if field.digest
-          value = Digest.const_get(field.digest.to_sym).hexdigest(value)
-        end
-        
-        obj[key] = value if field.save
+        field.set_value_to_object(obj)
       end
     end
     
@@ -413,12 +454,18 @@ class Kiss
       (@_errors.size > 0 || @_has_field_errors)
     end
     
+    # Returns true if user submitted form in this request.
+    def submitted?
+      @_submitted
+    end
+    
     # Returns true if user submitted form with non-cancel submit button
     # (non-nil submit param, not equal to cancel submit button value).
-    def accepted
+    def accepted?
       raise 'form missing submit field' unless @_submit
       return params[@_submit.name] != @_submit.cancel
     end
+    alias_method :accepted, :accepted?
     
     # Renders error HTML block for top of form, and returns as string.
     def errors_html
@@ -435,7 +482,7 @@ class Kiss
       @_errors.pop if @_has_field_errors
       
       plural = @_errors.size > 1 || @_has_field_errors ? 's' : nil
-      %Q(<table class="kiss_error"><tr><td>#{content}</td></tr></table>)
+      %Q(<table class="kiss_form_errors"><tr><td>#{content}</td></tr></table>)
     end
     
     # Renders current action using form's HTML as action render content.
@@ -468,93 +515,115 @@ class Kiss
       styles = []
       styles.push( <<-EOT
 table.kiss_form {
+  border: 0;
+  border-collapse: collapse;
+  margin-right: -12px;
+}
+table.kiss_form > tbody > tr > td {
+  padding: 0;
+}
+
+table.kiss_form_section {
+  border: 0;
+  border-collapse: collapse;
+}
+table.kiss_form_section > tbody > tr > td {
+  padding: 0 12px 0 0;
+}
+
+td.kiss_form_column {
+  vertical-align: top;
+}
+table.kiss_form_column {
   margin-bottom: 6px;
 }
-.kiss_form td {
-  padding: 2px 4px;
+table.kiss_form_column > tbody > tr > td {
+  padding: 2px 6px 2px 0;
   vertical-align: middle;
 }
-.kiss_form .kiss_error {
+.kiss_form_errors {
   margin-bottom: 4px;
 }
-.kiss_form .kiss_error td {
+.kiss_form_errors td {
   background-color: #ff8;
   padding: 2px 4px;
   line-height: 135%;
   color: #900;
-  border: 1px solid #ea4;
+  border: 1px solid #db4;
 }
-.kiss_form .kiss_error td ul {
+.kiss_form_errors td ul {
   padding-left: 16px;
   margin: 0;
 }
-.kiss_form .kiss_help {
-  padding: 0px 3px 0 6px;
+.kiss_form .kiss_form_help {
+  padding-bottom: 4px;
   font-size: 90%;
   color: #555;
 }
-.kiss_required {
+.kiss_form_required {
   color: #a21;
   font-size: 150%;
   line-height: 50%;
   position: relative;
   top: 4px;
 }
-.kiss_form td.kiss_label {
+.kiss_form_column td.kiss_form_label {
   text-align: right;
   white-space: nowrap;
 }
-.kiss_form td.kiss_label.error {
+.kiss_form_column td.kiss_form_label.error {
   color: #b10;
 }
-.kiss_form tr.kiss_prompt td {
+.kiss_form_column tr.kiss_form_prompt td {
   padding: 8px 3px 0px 4px;
 }
-.kiss_form tr.kiss_submit td.kiss_submit {
-  padding: 6px 3px;
-}
-.kiss_form input[type="text"],
-.kiss_form input[type=password],
-.kiss_form textarea {
+.kiss_form_column input[type="text"],
+.kiss_form_column input[type=password],
+.kiss_form_column textarea {
   width: 250px;
   margin-left: 0;
   margin-right: 0;
 }
-.kiss_form table.kiss_field_columns {
+.kiss_form_column table.kiss_form_field_columns {
   border-spacing: 0;
   border-collapse: collapse;
   width: 100%;
 }
-.kiss_form table.kiss_field_columns td {
+.kiss_form_column table.kiss_form_field_columns td {
   padding: 0 16px 2px 0;
   vertical-align: top;
 }
-.kiss_form .kiss_checkbox .kiss_label {
+.kiss_form_column .kiss_form_checkbox .kiss_form_label {
   vertical-align: top;
   padding-top: 3px;
 }
-.kiss_form .kiss_radio .kiss_label {
+.kiss_form_column .kiss_form_radio .kiss_form_label {
   vertical-align: top;
   padding-top: 4px;
 }
-.kiss_form .kiss_textarea .kiss_label {
+.kiss_form_column .kiss_form_textarea .kiss_form_label {
   vertical-align: top;
   padding-top: 3px;
 }
+.kiss_form tr.kiss_form_submit td {
+  padding: 0 6px 0 0;
+  text-align: center;
+}
 EOT
       )
-      styles.push( <<-EOT
+      
+      if @_error_class == 'kiss_form_error_message'
+        styles.push( <<-EOT
 .kiss_form_error_message {
   padding: 1px 4px;
-  border: 1px solid #edc;
-  border-top: 0;
-  border-bottom: 1px solid #db4;
+  border: 1px solid #db4;
   background-color: #ff8;
   color: #900;
   font-size: 90%;
   line-height: 135%;
   display: block;
   float: left;
+  width: 246px;
   margin-bottom: 2px;
 }
 .kiss_form_error_message div {
@@ -574,7 +643,8 @@ tr.kiss_form_error_row .kiss_form_error_message {
   margin-bottom: 0;
 }
 EOT
-      ) if @_error_class == 'kiss_form_error_message'
+        )
+      end
       style_tag = styles.size == 0 ? '' : "<style>" + styles.join('') + "</style>"
       
       # combine
@@ -586,7 +656,14 @@ EOT
       "</div></form>#{@_append_html}"
     end
     
-    # Renders form fields HTML.
+    # 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)
@@ -596,22 +673,22 @@ EOT
     
     # Renders open of form table.
     def table_html_open
-      %Q(<table class="kiss_form" border=0 cellspacing=0>)
+      %Q(<table class="kiss_form" border=0 cellspacing=0><tbody>)
     end
     
     def required_legend_html
       (@_has_required_fields && @_mark_required) ?
-        %Q( <tr><td></td><td class="kiss_help">Required fields marked by <span class="kiss_required">*</span></td></tr> ) : ''
+        %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
-      '</table>'
+      '</tbody></table>'
     end
     
     # Renders form submit buttons.
     def submit_html
-      @_submit ? field_html(@_submit) : ''
+      @_submit ? %Q(<tr class="kiss_form_submit"><td>#{@_submit.element_html}</td></tr>) : ''
     end
     
     # Renders complete form HTML.
@@ -620,7 +697,7 @@ EOT
         html_open,
         table_html_open,
         required_legend_html,
-        components_html,
+        sections_html,
         submit_html,
         table_html_close,
         html_close
@@ -630,23 +707,23 @@ EOT
     # 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.type == :hidden
+      return field.element_html if field.is_a?(HiddenField)
       
-      type = field.type
+      type = field.class.type
       prompt = field.prompt
       label = field.label
       errors = field.errors_html
-      required = field.required ? %Q(<span class="kiss_required">#{@_mark_required}</span> ) : ''
+      required = field.required ? %Q(<span class="kiss_form_required">#{@_mark_required}</span> ) : ''
       
       ([
-    	  prompt ? %Q(<tr class="kiss_prompt"><td class="kiss_label">#{required}</td><td>#{prompt.to_s}</td></tr>) : '',
+    	  prompt ? %Q(<tr class="kiss_form_prompt"><td class="kiss_form_label">#{required}</td><td>#{prompt.to_s}</td></tr>) : '',
     	  
-        %Q(<tr class="kiss_#{type}"><td class="kiss_label#{errors ? ' error' : ''}">),
+        %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_#{type}">),
+    	  %Q(</td><td class="kiss_form_#{type}">),
     		field.element_html, "</td></tr>"
     	] + (errors ? [
-    	  '<tr class="kiss_form_error_row"><td class="kiss_required"></td><td>',
+    	  '<tr class="kiss_form_error_row"><td class="kiss_form_required"></td><td>',
     	  errors,
     	  '</td></tr>'
     	] : [])).join

data/lib/kiss.rb

@@ -1,9 +1,9 @@
 # Kiss - A web application framework for Ruby
-# Copyright (C) 2005-2010 MultiWidget LLC.
+# Copyright (C) 2005-2012 AppJudo Inc.
 # See LICENSE for details.
 
-# Author::    Shawn Van Ittersum, MultiWidget LLC
-# Copyright:: Copyright (c) 2005-2010 MultiWidget LLC.
+# Author::    Shawn Van Ittersum, AppJudo Inc.
+# Copyright:: Copyright (c) 2005-2012 AppJudo Inc.
 # License::   MIT X11 License
 
 require 'rubygems'

metadata

@@ -4,9 +4,8 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 1
-  - 7
-  - 4
-  version: 1.7.4
+  - 8
+  version: "1.8"
 platform: ruby
 authors: 
 - Shawn Van Ittersum
@@ -14,7 +13,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-02-02 00:00:00 -08:00
+date: 2012-02-11 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -107,7 +106,6 @@ files:
 - lib/kiss/ext/sequel_database.rb
 - lib/kiss/ext/sequel_mysql_dataset.rb
 - lib/kiss/form/field.rb
-- lib/kiss/form/field_types.rb
 - lib/kiss/form.rb
 - lib/kiss/format.rb
 - lib/kiss/html/exception_report.css