aurita-gui 0.5.0 → 0.5.9

data/Manifest.txt

@@ -0,0 +1,55 @@
+./README.txt
+./Manifest.txt
+./spec
+./spec/html.rb
+./spec/form.rb
+./spec/element.rb
+./spec/options.rb
+./spec/fieldset.rb
+./spec/javascript.rb
+./spec/marshal.rb
+./spec/selection_list.rb
+./spec/init_code.rb
+./spec/table.rb
+./TODO
+./samples
+./samples/putstest.rb
+./samples/recurse.rb
+./samples/cheatsheet.rb
+./samples/valuetest.rb
+./samples/pushtest.rb
+./aurita-gui.gemspec
+./lib
+./lib/aurita-gui.rb
+./lib/aurita-gui
+./lib/aurita-gui/element_fixed.rb
+./lib/aurita-gui/html.rb
+./lib/aurita-gui/form.rb
+./lib/aurita-gui/widget.rb
+./lib/aurita-gui/button.rb
+./lib/aurita-gui/element.rb
+./lib/aurita-gui/form
+./lib/aurita-gui/form/datetime_field.rb
+./lib/aurita-gui/form/input_field.rb
+./lib/aurita-gui/form/radio_field.rb
+./lib/aurita-gui/form/checkbox_field.rb
+./lib/aurita-gui/form/time_field.rb
+./lib/aurita-gui/form/date_field.rb
+./lib/aurita-gui/form/form_field.rb
+./lib/aurita-gui/form/options_field.rb
+./lib/aurita-gui/form/password_field.rb
+./lib/aurita-gui/form/text_field.rb
+./lib/aurita-gui/form/textarea_field.rb
+./lib/aurita-gui/form/select_field.rb
+./lib/aurita-gui/form/file_field.rb
+./lib/aurita-gui/form/hidden_field.rb
+./lib/aurita-gui/form/template_helper.rb
+./lib/aurita-gui/form/boolean_field.rb
+./lib/aurita-gui/form/form_error.rb
+./lib/aurita-gui/form/fieldset.rb
+./lib/aurita-gui/form/selection_list.rb
+./lib/aurita-gui/javascript.rb
+./lib/aurita-gui/marshal.rb
+./lib/aurita-gui/table.rb
+./bin
+./LICENSE

data/aurita-gui.gemspec

@@ -14,19 +14,69 @@ as stand-alone library in any context (such as rails).
 As there seems to be a lack of ruby form generators, i decided to release this 
 part of Aurita in a single gem with no dependencies on aurita itself. 
   EOF
-  s.version = '0.5.0'
+  s.version = '0.5.9'
   s.author = 'Tobias Fuchs'
   s.email = 'fuchs@wortundform.de'
   s.date = Time.now
   s.files = '*.rb'
   s.add_dependency('arrayfields', '>= 4.6.0')
-  s.files = FileList['*', 
-                     'lib/*', 
-                     'lib/aurita-gui/*', 
-                     'lib/aurita-gui/form/*', 
-                     'bin/*', 
-                     'samples/*',
-                     'spec/*'].to_a
+  s.files = [ 
+    './README.txt', 
+    './Manifest.txt', 
+    './spec', 
+    './spec/html.rb', 
+    './spec/form.rb', 
+    './spec/element.rb', 
+    './spec/options.rb', 
+    './spec/fieldset.rb', 
+    './spec/javascript.rb', 
+    './spec/marshal.rb', 
+    './spec/selection_list.rb', 
+    './spec/init_code.rb', 
+    './spec/table.rb', 
+    './TODO', 
+    './samples', 
+    './samples/putstest.rb', 
+    './samples/recurse.rb', 
+    './samples/cheatsheet.rb', 
+    './samples/valuetest.rb', 
+    './samples/pushtest.rb', 
+    './aurita-gui.gemspec', 
+    './lib', 
+    './lib/aurita-gui.rb', 
+    './lib/aurita-gui', 
+    './lib/aurita-gui/element_fixed.rb', 
+    './lib/aurita-gui/html.rb', 
+    './lib/aurita-gui/form.rb', 
+    './lib/aurita-gui/widget.rb', 
+    './lib/aurita-gui/button.rb', 
+    './lib/aurita-gui/element.rb', 
+    './lib/aurita-gui/form', 
+    './lib/aurita-gui/form/datetime_field.rb', 
+    './lib/aurita-gui/form/input_field.rb', 
+    './lib/aurita-gui/form/radio_field.rb', 
+    './lib/aurita-gui/form/checkbox_field.rb', 
+    './lib/aurita-gui/form/time_field.rb', 
+    './lib/aurita-gui/form/date_field.rb', 
+    './lib/aurita-gui/form/form_field.rb', 
+    './lib/aurita-gui/form/options_field.rb', 
+    './lib/aurita-gui/form/password_field.rb', 
+    './lib/aurita-gui/form/text_field.rb', 
+    './lib/aurita-gui/form/textarea_field.rb', 
+    './lib/aurita-gui/form/select_field.rb', 
+    './lib/aurita-gui/form/file_field.rb', 
+    './lib/aurita-gui/form/hidden_field.rb', 
+    './lib/aurita-gui/form/template_helper.rb', 
+    './lib/aurita-gui/form/boolean_field.rb', 
+    './lib/aurita-gui/form/form_error.rb', 
+    './lib/aurita-gui/form/fieldset.rb', 
+    './lib/aurita-gui/form/selection_list.rb', 
+    './lib/aurita-gui/javascript.rb', 
+    './lib/aurita-gui/marshal.rb', 
+    './lib/aurita-gui/table.rb', 
+    './bin', 
+    './LICENSE' 
+  ]
 
   s.has_rdoc = true
   s.rdoc_options << '--title' << 'Aurita::GUI' <<

data/lib/aurita-gui/element.rb

@@ -203,7 +203,7 @@ module GUI
         @content = params[:content] unless @content
       end
 # DON'T EVER USE @content.string UNLESS FOR RENDERING!!
-#     @content   = nil if @content.to_s.length == 0
+#     @content   = nil if @content.to_s.length == 0    # <--- NOOOOooo!
 # instead, do: 
       @content   = nil if !@content.is_a?(Element) && ((@content.respond_to?(:length) && @content.length == 0))
       @content   = [ @content ] unless (@content.kind_of? Array or @content.nil?)
@@ -222,6 +222,10 @@ module GUI
       super(@content)
     end
 
+    def inspect
+      "#{self.class.to_s}: <#{@tag}>, #{@attrib.inspect} { #{@content.inspect} }"
+    end
+
     # To definitely tell if a class is 
     # anyhow derived from Element, use 
     # 
@@ -241,7 +245,8 @@ module GUI
     def touch
       @touched = true
       @string  = nil
-      @parent.touch() if @parent
+      # Don't re-touch! Parent could have been caller!
+      @parent.touch() if (@parent && !@parent.touched?) 
     end
     alias touch! touch
     def touched? 

data/lib/aurita-gui/form.rb

@@ -42,7 +42,7 @@ module GUI
   # To use your own implementation as defaut, overload Form.initialize 
   # like
   #
-  #   class My_Form < Aurita::GUI::Form
+  #   class My_Form < Aurita::GUI::For
   #     def initialize(params={}, &block)
   #       super(params, &block)
   #       @field_decorator = My_Field_Decorator
@@ -313,7 +313,29 @@ module GUI
   #
   class Form < Element
 
-    attr_accessor :fields, :elements, :element_map, :values, :field_decorator, :content_decorator
+    # Array of form field names ordered by appearance in the form. 
+    # It is used to determine which fields to render, and in which 
+    # order. 
+    attr_accessor :fields
+    
+    # Array of Form_Field instances includes in this form. 
+    attr_accessor :elements
+    
+    # Hash mapping field names to Form_Field instances. 
+    attr_accessor :element_map
+    
+    # Hash mapping form field names to their values. 
+    attr_accessor :values 
+    
+    # Field decorator class to use for decorating single fields. 
+    attr_accessor :field_decorator 
+    
+    # Decorator class to use for decorating the form content. 
+    attr_accessor :content_decorator
+
+    # Array of fieldsets in this form, ordered by appearance in 
+    # the form. 
+    attr_reader :fieldsets
   
     def initialize(params={}, &block)
       @fields        = params[:fields]
@@ -321,6 +343,7 @@ module GUI
       @fields      ||= []
       @elements      = []
       @element_map   = {}
+      @fieldsets     = {}
       @values      ||= {}
       @title         = false
       @custom_fields = false
@@ -351,6 +374,7 @@ module GUI
     # parameter is of type Numeric, by name otherwhise)
     def [](index)
       return @elements[index] if index.kind_of? Numeric
+      return @element_map[index] if @element_map[index] 
       return @element_map[index.to_s] 
     end
 
@@ -391,13 +415,21 @@ module GUI
     # with same field name. 
     def add(form_field_element)
       touch()
-      field_name = form_field_element.name.to_s
-      form_field_element.value = @values[field_name] unless form_field_element.value.to_s != ''
-      if !form_field_element.dom_id then
-        form_field_element.dom_id = field_name.gsub('.','_')
+      if form_field_element.is_a?(Fieldset) then
+        form_field_element.field_decorator   = @field_decorator
+        form_field_element.content_decorator = @content_decorator
+        @element_map.update(form_field_element.element_map)
+        @elements  << form_field_element
+        @fieldsets[form_field_element.name.to_s] = form_field_element
+      else
+        field_name = form_field_element.name.to_s
+        form_field_element.value = @values[field_name] unless form_field_element.value.to_s != ''
+        if !form_field_element.dom_id then
+          form_field_element.dom_id = field_name.gsub('.','_')
+        end
+        @element_map[field_name] = form_field_element
+        @elements << form_field_element
       end
-      @element_map[field_name] = form_field_element
-      @elements << form_field_element
       @content = false # Invalidate
     end
 
@@ -413,10 +445,50 @@ module GUI
     def fields=(attrib_array)
       touch()
       @custom_fields = true
-      @fields = attrib_array.flatten.collect { |fieldname| fieldname.to_s }
+      @fields = attrib_array.map { |field| 
+        (field.is_a?(Hash))? field : field.to_s 
+      }
+      attrib_array.each { |attrib|
+        if attrib.is_a?(Hash) then
+          attrib.each_pair { |fieldset_name, fieldset_fields|
+            legend = false
+            if fieldset_fields.is_a?(Hash) then
+              legend = fieldset_fields[:legend]
+              fieldset_fields = fieldset_fields[:fields]
+            end
+            # This is a configuration for a fieldset. 
+            # There are two cases: 
+            fieldset = @fieldsets[fieldset_name.to_s]
+            if fieldset then 
+              # - The fieldset already has been added to this form. 
+              #   In this case, just pass field settings along to 
+              #   the fieldset. 
+              fieldset.fields = fieldset_fields
+            else
+              # - There is no fieldset with given name in this form. 
+              #   In this case, we expect that at least the given 
+              #   form fields are present in this form, and we 
+              #   implicitly create a Fieldset instance here. 
+              fieldset = Fieldset.new(:name => fieldset_name, :legend => legend)
+              fieldset_fields.each { |field|
+                existing_field = @element_map[field.to_s]
+                fieldset.add(existing_field) if existing_field
+              }
+              fieldset.fields = fieldset_fields
+              add(fieldset)
+            end
+          }
+        end
+      }
       @elements.each { |field|
-        @element_map[field.name.to_s] = field
+        if field.is_a?(Form_Field) then
+          # Update element map only if referenced eleemnt is a 
+          # Form_Field, do not include Fieldset elements. 
+          @element_map[field.name.to_s] = field 
+        elsif field.is_a?(Fieldset) then
+        end
       }
+      @content = false # Invalidate
     end
     alias set_field_config fields=
 
@@ -436,21 +508,18 @@ module GUI
     end
     alias set_values values=
 
-    # Set all elements to readonly rendering mode. 
-    def readonly!
-      touch()
-      @elements.each { |e|
-        e.readonly!
-      }
-    end
-
     # Return array of field names currently 
     # available for rendering. 
     def fields()
       if !@custom_fields || @fields.length == 0 then
         @elements.each { |field|
-          @fields << field.name.to_s
-          @element_map[field.name.to_s] = field
+          if field.is_a?(Form_Field) then
+            @fields << field.name
+            @element_map[field.name.to_s] = field
+          elsif field.is_a?(Fieldset) then
+            @fields << { field.name => field.fields }
+            @element_map.update(field.element_map)
+          end
         }
       end
       @fields.uniq!
@@ -475,19 +544,26 @@ module GUI
     # Return underlying HTML element instance (HTML.ul), 
     # without wrapping HTML.form element. 
     def content
-      # TODO: Provide Fieldset instances
       @content = []
       if @title then
         @content << HTML.h1(:class => :form_title) { @title }
       end
       fields().each { |field|
-        element = @element_map[field.to_s]
-        if element then
-           element = element.to_hidden_field() if element.hidden?
-          if element.kind_of? Aurita::GUI::Hidden_Field then
-            @content << element
-          else
-            @content << @field_decorator.new(element)
+        if field.is_a?(Hash) then
+          # This is a fieldset
+          field.each_pair { |fieldset_name, fieldset_fields|
+            # Get Fieldset instance by name from @element_map: 
+            @content << HTML.li { @fieldsets[fieldset_name.to_s] }
+          }
+        else 
+          element = @element_map[field.to_s]
+          if element then
+             element = element.to_hidden_field() if element.hidden?
+            if element.kind_of? Aurita::GUI::Hidden_Field then
+              @content << element
+            else
+              @content << @field_decorator.new(element)
+            end
           end
         end
       }

data/lib/aurita-gui/form/fieldset.rb

@@ -5,24 +5,45 @@ module Aurita
 module GUI
 
   class Fieldset < Element
-    attr_accessor :legend, :label, :name
+    attr_accessor :legend
+    
+    attr_accessor :label 
+    
+    attr_accessor :name 
+    
+    attr_accessor :element_map
+    
+    attr_accessor :elements
+    
+    attr_accessor :field_decorator 
+    
+    attr_accessor :content_dacorator
 
     def initialize(params, &block)
-      params[:tag] = :fieldset
-      @name = params[:name]
-      @elements = []
+      params[:tag]       = :fieldset
+      params[:id]        = params[:name] unless params[:id]
+      @name              = params[:name]
+      @fields            = []
+      @elements          = []
+      @element_map       = {}
+      @field_decorator   = Aurita::GUI::Form_Field_Wrapper
+      @content_decorator = Aurita::GUI::Form_Content_Wrapper
+
       if block_given? then
         yield.each { |field_element|
           add(field_element)
         }
       end
+
       legend_element   = params[:legend]
       legend_element ||= params[:label]
-      set_legend(legend_element)
+      set_legend(legend_element) if legend_element
       params.delete(:legend)
       params.delete(:label)
       params.delete(:name)
       super(params, &block)
+
+      @content = false
     end
     alias legend label
 
@@ -36,19 +57,73 @@ module GUI
     alias set_legend legend=
     alias label= legend=
 
+    def each(&block)
+      @elements.each(&block)
+    end
+
     def add(field_element)
       @elements << field_element
+      @element_map[field_element.name.to_s] = field_element
+      @fields   << field_element.name
+
+      touch()
+    end
+
+    def fields=(attrib_array)
+      @fields = attrib_array.map { |f| f.to_s }
+      touch()
+    end
+
+    def fields
+      @fields
+    end
+    
+    # Set all elements to readonly rendering mode. 
+    def readonly!
+      @elements.each { |e|
+        e.readonly!
+      }
+      touch()
+    end
+    # Set all form elements to editable mode. 
+    def editable! 
+      @elements.each { |e|
+        e.editable! 
+      }
+      touch()
+    end
+
+    def length
+      @elements.length
     end
 
     def content
+      return @content if (@content && !@touched)
+
+      @content = fields().map { |field|
+        element = @element_map[field.to_s]
+        STDERR.puts "What the? #{field.inspect}" unless element
+        @field_decorator.new(element) if element
+      }
+
+      @content = @content_decorator.new() { @content } 
+      @content.add_css_class(:fieldset)
+
       if @legend then
-        @content = [ @legend, @elements ]
+        @content = HTML.fieldset { @legend + @content }
       else 
-        @content = @elements
+        @content = HTML.fieldset { @content} 
       end
+
       return @content
     end
 
+    def string
+      content().to_s
+    end
+    alias to_s string
+    alias to_str string
+
   end
   
 end

data/lib/aurita-gui/form/form_field.rb

@@ -131,13 +131,6 @@ module GUI
       super(params)
     end
 
-=begin
-    def form=(form_instance)
-      @form = form_instance
-      @params[:parent] = @form
-    end
-=end
-
     # Virtual method. 
     def element
       raise Form_Error.new('Form_Field@element not set') unless @element

data/lib/aurita-gui/form/time_field.rb

@@ -44,6 +44,7 @@ module GUI
                                            :class => :minute_select, 
                                            :value => @minute, :options => options)
       end
+      @minute_element
     end
     def second_element
       if !@second_element then
@@ -58,7 +59,7 @@ module GUI
 
     def element
       select_fields = []
-      @time_format.scan(/./).each { |c|
+      @time_format.to_s.split('').each { |c|
         case c
         when 'h' then
           select_fields << hour_element() 

data/lib/aurita-gui/table.rb

@@ -53,8 +53,8 @@ module GUI
       @column_css_classes   = params[:column_css_classes]
       @column_css_classes ||= []
       @column_css_classes   = [ @column_css_classes ] unless @column_css_classes.is_a?(Array)
-      params[:cellpadding] = 0 unless params[:cellpadding]
-      params[:cellspacing] = 0 unless params[:cellspacing]
+      params[:cellpadding]  = 0 unless params[:cellpadding]
+      params[:cellspacing]  = 0 unless params[:cellspacing]
       params.delete(:headers)
       params.delete(:num_columns)
       params.delete(:row_css_classes)
@@ -63,8 +63,9 @@ module GUI
       super(params, &block)
     end
 
-    def headers=(headers)
+    def headers=(*headers)
       @headers = headers
+      @headers = headers.first if headers.is_a?(Array)
       if @headers.length > 0 then
         @headers.map! { |cell| 
           if cell.is_a? Element then 
@@ -77,6 +78,13 @@ module GUI
     end
     alias set_headers headers=
 
+    def column_css_classes=(*classes)
+      @column_css_classes = classes
+      @column_css_classes.flatten! 
+   #  touch()
+    end
+    alias set_column_css_classes column_css_classes=
+
     def add_row(*row_data)
       if row_data.first.is_a?(Array) then
         row_data = row_data.first
@@ -114,13 +122,17 @@ module GUI
       }
     end
 
+    # Returns cell at given column and row (like x, y coordinates)
     def cell(column, row)
       rows[row][column]
     end
 
+    # Returns Table_Row instance at given row index in table. 
     def [](row_index)
       rows[row_index]
     end
+
+    # Sets Table_Row instance at given row index in table. 
     def []=(row_index, row_data)
       rows[row_index] = row_data
     end
@@ -169,7 +181,7 @@ module GUI
     end
 
     def string
-      if @touched then
+      if touched? then
         @cells = []
         @cell_data.each { |cell|
           @cells << @cell_class.new(cell, :parent => self, :column_index => column_index)
@@ -205,14 +217,14 @@ module GUI
   #
   #   cell = my_table[row][column]
   #   cell.content = 'New cell content'
-  #   cell.class = 'table_cell_css_class'
+  #   cell.class   = 'table_cell_css_class'
   #
   class Table_Cell < Element
 
     attr_accessor :value, :presentation_class, :parent
 
     def initialize(cell_element, params={})
-      params[:tag]        = :td
+      params[:tag]          = :td
       @content            ||= cell_element
       @value              ||= cell_element
       @presentation_class ||= false

data/lib/aurita-gui/widget.rb

@@ -5,6 +5,46 @@ require('aurita-gui/element')
 module Aurita
 module GUI
 
+  # Widget is a proxy / factory for an actual Aurita::GUI::Element. 
+  # Method #element has to be overloaded that defines the Element 
+  # instance the class is delegating to. 
+  #
+  # A simple widget could look like this: 
+  #
+  #    class Annotated_Image < Aurita::GUI::Widget
+  #
+  #      attr_accessor :src, :title, :description
+  #
+  #      def initialize(params={})
+  #         @src         = params[:src]
+  #         @title       = params[:title]
+  #         @description = params[:description]
+  #      end
+  #
+  #      def element
+  #         HTML.div.annotated_image {
+  #           HTML.img(:src => @src, :title => @title, :alt => @title) + 
+  #           HTML.p { @description }
+  #         }
+  #      end
+  #
+  #    end # class
+  #
+  # It then can be used like a regular Element instance: 
+  #
+  #    image = Annotated_Image.new(:src         => '/images/wombat.jpg', 
+  #                                :title       => 'wombat', 
+  #                                :description => 'A cute wombat')
+  #    image.add_css_class(:active)
+  #    puts image.string
+  #    
+  #    -->
+  #
+  #    <div class="annotated_image active">
+  #      <img src="/images/wombat.jpg" title="wombat" alt="wombat" />
+  #      <p>A cute wombat</p>
+  #    </div>
+  #
   class Widget < DelegateClass(Element)
   include Aurita::GUI
 

data/spec/fieldset.rb

@@ -0,0 +1,127 @@
+
+require('rubygems')
+require('aurita-gui/form')
+
+include Aurita::GUI
+
+describe Aurita::GUI::Form, "basic rendering" do
+  before do
+    @form = Form.new()
+    @first_input_field  = Input_Field.new(:name => :first_input_field, :value => 42) 
+    @second_input_field = Input_Field.new(:name => :second_input_field) 
+    @fieldset = Fieldset.new(:legend => 'First fieldset', :name => :the_fieldset) { 
+      @first_input_field + @second_input_field
+    }
+    @third_input_field = Input_Field.new(:name => :third_input_field) 
+  end
+
+  it "should provide method #add to add form fields" do
+    @form.add(@third_input_field)
+    @form.add(@fieldset)
+
+    @form.elements.length.should == 2
+
+    @form[:first_input_field].value.should == 42
+    @form[:second_input_field].value = 23
+    @form[:second_input_field].value.should == 23
+  end
+
+  it "should allow access to form fields by index" do
+    @form.add(@fieldset)
+    @form.add(@third_input_field)
+    @form.elements[0].should == @fieldset
+    @form.elements[1].should == @third_input_field
+  end
+
+  it "should render as a <fieldset> element" do
+    @form.add(@fieldset)
+    @form.add(@third_input_field)
+
+    expected = <<END
+<form method="POST" enctype="multipart/form-data">
+  <ul class="form_fields">
+    <li>
+      <fieldset>
+        <legend>First fieldset</legend>
+        <ul class="form_fields fieldset">
+          <li class="input_field_wrap form_field" id="first_input_field_wrap">
+            <input type="text" value="42" name="first_input_field" id="first_input_field" />
+          </li>
+
+          <li class="input_field_wrap form_field" id="second_input_field_wrap">
+            <input type="text" name="second_input_field" id="second_input_field" />
+          </li>
+        </ul>
+      </fieldset>
+
+    </li>
+
+    <li class="input_field_wrap form_field" id="third_input_field_wrap">
+      <input type="text" name="third_input_field" id="third_input_field" />
+    </li>
+  </ul>
+</form>
+END
+    @form.to_s.gsub("\n",'').gsub(/>\s*</,'><').should == expected.gsub("\n",'').gsub(/>\s*</,'><')
+  end
+
+  it "should allow applying field settings to a form's fieldsets" do
+    form = Form.new()
+
+    first  = Text_Field.new(:name => :first,  :value => 1)
+    second = Text_Field.new(:name => :second, :value => 2)
+    third  = Text_Field.new(:name => :third,  :value => 3)
+
+    form.add(first)
+    form.add(second)
+    form.add(third)
+
+    form.fields = [ { :the_legend => [ :first, :third ] }, :second ]
+
+    expected = <<END
+<form method="POST" enctype="multipart/form-data">
+  <ul class="form_fields">
+    <li>
+      <fieldset>
+        <ul class="form_fields fieldset">
+          <li class="text_field_wrap form_field" id="first_wrap">
+            <input type="text" value="1" name="first" id="first" />
+          </li>
+          <li class="text_field_wrap form_field" id="third_wrap">
+            <input type="text" value="3" name="third" id="third" />
+          </li>
+        </ul>
+      </fieldset>
+    </li>
+    <li class="text_field_wrap form_field" id="second_wrap">
+      <input type="text" value="2" name="second" id="second" />
+    </li>
+  </ul>
+</form>
+END
+
+    form.to_s.gsub("\n",'').gsub(/>\s*</,'><').should == expected.gsub("\n",'').gsub(/>\s*</,'><')
+
+    form.fields = [ { :the_legend => [ :third ] }, :second ]
+    expected = <<END
+<form method="POST" enctype="multipart/form-data">
+  <ul class="form_fields">
+    <li>
+      <fieldset>
+        <ul class="form_fields fieldset">
+          <li class="text_field_wrap form_field" id="third_wrap">
+            <input type="text" value="3" name="third" id="third" />
+          </li>
+        </ul>
+      </fieldset>
+    </li>
+    <li class="text_field_wrap form_field" id="second_wrap">
+      <input type="text" value="2" name="second" id="second" />
+    </li>
+  </ul>
+</form>
+END
+    form.to_s.gsub("\n",'').gsub(/>\s*</,'><').should == expected.gsub("\n",'').gsub(/>\s*</,'><')
+  end
+
+end

data/spec/form.rb

@@ -10,7 +10,7 @@ describe Aurita::GUI::Form, "basic rendering" do
     @text_field = Input_Field.new(:name => :textfield)
   end
 
-  it "should probvide method #add to add form fields" do
+  it "should provide method #add to add form fields" do
     @form.add(@text_field)
   end
 
@@ -25,4 +25,22 @@ describe Aurita::GUI::Form, "basic rendering" do
     @form.to_s.should == '<form method="POST" enctype="multipart/form-data"><ul class="form_fields"><li class="input_field_wrap form_field" id="textfield_wrap"><input type="text" name="textfield" id="textfield" /></li></ul></form>'
   end
 
+  it "should provide reordering of form fields" do
+    form     = Form.new
+
+    text_1   = Text_Field.new(:name => :first, :value => 1)
+    checkbox = Checkbox_Field.new(:name => :second, :options => { 'foo' => 1, 'bar' => 2 } )
+
+    form.add(text_1)
+    form.add(checkbox)
+
+    form.fields = [ 'first' ]
+
+    puts form.to_s.gsub('><', ">\n<")
+  end
+
+  it "should provide disabling form fields for rendering" do
+
+  end
+
 end

data/spec/table.rb

@@ -9,44 +9,44 @@ describe Aurita::GUI::Table, "basic rendering" do
   it "should provide headers" do
     table = Table.new(:headers => [ :username, :email, 'last login' ], 
                       :class => 'spectable')
-    table.to_s.should == '<table class="spectable"><tr><th>username</th><th>email</th><th>last login</th></tr></table>'
+    table.to_s.should == '<table cellpadding="0" cellspacing="0" class="spectable"><tr><th>username</th><th>email</th><th>last login</th></tr></table>'
   end
 
   it "should be possible to add rows" do
     table = Table.new(:headers => [ :username, :email, 'last login' ], 
                       :class => 'spectable')
     table.add_row('a','b','c')
-    table.to_s.should == '<table class="spectable"><tr><th>username</th><th>email</th><th>last login</th></tr><tr><td>a</td><td>b</td><td>c</td></tr></table>'
+    table.to_s.should == '<table cellpadding="0" cellspacing="0" class="spectable"><tr><th>username</th><th>email</th><th>last login</th></tr><tr><td>a</td><td>b</td><td>c</td></tr></table>'
   end
 
   it "should be possible to change cell values" do
     table = Table.new(:class => 'spectable')
     table.add_row('a','b','c')
     table[0][1] = 'changed'
-    table.to_s.should == '<table class="spectable"><tr><td>a</td><td>changed</td><td>c</td></tr></table>'
+    table.to_s.should == '<table cellpadding="0" cellspacing="0" class="spectable"><tr><td>a</td><td>changed</td><td>c</td></tr></table>'
   end
 
   it "should be possible to modify Table_Cell elements" do
     table = Table.new(:column_css_classes => [ :c1, :c2, :c3 ] )
     table.add_row('a','b','c')
-    table.to_s.should == '<table><tr><td class="c1">a</td><td class="c2">b</td><td class="c3">c</td></tr></table>'
+    table.to_s.should == '<table cellpadding="0" cellspacing="0"><tr><td class="c1">a</td><td class="c2">b</td><td class="c3">c</td></tr></table>'
     table.add_row('a','b','c')
     table[0].add_css_class(:gnarg)
     table[0][1].add_css_class(:knorg)
-    table.to_s.should == '<table><tr class="gnarg"><td class="c1">a</td><td class="c2 knorg">b</td><td class="c3">c</td></tr><tr><td class="c1">a</td><td class="c2">b</td><td class="c3">c</td></tr></table>'
+    table.to_s.should == '<table cellpadding="0" cellspacing="0"><tr class="gnarg"><td class="c1">a</td><td class="c2 knorg">b</td><td class="c3">c</td></tr><tr><td class="c1">a</td><td class="c2">b</td><td class="c3">c</td></tr></table>'
   end
 
   it "should be possible to set CSS classes for columns" do
     table = Table.new(:class => 'spectable', :column_css_classes => [ :c1, :c2, :c3 ] )
     table.add_row('a','b','c')
-    table.to_s.should == '<table class="spectable"><tr><td class="c1">a</td><td class="c2">b</td><td class="c3">c</td></tr></table>'
+    table.to_s.should == '<table cellpadding="0" cellspacing="0" class="spectable"><tr><td class="c1">a</td><td class="c2">b</td><td class="c3">c</td></tr></table>'
   end
 
   it "should be possible to set CSS classes for rows" do
     table = Table.new(:class => 'spectable', :row_css_classes => :trow )
     table.add_row('a','b','c')
     table.add_row('a','b','c')
-    table.to_s.should == '<table class="spectable"><tr class="trow"><td>a</td><td>b</td><td>c</td></tr><tr class="trow"><td>a</td><td>b</td><td>c</td></tr></table>'
+    table.to_s.should == '<table cellpadding="0" cellspacing="0" class="spectable"><tr class="trow"><td>a</td><td>b</td><td>c</td></tr><tr class="trow"><td>a</td><td>b</td><td>c</td></tr></table>'
   end
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: aurita-gui
 version: !ruby/object:Gem::Version 
-  version: 0.5.0
+  version: 0.5.9
 platform: ruby
 authors: 
 - Tobias Fuchs
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-08-23 00:00:00 +02:00
+date: 2009-08-31 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -31,60 +31,61 @@ extensions: []
 extra_rdoc_files: []
 
 files: 
-- test
-- README.txt
-- spec
-- TODO
-- samples
-- aurita-gui.gemspec
-- lib
-- bin
-- LICENSE
-- lib/aurita-gui.rb
-- lib/aurita-gui
-- lib/aurita-gui/element_fixed.rb
-- lib/aurita-gui/html.rb
-- lib/aurita-gui/form.rb
-- lib/aurita-gui/widget.rb
-- lib/aurita-gui/button.rb
-- lib/aurita-gui/element.rb
-- lib/aurita-gui/form
-- lib/aurita-gui/javascript.rb
-- lib/aurita-gui/marshal.rb
-- lib/aurita-gui/table.rb
-- lib/aurita-gui/form/datetime_field.rb
-- lib/aurita-gui/form/input_field.rb
-- lib/aurita-gui/form/radio_field.rb
-- lib/aurita-gui/form/checkbox_field.rb
-- lib/aurita-gui/form/time_field.rb
-- lib/aurita-gui/form/date_field.rb
-- lib/aurita-gui/form/form_field.rb
-- lib/aurita-gui/form/options_field.rb
-- lib/aurita-gui/form/password_field.rb
-- lib/aurita-gui/form/text_field.rb
-- lib/aurita-gui/form/textarea_field.rb
-- lib/aurita-gui/form/select_field.rb
-- lib/aurita-gui/form/file_field.rb
-- lib/aurita-gui/form/hidden_field.rb
-- lib/aurita-gui/form/template_helper.rb
-- lib/aurita-gui/form/boolean_field.rb
-- lib/aurita-gui/form/form_error.rb
-- lib/aurita-gui/form/fieldset.rb
-- lib/aurita-gui/form/selection_list.rb
-- samples/putstest.rb
-- samples/recurse.rb
-- samples/cheatsheet.rb
-- samples/valuetest.rb
-- samples/pushtest.rb
-- spec/html.rb
-- spec/form.rb
-- spec/element.rb
-- spec/options.rb
-- spec/javascript.rb
-- spec/marshal.rb
-- spec/selection_list.rb
-- spec/init_code.rb
-- spec/table.rb
+- ./README.txt
+- ./Manifest.txt
+- ./spec
+- ./spec/html.rb
+- ./spec/form.rb
+- ./spec/element.rb
+- ./spec/options.rb
+- ./spec/fieldset.rb
+- ./spec/javascript.rb
+- ./spec/marshal.rb
+- ./spec/selection_list.rb
+- ./spec/init_code.rb
+- ./spec/table.rb
+- ./TODO
+- ./samples
+- ./samples/putstest.rb
+- ./samples/recurse.rb
+- ./samples/cheatsheet.rb
+- ./samples/valuetest.rb
+- ./samples/pushtest.rb
+- ./aurita-gui.gemspec
+- ./lib
+- ./lib/aurita-gui.rb
+- ./lib/aurita-gui
+- ./lib/aurita-gui/element_fixed.rb
+- ./lib/aurita-gui/html.rb
+- ./lib/aurita-gui/form.rb
+- ./lib/aurita-gui/widget.rb
+- ./lib/aurita-gui/button.rb
+- ./lib/aurita-gui/element.rb
+- ./lib/aurita-gui/form
+- ./lib/aurita-gui/form/datetime_field.rb
+- ./lib/aurita-gui/form/input_field.rb
+- ./lib/aurita-gui/form/radio_field.rb
+- ./lib/aurita-gui/form/checkbox_field.rb
+- ./lib/aurita-gui/form/time_field.rb
+- ./lib/aurita-gui/form/date_field.rb
+- ./lib/aurita-gui/form/form_field.rb
+- ./lib/aurita-gui/form/options_field.rb
+- ./lib/aurita-gui/form/password_field.rb
+- ./lib/aurita-gui/form/text_field.rb
+- ./lib/aurita-gui/form/textarea_field.rb
+- ./lib/aurita-gui/form/select_field.rb
+- ./lib/aurita-gui/form/file_field.rb
+- ./lib/aurita-gui/form/hidden_field.rb
+- ./lib/aurita-gui/form/template_helper.rb
+- ./lib/aurita-gui/form/boolean_field.rb
+- ./lib/aurita-gui/form/form_error.rb
+- ./lib/aurita-gui/form/fieldset.rb
+- ./lib/aurita-gui/form/selection_list.rb
+- ./lib/aurita-gui/javascript.rb
+- ./lib/aurita-gui/marshal.rb
+- ./lib/aurita-gui/table.rb
+- ./bin
+- ./LICENSE
 has_rdoc: true
 homepage: http://aurita.wortundform.de/
 post_install_message: