aurita-gui 0.3.7 → 0.5.0

data/lib/aurita-gui/form.rb

@@ -390,6 +390,7 @@ module GUI
     # TODO: Should overwrite previous field element 
     # 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
@@ -410,6 +411,7 @@ module GUI
     #   form.fields = [ :name, :description, :date ]
     #
     def fields=(attrib_array)
+      touch()
       @custom_fields = true
       @fields = attrib_array.flatten.collect { |fieldname| fieldname.to_s }
       @elements.each { |field|
@@ -425,6 +427,7 @@ module GUI
     #   form.values = { :name => 'Foo', :description => 'Bar', :date => '20081012' }
     #
     def values=(value_hash={})
+      touch()
       @values = value_hash
       @values.each_pair { |field_name, value|
         element = @element_map[field_name.to_s]
@@ -435,6 +438,7 @@ module GUI
 
     # Set all elements to readonly rendering mode. 
     def readonly!
+      touch()
       @elements.each { |e|
         e.readonly!
       }

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

@@ -30,7 +30,10 @@ module GUI
     end
 
     def element
-      HTML.ul(:class => :checkbox_options) { 
+      element_attrib = @attrib.dup.update({ :class => :checkbox_options })
+      element_attrib.delete(:name)
+      element_attrib.delete(:value)
+      HTML.ul(element_attrib) { 
         option_elements().map { |o| HTML.li() { o } } 
       }
     end

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

@@ -172,7 +172,10 @@ module GUI
     end
 
     def options=(options)
-      if options.kind_of? Array then
+      if options.kind_of? ArrayFields then
+        @option_values = options.fields
+        @option_labels = options.values
+      elsif options.kind_of? Array then
         @option_values = options
         @option_labels = options
       elsif options.kind_of? Range then

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

@@ -102,7 +102,7 @@ module GUI
       params.delete(:select_field)
       params.delete(:selectable_options)
       super(params)
-      set_value(@value)
+      set_value(@value) 
       add_css_class(:selection_list_field)
     end
 
@@ -118,6 +118,7 @@ module GUI
 
     # Set list of active selection options as array. 
     def value=(value)
+      return unless value
       super(value)
       @selectable_options = []
       options().each_pair { |value, name|
@@ -130,12 +131,13 @@ module GUI
     # decorated by @option_field_decorator 
     # (see comments on Selection_List_Field). 
     def option_elements
-      id_prefix = "#{@attrib[:id]}_" if @attrib[:id]
+      base_id   = @attrib[:id]
+      base_id ||= @attrib[:name]
       elements = []
       options().each_pair { |opt_value, opt_label|
         selected = @value.map { |v| v.to_s }.include?(opt_value.to_s)
         if selected then
-          elements << HTML.li(:id => "#{id_prefix}#{@attrib[:name]}_#{opt_value}") { 
+          elements << HTML.li(:id => "#{base_id}_#{opt_value}") { 
             @option_field_decorator.new(:name   => @attrib[:name], 
                                         :value  => opt_value, 
                                         :label  => opt_label, 
@@ -150,31 +152,51 @@ module GUI
     # as select field element containing additionally 
     # available options. 
     def element
-      select_options = {}
+      select_options = []
+      select_option_ids = []
       @selectable_options.each { |v|
-        select_options[v] = @option_labels[v]
+        select_option_ids << v 
+        select_options << @option_labels[v]
       }
-      id_prefix = "#{@attrib[:id]}_" if @attrib[:id]
+      select_options.fields = select_option_ids 
+
+      base_id   = @attrib[:id]
+      base_id ||= @attrib[:name]
       
       if @value && @value.length > 0 then
         HTML.div(@attrib) { 
-          HTML.ul(:id => "#{id_prefix}#{@attrib[:name]}") { 
+          HTML.ul(:id => "#{base_id}_selected_options") { 
             option_elements()
           } + 
-          @select_field_class.new(:id      => "#{id_prefix}#{@attrib[:name]}_select", 
+          @select_field_class.new(:id      => "#{base_id}_select", 
                                   :options => select_options, 
+                                  :parent  => self, 
                                   :name    => "#{@attrib[:name]}" ) 
         }
       else
         HTML.div(@attrib) { 
-          HTML.ul(:id => "#{id_prefix}#{@attrib[:name]}", :force_closing_tag => true)  + 
-          @select_field_class.new(:id      => "#{id_prefix}#{@attrib[:name]}_select", 
+          HTML.ul(:id => "#{base_id}_selected_options", :force_closing_tag => true)  + 
+          @select_field_class.new(:id      => "#{base_id}_select", 
                                   :options => select_options, 
+                                  :parent  => self, 
                                   :name    => "#{@attrib[:name]}" ) 
         }
       end
     end
 
+    def readonly_element
+      base_id   = @attrib[:id]
+      base_id ||= @attrib[:name]
+      elements = HTML.ul.readonly_selection_list { } 
+      options().each_pair { |opt_value, opt_label|
+        selected = @value.map { |v| v.to_s }.include?(opt_value.to_s)
+        if selected then
+          elements << HTML.li(:id => "#{base_id}_#{opt_value}") { opt_label }
+        end
+      }
+      elements
+    end
+
   end
 
 end

data/lib/aurita-gui/javascript.rb

@@ -119,9 +119,9 @@ module GUI
       args_string = args.join(',') if args.size > 0
       meth = meth.to_s
       # Uppercase method => method call
-      meth << '(' << args_string.to_s << '); ' if meth[0] > 96
+      meth << '(' << args_string.to_s << '); ' if meth[0].to_i > 96
       # Uppercase method => Namespace
-      meth << '.' if meth[0] < 97
+      meth << '.' if meth[0].to_i < 97
       @script << meth
       return self
     end
@@ -134,19 +134,19 @@ module GUI
 
     def to_js(arg)
       case arg
-      when String: 
+      when String then
         arg.gsub!("'","\\\\'")
         "'#{arg}'"
-      when Hash: 
+      when Hash then
         obj = []
         arg.each_pair { |k,v|
           v = to_js(v)
           obj << "#{k}: #{v}"
         }
         "{#{obj.join(', ')}}"
-      when Symbol
+      when Symbol then
         arg.to_s
-      else
+      else 
         arg
       end
     end

data/lib/aurita-gui/table.rb

@@ -8,7 +8,7 @@ module GUI
   # Usage: 
   #
   #   table = Table.new(:headers => [ 'user', 'phone', 'mobile', 'email' ])
-  #   table.add_row('fuchsto', '+49 89 123456', '+49 89 987654', 'fuchst@wortundform.de')
+  #   table.add_row('fuchsto', '+49 89 123456', '+49 89 987654', 'fuchs@wortundform.de')
   #
   # A row element may be of type Aurita::GUI::Element. 
   # In this case, method #string is invoked to render the cell. 
@@ -16,43 +16,73 @@ module GUI
   # More examples: 
   #
   #   t = Table.new(:headers => ['user', 'phone', 'email'], 
-  #                 :options => { :class => 'css_class', :id => 'test_table' })
-  #   t.add_row([ 'a','b','c' ])
-  #   t.add_row([ 'd','e','f' ])
-
+  #                 :class => 'css_class', 
+  #                 :id => 'test_table' )
+  #   t.add_row('a','b','c' )
+  #
+  #   t[0].class == Table_Cell
   #   t[0][0].value = 'foo'
   #   t[0][0].value = 45
   #   t[1][0].onclick = 'test();'
   #   t[0][1] = HTML.a(:href => 'http://google.com') { 'google' }
-
+  #
   #   t[0][1].value.href = 'other'
   #   t[0][1].value.content = 'clickme'
-
+  #
   #   puts t[0][1].value.string
-
+  #
   #   t[0].class = 'highlighted'
   #
   class Table < Element
 
-    attr_accessor :columns, :headers, :rows, :template, :row_css_classes, :column_css_classes, :options
+    attr_accessor :columns, :headers, :rows, :template, :row_css_classes, :column_css_classes, :row_class
 
     def initialize(params={}, &block)
-      @options       = params[:options]
-      @options[:tag] = 'table'
-      @headers       = params[:headers]
-      @num_columns   = params[:num_columns]
-      @num_columns   = @headers.length if (!@columns && @headers)
-      @columns       = []
-      @rows          = []
+      params[:tag]   = :table
+      @headers     ||= params[:headers]
+      @num_columns ||= params[:num_columns]
+      @num_columns ||= @headers.length if (!@columns && @headers)
+      @columns     ||= []
+      @rows        ||= []
+      @headers     ||= []
+      @row_class   ||= params[:row_class]
+      @row_class   ||= Table_Row
       @row_css_classes      = params[:row_css_classes]
       @row_css_classes    ||= []
+      @row_css_classes      = [ @row_css_classes ] unless @row_css_classes.is_a?(Array)
       @column_css_classes   = params[:column_css_classes]
       @column_css_classes ||= []
-      super(@options, &block)
+      @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.delete(:headers)
+      params.delete(:num_columns)
+      params.delete(:row_css_classes)
+      params.delete(:column_css_classes)
+      set_headers(@headers)
+      super(params, &block)
+    end
+
+    def headers=(headers)
+      @headers = headers
+      if @headers.length > 0 then
+        @headers.map! { |cell| 
+          if cell.is_a? Element then 
+            cell 
+          else 
+            HTML.th { cell } 
+          end 
+        }  
+      end
     end
+    alias set_headers headers=
 
-    def add_row(row_data)
-      row = Table_Row.new(row_data, :parent => self)
+    def add_row(*row_data)
+      if row_data.first.is_a?(Array) then
+        row_data = row_data.first
+      end
+      # TODO: This should happen in #string
+      row = @row_class.new(row_data, :parent => self)
       @rows << row
 
       # Add row content to columns
@@ -64,9 +94,12 @@ module GUI
     end
 
     def string
-      @content = "\n" 
-      @content << HTML.tr { @headers.collect { |cell| HTML.th { cell } }.join }.string
-      @content << @rows.collect { |row| row.string }.join("\n")
+      t = []
+      if @headers.length > 0 then
+        t = HTML.tr { @headers.collect { |cell| if cell.is_a? Element then cell else HTML.th { cell } end } }  
+      end
+      t += rows()
+      set_content(t)
       super()
     end
     alias to_s string
@@ -75,20 +108,21 @@ module GUI
     end
 
     def set_data(row_array)
+      @rows = []
       row_array.each { |row|
-        @rows << Table_Row.new(row, :parent => self)
+        @rows << @row_class.new(row, :parent => self)
       }
     end
 
     def cell(column, row)
-      @rows[row][column]
+      rows[row][column]
     end
 
     def [](row_index)
-      @rows[row_index]
+      rows[row_index]
     end
     def []=(row_index, row_data)
-      @rows[row_index] = row_data
+      rows[row_index] = row_data
     end
 
     def columns
@@ -98,34 +132,57 @@ module GUI
   end
 
   class Table_Row < Element
+    
+    attr_accessor :cells, :parent
+
     def initialize(cell_data, params={})
-      @cell_data = cell_data
-      @cells = []
+      params[:tag]  = :tr
+
+      @parent     ||= params[:parent]
+      @cell_class ||= Table_Cell
+      @cell_data  ||= cell_data
+      @cells      ||= []
+      @touched      = false
+      column_index  = 0
+
       @cell_data.each { |cell|
-        @cells << Table_Cell.new(cell, :parent => self)
+        @cells << @cell_class.new(cell, :parent => self, :column_index => column_index)
+        column_index += 1
       }
-      params[:tag] = 'tr'
+      set_content(@cells)
+      @content = @cells
+
       super(params)
+      add_css_classes(@parent.row_css_classes) if @parent.row_css_classes.length > 0
     end
 
     def table
-      @params[:parent]
+      @parent
     end
 
     def [](column_index)
       @cells[column_index]
     end
     def []=(column_index, cell_data)
+      touch()
       @cells[column_index].value = cell_data
     end
 
     def string
-      @content = "\n" << @cells.collect { |c| c.string }.join()
+      if @touched then
+        @cells = []
+        @cell_data.each { |cell|
+          @cells << @cell_class.new(cell, :parent => self, :column_index => column_index)
+          column_index += 1
+        }
+        set_content(@cells)
+        @touched = false
+      end
       super()
     end
 
     def inspect
-      '[' << @cells.collect { |c| c.value }.join(',') + ']'
+      'Row[' << @cells.collect { |c| c.inspect }.join(',') + ']'
     end
   end
 
@@ -152,37 +209,34 @@ module GUI
   #
   class Table_Cell < Element
 
-    attr_accessor :value, :presentation_class
+    attr_accessor :value, :presentation_class, :parent
 
     def initialize(cell_element, params={})
-      params[:tag] = 'td'
-      @presentation_class = false
+      params[:tag]        = :td
+      @content            ||= cell_element
+      @value              ||= cell_element
+      @presentation_class ||= false
+      @column_index         = params[:column_index]
+      @parent             ||= params[:parent]
+      params.delete(:column_index)
       super(params)
-      @value = cell_element
-      @content = cell_element
+      column_css_classes = @parent.parent.column_css_classes[@column_index]
+      add_css_classes(column_css_classes) if column_css_classes
     end
 
-    def value=(val)
-      @value = val
-      @content = val.to_s
-      if @presentation_class then
-        @content = @presentation_class.new(@value).string 
-      else
-        @content = @value.to_s 
-      end
-    end
-  
     def set_presentation(presentation_class)
       @presentation_class = presentation_class
     end
+    alias presentation= set_presentation
 
-    def string
-      if @presentation_class then
-        @content = @presentation_class.new(@value).string 
-      else
-        @content = @value.to_s 
-      end
-      super()
+    def value=(val)
+      @value = val
+      set_content(@value) unless @presentation_class
+      set_content(@presentation_class.new(@value)) if @presentation_class
+    end
+
+    def inspect
+      'Cell[' << @value + ']'
     end
 
   end

data/lib/aurita-gui/widget.rb

@@ -0,0 +1,27 @@
+
+require('delegate')
+require('aurita-gui/element')
+
+module Aurita
+module GUI
+
+  class Widget < DelegateClass(Element)
+  include Aurita::GUI
+
+    def initialize()
+      super(element())
+    end
+
+    def element
+      raise ::Exception.new('Missing method #element for ' << self.class.to_s)
+    end
+
+    def js_initialize
+      ''
+    end
+
+  end
+
+end
+end
+