Capcode 0.9.3 → 0.9.4

data/examples/upload.rb

@@ -12,7 +12,7 @@ module Capcode
     def post
       FileUtils.cp( 
         params["upfile"][:tempfile].path, 
-        File.join( static[:path], params["upfile"][:filename] )
+        ::File.join( static[:path], params["upfile"][:filename] )
       )
       render :static => params["upfile"][:filename]
     end

data/lib/capcode.rb

@@ -6,7 +6,7 @@ require 'logger'
 Logger.class_eval { alias :write :<< } unless Logger.instance_methods.include? "write"
 require 'optparse'
 require 'irb'
-require 'mime/types'
+require 'active_support'
 require 'capcode/version'
 require 'capcode/core_ext'
 require 'capcode/helpers/auth'
@@ -14,17 +14,9 @@ require 'capcode/render/text'
 require 'capcode/configuration'
 require 'capcode/filters'
 
+require 'capcode/ext/rack/urlmap'
+
 module Capcode
-  #@@__ROUTES = {}
-  #@@__STATIC_DIR = nil
-  #@@__APP = nil
-  
-  # @@__FILTERS = []
-  # def self.before_filter( opts, &b )
-  #   opts[:action] = b
-  #   @@__FILTERS << opts
-  # end
-  
   class ParameterError < ArgumentError #:nodoc: all
   end
   
@@ -42,7 +34,6 @@ module Capcode
   
   # Helpers contains methods available in your controllers
   module Helpers
-    #@@__ARGS__ = nil
     def self.args
       @args ||= nil
     end
@@ -85,33 +76,32 @@ module Capcode
         render_type = nil
         possible_code_renderer = nil
         
-        if render_type.nil?
-          hash.keys.each do |key|
-            begin
-              gem "capcode-render-#{key.to_s}"
-              require "capcode/render/#{key.to_s}"
-            rescue Gem::LoadError
-              nil
-            rescue LoadError
-              raise Capcode::RenderError, "Hum... The #{key} renderer is malformated! Please try to install a new version or use an other renderer!", caller
-            end
-       
-            if self.respond_to?("render_#{key.to_s}")
-              unless render_type.nil?
-                raise Capcode::RenderError, "Can't use multiple renderer (`#{render_type}' and `#{key}') !", caller
-              end
-              render_type = key
-            end
-            
-            if key.class == Fixnum
-              possible_code_renderer = key
+        hash.keys.each do |key|
+          begin
+            gem "capcode-render-#{key.to_s}"
+            require "capcode/render/#{key.to_s}"
+          rescue Gem::LoadError
+            nil
+          rescue LoadError
+            raise Capcode::RenderError, "Hum... The #{key} renderer is malformated! Please try to install a new version or use an other renderer!", caller
+          end
+        
+          if self.respond_to?("render_#{key.to_s}")
+            unless render_type.nil?
+              raise Capcode::RenderError, "Can't use multiple renderer (`#{render_type}' and `#{key}') !", caller
             end
+            render_type = key
           end
           
-          if render_type.nil? and possible_code_renderer.nil?
-            raise Capcode::RenderError, "Renderer type not specified!", caller
+          if key.class == Fixnum
+            possible_code_renderer = key
           end
         end
+        
+        if render_type.nil? and possible_code_renderer.nil?
+          raise Capcode::RenderError, "Renderer type not specified!", caller
+        end
+        
         unless self.respond_to?("render_#{render_type.to_s}")
           if possible_code_renderer.nil?
             raise Capcode::RenderError, "#{render_type} renderer not present ! please require 'capcode/render/#{render_type}'", caller
@@ -123,7 +113,8 @@ module Capcode
               k = k.to_s.split(/_/).map{|e| e.capitalize}.join("-")
               header[k] = v
             end
-            [code, hash, body]
+            
+            [code, header, body]
           end
         else
           render_name = hash.delete(render_type)
@@ -212,17 +203,39 @@ module Capcode
     #   URL( Capcode::Hello, "you" ) # => /hello/you
     def URL( klass, *a )
       path = nil
+      result = {}
+      
       a = a.delete_if{ |x| x.nil? }
       
       if klass.class == Class
-        Capcode.routes.each do |p, k|
-          path = p if k.class == klass
+        last_size = 0
+        
+        klass.__urls__[0].each do |cpath, regexp|
+          data = a.clone
+          
+          n = Regexp.new( regexp ).number_of_captures
+          equart = (a.size - n).abs
+          
+          rtable = regexp.dup.gsub( /\\\(/, "" ).gsub( /\\\)/, "" ).split( /\([^\)]*\)/ )
+          
+          rtable.each do |r|
+            if r == ""
+              cpath = cpath + "/#{data.shift}"
+            else
+              cpath = cpath + "/#{r}"
+            end
+          end
+          
+          cpath = (cpath + "/" + data.join( "/" )).gsub( /\/\//, "/" ).gsub( /\/$/, "" )
+          result[equart] = cpath
         end
+        
+        path = result[result.keys.min]
       else
         path = klass
       end
       
-      (ENV['RACK_BASE_URI']||'')+path+((a.size>0)?("/"+a.join("/")):(""))
+      (ENV['RACK_BASE_URI']||'')+path
     end
     
     # Calling content_for stores a block of markup in an identifier.
@@ -258,7 +271,6 @@ module Capcode
     #     end
     #   end
     def content_for( x )
-      #if @@__ARGS__.map{|_| _.to_s }.include?(x.to_s)
       if Capcode::Helpers.args.map{|_| _.to_s }.include?(x.to_s)
         yield
       end
@@ -293,6 +305,18 @@ module Capcode
   #     end
   #   end
   #
+  # the rXXX method can also receive a second optional parameter corresponding 
+  # of the header's Hash :
+  #
+  #   module Capcode
+  #     class HTTPError
+  #       def r404(f, h)
+  #         h['Content-Type'] = 'text/plain'
+  #         "You are here ---> X (#{f} point)"
+  #       end
+  #     end
+  #   end
+  #
   # Do the same (r500, r501, r403) to customize 500, 501, 403 errors
   class HTTPError
     def initialize(app) #:nodoc:
@@ -301,16 +325,23 @@ module Capcode
 
     def call(env) #:nodoc:
       status, headers, body = @app.call(env)
-      
       if self.methods.include? "r#{status}"
-        body = self.send( "r#{status}", env['REQUEST_PATH'] )
+        headers.delete('Content-Type') if headers.keys.include?('Content-Type')
+        body = begin
+          self.send( "r#{status}", env['REQUEST_PATH'], headers )
+        rescue
+          self.send( "r#{status}", env['REQUEST_PATH'] )
+        end
         headers['Content-Length'] = body.length.to_s
+        headers['Content-Type'] = "text/html" unless headers.keys.include?('Content-Type')
       end
       
       [status, headers, body]
     end
   end
     
+  require 'capcode/response'
+  
   class << self
     attr :__auth__, true #:nodoc:
     
@@ -332,8 +363,10 @@ module Capcode
     # 
     # If the regexp in the route does not match, all arguments will be <tt>nil</tt>
     def Route *routes_paths
+      create_path = routes_paths[0].nil?
       Class.new {
         meta_def(:__urls__) {
+          routes_paths = ['/'+self.to_s.gsub( /^Capcode::/, "" ).underscore] if create_path == true
           # < Route '/hello/world/([^\/]*)/id(\d*)', '/hello/(.*)', :agent => /Songbird (\d\.\d)[\d\/]*?/
           # # => [ {'/hello/world' => '([^\/]*)/id(\d*)', '/hello' => '(.*)'}, 
           #        2, 
@@ -391,21 +424,6 @@ module Capcode
           @response = Rack::Response.new
           @request = Rack::Request.new(@env)
 
-          # __k = self.class.to_s.split( /::/ )[-1].downcase.to_sym
-          # @@__FILTERS.each do |f|
-          #   proc = f.delete(:action)
-          #   __run = true
-          #   if f[:only]
-          #     __run = f[:only].include?(__k)
-          #   end
-          #   if f[:except]
-          #     __run = !f[:except].include?(__k)
-          #   end
-          #   
-          #   # proc.call(self) if __run
-          #   puts "call #{proc} for #{__k}"
-          # end
-
           # Check authz
           authz_options = nil
           if Capcode.__auth__ and Capcode.__auth__.size > 0
@@ -441,14 +459,17 @@ module Capcode
               xPath = p.gsub( /^\//, "" ).split( "/" )
               if (xPath - aPath).size == 0
                 diffArgs = aPath - xPath
-                diffNArgs = diffArgs.size
+                diffNArgs = diffArgs.size - 1
                 if finalNArgs.nil? or finalNArgs > diffNArgs
                   finalPath = p
                   finalNArgs = diffNArgs
                   finalArgs = diffArgs
                 end
               end
-              
+            end
+            
+            if finalNArgs > self.class.__urls__[1]
+              return [404, {'Content-Type' => 'text/plain'}, "Not Found: #{@request.path}"]
             end
         
             nargs = self.class.__urls__[1]
@@ -481,32 +502,33 @@ module Capcode
               filter_output
             end
           }
+          
           if r.respond_to?(:to_ary)
             @response.status = r.shift #r[0]
             #r[1].each do |k,v|
             r.shift.each do |k,v|
               @response[k] = v
             end
-            @response.body = r.shift #r[2]
+            @response.write r.shift #r[2]
           else
             @response.write r
           end
-                    
+          
           @response.finish
         end
                 
         include Capcode::Helpers
-        include Capcode::Views
+        include Capcode::Views        
       }      
     end
-  
+    Capcode::Route = Capcode::Route(nil)
+    
     # This method help you to map and URL to a Rack or What you want Helper
     # 
     #   Capcode.map( "/file" ) do
     #     Rack::File.new( "." )
     #   end
     def map( route, &b )
-      #@@__ROUTES[route] = yield
       Capcode.routes[route] = yield
     end
     
@@ -570,15 +592,28 @@ module Capcode
     def application( args = {} )
       Capcode::Configuration.configuration(args)
       
-      Capcode.constants.each do |k|
+      Capcode.constants.clone.delete_if {|k| 
+        not( Capcode.const_get(k).to_s =~ /Capcode/ ) or [
+          "Filter", 
+          "Helpers", 
+          "RouteError", 
+          "Views", 
+          "ParameterError", 
+          "HTTPError", 
+          "Configuration", 
+          "MissingLibrary", 
+          "Route", 
+          "RenderError"
+        ].include?(k)
+      }.each do |k|
         begin
           if eval "Capcode::#{k}.public_methods(true).include?( '__urls__' )"
-            hash_of_routes, max_captures_for_routes, klass = eval "Capcode::#{k}.__urls__"
+            hash_of_routes, max_captures_for_routes, klass = eval "Capcode::#{k}.__urls__"            
             hash_of_routes.keys.each do |current_route_path|
               #raise Capcode::RouteError, "Route `#{current_route_path}' already define !", caller if @@__ROUTES.keys.include?(current_route_path)
               raise Capcode::RouteError, "Route `#{current_route_path}' already define !", caller if Capcode.routes.keys.include?(current_route_path)
-              #@@__ROUTES[current_route_path] = klass.new
-              Capcode.routes[current_route_path] = klass.new
+#              Capcode.routes[current_route_path] = klass.new
+              Capcode.routes[current_route_path] = klass
             end
           end
         rescue => e
@@ -587,13 +622,12 @@ module Capcode
       end
       
       # Set Static directory
-      #@@__STATIC_DIR = (conf[:static][0].chr == "/")?conf[:static]:"/"+conf[:static] unless conf[:static].nil?
       Capcode.static = (Capcode::Configuration.get(:static)[0].chr == "/")?Capcode::Configuration.get(:static):"/"+Capcode::Configuration.get(:static) unless Capcode::Configuration.get(:static).nil?
       
       # Initialize Rack App
       puts "** Map routes." if Capcode::Configuration.get(:verbose)
-      #app = Rack::URLMap.new(@@__ROUTES)
-      app = Rack::URLMap.new(Capcode.routes)
+#      app = Rack::URLMap.new(Capcode.routes)
+      app = Capcode::Ext::Rack::URLMap.new(Capcode.routes)
       puts "** Initialize static directory (#{Capcode.static}) in #{File.expand_path(Capcode::Configuration.get(:root))}" if Capcode::Configuration.get(:verbose)
       app = Rack::Static.new( 
         app, 
@@ -608,7 +642,6 @@ module Capcode
       app = Rack::Lint.new(app)
       app = Rack::ShowExceptions.new(app)
       #app = Rack::Reloader.new(app) ## -- NE RELOAD QUE capcode.rb -- So !!!
-      # app = Rack::CommonLogger.new( app, Logger.new(conf[:log]) )
       
       middlewares.each do |mw|
         middleware, args, block = mw
@@ -626,6 +659,7 @@ module Capcode
       end
       
       if block_given?
+        puts "** Execute block" if Capcode::Configuration.get(:verbose)
         yield( self )
       end
       
@@ -763,16 +797,13 @@ module Capcode
     end
 
     def routes #:nodoc:
-      #@@__ROUTES
       @routes ||= {}
     end
     
     def static #:nodoc:
-      #@@__STATIC_DIR
       @static_dir ||= nil
     end
     def static=(x) #:nodoc:
-      #@@__STATIC_DIR
       @static_dir = x
     end
     

data/lib/capcode/ext/rack/urlmap.rb

@@ -0,0 +1,59 @@
+module Capcode
+  module Ext
+    module Rack
+      # Rack::URLMap takes a hash mapping urls or paths to apps, and
+      # dispatches accordingly.  Support for HTTP/1.1 host names exists if
+      # the URLs start with <tt>http://</tt> or <tt>https://</tt>.
+      #
+      # URLMap modifies the SCRIPT_NAME and PATH_INFO such that the part
+      # relevant for dispatch is in the SCRIPT_NAME, and the rest in the
+      # PATH_INFO.  This should be taken care of when you need to
+      # reconstruct the URL in order to create links.
+      #
+      # URLMap dispatches in such a way that the longest paths are tried
+      # first, since they are most specific.
+    
+      class URLMap
+        def initialize(map = {})
+          remap(map)
+        end
+    
+        def remap(map)
+          @mapping = map.map { |location, app|
+            if location =~ %r{\Ahttps?://(.*?)(/.*)}
+              host, location = $1, $2
+            else
+              host = nil
+            end
+    
+            unless location[0] == ?/
+              raise ArgumentError, "paths need to start with /"
+            end
+            location = location.chomp('/')
+            match = Regexp.new("^#{Regexp.quote(location).gsub('/', '/+')}(.*)", nil, 'n')
+    
+            [host, location, match, app]
+          }.sort_by { |(h, l, m, a)| [h ? -h.size : (-1.0 / 0.0), -l.size] }  # Longest path first
+        end
+    
+        def call(env)
+          path = env["PATH_INFO"].to_s
+          script_name = env['SCRIPT_NAME']
+          hHost, sName, sPort = env.values_at('HTTP_HOST','SERVER_NAME','SERVER_PORT')
+          @mapping.each { |host, location, match, app|
+            next unless (hHost == host || sName == host \
+              || (host.nil? && (hHost == sName || hHost == sName+':'+sPort)))
+            next unless path =~ match && rest = $1
+            next unless rest.empty? || rest[0] == ?/
+    
+            return app.new.call(
+              env.merge(
+                'SCRIPT_NAME' => (script_name + location),
+                'PATH_INFO'   => rest))
+          }
+          [404, {"Content-Type" => "text/plain", "X-Cascade" => "pass"}, ["Not Found: #{path}"]]
+        end
+      end
+    end
+  end
+end

data/lib/capcode/render/text.rb

@@ -1,6 +1,7 @@
 module Capcode
   module Helpers
     def render_text( f, _ ) #:nodoc:
+      @response['Content-Type'] = 'text/plain'
       f
     end
   end

data/lib/capcode/version.rb

@@ -1,3 +1,3 @@
 module Capcode
-  CAPCOD_VERION="0.9.3"
+  CAPCOD_VERION="0.9.4"
 end

metadata

@@ -1,7 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: Capcode
 version: !ruby/object:Gem::Version 
-  version: 0.9.3
+  hash: 51
+  prerelease: false
+  segments: 
+  - 0
+  - 9
+  - 4
+  version: 0.9.4
 platform: ruby
 authors: 
 - "Gr\xC3\xA9goire Lejeune"
@@ -9,19 +15,37 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-02-10 00:00:00 +01:00
+date: 2010-05-28 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rack
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
   type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
+  name: activesupport
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
         version: "0"
-    version: 
+  type: :runtime
+  version_requirements: *id002
 description: Capcode is a web microframework
 email: gregoire.lejeune@free.fr
 executables: []
@@ -67,6 +91,7 @@ files:
 - lib/capcode/base/db.rb
 - lib/capcode/configuration.rb
 - lib/capcode/core_ext.rb
+- lib/capcode/ext/rack/urlmap.rb
 - lib/capcode/filters.rb
 - lib/capcode/helpers/auth.rb
 - lib/capcode/render/text.rb
@@ -89,6 +114,7 @@ files:
 - examples/rest-run.rb
 - examples/rest.rb
 - examples/rest.ru
+- examples/route.rb
 - examples/sample.rb
 - examples/session.rb
 - examples/soapbox/public/jquery.js
@@ -144,21 +170,29 @@ rdoc_options:
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 53
+      segments: 
+      - 1
+      - 8
+      - 1
       version: 1.8.1
-  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: capcode
-rubygems_version: 1.3.5
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Capcode is a web microframework