cuca 0.05 → 0.06

data/CHANGELOG

@@ -1,13 +1,22 @@
+* 2009/03/04 - 0.06
+   - Fixed sorting bug of filters with priority specified
+   - Nicer pagination on listwidget for large lists
+   - Allowing to tune default query definitions on listwidget 
+   - Fixed bad rescue of NameError which resulted in misleading exception tracebacks
+   - Catch exceptions on loading/parsing the controller code
+   - Changed FormWidget and ARFormWidget, added FormElements module
+   - 'stop' can switch off after filters with :no_after_filters option
+   - Console will automatically load root support files
+   - Delete method for session.page variables
 
-* 2009/08/20 - 0.05
-   - Widget can be defined within the action controller file.
+* 2008/08/20 - 0.05
+   - Widget definition can be done within the action controller file.
    - Fixed minor typos in application skeleton conf/config.rb
    - Fix to catch exceptions in conf/config and conf/environment
    - Fixes & minor changes in stdlib/form
    - Stdlib listwidget rewrite_hooks will pass named hash instead of plain array 
      as row data
    - fixed script/console to load support files
-   - Fixed bad error rescueing in generators that displayed irritating errors
 
 * 2008/06/17 - 0.04
    - Fixed error-message displaying traceback but not the actual exception

data/README

@@ -0,0 +1,34 @@
+
+== Installing Cuca
+
+To use the source code you can simply run:
+ sudo renew.sh
+
+To install the gem from the internet use
+ gem install --remote cuca
+
+See http://cuca.rubyforge.org for more information how to get started.
+
+
+== Coding on the Framework
+
+You can tell your application to load the cuca framework from a 
+different location instead from rubygems. For that create a new dispatcher 
+cgi script, a minimal version would be:
+
+ #!/usr/bin/ruby
+ 
+ FRAMEWORK_PATH = '/home/bones/path/to/cuca-framework/lib'
+ $: << FRAMEWORK_PATH
+
+ require 'cuca'
+ require 'rubygems'
+
+ application = Cuca::App.new
+ application.cgicall
+
+
+And tell your webserver to use this new handler (or edit the script/server*
+files).
+
+

data/application_skeleton/app/index.rb

@@ -17,7 +17,7 @@ class IndexController < ApplicationController
     h2 { "If you want to learn cuca" }
     ul do 
      li { text "Have a look at the Demo Widgets: "; SLink('demo', 'Here') }
-     li { text "Checkout the cuca website: "; SLink("http://cuca.rubyforge.org") }
+     li { text "Checkout the cuca website: "; SLink("http://cuca.rubyforge.net") }
      li { text "Read the source code of these examples" }
     end
 

data/application_skeleton/scripts/console.rb

@@ -1,5 +1,5 @@
 #!/usr/bin/ruby
 # A simple irb session that loads the cuca framework
 
-libs  = " -r irb/completion -r rubygems -r cuca"
+libs  = " -r irb/completion -r rubygems -r cuca -r cuca_console"
 exec "irb #{libs} --simple-prompt"

data/lib/cuca/app.rb

@@ -232,7 +232,7 @@ class App
   # 3rd: Load additional files
   load_support_files(@urlmap)
 
-#  test = ApplicationController.new
+  test = ApplicationController.new
 
 
   # 4th: Now let's run the actual page script code
@@ -245,20 +245,18 @@ class App
   controller_module = @urlmap.action_module
 
 
-  controller_module.module_eval(File.open(script).read, script)  unless \
+  # things fail in this block get error logged and/or displayed in browser
+  begin
+     # load controller
+     controller_module.module_eval(File.open(script).read, script)  unless \
                   controller_module.const_defined?(controller_class_name.intern)
 
-  # Catch a common user error
-  if !controller_module.const_defined?(controller_class_name.intern) then 
-     @cgi.out { "Could not find #{controller_class_name} defined in #{script}" }
-     return
-  end
+     # Catch a common user error
+     raise Cuca::ApplicationException.new("Could not find #{controller_class_name} defined in #{script}") \
+          unless controller_module.const_defined?(controller_class_name.intern)
 
-  #
-  # Load the controller
-  #
-  begin
 
+     # run controller
      (status, mime, content) = Sandbox.run(controller_class_name, 
                            @urlmap.action_module, @urlmap.assigns, 
                            @cgi.request_method, @urlmap.subcall)

data/lib/cuca/const.rb

@@ -1,3 +1,3 @@
 module Cuca
-   VERSION = '0.05'
+   VERSION = '0.06'
 end

data/lib/cuca/controller.rb

@@ -197,7 +197,7 @@ class Controller < Widget
         filters << [mp[0], mp[1]]
    end
 
-   sorted_filters = filters.sort { |a,b| a[1] <=> b[1] }
+   sorted_filters = filters.sort { |a,b| a[1].to_i <=> b[1].to_i }
 
    sorted_filters.each do |f|
      break if @cancel_execution
@@ -226,7 +226,8 @@ class Controller < Widget
  # run defined after_filters
  public 
  def run_after_filters
-   run_filters(:def_after_filter, 'After Filters')
+   run_filters(:def_after_filter, 'After Filters') \
+      unless @_stop_no_after_filters
    ce = @cancel_execution
    @cancel_execution = false
    run_filters(:def_priority_after_filter, 'Priority After Filters')
@@ -238,9 +239,10 @@ class Controller < Widget
  # it's usefull to break somewhere in the middle or to 
  # set a different layout
  # flags can be
- # :layout - Set a new layout
+ # :layout - Set a new layout, or 'false' for no layout
  # :redirect - redirect to a different page
  # :error - An error message (for application errors)
+ # :no_after_filters - Do not execute any after filters defined
  def stop(flags = {})
    raise BreakControllerException.new(flags)
  end
@@ -252,6 +254,10 @@ class Controller < Widget
        @_layout = e.flags[:layout]
    end
 
+   if e.flags.has_key?(:no_after_filters) then
+       @_stop_no_after_filters = true
+   end
+
    if e.flags.has_key?(:redirect) then
      @_layout = false
      to = e.flags[:redirect]

data/lib/cuca/generator/markaby.rb

@@ -8,21 +8,24 @@ class ::Markaby::Builder		# :nodoc:
   def method_missing(sym, *args, &block )	# :nodoc:
     class_name = sym.id2name  
 
-         # give up immediately if we don't have a Constant capable method
-    return old_method_missing(sym, *args, &block) if
-         class_name[0].chr.upcase != class_name[0].chr
-
-
-    widget_name = class_name+'Widget'
-
-    c=Object::const_get(widget_name) if Object::const_defined?(widget_name)
-   
-    if (c.nil? && !$app.nil?) then
-          c = $app.urlmap.action_module.const_get(widget_name) if \
-                 $app.urlmap.action_module.const_defined?(widget_name)
+    return old_method_missing(sym, *args, &block) if 
+        (class_name[0].chr.upcase != class_name[0].chr) 
+    
+    if Object.const_defined?(class_name+'Widget') then
+        c = Object::const_get(class_name+"Widget")
+    else
+        # try to find the widget in the action namespace
+        return old_method_missing(sym, *args,&block) if $app.nil?
+        
+        am = $app.urlmap.action_module
+        if am.const_defined?(class_name+'Widget') then
+           c = am.const_get(class_name+'Widget')
+        else
+           return old_method_missing(sym, *args, &block)
+        end
     end
 
-    return old_method_missing(sym, *args, &block) if c.nil?
+#    $stderr.puts "Widget in markaby: Class: #{class_name}, \n\n assigns: #{@assigns.inspect} \n\n"
 
     widget = c.new({:args => args,
                     :assigns => @assigns },

data/lib/cuca/generator/view.rb

@@ -52,37 +52,36 @@ module View
       @base = base_object
     end
         
-
-
     def method_missing(sym, *args, &block )
       class_name = sym.id2name
-      
-#      $stderr.puts "View: Method missing: #{class_name}: #{@base.class.name}"
 
+         
       # 1st try to find method in the base widget
       if @base.methods.include?(class_name) then 
-           return @base.send(class_name, *args, &block)
+            return @base.send(class_name, *args, &block)
       end
-
-         # 2nd try to find a widget in root namespace and the controllers
-      widget_name = class_name+'Widget'
-      c=Object::const_get(widget_name) if Object.const_defined?(widget_name)
-      if (c.nil? && !$app.nil?) then 
-          c = $app.urlmap.action_module.const_get(widget_name) if \
-                    $app.urlmap.action_module.const_defined?(widget_name)
+      c = nil
+      # 2nd try to find a widget
+      if Object.const_defined?(class_name+'Widget') then
+           c = Object::const_get(class_name+'Widget')
+      else
+           # ...try to find in action namespace
+           mod = $app.urlmap.action_module
+           c = mod.const_get(class_name+'Widget') if mod.const_defined?(class_name+'Widget')
       end
-
-      raise "Undefined method: #{sym.id2name}" if c.nil?
-
+         
+      raise NameError.new "Undefined method: #{class_name}" unless c
+ 
       widget = c.new({:args => args,
                     :assigns => @assigns },
                     &block)
 
-
+#     $stderr.puts "Widget:" + widget.inspect
       return widget.to_s
+
+#     $stderr.puts "Good"
     end
-   end
-  
+  end  
   
 #  VIEW_DIR = $cuca_path+'app/_views'
 

data/lib/cuca/sessionpage.rb

@@ -18,7 +18,7 @@ class SessionPage
    @ses = session
    @ses[:SessionPage] ||= {}
    pagemem[pagekey] ||= {}
-   session.cgi.parameters.each_pair { |k,v|  self[k] = v } 
+   session.cgi.parameters.each_pair { |k,v|  self[k] = v if v.kind_of?(String) } 
    expire
  end
 
@@ -29,6 +29,11 @@ class SessionPage
  def []=(key,value)
     pagemem[pagekey][key] = value
  end
+ 
+ # remove a variable from page memory
+ def delete(key)
+    pagemem[pagekey].delete(key)
+ end
 
  private
  def expire

data/lib/cuca/stdlib/arform.rb

@@ -1,64 +1,65 @@
 require 'cuca/stdlib/form'
 require 'cuca/stdlib/formerrors'
+require 'cuca/stdlib/formelements'
 require 'cuca/generator/markaby'
 
 # == Form's for ActiveRecord
-# AR Form can work just by providing one model of ActiveRecord.
+# AR Form build a form by providing one model of ActiveRecord.
 # Likly that you want to overwrite the form method to
-# run a custom layout. You can use the fe* methods to
-# build form elements for the model columns definition.
+# run a custom layout.
 #
 # This Widget will call <form_name>_submit(model) if Form is submitted
-# and validation passed. You still have to ::save the model.
+# and validation of the model is passed. You still have to save the model.
 #
 # = Example:
 #
 #  ARForm('user_edit', User.find_by_username('bones'), 
 #                     :disable_on_update => ['username', 'created'])
 #
+
+
 class ARFormWidget < FormWidget
 
  include Cuca::Generator::Markaby
+ include Cuca::FormElements
 
  # valid options
  # * :disabled_on_create => ['field_name_1', 'field_name_2', ..]
  #     switch off fields on new records
  # * :diabled_on_update =>  ['field_name_1', 'field_name_2', ..]
  #     switch off fields on existing records
+ # * .. options from FormWidgets ...
  def output(form_name, model, options = {})
    @model = model
    @disabled_on_update = options[:disabled_on_update] || []
    @disabled_on_create = options[:disabled_on_create] || []
    @hidden_on_update     = options[:hidden_on_update] || []
    @hidden_on_create     = options[:hidden_on_create] || []
+
+   options[:default_values] = model.attributes.merge(options[:default_values] || {})
+
    super(form_name, options)
  end
 
+
+ # On submit will pass the model to the callback on the controller
  def on_submit
   controller.send(@form_name+'_submit', @model) unless controller.nil?
-  
-  # this is to reload the form with the new values in case the formname_submit did
-  # save something:
   clear
-  form
  end
 
- # overwrite this method to perform modifications 
- # before validateing the data
- def before_validate(variables)
-    variables
- end
 
- def validate
+ 
+ #
+ # Validate will check on ActiveRecord validation errors
+ #
+ def validate(variables)
    form	if @_content.empty? # password fields might write hints to the validator...
-   @form_erros = {}
-   p = request_parameters.dup
+   clear
+   @form_errors = {}
+   p = variables
    p.delete(@submit_name)
    
-
-   p = before_validate(p)
-
-
    if @model.new_record? then 
       @disabled_on_create.each { |d| p.delete(d) }
       @hidden_on_create.each { |d| p.delete(d) }
@@ -67,13 +68,12 @@ class ARFormWidget < FormWidget
       @hidden_on_update.each { |d| p.delete(d) }
    end
 
-
    # don't save empty passwords!!
    @password_fields ||= []
    @password_fields.each do |pwf|
       p.delete(pwf) if p[pwf].chomp.empty?
    end
-#   $stderr.puts p.inspect
+   
    @model.attributes = p
    
    return true if @model.valid?
@@ -82,20 +82,17 @@ class ARFormWidget < FormWidget
       @form_errors[k] = v
    end
  end
-
- # to make a 2 digit string out a number
- private
- def twodig(n)
-   n.to_s.length == 1 ? "0"+n.to_s : n.to_s
- end
-
- def field_enable?(fname)
+ 
+ 
+ 
+  def field_enable?(fname)
    if @model.new_record? then
       return @disabled_on_create.include?(fname) ? false : true
    else
       return @disabled_on_update.include?(fname) ? false : true
    end
  end
+ 
  def field_hidden?(fname)
    if @model.new_record? then
       return @hidden_on_create.include?(fname) ? true : false
@@ -103,173 +100,52 @@ class ARFormWidget < FormWidget
       return @hidden_on_update.include?(fname) ? true : false
    end
  end
-
-
- private 
- def fe_text(name, value,enabled)
-   "<input type='text' name='#{name}' value='#{value}' #{'disabled' unless enabled}>"
- end
-
- private 
- def fe_textarea(name, value, enabled, rows=4, cols = 50)
-   "<textarea name='#{name}' rows='#{rows}' cols='#{cols}'>#{value}</textarea>"
- end
  
-
- # the fe-password is special: will never contain a value and will not save the
- # password if nothing was typed into the field
- private
- def fe_password(name,enabled)
-   @password_fields ||= []
-   @password_fields << name
-   r = "<input type='password' name='#{name}' #{'disabled' unless enabled}>"
-   if !@model.new_record? then
-     r << "<br><small>Leave empty to keep current password</small>"
-   end
-   return r
- end
-
- # this is to build a select box, example:
- # fe_select('gender', [['f', 'female'],['m','Male']], true) or
- # fe_select('gender', ['f','m'], true)
- private
- def fe_select(name, options, enabled)
-   r = "<select name='#{name}' #{'disabled' unless enabled}>\n"
-   options.each do |o|
-     ov = o.instance_of?(Array) ? o[0] : o
-     sel = ''
-     sel = ' selected' if @model.send(name.intern) == ov
-     if o.instance_of?(Array) then
-       r+="<option value='#{o[0]}'#{sel}>#{o[1]}</option>\n"
-     else
-      r+="<option value='#{o}'#{sel}>#{o}</option>\n"
-     end
-   end
-   r+="</option>\n" 
-end
-
-
- def fe_datetime(name, v,enabled)
-   v = Time.now unless v
-   v =  "#{v.year}/#{twodig(v.month)}/#{twodig(v.day)} #{v.hour}:#{v.min}" if v.instance_of?(Time)
-   r = <<-EOS
-<input type='text' name='#{name}' id='i_#{name}' value='#{v}' #{'disabled' unless enabled}>
-  EOS
-    if enabled then 
-      r << <<-EOS 
-<input type='submit' id='s_#{name}' value='...'>
-<script type="text/javascript">
-    Calendar.setup({
-        inputField     :    "i_#{name}",      // id of the input field
-        ifFormat       :    "%Y/%m/%d %H:%M",       // format of the input field
-        showsTime      :    true,            // will display a time selector
-        button         :    "s_#{name}",   // trigger for the calendar (button ID)
-        singleClick    :    true,           // double-click mode
-        step           :    1                // show all years in drop-down boxes (instead of every other year as default)
-     }); 
-</script>
-</input>
-     EOS
-   end
-   return r
- end
-
- # select date.. no time
- def fe_date(name, v,enabled)
-   v = Time.now unless v
-   r = <<-EOS
-<input type='text' name='#{name}' id='i_#{name}' value='#{v.year}/#{twodig(v.month)}/#{twodig(v.day)}' #{'disabled' unless enabled}>
-  EOS
-    if enabled then 
-      r << <<-EOS 
-<input type='submit' id='s_#{name}' value='...'>
-<script type="text/javascript">
-    Calendar.setup({
-        inputField     :    "i_#{name}",      // id of the input field
-        ifFormat       :    "%Y/%m/%d",       // format of the input field
-        showsTime      :    false,            // will display a time selector
-        button         :    "s_#{name}",   // trigger for the calendar (button ID)
-        singleClick    :    true,           // double-click mode
-        step           :    1                // show all years in drop-down boxes (instead of every other year as default)
-     }); 
-</script>
-</input>
-     EOS
-   end
-   return r
- end
-
- def fe_time(name,v,enabled)
-   "<input name='#{name}' size=5 type='text' value='#{v || '0:00'}'#{' disabled' unless enabled}>"
- end
-
- def fe_bool(name,v,enabled)
-    r = ''
-    r << "<select name='#{name}' #{'disabled' unless enabled}>\n"
-    r << "<option #{"selected" if v} value='t'>true</option>\n"
-    r << "<option #{"selected" if !v} value='f'>false</option>\n"
-    r << "</select>\n"
- end
-
- def fe_int(name,v,enabled)
-   "<input type='text' name='#{name}' value='#{v}' #{'disabled' unless enabled} size=5>"
- end
-
- def fe(type, name, value='')
+ 
+ 
+ def fe(type, name)
    return '' if field_hidden?(name)
-   enabled = field_enable?(name)
+   attribs = {}
+   attribs[:disabled] = '' unless field_enable?(name)
    r = ""
    case(type)
        when :string
-          r << fe_text(name,value,enabled)
+          r << fe_text(name, attribs)
        when :boolean
-          r << fe_bool(name,value,enabled)
+          r << fe_bool(name, attribs)
        when :integer
-         r << fe_int(name,value,enabled)
+         r << fe_int(name, attribs)
        when :datetime
-         r << fe_datetime(name,value,enabled)
+         r << fe_datetime(name, attribs)
        when :date
-         r << fe_date(name,value,enabled)
-       when :time
-         r << fe_time(name, value, enabled)
+         r << fe_date(name, attribs)
        when :password
-         r << fe_password(name, enabled)
+         r << fe_password(name, attribs)
      end
    return r
  end
-
- # build a form element for column name
- def fe_for(column_name, hint='')
-   col = @model.column_for_attribute(column_name)
-   fe(col.type, col.name, @model.send(column_name.intern))
- end
-
  
- # Load column values into instance variables
- def setup
-  @model.class.columns.each do |col|
-    self.instance_variable_set("@#{col.name}", @model.send(col.name.intern))
-  end
+  # build a form element for column name
+ def fe_for(column_name)
+   col = @model.column_for_attribute(column_name)
+   fe(col.type, col.name)
  end
 
- # you might want to replace this method
+  # you might want to replace this method
  public
  def form
-   r = mabtext { FormErrors(@form_errors) }
-   r << "<form action='#{@post_to}' method='POST'>\n"
-   r << "<table>"
-   @model.class.columns.each do |col|
-     next if field_hidden?(col.name)
-     k = col.name
-     v = @model.send(k.intern)		# this allows us to overwrite accessors
-     r << "<tr><td>#{k}</td><td>#{fe(col.type,k,v)}</td></tr>"
+   mab do
+      FormErrors(@form_errors)
+      fe_formstart
+      table do
+         @model.class.columns.each do |col|
+            next if field_hidden?(col.name)
+            tr { td { col.name }; td { fe(col.type, col.name) } }
+         end
+         tr { td {} ; td { fe_submit }}
+      end
+      fe_formend
    end
-   r << "<tr><td><br/></td></tr>"
-   r << "<tr><td></td><td><input type='submit' value=#{@model.new_record? ? 'Save' : 'Update'} name='#{@submit_name}'></td></tr>"
-   r << "</table>\n</form>\n"
-   @_content = r
  end
-
-
 end