cuca 0.05 → 0.06

data/lib/cuca/stdlib/old_arform.rb

@@ -0,0 +1,254 @@
+require 'cuca/stdlib/form'
+require 'cuca/stdlib/formerrors'
+require 'cuca/generator/markaby'
+
+# == Form's for 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.
+#
+# This Widget will call <form_name>_submit(model) if Form is submitted
+# and validation 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
+
+ 
+
+
+ # 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
+ 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] || []
+   super(form_name, options)
+ end
+
+ 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
+
+ def validate
+   form	if @_content.empty? # password fields might write hints to the validator...
+   clear
+   @form_erros = {}
+   p = request_parameters.dup
+   p.delete(@submit_name)
+   
+   if @model.new_record? then 
+      @disabled_on_create.each { |d| p.delete(d) }
+      @hidden_on_create.each { |d| p.delete(d) }
+   else 
+      @disabled_on_update.each { |d| p.delete(d) }
+      @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?
+
+   @model.errors.each do |k,v|
+      @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)
+   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
+   else
+      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
+   r = <<-EOS
+<input type='text' name='#{name}' id='i_#{name}' value='#{v.year}/#{twodig(v.month)}/#{twodig(v.day)} #{v.hour}:#{v.min}' #{'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_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='')
+   return '' if field_hidden?(name)
+   enabled = field_enable?(name)
+   r = ""
+   case(type)
+       when :string
+          r << fe_text(name,value,enabled)
+       when :boolean
+          r << fe_bool(name,value,enabled)
+       when :integer
+         r << fe_int(name,value,enabled)
+       when :datetime
+         r << fe_datetime(name,value,enabled)
+       when :date
+         r << fe_date(name,value,enabled)
+       when :password
+         r << fe_password(name, enabled)
+     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
+
+
+ # 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>"
+   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
+

data/lib/cuca/test/helpers.rb

@@ -11,9 +11,10 @@ module Helpers
 # init the application. call this from the setup method.
 def init(app_path = '/', params = {})
  require 'cuca/cgi_emu'
+ require 'cuca/urlmap'
  @cgi = CGIEmu.new({'PATH_INFO' => app_path, 'QUERY_PARAMS' => params})
- @app = Cuca::App.new(@cgi)
- @app.load_support_files
+ @app = Cuca::App.new
+ @app.load_support_files(Cuca::URLMap.new($cuca_path+'/app', app_path))
 end
 
 

data/lib/cuca_console.rb

@@ -10,3 +10,5 @@ $app = Cuca::App.new
 def url(some_path)
   $app.load_support_files(Cuca::URLMap.new($cuca_path+'/app', some_path))
 end
+
+url '/'

data/tests/controller.rb

@@ -101,6 +101,36 @@ class ReturnOtherMimeController < Cuca::Controller
 end
 
 
+
+class ChainAController < Cuca::Controller
+  before_filter 'a', 1  
+  def a 
+    @out ||= ''
+    @out << 'a'
+  end
+end
+
+
+class ChainBController < ChainAController
+  before_filter 'b',100
+  def b
+    @out ||= ''
+    @out << 'b'
+  end
+end
+
+class ChainCController < ChainBController
+  before_filter 'c',2
+  attr :out
+  def c
+    @out ||= ''
+    @out << 'c'
+  end
+end
+
+
+
+
 class ControllerTests < Test::Unit::TestCase
 
   def test_basic
@@ -160,4 +190,11 @@ class ControllerTests < Test::Unit::TestCase
   end
 
 
+  def test_chain_filters
+    c = ChainCController.new
+    c.run_before_filters
+    assert_equal 'acb', c.out
+  end
+  
+
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: cuca
 version: !ruby/object:Gem::Version 
-  version: "0.05"
+  version: "0.06"
 platform: ruby
 authors: 
 - Martin Boese
@@ -9,11 +9,12 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-08-20 00:00:00 +00:00
+date: 2009-03-04 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: markaby
+  type: :runtime
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
@@ -23,6 +24,7 @@ dependencies:
     version: 
 - !ruby/object:Gem::Dependency 
   name: fcgi
+  type: :runtime
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
@@ -38,106 +40,110 @@ extensions: []
 
 extra_rdoc_files: 
 - CHANGELOG
+- README
 files: 
 - bin/cuca
-- lib/cuca.rb
-- lib/cuca_console.rb
 - lib/cuca
+- lib/cuca/mimetypes.rb
+- lib/cuca/sessionpage.rb
+- lib/cuca/urlmap.rb
+- lib/cuca/layout.rb
+- lib/cuca/widget.rb
 - lib/cuca/cgi_fix.rb
+- lib/cuca/const.rb
+- lib/cuca/sessionflash.rb
 - lib/cuca/controller.rb
+- lib/cuca/session.rb
+- lib/cuca/app.rb
 - lib/cuca/config.rb
+- lib/cuca/test
+- lib/cuca/test/helpers.rb
 - lib/cuca/stdlib
-- lib/cuca/stdlib/arview.rb
-- lib/cuca/stdlib/form.rb
-- lib/cuca/stdlib/link.rb
 - lib/cuca/stdlib/slink.rb
+- lib/cuca/stdlib/link.rb
+- lib/cuca/stdlib/form.rb
+- lib/cuca/stdlib/list.rb
+- lib/cuca/stdlib/arview.rb
 - lib/cuca/stdlib/arform.rb
+- lib/cuca/stdlib/old_arform.rb
 - lib/cuca/stdlib/listwidget
-- lib/cuca/stdlib/listwidget/querydef.rb
+- lib/cuca/stdlib/listwidget/list.rb
 - lib/cuca/stdlib/listwidget/dblist.rb
+- lib/cuca/stdlib/listwidget/querydef.rb
 - lib/cuca/stdlib/listwidget/staticdatalist.rb
-- lib/cuca/stdlib/listwidget/list.rb
-- lib/cuca/stdlib/list.rb
 - lib/cuca/stdlib/formerrors.rb
+- lib/cuca/stdlib/formelements.rb
 - lib/cuca/generator
 - lib/cuca/generator/markaby.rb
 - lib/cuca/generator/view.rb
-- lib/cuca/sessionflash.rb
-- lib/cuca/widget.rb
-- lib/cuca/mimetypes.rb
-- lib/cuca/test
-- lib/cuca/test/helpers.rb
-- lib/cuca/sessionpage.rb
-- lib/cuca/session.rb
 - lib/cuca/cgi_emu.rb
-- lib/cuca/app.rb
-- lib/cuca/urlmap.rb
-- lib/cuca/layout.rb
-- lib/cuca/const.rb
+- lib/cuca_console.rb
+- lib/cuca.rb
+- tests/mimetypes.rb
+- tests/urlmap.rb
 - tests/generator_markaby.rb
-- tests/controller.rb
+- tests/all.rb
 - tests/widget.rb
-- tests/mimetypes.rb
+- tests/generator_view.rb
+- tests/controller.rb
 - tests/app.rb
 - tests/test_app
+- tests/test_app/conf
+- tests/test_app/conf/environment.rb
+- tests/test_app/conf/config.rb
 - tests/test_app/log
 - tests/test_app/log/messages
 - tests/test_app/README
 - tests/test_app/app
+- tests/test_app/app/agent
+- tests/test_app/app/agent/index.rb
+- tests/test_app/app/agent/list.rb
+- tests/test_app/app/_views
+- tests/test_app/app/_views/test_template.rhtml
 - tests/test_app/app/user
 - tests/test_app/app/user/__username
 - tests/test_app/app/user/__username/index.rb
 - tests/test_app/app/user/list.rb
-- tests/test_app/app/_views
-- tests/test_app/app/_views/test_template.rhtml
-- tests/test_app/app/agent
-- tests/test_app/app/agent/index.rb
-- tests/test_app/app/agent/list.rb
-- tests/test_app/conf
-- tests/test_app/conf/config.rb
-- tests/test_app/conf/environment.rb
-- tests/urlmap.rb
-- tests/generator_view.rb
-- tests/all.rb
-- application_skeleton/log
-- application_skeleton/log/messages
-- application_skeleton/log/error.log
-- application_skeleton/log/access.log
-- application_skeleton/README
 - application_skeleton/tests
 - application_skeleton/tests/widgets
 - application_skeleton/tests/widgets/link.rb
-- application_skeleton/app
-- application_skeleton/app/index.rb
-- application_skeleton/app/demo.rb
-- application_skeleton/app/_controllers
-- application_skeleton/app/_controllers/application.rb
-- application_skeleton/app/_layouts
-- application_skeleton/app/_layouts/simple.rb
-- application_skeleton/app/_widgets
-- application_skeleton/app/_widgets/test.rb
-- application_skeleton/app/_widgets/sourcecode.rb
-- application_skeleton/app/_views
+- application_skeleton/conf
+- application_skeleton/conf/environment.rb
+- application_skeleton/conf/config.rb
+- application_skeleton/public
+- application_skeleton/public/img
+- application_skeleton/public/img/cuca-seagull.png
+- application_skeleton/public/dispatch.cgi
+- application_skeleton/public/dispatch.fcgi
+- application_skeleton/public/500.html
+- application_skeleton/public/css
+- application_skeleton/public/css/style.css
+- application_skeleton/public/404.html
 - application_skeleton/scripts
 - application_skeleton/scripts/server-lighttpd-fcgi.rb
+- application_skeleton/scripts/server-webrick.rb
 - application_skeleton/scripts/console.rb
-- application_skeleton/scripts/test.rb
 - application_skeleton/scripts/server-lighttpd.rb
-- application_skeleton/scripts/server-webrick.rb
+- application_skeleton/scripts/test.rb
 - application_skeleton/lib
-- application_skeleton/public
-- application_skeleton/public/404.html
-- application_skeleton/public/dispatch.fcgi
-- application_skeleton/public/dispatch.cgi
-- application_skeleton/public/css
-- application_skeleton/public/css/style.css
-- application_skeleton/public/img
-- application_skeleton/public/img/cuca-seagull.png
-- application_skeleton/public/500.html
-- application_skeleton/conf
-- application_skeleton/conf/config.rb
-- application_skeleton/conf/environment.rb
+- application_skeleton/log
+- application_skeleton/log/access.log
+- application_skeleton/log/error.log
+- application_skeleton/log/messages
+- application_skeleton/README
+- application_skeleton/app
+- application_skeleton/app/_widgets
+- application_skeleton/app/_widgets/sourcecode.rb
+- application_skeleton/app/_widgets/test.rb
+- application_skeleton/app/index.rb
+- application_skeleton/app/_views
+- application_skeleton/app/_layouts
+- application_skeleton/app/_layouts/simple.rb
+- application_skeleton/app/demo.rb
+- application_skeleton/app/_controllers
+- application_skeleton/app/_controllers/application.rb
 - CHANGELOG
+- README
 has_rdoc: true
 homepage: http://cuca.rubyforge.org/
 post_install_message: 
@@ -160,7 +166,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: cuca
-rubygems_version: 1.1.1
+rubygems_version: 1.2.0
 signing_key: 
 specification_version: 2
 summary: A widget-based web framework