cuca 0.04 → 0.05

data/CHANGELOG

@@ -1,5 +1,15 @@
 
-* xxxx/xx/xx - 0.04
+* 2009/08/20 - 0.05
+   - Widget can be defined 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
    - Display trace if enabled on 'stop :error' events
    - Option for autoloading support files (instead of bulk 'require')
@@ -12,7 +22,6 @@
    - Added some unit tests
    - Minor fixes in stdlib
    - Some fixes in dispatchers
-   - 
 
 
 * 2008/05/18 - 0.03

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.net") }
+     li { text "Checkout the cuca website: "; SLink("http://cuca.rubyforge.org") }
      li { text "Read the source code of these examples" }
     end
 

data/application_skeleton/conf/config.rb

@@ -26,14 +26,14 @@ Cuca::App.configure do |config|
 
   ### This would be an autoload configuration
   # config.include_directories = [
-  #    { :dir => '_controllers', :class_naming = Proc.new { |f| f.capitalize+'Controller' } },
-  #    { :dir => '_widgets',     :class_naming = Proc.new { |f| f.capitalize+'Widget' } },
-  #    { :dir => '_layouts',     :class_naming = Proc.new { |f| f.capitalize+'Layout' } }
-  #    { :dir => '_models',      :class_naming = Proc.new { |f| f.capitalize } }
+  #    { :dir => '_controllers', :class_naming => lambda { |f| f.capitalize+'Controller' } },
+  #    { :dir => '_widgets',     :class_naming => lambda { |f| f.capitalize+'Widget' } },
+  #    { :dir => '_layouts',     :class_naming => lambda { |f| f.capitalize+'Layout' } },
+  #    { :dir => '_models',      :class_naming => lambda { |f| f.capitalize } }
   #  ]
 
   ### For pretty url mapping
-  # config.magic_action_prefix = '__default_'
+  # config.magic_action_prefix = '__'
   
   ### This defines the session cookie definitions
   # config.session_key = 'cuca_session'

data/lib/cuca.rb

@@ -35,6 +35,7 @@ require 'rubygems'
 # All Classes are defined under this namespace
 module Cuca
 
+
 class CucaException < Exception # :nodoc:
 end
 
@@ -44,6 +45,24 @@ end
 
 end
 
+# To require config and environment
+def init_save_require(filename)
+ begin 
+   require filename
+ rescue  => e
+   title = "INIT Error [#{filename}]: #{e}"
+   $stderr.puts title
+   err = ''
+   e.backtrace.each do |b|
+     err << "    #{b}\n"
+   end
+   $stderr.puts err
+   c = CGI.new
+   c.out { "<b>#{title}<br><br>#{err.gsub(/\n/,'<br>')}" }
+ end
+end
+
+
 
 if $cuca_path.nil? then
  $stderr.puts "WARN: $cuca_path not found, assuming #{Dir.pwd}"
@@ -57,23 +76,12 @@ $cuca_path = File.expand_path($cuca_path) + '/'
 require 'cuca/app'
 
 $LOAD_PATH << $cuca_path+'/lib'
-begin 
- require $cuca_path+'/conf/config'
-rescue LoadError => e
- $stderr.puts "WARN: Error loading conf/config: #{e}"
-end
+
+init_save_require($cuca_path+'/conf/config')
 
 require 'cuca/widget'
 require 'cuca/controller'
 require 'cuca/layout'
 
-begin 
- require $cuca_path+'/conf/environment'
-rescue LoadError => e
- $stderr.puts "WARN: Error loading conf/environment: #{e}"
-rescue => e
- e.backtrace.each do |b|
-    $stderr.puts"    #{b}\n"
- end
-end
+init_save_require($cuca_path+'/conf/environment')
 

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

data/lib/cuca/const.rb

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

data/lib/cuca/controller.rb

@@ -65,9 +65,8 @@ end
 #
 # == Interrupting the program
 #
-# If you want to stop your program you can call the 'stop' method. Stop has
-# function to do most function, like redirect or setting a different layout or
-# raising an error message.
+# If you want to stop your program you can call the 'stop' method. Stop take some arguments
+# that allows you to redirect, display error or set a different layout.
 #
 #
 # == Examples
@@ -157,7 +156,7 @@ class Controller < Widget
  # One or more before filter can set by an application Controller
  # The instance methods will be run before the action get ran (get/post/run)
  # If you have many filters and need order you can set the priority option.
- # Lower priorities will be ran first.
+ # Lower priorities will run first.
  public
  def self.before_filter(method, priority = 50)
     define_filter_method(:def_before_filter, method, priority)

data/lib/cuca/generator/markaby.rb

@@ -7,13 +7,22 @@ class ::Markaby::Builder		# :nodoc:
 
   def method_missing(sym, *args, &block )	# :nodoc:
     class_name = sym.id2name  
-    begin
-      c=Object::const_get(class_name+"Widget")
-    rescue NameError => e
-      return old_method_missing(sym,*args,&block)
+
+         # 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)
     end
 
-#    $stderr.puts "Widget in markaby: Class: #{class_name}, \n\n assigns: #{@assigns.inspect} \n\n"
+    return old_method_missing(sym, *args, &block) if c.nil?
 
     widget = c.new({:args => args,
                     :assigns => @assigns },
@@ -32,10 +41,11 @@ module Cuca
 # A generator is a mixin to Cuca::Widget. It should provide functions that generate
 # content.
 # Visible within a generator function should be all instance variables, all instance
-# methods and an easy accessor to widgets. For example the view and markaby generators
-# that come with cuca you can call a widget like:
+# methods and an easy accessor to widgets defined on the root namespace and 
+# within the action namespace ($app.urlmap.action_namespace). For example the view and 
+# markaby generators that come with cuca you can call a widget like:
 #   Link(a,b,c..) { block}
-# and it will initialize the LinkWidget
+# and it will initialize the LinkWidget.
 module Generator
 
 # == Markaby Generator

data/lib/cuca/generator/view.rb

@@ -52,30 +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)
+      end
 
-      begin
-         # 1st try to find method in the base widget
-         if @base.methods.include?(class_name) then 
-             return @base.send(class_name, *args, &block)
-         end
-         # 2nd try to find a widget
-         c=Object::const_get(class_name+"Widget")
-      rescue NameError => e
-         raise "Undefined method: #{sym.id2name}"
+         # 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)
       end
 
+      raise "Undefined method: #{sym.id2name}" if c.nil?
+
       widget = c.new({:args => args,
                     :assigns => @assigns },
                     &block)
 
-#     $stderr.puts "Widget:" + widget.inspect
-      return widget.to_s
 
-#     $stderr.puts "Good"
+      return widget.to_s
     end
-  end
+   end
   
   
 #  VIEW_DIR = $cuca_path+'app/_views'

data/lib/cuca/session.rb

@@ -57,6 +57,8 @@ module Cuca
 #
 # Page memory is a container to store data only valid for the current action.
 # It will be erased once you leave to a different action.
+# Current request and query parameters (get/post) are automatically available in this
+# container.
 #
 #
 # 

data/lib/cuca/stdlib/arform.rb

@@ -31,11 +31,22 @@ class ARFormWidget < FormWidget
    @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[:post_to])
+   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
+
+ # overwrite this method to perform modifications 
+ # before validateing the data
+ def before_validate(variables)
+    variables
  end
 
  def validate
@@ -44,6 +55,10 @@ class ARFormWidget < FormWidget
    p = request_parameters.dup
    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) }
@@ -58,7 +73,7 @@ class ARFormWidget < FormWidget
    @password_fields.each do |pwf|
       p.delete(pwf) if p[pwf].chomp.empty?
    end
-   $stderr.puts p.inspect
+#   $stderr.puts p.inspect
    @model.attributes = p
    
    return true if @model.valid?
@@ -95,6 +110,12 @@ class ARFormWidget < FormWidget
    "<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
@@ -130,8 +151,9 @@ 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.year}/#{twodig(v.month)}/#{twodig(v.day)} #{v.hour}:#{v.min}' #{'disabled' unless enabled}>
+<input type='text' name='#{name}' id='i_#{name}' value='#{v}' #{'disabled' unless enabled}>
   EOS
     if enabled then 
       r << <<-EOS 
@@ -152,6 +174,35 @@ 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"
@@ -177,6 +228,10 @@ end
          r << fe_int(name,value,enabled)
        when :datetime
          r << fe_datetime(name,value,enabled)
+       when :date
+         r << fe_date(name,value,enabled)
+       when :time
+         r << fe_time(name, value, enabled)
        when :password
          r << fe_password(name, enabled)
      end
@@ -189,6 +244,13 @@ end
    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
+ end
 
  # you might want to replace this method
  public

data/lib/cuca/stdlib/form.rb

@@ -53,25 +53,38 @@ class FormWidget < Cuca::Widget
  # {form_name}_submit(result) on the CONTROLLER.
  def on_submit
   controller.send(@form_name+'_submit', get_variables) unless controller.nil?
+  clear
+  form
  end
 
- def output(form_name, post_to = nil)
+ # options can be used for form specific stuff
+ # we only use :post_to to set @post_to atm
+ def output(form_name, options = {})
    @form_name = form_name
-   @post_to   = post_to || cgi.path_info
+   
    @submit_name = 'submit_'+@form_name
    @form_errors = {}
 
+   @options = options
+   
+   setup
+
+   @post_to   = @options[:post_to] || cgi.path_info
+
+
+#   form
+
    if posted? then
      load_variables
      validate
      if @form_errors.empty? then
-        clear		# submitted forms should not have any content that might have been generated
+# What was that thought about?
+#        clear		# submitted forms should not have any content that might have been generated
         return on_submit
      else
         form
      end
    else
-     setup
      form
    end
  end

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

@@ -20,10 +20,19 @@ class BaseList < Cuca::Widget
     @rewrite_hooks[field_id] = proc
  end
 
+ def row2hash(row)
+    res = {}
+    c = columns
+    c.each_index do |idx|
+      res[c[idx][:id]] = row[idx]
+    end
+    res
+ end
+
  def rewrite_field(row, field_id, content)
 #   $stderr.puts "REwrite field(#{row.inspect}, #{field_id.inspect}, #{content.inspect} - hooks #{@rewrite_hooks.inspect}"
    return content unless @rewrite_hooks[field_id]
-   return @rewrite_hooks[field_id].call(row, content)
+   return @rewrite_hooks[field_id].call(row2hash(row), content)
  end
 
 

data/lib/cuca_console.rb

@@ -0,0 +1,12 @@
+# 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

data/tests/test_app/README

@@ -1 +1 @@
-This directory is for the unit tests, it doesn't make sense for anything else.
+This directory is for the unit tests, it doesn't make sense for anything else.

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: cuca
 version: !ruby/object:Gem::Version 
-  version: "0.04"
+  version: "0.05"
 platform: ruby
 authors: 
 - Martin Boese
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-06-17 00:00:00 +01:00
+date: 2008-08-20 00:00:00 +00:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -41,12 +41,11 @@ extra_rdoc_files:
 files: 
 - bin/cuca
 - lib/cuca.rb
+- lib/cuca_console.rb
 - lib/cuca
 - lib/cuca/cgi_fix.rb
 - lib/cuca/controller.rb
 - lib/cuca/config.rb
-- lib/cuca/urlmap2.rb
-- lib/cuca/urlmap-original.rb
 - lib/cuca/stdlib
 - lib/cuca/stdlib/arview.rb
 - lib/cuca/stdlib/form.rb

data/lib/cuca/urlmap-original.rb

@@ -1,324 +0,0 @@
-
-if __FILE__ == $0  then
- require 'rubygems'
- require 'cuca'
-end
-
-module Cuca
-
-# URLMap will throw this in case we can't find a controller
-# file for a URL.
-class RoutingError < StandardError	# :nodoc:
-end
-
-
-# == URLMap 
-#
-# URLMap is used internally to match a URL to a controller file.
-# Call with ds = URLMap.new('/path/to/app', 'path/from/url')
-#                URLMap.new(base_path, url)
-#
-# You can then fetch the following values:
-#
-# * script 		- path to the controller file
-# * url			- unmodified URL as passed to initializer
-# * assigns 		- hash with variable assigns from the url (magick prefixes)
-# * subcall 		- name of subcall or nil if a normal call was made
-# * action 		- Action name (Note: action.capitalize+"Controller" is your controller class name)
-# * base_url		- Base URL to the action (e.g.: /user/someone/show is -> /user/someone/)
-# * base_path		- Unmodified base_path
-# * action_path 	- Path to the action script
-# * action_path_full 	- Full path to action script
-# * path_tree		- an array of each directory on the way from /path/to/app to the script
-#                         (to look for include_directories in - see Cuca::Config)
-# * action_module	- The module the action should be loaded into (to avoid name conflicts, depends on action_path)
-#
-#
-# == Match on other URL
-#
-# A widget/controller can make use of the URLMap object to scan on other directories (example to find out if a
-# link url will be withing the same controller).
-#
-# See match? / submatch? and usubmatch?
-#
-#
-# == Notes
-#
-# URL's ending with '/' will be scanned for default index files.
-#
-# URL's where last part (action) starts with '-' will be scanned for
-# subcalls
-#
-# If no script is found or any other error it will raise a RoutingError exception
-#
-#
-# == Example
-#
-#  u = URLMap.new('/home/bones/src/cuca_app/app', 'customer/southwind_lda/show'
-#  
-#  u.script 	 => '/home/bones/src/cuca_app/app/customer/__customer/show.rb'
-#  u.action 	 => 'show'
-#  u.base_url    => '/customer/__customer/'
-#  u.assigns 	 => { 'customer' => 'southwind_lda' }
-#  u.action_path => 'customer/southwind_lda/'
-#
-class URLMap
- attr_reader :url		# current url
- attr_reader :assigns
- attr_reader :script
- attr_reader :subcall
- attr_reader :base_url
- attr_reader :base_path
- attr_reader :action
- attr_reader :action_path
- attr_reader :action_path_full
- attr_reader :action_module
- attr_reader :path_tree
- 
- DEF_ACT = Cuca::App::config['magic_action_prefix'] || '__'
- DEF_IDX = [ 'index', 'default' ]
-
- private 
- def scan_file(base, file)
-
-   if (file == '') then 	# check for default index file
-     DEF_IDX.each do |idxfile|
-       if File.exist?("#{base}/#{idxfile}.rb")
-          @action = idxfile
-          return "#{idxfile}.rb"
-       end
-     end
-     raise RoutingError.new("No default index file found in #{base}")
-   end
-   
-   @action = file
-   
-   # check if a regular file exists:
-#   puts "Checking file on #{check}"
-   return (file+".rb") if File.exist?("#{base}/#{file}.rb")
-   
-   # check if the subcall file exists:
-   if (file[0].chr == '-') then
-      (action,subcall) = file.scan(/^\-(.*)\-(.*)$/).flatten
-      if action.nil? || subcall.nil? || action.strip.empty? then
-        raise RoutingError.new("Bad format on subcall: #{file}")
-      end
-      raise RoutingError.new("Script not found for subcall: #{file}: #{action}.rb") if !File.exist?("#{base}/#{action}.rb")
-      @subcall = subcall
-      @action = action
-      return "#{action}.rb"
-   end 
- end
-
-
- # scan_dir will look within a realdirectory for an unparsed url 'file' and return 
- # 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}"
-   $stderr.puts "MOUNTS:   #{mount.inspect}"
-   
-
-   if mount["#{striped}/"] then
-      $stderr.puts "Found mount point, returning: #{mount["#{striped}/"]}"
-      return mount["#{striped}/"]
-   end
-
-   if File.directory?("#{base}/#{file}") then
-     return file.empty? ? base : "#{base}/#{file}"		# avoid returning double //
-   end
-   
-   d = Dir["#{base}/#{DEF_ACT}*"].collect { |f| f.split('/').last }
-
-#   puts "Directory not found, checking for default in #{base}  - #{file}"
-
-#   puts d.inspect
-#   
-  
-   raise RoutingError.new("Multiple default actions defined in #{base}") if  d.size > 1 
-   raise RoutingError.new("Routing Error in #{base}") if d.empty?
-
-
-   @assigns[d[0][DEF_ACT.size..-1]] = file
-   "#{base}/#{d[0]}"
- end
-
-
- private
- def make_module(path)
-   const_name = "Appmod_#{path.gsub(/[\/\\]/, '_')}"
-   
-   if Cuca::Objects::const_defined?(const_name.intern) then
-     return Cuca::Objects::const_get(const_name.intern)
-   end
- 
-   m = Module.new
-   Cuca::Objects::const_set(const_name.intern, m)
-   return m
- 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]
-
-#   puts files.inspect  
-   real_path = @base_path.dup
-
-   # scan directory
-   files.each_index do |idx| 
-     next if idx >= (files.size-1)  # skip last element
-     r = scan_dir(real_path, files[idx])
-     raise RoutingError.new("Routing Error at #{real_path} - #{files[idx]}") if !r
-     @path_tree << r
-     real_path = r
-   end
-
-   @url               = @path_info
-   @base_url	      = "#{files[0..-2].join('/')}/"
-   @action_path       = real_path[@base_path.length..-1]
-   @action_path_full  = real_path 
-   @action_module     = make_module(@action_path)
-   
-   # scan file (last element)
-   r = scan_file(real_path, files.last)
-
-   raise RoutingError.new("Routing Error - script not found at #{real_path} - #{files.last}") if !r
-   
-   real_path = "#{real_path}/#{r}"
-
-   @script          = File.expand_path(real_path)
-#   @path_tree	    = _tree(@base_path, @script)
-   self
- end
-
- 
- # match will check if the supplied url maches with a script
- # returns boolean
- #
- # Example: 
- #  URLMap('/path/to/app', '/customer/southwind_lda/').match?('/path/to/app/customer/__custid/index.rb') => true
- public
- def match?(script)
-   m_script = @script
-   p_script = File.expand_path(script)
-   
-#   $stderr.puts "URLMap::match - #{m_script} - #{p_script}"
-   return (m_script == p_script)
-   rescue RoutingError
-     false
- end
- 
-
- # this will match if the current script can be found within a path
- # from the parameters.
- #
- # Example:
- #  URLMap('/path/to/app', '/customer/southwind_lda/').submatch?('/customer/__custid/') => true 
- public
- def submatch?(some_path)
-#    $stderr.puts "Submatch: #{some_path} with #{@script} - #{(@script.length < some_path.length).inspect} #{@script.include?(some_path)}"
-    return false if @script.length < some_path.length
-    return @script.include?(some_path)
- end
- 
- # this will match the current script to a part of a url (link):
- #
- # Example:
- #  URLMap('/path/to/app', '/customer/southwind_lda/').submatch?('/customer/other_customer/') => true 
- public
- def usubmatch?(some_path)
-    @path_info.include?(some_path)
- end
-
- # FIXME: needed?
- public
- def has_script?(script)
-    return !(@script == '')
- end
- 
-
- def initialize(base_path, path_info, default_actions = ['index'])
-   @path_info = path_info
-   @base_path = File.expand_path(base_path)
-   @script    = ''
-   @subcall   = nil
-   @default_actions = default_actions
-   @assigns = {}
-   @action = ''
-   @action_path = ''
-   @path_tree = [base_path]
-   scan
-   self
- end
-
-end
-
-end
-
-
-#
-# Testings:
-#
-
-if __FILE__ == $0  then
-require 'app'
- 
- BASE = '/home/bones/src/cuca/app'
- URL  = 'user/martin/somewhere/notexist/'
- 
- puts "Testing on '#{BASE}' - '#{URL}'"
- 
- module Cuca
-  ds = URLMap.new(BASE, URL)
- begin
-  rescue RoutingError => e
-  puts "E: Invalid request #{$!}"
- end
-
-
-
-  puts "Match with: #{ds.match?('/home/bones/src/cuca/app/user/__default_username/index.rb')}"
-  puts "Submatch with /user/__username/ #{ds.submatch?('/user/__username/')}"
-  puts "Submatch with '/user/' #{ds.submatch?('/user/')}"
-  puts "USubmatch with '/user/' #{ds.usubmatch?('/user/martin')}"
-  puts
-  puts "Script is:        #{ds.script}"
-  puts "Assigns are:      #{ds.assigns.inspect}"
-  puts "Subcall:          #{ds.subcall.inspect}"
-  puts "Action:           #{ds.action}"  
-  puts "Action Path:      #{ds.action_path}"
-  puts "Action Path Full: #{ds.action_path_full}"
-  puts "Action Module:    #{ds.action_module.inspect}"
-  puts "Path tree:        #{ds.path_tree.inspect}"
-  end
-  
-end
-
-
-
-
-
-
-
-# URL:             "/user/martin/show"
-# DIR:             "/user/__userid/show'
-# MOUNT:           "/user/__userid/" =>>> "/plugin/user"   contains 'show'
-# MOUNT:           "/user/__userid/" =>>> "/plugin/user2"  contains 'see'
-
-
- 
-
-
-
-
-

data/lib/cuca/urlmap2.rb

@@ -1,22 +0,0 @@
-
-
-class URLMap2
-
-
- def path2array(p)
-   p.split('/')
- end
- def array2path(a)
-   a.join('/')
- end
- 
-
- def initialize(directory, options)
-   @app_path = options[:app_path] || raise ArgumentError.new("app_path required")
-   @mounts   = options[:mounts] || []
-   @url      = options[:url] || raise ArgumentError.new("url required")
- end
- 
-
-
-end