cuca 0.03 → 0.04

data/lib/cuca/urlmap.rb

@@ -16,16 +16,21 @@ end
 #
 # 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)
 #
 #
@@ -58,14 +63,17 @@ end
 #  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' ]
@@ -102,9 +110,28 @@ class URLMap
    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)
-   return file if File.directory?("#{base}/#{file}")
+
+   striped = "#{base}/#{file}"[@base_path.length..-1]
+   mount = Cuca::App.config['mount']  || {}
+#   $stderr.puts "SCAN DIR: #{striped}"
+#   $stderr.puts "MOUNTS:   #{mount.inspect}"
+#  $stderr.puts "AGAINST:  #{striped} #{mount.has_key?(striped).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 }
 
@@ -112,12 +139,13 @@ class URLMap
 
 #   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   
-   d[0]  
+   @assigns[d[0][DEF_ACT.size..-1]] = file
+   "#{base}/#{d[0]}"
  end
 
 
@@ -125,12 +153,12 @@ class URLMap
  def make_module(path)
    const_name = "Appmod_#{path.gsub(/[\/\\]/, '_')}"
    
-   if Cuca::const_defined?(const_name.intern) then
-     return Cuca::const_get(const_name.intern)
+   if Cuca::Objects::const_defined?(const_name.intern) then
+     return Cuca::Objects::const_get(const_name.intern)
    end
  
    m = Module.new
-   Cuca::const_set(const_name.intern, m)
+   Cuca::Objects::const_set(const_name.intern, m)
    return m
  end
 
@@ -142,17 +170,22 @@ class URLMap
    
    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
-   
+   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
-     real_path = "#{real_path}/#{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 
@@ -164,8 +197,9 @@ class URLMap
    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)
+
+   @script          = File.expand_path(real_path)
+#   @path_tree	    = _tree(@base_path, @script)
    self
  end
 
@@ -217,13 +251,14 @@ class URLMap
 
  def initialize(base_path, path_info, default_actions = ['index'])
    @path_info = path_info
-   @base_path = base_path
+   @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
@@ -241,7 +276,7 @@ if __FILE__ == $0  then
 require 'app'
  
  BASE = '/home/bones/src/cuca/app'
- URL  = 'user/martin/'
+ URL  = 'user/martin/somewhere/notexist/'
  
  puts "Testing on '#{BASE}' - '#{URL}'"
  
@@ -266,6 +301,26 @@ require 'app'
   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

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

data/lib/cuca/widget.rb

@@ -74,12 +74,12 @@ class Widget
   
   # An accessor to the global cgi variables
   def cgi
-   $cgi
+   $app.cgi
   end
 
   # An accessor to the global logger variables
   def log
-   $logger
+   $app.logger
   end
 
   # An accessor to the Cuca::app object
@@ -91,22 +91,22 @@ class Widget
   # an accessor to cgi.parameters variables. This is NOT params from the CGI class 
   # (see cgi_fix)
   def params
-    $cgi.parameters
+    $app.cgi.parameters
   end
   
   # accessor to cgi query parameters (http GET)
   def query_parameters
-     $cgi.query_parameters
+     $app.cgi.query_parameters
   end
   
   # accessor to the cgi request parameters (http POST)
   def request_parameters
-    $cgi.request_parameters
+    $app.cgi.request_parameters
   end
   
   # an accessor to request_method
   def request_method
-    return $cgi.request_method
+    return $app.cgi.request_method
   end
 
   # Escape a string to use with URL etc..

data/tests/all.rb

@@ -0,0 +1,8 @@
+require 'test/unit'
+
+require 'tests/widget'
+require 'tests/urlmap'
+require 'tests/controller'
+require 'tests/mimetypes'
+require 'tests/generator_markaby'
+require 'tests/generator_view'

data/tests/app.rb

@@ -0,0 +1,37 @@
+require 'test/unit'
+
+$: << File.expand_path(File.dirname(__FILE__) + '/../lib')
+
+$cuca_path = File.expand_path("#{File.dirname(__FILE__)}/test_app")
+require 'cuca'
+require 'cuca/urlmap'
+require 'cuca/cgi_emu'
+
+
+class TestApp < Test::Unit::TestCase
+
+  def test_basic
+    app = Cuca::App.new
+    assert app.app_path
+    assert app.public_path
+    assert app.log_path
+    assert app.logger.instance_of?(Logger)
+    assert_equal $app.object_id, app.object_id
+  end
+
+  def test_configure
+    Cuca::App.configure do |conf|
+      conf.test_var = 'test'
+    end
+    assert_equal 'test', Cuca::App.config['test_var']
+  end
+
+  def test_support_files_loading
+    app = Cuca::App.new
+    um = Cuca::URLMap.new("#{$cuca_path}/app/", "/user/list.rb")
+    app.load_support_files(um)
+  end
+
+
+ 
+end

data/tests/controller.rb

@@ -0,0 +1,163 @@
+require 'test/unit'
+
+$: << File.expand_path(File.dirname(__FILE__) + '/../lib')
+
+$cuca_path = File.expand_path("#{File.dirname(__FILE__)}/test_app")
+require 'cuca'
+require 'cuca/urlmap'
+
+class TestAController < Cuca::Controller
+  def get
+    content << 'GET'
+  end
+  def post
+    content << 'POST'
+  end
+end
+class TestBController < Cuca::Controller
+  def run
+    content << 'RUN'
+  end
+end
+
+# test layout - will just put brackets around content
+class TestLayout < Cuca::Layout
+  def output
+    @_content = "(#{@content_for_layout})"
+  end
+end
+
+# A Controller that defines a layout
+class LayoutController < Cuca::Controller
+  layout 'test'
+
+  def run
+     content << "LAYOUT"
+  end
+end
+
+# should produce: "(zero-one-two-three-FILTER-aone-atwo)"
+class FilterController < Cuca::Controller
+ priority_before_filter 'filter_pri'
+ before_filter 'filter_three', 30
+ before_filter 'filter_one', 1
+ before_filter 'filter_two', 10
+
+ priority_after_filter 'afilter_pri'
+ after_filter 'afilter_one', 10
+ after_filter 'afilter_two', 20
+
+ def run
+    content << "(#{@filter.join('-')}-FILTER"
+ end
+
+ def filter_pri
+   @filter = ['zero']
+ end
+ 
+ def afilter_pri
+   @_content << ')'
+ end
+ 
+
+ def filter_one
+   @filter << 'one'
+ end
+
+ def filter_two
+  @filter << 'two'
+ end
+
+ def filter_three
+  @filter << 'three'
+ end
+
+ def afilter_one
+   @_content << '-aone'
+ end
+
+ def afilter_two
+   @_content << '-atwo'
+ end
+end
+
+
+# this defines a filter that doesn't exist, raises ApplicationException
+class BadFilterController < Cuca::Controller
+ before_filter 'notexist'
+end
+
+class ReturnErrorController < Cuca::Controller
+  def run
+    http_status 'SERVER_ERROR'
+  end
+end
+
+class ReturnOtherMimeController < Cuca::Controller
+  def run
+    mime_type 'text/plain'
+    @_content = 'test text'
+  end
+end
+
+
+class ControllerTests < Test::Unit::TestCase
+
+  def test_basic
+    c = Cuca::Controller.new
+    assert c.to_s == ''
+
+    a = TestAController.new
+    a._do('get')
+    assert_equal 'GET', a.to_s
+    a = TestAController.new
+    a._do('post')
+    assert_equal 'POST', a.to_s
+
+    b = TestBController.new
+    b._do('run')
+    assert_equal 'RUN', b.to_s
+    assert_equal "OK", b.http_status
+    assert_equal "text/html", b.mime_type
+  end
+
+  def test_layout
+     l = LayoutController.new
+     l._do('run')
+     assert_equal '(LAYOUT)', l.to_s
+     assert_equal "OK", l.http_status
+     assert_equal "text/html", l.mime_type
+  end
+
+
+  def test_filters
+    f = FilterController.new
+    f.run_before_filters
+    f._do('run')
+    f.run_after_filters
+    assert_equal "(zero-one-two-three-FILTER-aone-atwo)", f.to_s
+    assert_equal "OK", f.http_status
+  end
+
+  def test_badfilter
+   f = BadFilterController.new
+   assert_raise Cuca::ApplicationException do
+     f.run_before_filters
+   end
+   assert_equal "SERVER_ERROR", f.http_status
+  end
+
+  def test_http_status
+    c = ReturnErrorController.new
+    c._do('run')
+    assert_equal c.http_status, 'SERVER_ERROR'
+  end
+
+  def test_mime_type
+    c = ReturnOtherMimeController.new
+    c._do('run')
+    assert_equal c.mime_type, 'text/plain'
+  end
+
+
+end