cuca 0.06 → 0.07

data/lib/cuca/stdlib/listwidget/dblist.rb

@@ -17,6 +17,8 @@ require 'active_record'
 #   :sortable = => [optional] true/false if columns can be sorted (default autodetect)
 # DBLIST specific is only :query
 class DBListWidget < BaseList
+ @@like_expression = 'LIKE'
+
  def columns
 #   $stderr.puts " Getting Columns: #{@columns}"
    @columns.delete_if { |c| !c[:display] }
@@ -32,14 +34,19 @@ class DBListWidget < BaseList
     field_id
  end
 
+ def quote(input)
+   input.gsub(/\\/, '\&\&').gsub(/'/, "''") 
+ end
+ 
  def where_clause(query_def)
+   like = @@like_expression || 'LIKE'		# this allows to overwrite to ILIKE for example
    res = []
    query_def.filters.each_pair do |k,v|
        next if (v.nil? || v == '')
        if @model_class.columns_hash.include?(k) && @model_class.columns_hash[k].number? then
-         res << "#{wc_query_field(k)} = #{v}"
+         res << "#{wc_query_field(k)} = #{v.to_i}"
        else
-         res << "#{wc_query_field(k)} LIKE '%#{v}%'"
+         res << "#{wc_query_field(k)} #{like} '%#{quote(v)}%'"
        end
    end
    wc =  "true"
@@ -79,15 +86,11 @@ class DBListWidget < BaseList
       ret
    end
    findstuff[:select] = sel.compact.join(',')
-   $stderr.puts "Find-Stuff: #{findstuff.inspect}"
    @data = @model_class.find(:all, findstuff)
-   $stderr.puts "data: #{@data}"
    @additional_data = @data.dup
    
    @data = normalize_result(@data)   
    @total_rows= @model_class.count(:conditions => where_clause(query_def), :joins => @joins)
-   
-#   $stderr.puts "Query: #{@data.inspect} - #{query_def.order_by.inspect}"
  end
 
  def setup
@@ -115,6 +118,7 @@ class DBListWidget < BaseList
    @columns           = data_setup[:columns] || [] 
    @extra_conditions = data_setup[:conditons] || ""
    @joins	      = data_setup[:joins] || ""
+   @options	      ||= data_setup[:options] 		# can be used by 'setup'
    @model_class = model_class || nil
    setup
    fixup_columns

data/lib/cuca/stdlib/listwidget/list.rb

@@ -103,6 +103,23 @@ class BaseList < Cuca::Widget
    view_p(erb_template)
  end # def
 
+ def list_size_links
+   r = []
+   [25,50,75,100,-1].each do |n_rows|
+      next if n_rows > @total_rows
+      next if n_rows == -1 && (@total_rows > 2000)
+      t = n_rows > 0 ? n_rows.to_s : 'all'
+      start = @query_def.range.first < n_rows ? 0 : @query_def.range.first
+      rows = n_rows > 0 ? n_rows : @total_rows * 2
+      if (@query_def.range.last - @query_def.range.first) == rows then
+        r << "<b>#{t}</b>"
+      else
+        r << "#{SLinkWidget.new(:args => ['',t,@query_def.to_h('range', (start..start+rows))] )}" 
+      end
+   end
+   r.join(' ')
+ end
+
  private
  def paginate_links()
    @rows_per_page = (@query_def.range.last - @query_def.range.first) + 1
@@ -133,14 +150,14 @@ class BaseList < Cuca::Widget
     end
    
   return pl
-
 end
  
  private
  def erb_template
   <<'ENDTEMPLATE'
  <div class='list'>
- [ <%= @paginate %> ]
+ Pages: [ <%= @paginate %> ]
+ Rows: [<%= list_size_links %> ]
  <table width>
     <tr>
 
@@ -184,8 +201,11 @@ end
       <% @data.each_index do |row_idx| %>
       <tr>
            <% @data[row_idx].each_index do |field_idx| %>
-              <% add_data = @additional_data[row_idx] || nil %>
-              <td> <%= rewrite_field(@data[row_idx], @columns[field_idx][:id], @data[row_idx][field_idx], add_data) %> </td>
+              <% add_data   = @additional_data[row_idx] || nil 
+                 cell_align = @columns[field_idx][:align]
+                 align_line = cell_align ? " align='#{cell_align}'" : ''
+              %>
+              <td<%=align_line%>> <%= rewrite_field(@data[row_idx], @columns[field_idx][:id], @data[row_idx][field_idx], add_data) %> </td>
            <% end %>
       </tr>
       <% end %>

data/lib/cuca/widget.rb

@@ -1,5 +1,5 @@
 module Cuca
-# === Widget
+# = Widget
 #
 # All elements that generate content (e.g. html) are widgets. To implement a widget create
 # a class derrived from Cuca::Widget and overwrite the +output+ method. The output method 
@@ -7,11 +7,6 @@ module Cuca
 # should write your result to @_content. For this it is advisable to use the content accessor 
 # or any of the Cuca::Generator 's. 
 #
-# == Variables
-#
-# Instance variables shall be used by sub-widgets and generators. You can fetch them 
-# with get_assigns.
-#
 # == Naming
 #
 # Name all widgets like YournameWidget - when using them in a generator simply call them
@@ -153,11 +148,12 @@ class Widget
     a = @_assigns.clone
 
     self.instance_variables.each do |v|
-      next if v.match(/^\@\_/)
-      next if v.include?('cancel_execution')		# this is some internal key
-      a[v.gsub(/\@/,'')] = self.instance_variable_get(v)
+      vs = v.to_s
+      next if vs.match(/^\@\_/)
+      next if vs.include?('cancel_execution')		# this is some internal key
+      a[vs.gsub(/\@/,'')] = self.instance_variable_get(v)
     end
-    return a
+    a
   end
 
   # clear widgets generated content
@@ -187,8 +183,8 @@ class Widget
     end
        
     output(*@_args, &@_block)
-    before_to_s if self.methods.include?('before_to_s')
-    content = @_content.to_s
+    before_to_s if self.respond_to?(:before_to_s)
+    out = @_content.to_s
 
     if @_profiler then
         Profiler__::stop_profile
@@ -196,7 +192,7 @@ class Widget
         Profiler__::print_profile(@_profiler)
     end
 
-    return content
+    out
   end
 
 
@@ -209,7 +205,8 @@ class Widget
 
   # tries to run a class method if defined and return it
   def self.run_attr_method(name)
-    return nil unless self.methods.include?(name)
+    return nil unless self.respond_to?(name.intern)
+       
     self.send(name.intern)
   end
 

data/lib/cuca_cli.rb

@@ -0,0 +1,14 @@
+# This file is -r required when runnung script/console to load
+# support files automatically.
+# Only for the CLI irb console
+
+require 'cuca/urlmap'
+
+puts "Cuca console: type: url [/some/path] to load support files of your app"
+$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

@@ -8,15 +8,15 @@ require 'cuca/urlmap'
 
 class TestAController < Cuca::Controller
   def get
-    content << 'GET'
+    @_content = 'GET'
   end
   def post
-    content << 'POST'
+    @_content = 'POST'
   end
 end
 class TestBController < Cuca::Controller
   def run
-    content << 'RUN'
+    @_content = 'RUN'
   end
 end
 
@@ -129,7 +129,19 @@ class ChainCController < ChainBController
 end
 
 
-
+class StopFilterController < Cuca::Controller
+  before_filter 'stop_it'
+  
+  def stop_it
+     stop :cancel_execution => true
+  end
+  
+  def run
+      raise "Never got here"
+  end
+end
+        
+        
 
 class ControllerTests < Test::Unit::TestCase
 
@@ -195,6 +207,10 @@ class ControllerTests < Test::Unit::TestCase
     c.run_before_filters
     assert_equal 'acb', c.out
   end
-  
 
+  def test_stop_in_filter
+    c = StopFilterController.new
+    c.run_before_filters
+    c._do('run') 
+  end
 end

data/tests/generator_markaby.rb

@@ -11,7 +11,7 @@ class TestMabAWidget < Cuca::Widget
  include Cuca::Generator::Markaby
 
  def output(param1='one', param2='two')
-    mab { b { param1}; b {param2}}
+    mab { b { param1 }; b { param2 }}
  end
 end
 

data/tests/widget.rb

@@ -140,7 +140,8 @@ class WidgetTest < Test::Unit::TestCase
 
  def test_attr_method
    assert_equal 'stuff', TestDWidget.run_attr_method('something')
-   
+   assert_equal 'stuff', TestDWidget.something
+
    a = TestEWidget.run_attr_method('something')
    assert a.instance_of?(Array)
    assert_equal 3, a.length

metadata

@@ -1,7 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: cuca
 version: !ruby/object:Gem::Version 
-  version: "0.06"
+  hash: 5
+  prerelease: false
+  segments: 
+  - 0
+  - 7
+  version: "0.07"
 platform: ruby
 authors: 
 - Martin Boese
@@ -9,30 +14,31 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-03-04 00:00:00 +01:00
+date: 2011-05-19 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: markaby
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 1
+        segments: 
+        - 0
+        - 5
         version: "0.5"
-    version: 
-- !ruby/object:Gem::Dependency 
-  name: fcgi
   type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: 0.8.7
-    version: 
-description: Cuca is a light web development framework that supports CGI and FastCGI. It has  a widget-bases approach to reuse functionality and does not implement an MVC architecture. Content  can be generated directly by the controller with the help of external widgets that can generate code using  markaby, eruby or any other user implemented 'generator'. It supports pretty URL's, layouts,  sessions and the rendering of 'partials'.
+  version_requirements: *id001
+description: |
+  Cuca is a light web development framework that supports CGI and FastCGI. It has 
+  a widget-bases approach to reuse functionality and does not implement an MVC architecture. Content 
+  can be generated directly by the controller with the help of external widgets that can generate code using 
+  markaby, eruby or any other user implemented 'generator'. It supports pretty URL's, layouts, 
+  sessions and the rendering of 'partials'.
+
 email: boesemar@gmx.de
 executables: 
 - cuca
@@ -43,132 +49,126 @@ extra_rdoc_files:
 - README
 files: 
 - bin/cuca
-- lib/cuca
-- lib/cuca/mimetypes.rb
-- lib/cuca/sessionpage.rb
-- lib/cuca/urlmap.rb
+- lib/cuca.rb
+- lib/cuca_console.rb
+- lib/cuca_cli.rb
 - lib/cuca/layout.rb
-- lib/cuca/widget.rb
-- lib/cuca/cgi_fix.rb
+- lib/cuca/cgi_emu.rb
+- lib/cuca/app.rb
 - lib/cuca/const.rb
-- lib/cuca/sessionflash.rb
-- lib/cuca/controller.rb
+- lib/cuca/generator/view.rb
+- lib/cuca/generator/markaby.rb
+- lib/cuca/app_cgi.rb
+- lib/cuca/widget.rb
 - lib/cuca/session.rb
-- lib/cuca/app.rb
-- lib/cuca/config.rb
-- lib/cuca/test
+- lib/cuca/session.rb-cgi
+- lib/cuca/urlmap.rb
+- lib/cuca/sessionpage.rb
+- lib/cuca/controller.rb
 - lib/cuca/test/helpers.rb
-- lib/cuca/stdlib
 - lib/cuca/stdlib/slink.rb
+- lib/cuca/stdlib/old_arform.rb
+- lib/cuca/stdlib/formelements.rb
+- lib/cuca/stdlib/arform.rb
 - lib/cuca/stdlib/link.rb
-- lib/cuca/stdlib/form.rb
 - lib/cuca/stdlib/list.rb
+- lib/cuca/stdlib/formelements.rbs
+- lib/cuca/stdlib/form.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/list.rb
+- lib/cuca/stdlib/formerrors.rb
 - lib/cuca/stdlib/listwidget/dblist.rb
+- lib/cuca/stdlib/listwidget/list.rb
 - lib/cuca/stdlib/listwidget/querydef.rb
 - lib/cuca/stdlib/listwidget/staticdatalist.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/cgi_emu.rb
-- lib/cuca_console.rb
-- lib/cuca.rb
-- tests/mimetypes.rb
-- tests/urlmap.rb
+- lib/cuca/mimetypes.rb
+- lib/cuca/generator_context.rb
+- lib/cuca/cgi_fix.rb
+- lib/cuca/sessionflash.rb
+- lib/cuca/config.rb
 - tests/generator_markaby.rb
-- tests/all.rb
-- tests/widget.rb
 - tests/generator_view.rb
-- tests/controller.rb
 - tests/app.rb
-- tests/test_app
-- tests/test_app/conf
+- tests/widget.rb
+- tests/all.rb
+- tests/test_app/app/user/list.rb
+- tests/test_app/app/user/__username/index.rb
+- tests/test_app/app/_views/test_template.rhtml
+- tests/test_app/app/agent/index.rb
+- tests/test_app/app/agent/list.rb
 - 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
-- application_skeleton/tests
-- application_skeleton/tests/widgets
+- tests/urlmap.rb
+- tests/controller.rb
+- tests/mimetypes.rb
 - application_skeleton/tests/widgets/link.rb
-- 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-lighttpd.rb
 - application_skeleton/scripts/server-webrick.rb
+- application_skeleton/scripts/server-webrick-cgihandler.rb
 - application_skeleton/scripts/console.rb
-- application_skeleton/scripts/server-lighttpd.rb
+- application_skeleton/scripts/server-rack-thin.rb
 - application_skeleton/scripts/test.rb
-- application_skeleton/lib
-- 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/scripts/server-lighttpd-fcgi.rb
+- application_skeleton/scripts/rack-test.rb
+- application_skeleton/scripts/server-rack-webrick.rb
+- application_skeleton/public/dispatch.fcgi
+- application_skeleton/public/dispatch.cgi
+- application_skeleton/public/dispatch.fcgi-old
+- application_skeleton/public/dispatch-fwdev.cgi
+- application_skeleton/public/css/style.css
+- application_skeleton/public/dispatch.cgi-old
+- application_skeleton/public/img/cuca-seagull.png
+- application_skeleton/public/500.html
+- application_skeleton/public/404.html
 - 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
+- application_skeleton/app/_widgets/test.rb
+- application_skeleton/app/_widgets/sourcecode.rb
+- application_skeleton/app/_layouts/simple.rb
+- application_skeleton/conf/environment.rb
+- application_skeleton/conf/config.rb
+- application_skeleton/log/error.log
+- application_skeleton/log/messages
+- application_skeleton/log/access.log
+- application_skeleton/README
 - CHANGELOG
 - README
 has_rdoc: true
 homepage: http://cuca.rubyforge.org/
-post_install_message: 
-rdoc_options: []
+licenses: []
 
+post_install_message: 
+rdoc_options: 
+- --main
+- README
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: cuca
-rubygems_version: 1.2.0
+rubygems_version: 1.3.7
 signing_key: 
-specification_version: 2
+specification_version: 3
 summary: A widget-based web framework
 test_files: []