aurita-gui 0.3.6 → 0.3.7

data/aurita-gui.gemspec

@@ -14,7 +14,7 @@ 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.3.6'
+  s.version = '0.3.7'
   s.author = 'Tobias Fuchs'
   s.email = 'fuchs@wortundform.de'
   s.date = Time.now

data/lib/aurita-gui/element.rb

@@ -153,19 +153,18 @@ module GUI
     
     def initialize(*args, &block) 
 
-      params = {}
       case args[0]
       when Hash 
-        params = args[0]
+        params   = args[0]
       else
-        params = args[1] 
+        params   = args[1] 
         params ||= {}
         params[:content] = args[0]
       end
 
-      @@element_count += 1
-      @id          = @@element_count
-      @parent      = params[:parent]
+      @@element_count   += 1
+      @id                = @@element_count
+      @parent          ||= params[:parent]
       @force_closing_tag = params[:force_closing_tag]
 
       params[:tag] = :div if params[:tag].nil?
@@ -222,7 +221,13 @@ module GUI
     #   --> <Element [ <Element 'first'>, <Element 'second'> ] >
     #
     def +(other)
-      return [ self, other ]
+      other = [other] unless other.is_a?(Array) 
+      other.each { |o| 
+        if o.is_a?(Element) then
+          o.parent = @parent if @parent
+        end
+      }
+      return [ self ] + other 
     end
 
     # Append object to array of nested elements. 
@@ -231,9 +236,13 @@ module GUI
     # If so, however, other#parent will be set 
     # to this instance. 
     def <<(other)
-      other.parent = self if other.is_a?(Element)
+      if other.is_a?(Element) then
+        other.parent = self 
+      end
       __getobj__().push(other)
     end
+    alias add_child << 
+    alias add_content << 
 
     # Returns [ self ], so concatenation with 
     # Arrays and other Element instances works 
@@ -303,8 +312,13 @@ module GUI
     # Set enclosed content of this element. 
     # Will be automatically wrapped in an array. 
     def set_content(obj)
-      return __setobj__([ obj ]) unless (obj.is_a?(Array))
-      __setobj__(obj)
+      if obj.is_a?(Array) then
+        obj.each { |o| o.parent = self if o.is_a?(Element) } 
+        __setobj__(obj)
+      else
+        obj.parent = self if obj.is_a?(Element)
+        return __setobj__([ obj ]) 
+      end
     end
     alias content= set_content
 
@@ -376,7 +390,7 @@ module GUI
       }
       
       if (!(@force_closing_tag.instance_of?(FalseClass)) && 
-          [ :div, :label, :button, :textarea ].include?(@tag)) then
+          [ :div, :label, :button, :textarea, :ol, :ul ].include?(@tag)) then
         @force_closing_tag = true
       end
       if @force_closing_tag || has_content? then
@@ -469,6 +483,15 @@ module GUI
         end
       }
     end
+    
+    def js_init_code()
+      code = js_initialize() if self.respond_to?(:js_initialize)
+      code ||= ''
+      recurse { |e|
+        code << e.js_initialize if e.respond_to?(:js_initialize)
+      }
+      code
+    end
 
   end # class
 
@@ -508,6 +531,13 @@ module GUI
     end
 
   end
+
+  class PseudoElement < Element
+    def initialize(params={}, &block)
+      params[:tag] = :pseudo
+      super()
+    end
+  end
   
 end # module
 end # module

data/lib/aurita-gui/form.rb

@@ -12,6 +12,7 @@ require('aurita-gui/form/checkbox_field')
 require('aurita-gui/form/fieldset')
 require('aurita-gui/form/textarea_field')
 require('aurita-gui/form/date_field')
+require('aurita-gui/form/time_field')
 require('aurita-gui/form/datetime_field')
 require('aurita-gui/form/file_field')
 require('aurita-gui/form/boolean_field')
@@ -74,7 +75,12 @@ module GUI
         @content = field
       end
       field.dom_id = field.name.to_s.gsub('.','_') unless field.dom_id
-      css_classes = field.class.to_s.split('::')[-1].downcase + '_wrap form_field' 
+
+      # Inherit css classes from decorated field, if any: 
+      css_classes   = field.css_class.map { |c| c.to_s + '_wrap' if c }
+      css_classes ||= []
+
+      css_classes << field.class.to_s.split('::')[-1].downcase + '_wrap form_field' 
       css_classes << ' required' if field.required?
       css_classes << ' invalid' if field.invalid?
       params = { :tag => :li, 

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

@@ -14,7 +14,7 @@ module GUI
       @year_range    = params[:year_range]
       @year_range  ||= (2009..2020)
 
-      if params[:value] then set_date(params[:value]) end
+      set_value(params[:value]) 
 
       params.delete(:value)
       params.delete(:date_format)
@@ -69,6 +69,8 @@ module GUI
     end
 
     def value=(date)
+      return unless date
+
       case date 
       when Hash then
         @value = date
@@ -81,7 +83,7 @@ module GUI
                    :month => date.month, 
                    :day   => date.day }
       when String then
-        date = (::DateTime).strptime(date, "%Y%m%d")
+        date = (::DateTime).strptime(date, "%Y-%m-%d")
         @value = { :year  => date.year, 
                    :month => date.month, 
                    :day   => date.day }
@@ -91,6 +93,7 @@ module GUI
       @year, @month, @day = @value[:year], @value[:month], @value[:day]
     end
     alias set_date value=
+    alias set_value value=
 
     def value
       { :day => @day, :month => @month, :year => @year }

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

@@ -205,6 +205,12 @@ module GUI
       raise Form_Error.new('Method #element from Abstract class Options_Field has not been overloaded in ' << self.class.to_s)
     end
 
+    def readonly_element
+      opt = options()
+      return HTML.div(@attrib) { opt[@value] } if (opt && @value.to_s != '' && opt[@value])
+      return HTML.div(@attrib) { @value } 
+    end
+
     def content
       option_elements()
     end

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

@@ -31,7 +31,8 @@ module GUI
       elements = []
       options().each_pair { |k,v|
         element = []
-        element << HTML.input(:type => :radio, :value => k, :name => @attrib[:name] ) 
+        selected = (@value.to_s == k.to_s)? true : nil
+        element << HTML.input(:type => :radio, :value => k, :name => @attrib[:name], :checked => selected ) 
         element << HTML.label(:for => option_id) { v } if v
         elements << element
       }

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

@@ -91,11 +91,11 @@ module GUI
     attr_accessor :option_field_decorator, :select_field_class, :selectable_options
 
     def initialize(params={})
-      @option_field_decorator   = params[:option_field]
-      @select_field_class       = params[:select_field]
+      @option_field_decorator ||= params[:option_field]
+      @select_field_class     ||= params[:select_field]
       @option_field_decorator ||= Selection_List_Option_Field
       @select_field_class     ||= Select_Field
-      @selectable_options       = params[:selectable_options]
+      @selectable_options     ||= params[:selectable_options]
       @selectable_options     ||= []
 
       params.delete(:option_field)
@@ -136,9 +136,9 @@ module GUI
         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}") { 
-            @option_field_decorator.new(:name => @attrib[:name], 
-                                        :value => opt_value, 
-                                        :label => opt_label, 
+            @option_field_decorator.new(:name   => @attrib[:name], 
+                                        :value  => opt_value, 
+                                        :label  => opt_label, 
                                         :parent => self)
           }
         end
@@ -155,21 +155,22 @@ module GUI
         select_options[v] = @option_labels[v]
       }
       id_prefix = "#{@attrib[:id]}_" if @attrib[:id]
-
+      
       if @value && @value.length > 0 then
         HTML.div(@attrib) { 
           HTML.ul(:id => "#{id_prefix}#{@attrib[:name]}") { 
             option_elements()
           } + 
-          @select_field_class.new(:id => "#{id_prefix}#{@attrib[:name]}_select", 
+          @select_field_class.new(:id      => "#{id_prefix}#{@attrib[:name]}_select", 
                                   :options => select_options, 
-                                  :name => "#{@attrib[:name]}" ) 
+                                  :name    => "#{@attrib[:name]}" ) 
         }
       else
         HTML.div(@attrib) { 
-          @select_field_class.new(:id => "#{id_prefix}#{@attrib[:name]}_select", 
+          HTML.ul(:id => "#{id_prefix}#{@attrib[:name]}", :force_closing_tag => true)  + 
+          @select_field_class.new(:id      => "#{id_prefix}#{@attrib[:name]}_select", 
                                   :options => select_options, 
-                                  :name => "#{@attrib[:name]}" ) 
+                                  :name    => "#{@attrib[:name]}" ) 
         }
       end
     end

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

@@ -92,9 +92,14 @@ module GUI
     end
 
     def custom(params, &block)
-      klass = params[:element]
-      params.delete(:element)
-      @field_decorator.new(klass.new(params, &block)).string
+      if params.is_a?(Element) then
+        element = params
+      else
+        klass = params[:element]
+        params.delete(:element)
+        element = klass.new(params, &block)
+      end
+      @field_decorator.new(element).string
     end
 
   end

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

@@ -0,0 +1,118 @@
+
+require('aurita-gui/form/date_field')
+require('aurita-gui/form/select_field')
+
+module Aurita
+module GUI
+
+  class Time_Field < Form_Field
+    attr_accessor :hour, :minute, :second, :hour_element, :minute_element, :second_element, :time_format, :minute_range
+
+    def initialize(params, &block)
+      @time_format   = params[:time_format]
+      @time_format ||= 'hms'
+
+      @value = {}
+      @minute_range = params[:minute_range]
+      set_value(params[:value])
+
+      params.delete(:minute_range)
+      params.delete(:time_format)
+      params.delete(:hour)
+      params.delete(:minute)
+      params.delete(:second)
+      params.delete(:value)
+      super(params, &block)
+    end
+
+    def hour_element
+      if !@hour_element then
+        options = (0..23)
+        options = options.to_a.map { |e| (e < 10)? ('0' << e.to_s) : e.to_s }
+        @hour_element = Select_Field.new(:name  => @attrib[:name].to_s + '_hour', 
+                                         :class => :hour_select, 
+                                         :value => @hour, :options => options)
+      end
+      @hour_element
+    end
+    def minute_element
+      if !@minute_element then
+        options   = @minute_range
+        options ||= (0..59)
+        options = options.to_a.map { |e| (e < 10)? ('0' << e.to_s) : e.to_s }
+        @minute_element = Select_Field.new(:name  => @attrib[:name].to_s + '_minute', 
+                                           :class => :minute_select, 
+                                           :value => @minute, :options => options)
+      end
+    end
+    def second_element
+      if !@second_element then
+        options = (0..59)
+        options = options.to_a.map { |e| (e < 10)? ('0' << e.to_s) : e.to_s }
+        @second_element = Select_Field.new(:name  => @attrib[:name].to_s + '_second', 
+                                           :class => :second_select, 
+                                           :value => @second, :options => options)
+      end
+      @second_element
+    end
+
+    def element
+      select_fields = []
+      @time_format.scan(/./).each { |c|
+        case c
+        when 'h' then
+          select_fields << hour_element() 
+        when 'm' then
+          select_fields << minute_element() 
+        when 's' then
+          select_fields << second_element() 
+        end
+      }
+      HTML.div(@attrib) { 
+        select_fields
+      }
+    end
+
+    def value=(time)
+      case time 
+      when Hash then
+        @value = time
+      when Datetime then
+        @value = { :hour   => time.hour, 
+                   :minute => time.month, 
+                   :second => time.second }
+      when Date then
+        @value = { :hour   => time.hour, 
+                   :minute => time.minute, 
+                   :second => time.second }
+      when String then
+        value_parts = time.split(':')
+        count       = 0
+        @time_format.scan(/./).each { |c|
+          case c
+          when 'h' then
+            @hour = value_parts[count]
+            @value[:hour]   = @hour
+            count += 1
+          when 'm' then
+            @minute = value_parts[count]
+            @value[:minute] = @minute
+            count += 1
+          when 's' then
+            @second = value_parts[count]
+            @value[:second] = @second
+            count += 1
+          end
+        }
+      else
+      end
+    end
+    alias set_value value=
+
+    def value
+      { :second => @second, :minute => @minute, :hour => @hour }
+    end
+  end
+  
+end
+end

data/spec/init_code.rb

@@ -0,0 +1,46 @@
+
+require('rubygems')
+require('aurita-gui/element')
+require('aurita-gui/html')
+
+include Aurita::GUI
+
+class Unit_1 < Element
+  def js_initialize
+    "alert('init me');"
+  end
+end
+class Unit_2 < Element
+  def js_initialize
+    "init(this);"
+  end
+end
+
+describe Aurita::GUI::Element, "managing javascript init codes" do
+  before do
+    @u1 = Unit_1.new(:tag => :div) 
+    @u2 = Unit_2.new(:tag => :a) 
+  end
+
+  it "should be possible to apply javascript code to be eval'ed on rendering an element" do
+    @u1.js_initialize.should == "alert('init me');"
+    @u1.js_init_code.should == "alert('init me');"
+  end
+
+  it "should propagate its init code to its parent element" do 
+    e = HTML.div { 
+      HTML.span { 'bla' } + Unit_1.new(:tag => :div) 
+    }
+    e.js_init_code.should == "alert('init me');"
+  end
+
+  it "should concatenate all init codes from its children" do
+    e = HTML.div { 
+      HTML.span { 'bla' } + Unit_1.new(:tag => :inner) { Unit_2.new(:tag => :a) }
+    }
+    e.js_init_code.should == "alert('init me');init(this);"
+  end
+
+end
+
+

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: aurita-gui
 version: !ruby/object:Gem::Version 
-  version: 0.3.6
+  version: 0.3.7
 platform: ruby
 authors: 
 - Tobias Fuchs
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-01-31 00:00:00 +01:00
+date: 2009-02-03 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -61,6 +61,7 @@ files:
 - lib/aurita-gui/form/textarea_field.rb
 - lib/aurita-gui/form/datetime_field.rb
 - lib/aurita-gui/form/boolean_field.rb
+- lib/aurita-gui/form/time_field.rb
 - lib/aurita-gui/form/fieldset.rb
 - lib/aurita-gui/form/selection_list.rb
 - lib/aurita-gui/form/select_field.rb
@@ -78,6 +79,7 @@ files:
 - spec/marshal.rb
 - spec/javascript.rb
 - spec/form.rb
+- spec/init_code.rb
 - spec/html.rb
 - spec/options.rb
 - spec/selection_list.rb