cuca 0.07 → 0.12

data/lib/cuca/cgi_emu.rb

@@ -1,16 +1,23 @@
 # little fake cgi class that allows automated testing of cgi application
 
+require 'stringio'
+
 class CGIEmu < CGI
    
   attr_reader :out_params
   attr_reader :out_content
+  
+  attr_reader :output_cookies    # made by CGI::Session
 
   class EnvTable
     def initialize(options)
      @test_path_info = options['PATH_INFO'] || '/'
      @test_query_params = options['QUERY_PARAMS'] || {}
+     @request_method = options['REQUEST_METHOD'] || 'GET'
+     @content_length = options['CONTENT_LENGTH'] || 0
+     @http_cookie    = options['HTTP_COOKIE']
     
-     the_env_table.each_pair { |k,v| ENV[k] = v }
+     the_env_table.each_pair { |k,v| ENV[k] = v.to_s }
 
 #     ENV.merge(the_env_table)
     end
@@ -35,7 +42,6 @@ class CGIEmu < CGI
      "REMOTE_ADDR"=>"127.0.0.1", 
      "SERVER_SOFTWARE"=>"WEBrick/1.3.1 (Ruby/1.8.6/2007-06-07)",
      "HTTP_REFERER"=>"http://localhost:2000/",
-     "HTTP_COOKIE"=>"cuca_session=285715682bf030a19cb24b2560aabc36",
      "HTTP_ACCEPT_CHARSET"=>"utf-8, utf-8;q=0.5, *;q=0.5",
      "REQUEST_URI"=>"http://localhost:2000" + @test_path_info, 
      "SERVER_PORT"=>"2000", 
@@ -43,8 +49,12 @@ class CGIEmu < CGI
      "QUERY_STRING"=>query_string, 
      "HTTP_ACCEPT"=>"text/html, image/jpeg, image/png, text/*, image/*, */*",
      "SCRIPT_FILENAME"=>"/home/bones/workspace/cuca/scripts/../public/dispatch.cgi",
-     "REQUEST_METHOD"=>"GET", 
-     "HTTP_CONNECTION"=>"Keep-Alive"}
+     "REQUEST_METHOD"=>@request_method, 
+     "HTTP_CONNECTION"=>"Keep-Alive",
+     "CONTENT_LENGTH" => @content_length,
+     "HTTP_COOKIE" => @http_cookie,
+#     'CONTENT_TYPE' => "application/x-www-form-urlencoded"
+     }
     end
 
     def [](key)
@@ -58,11 +68,12 @@ class CGIEmu < CGI
   end
 
   def stdinput
-  #  $stderr.puts "Returning STDINPUT"
-    StringIO.new("")
+    StringIO.new(@content)
   end
 
   def initialize(options)
+    @content =  options['CONTENT'] || ''
+    options.delete('CONTENT')
     @test_options = options
     super()
   end

data/lib/cuca/const.rb

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

data/lib/cuca/controller.rb

@@ -330,8 +330,6 @@ class Controller < Widget
       self.send(method_name) if self.respond_to?(method_name.intern)
    rescue BreakControllerException => e
       handle_exception(e)
-   rescue ApplicationException => e
-      http_status "SERVER_ERROR"
    end
  end
 

data/lib/cuca/generator/view.rb

@@ -44,15 +44,17 @@ module View
   # This will return the generated markup as a string
   def viewtext(filename=nil)
     view_dir = $cuca_path + '/' + App::config['view_directory']
+
     begin
-       f = File.open(view_dir + "/#{filename}", 'r')
+       template = File.read(view_dir + "/#{filename}")
     rescue => e
-       return "Error opening template: #{e}"
+       return "Error reading template: #{e}"
     end
-   
-    template = f.read
-    f.close
 
+    if RUBY_VERSION > '1.8' && Cuca::App.config['view_encoding'] then
+      template.force_encoding(Cuca::App.config['view_encoding'])
+    end
+ 
     viewtext_p(template)
   end
 

data/lib/cuca/mimetypes.rb

@@ -1,5 +1,7 @@
 module Cuca
 
+#  This code whould take the data from /etc/mine.types, but not present on all systems
+#  
 #
 # MimeTypes is a self-writing hash.
 # Will take the data of the mime.types file

data/lib/cuca/sessionpage.rb

@@ -1,10 +1,19 @@
 module Cuca
 
 # A session page (access via session.page) is memory that is only valid 
-# for the current action. Once you leave to another page it will
-# be erased. (see Cuca::Session)
+# for the current action. 
+# Query and Request paramenters are automatically available in this container and
+# remain available if removed due to a page refresh or similar.
+# 
+# If you leave the page, they are NOT erased anymore (this used to be cuca behavior
+# <= 0.7). They stay valid until EXPIRE_TIME_HOURS (default 4 hours).
+#
+# see Cuca::Session
 class SessionPage
 
+ LAKEY = :session_page_last_access
+ EXPIRE_TIME_HOURS = 4
+
  private 
  def pagekey
    "Pk_#{$app.urlmap.script.gsub(/[\/\\]/, '_')}".intern
@@ -19,7 +28,8 @@ class SessionPage
    @ses = session
    @ses[:SessionPage] ||= {}
    pagemem[pagekey] ||= {}
-   session.cgi.parameters.each_pair { |k,v|  self[k] = v if v.kind_of?(String) } 
+   pagemem[pagekey][LAKEY] = Time.now
+   session.cgi.parameters.each_pair { |k,v|  self[k] = v.dup if v.kind_of?(String) } 
    expire
  end
 
@@ -49,9 +59,13 @@ class SessionPage
  private
  def expire
     pagemem.each_pair do |k,v| 
-      pagemem.delete(k) if k != pagekey
+      next if k == pagekey
+      next unless pagemem[k][LAKEY]
+      next if pagemem[k][LAKEY] > (Time.now - (3600 * EXPIRE_TIME_HOURS))
+      pagemem.delete(k)
     end
  end
+ 
 end
 
 end

data/lib/cuca/stdlib/README

@@ -0,0 +1,2 @@
+These are kind of example Widgets..
+

data/lib/cuca/stdlib/form.rb

@@ -88,7 +88,7 @@ class FormWidget < Cuca::Widget
  # it will get the variables from the options[:default_values]
  def get_form_variables
    var = @options[:default_values] || {}
-   params.each_pair { |k,v| var[k] = v } if posted? # request_method == 'POST'
+   params.each_pair { |k,v| var[k.to_s] = v } if posted? # request_method == 'POST'
    @variables = {}
    var.each_pair { |k,v| @variables[k.to_s] = v }		# this allows is to pass symbols to default_values
    @variables

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

@@ -80,6 +80,7 @@ class DBListWidget < BaseList
    findstuff[:offset] = query_def.range.first
    findstuff[:limit]  = query_def.range.last-query_def.range.first+1
    findstuff[:joins]  = @joins || nil
+   findstuff[:group]  = @group_by if @group_by.to_s != '' 
    sel = @query_columns.collect do |c| 
       ret = c.has_key?(:query) ? "#{c[:query]} as #{c[:id]}" : c[:id] 
       ret = nil if c[:query] == false
@@ -88,9 +89,18 @@ class DBListWidget < BaseList
    findstuff[:select] = sel.compact.join(',')
    @data = @model_class.find(:all, findstuff)
    @additional_data = @data.dup
-   
+
+   rowcount_findstuff = findstuff.dup
+   rowcount_findstuff.delete(:limit)
+   rowcount_findstuff.delete(:offset)
+   rowcount_findstuff.delete(:order)
+         
    @data = normalize_result(@data)   
-   @total_rows= @model_class.count(:conditions => where_clause(query_def), :joins => @joins)
+   
+   @total_rows= @model_class.count(rowcount_findstuff)
+   if @total_rows.kind_of?(Hash) then   # if group_by is defined we'll get this
+     @total_rows = @total_rows.size
+   end
  end
 
  def setup
@@ -118,6 +128,7 @@ class DBListWidget < BaseList
    @columns           = data_setup[:columns] || [] 
    @extra_conditions = data_setup[:conditons] || ""
    @joins	      = data_setup[:joins] || ""
+   @group_by	     =  data_setup[:group_by] || ""
    @options	      ||= data_setup[:options] 		# can be used by 'setup'
    @model_class = model_class || nil
    setup

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

@@ -67,8 +67,8 @@ class QueryDef
    end
  
    #setter
-   raise NoMethodError if met[met.size-1].chr != '='
-   raise NoMethodError if params.size != 1
+   raise NoMethodError, met if met[met.size-1].chr != '='
+   raise NoMethodError, met if params.size != 1
    met = met[0..met.size-2]		# cut '='
    if ATTRIBS.include?(met) then
      @data[met] = params[0]
@@ -79,9 +79,9 @@ class QueryDef
 
  # value enc/dec
  def ev_enc(name)
-#   $stderr.puts "env_enc(#{name}) #{@data.inspect}"
+
    if ATTRIBS_ENCODE.has_key?(name) then
-     ATTRIBS_ENCODE[name].call(@data[name] || '')
+     ATTRIBS_ENCODE[name].call(@data[name])
    else
      @data[name]
    end
@@ -89,7 +89,7 @@ class QueryDef
 
  def ev_dec(name, value)
    if ATTRIBS_DECODE.has_key?(name) then
-#     $stderr.puts "ev_dec #{name} #{value}"
+     $stderr.puts "ev_dec #{name} #{value}"
      begin
         return ATTRIBS_DECODE[name].call(value)
      rescue
@@ -112,20 +112,20 @@ class QueryDef
 
  # returns an hash with the values and escaped names and attributes
  # attr and newval with swap a value for this return without changing the actual data
- def to_h(attr=nil, newval=nil, attr2=nil, newval2=nil)
-   if attr then
+ def to_h(attr1=nil, newval1=nil, attr2=nil, newval2=nil)
+   if attr1 then
       @backup = @data.dup
-      @data[attr] = newval
+      @data[attr1] = newval1
       @data[attr2] = newval2 unless attr2.nil?
    end
 
    u = {}
    ATTRIBS.each do |a|
-#      $stderr.puts "Encoding: #{a} - #{@data[a]}"
+#     $stderr.puts "Encoding: #{a} - #{@data[a]}"
       u[at_enc(a)] = escape(ev_enc(a) || '')
    end
    
-   if attr then @data = @backup end
+   if attr1 then @data = @backup end
 
    return u
  end
@@ -153,7 +153,7 @@ class QueryDef
          fname = p.scan(/\_filter\_(.*)/)[0][0]
          fdata = v
          @data['filters'][fname] = fdata
-#         $stderr.puts "Filter update: #{@data['filters'].inspect}"
+         $stderr.puts "Filter update: #{@data['filters'].inspect}"
       end
    end
 
@@ -169,10 +169,4 @@ class QueryDef
  end
 end
 
-# qr = QueryDef.new("my_list")
-# qr.order_by = 'firstname'
-# qr.range = 100..200
-#
-# qr.filters = {'firstname' => 'martin', 'lastname' =>  'boese' }
-# puts qr.to_url
 

data/lib/cuca/test/helpers.rb

@@ -1,5 +1,9 @@
 
 require 'test/unit'
+require 'cuca/cgi_emu'
+require 'cuca/urlmap'
+
+require 'ostruct'
 
 module Cuca
 module Test
@@ -10,8 +14,6 @@ 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
  @app.load_support_files(Cuca::URLMap.new($cuca_path+'/app', app_path))
@@ -39,6 +41,57 @@ def widget_p(widget_class, *args, &block)
 end
 
 
+#
+# Functional Tests
+#
+def cgi_status_to_text(status)
+  require 'cgi'
+  CGI::HTTP_STATUS[status] || status
+end
+
+def cgi_to_result(cgi, other = {})
+  op = cgi.out_params
+
+  result = OpenStruct.new  
+  result.status     = cgi_status_to_text(op['status'])
+  result.status_cgi = op['status']
+  result.type       = op['type']
+  result.content    = cgi.out_content
+  result.cookies    = cgi.output_cookies
+  other.each { |k,v| result.send("#{k}=".intern, v) }
+  result 
+end
+
+
+def measure_time
+  t = Time.now.to_f
+  yield
+  Time.now.to_f - t
+end
+
+def get(target, query_parameters= {})
+  @cgi = CGIEmu.new({'PATH_INFO' => target, 
+                     'QUERY_PARAMS' => query_parameters,
+                     'HTTP_COOKIE' => @test_http_cookie})
+  @app = Cuca::App.new
+  t = measure_time { @app.cgicall(@cgi) }
+  cgi_to_result(@app.cgi, :time => t)
+end
+
+def post(target, request_parameters = {})
+  require 'uri'
+  body = URI.encode_www_form(request_parameters)
+  @cgi = CGIEmu.new({'PATH_INFO'      => target, 
+                     'REQUEST_METHOD' => 'POST', 
+                     'CONTENT_LENGTH' => body.size, 
+                     'CONTENT' =>  body,
+                     'HTTP_COOKIE' => @test_http_cookie})
+  @app = Cuca::App.new
+  t = measure_time { @app.cgicall(@cgi) }
+  cgi_to_result(@app.cgi, :time => t)
+end
+
+
 end
 end
 end

data/lib/cuca/urlmap.rb

@@ -1,7 +1,10 @@
 
 if __FILE__ == $0  then
  require 'rubygems'
- require 'cuca'
+ begin
+   require 'cuca'
+ rescue LoadError
+ end
 end
 
 module Cuca
@@ -115,7 +118,6 @@ class URLMap
  # it's real path
  private
  def scan_dir(base, file)
-
    striped = "#{base}/#{file}"[@base_path.length..-1]
    mount = Cuca::App.config['mount']  || {}
 #   $stderr.puts "SCAN DIR: #{striped}"
@@ -133,7 +135,7 @@ class URLMap
      return file.empty? ? base : "#{base}/#{file}"		# avoid returning double //
    end
    
-   d = Dir["#{base}/#{DEF_ACT}*"].collect { |f| f.split('/').last }
+   d = Dir["#{base}/#{DEF_ACT}*"].map { |f| f.split('/').last }
 
 #   puts "Directory not found, checking for default in #{base}  - #{file}"
 
@@ -163,19 +165,26 @@ class URLMap
  end
 
 
+ # removes double slashes from a path-string
+ def clean_path(directory)
+   directory.gsub(/\/\//, '/')
+ end
+
  # scan will match an URI to a script and set assigns. (called from initialize)
  private
  def scan
    files = @path_info.split('/')
-   
+
    files << '' if @path_info[@path_info.size-1].chr == '/'		# add empty element if we point to a directory
 
    # files now contains something like:
-   # [users, show, martin, contacts]
+   # ['', 'users', 'show', 'martin', 'contacts']
 
 #   puts files.inspect  
    real_path = @base_path.dup
 
+   @path_tree = [] if files.size > 1
+
    # scan directory
    files.each_index do |idx| 
      next if idx >= (files.size-1)  # skip last element
@@ -196,7 +205,7 @@ class URLMap
 
    raise RoutingError.new("Routing Error - script not found at #{real_path} - #{files.last}") if !r
    
-   real_path = "#{real_path}/#{r}"
+   real_path = clean_path("#{real_path}/#{r}")
 
    @script          = File.expand_path(real_path)
 #   @path_tree	    = _tree(@base_path, @script)
@@ -251,14 +260,14 @@ class URLMap
 
  def initialize(base_path, path_info, default_actions = ['index'])
    @path_info = path_info
-   @base_path = File.expand_path(base_path)
+   @base_path = clean_path(File.expand_path(base_path))
    @script    = ''
    @subcall   = nil
    @default_actions = default_actions
    @assigns = {}
    @action = ''
    @action_path = ''
-   @path_tree = [base_path]
+   @path_tree = [@base_path]
    scan
    self
  end
@@ -273,7 +282,7 @@ end
 #
 
 if __FILE__ == $0  then
-require 'app'
+require 'cuca/app'
  
  BASE = '/home/bones/src/cuca/app'
  URL  = 'user/martin/somewhere/notexist/'