Capcode 0.5.0 → 0.6.0

data/examples/sample.rb

@@ -76,8 +76,8 @@ module Capcode::Views
   end
 end
 
-Capcode.map( "/file" ) do
-  Rack::File.new( "." )
-end
+#Capcode.map( "/file" ) do
+#  Rack::File.new( "." )
+#end
 
-Capcode.run( :port => 3001, :host => "localhost" )
+Capcode.run( :port => 3001, :host => "localhost", :root => "." )

data/examples/test/index.html

@@ -0,0 +1 @@
+welcome in test directory

data/lib/capcode.rb

@@ -1,7 +1,8 @@
 require 'rubygems'
 require 'rack'
-require 'json'
+require 'json' ## DELETE THIS IN 1.0.0
 require 'logger'
+require 'mime/types'
 require 'capcode/version'
 require 'capcode/core_ext'
 
@@ -21,6 +22,11 @@ module Capcode
   
   # Helpers contains methods available in your controllers
   module Helpers
+    @@__ROOT_DIRECTORY = ""
+    def self.root=(p)
+      @@__ROOT_DIRECTORY=p
+    end
+    
     # Render a view
     def render( h )
       if h.class == Hash
@@ -46,7 +52,7 @@ module Capcode
     #       end
     #     end
     #   end
-    def json( d )
+    def json( d ) ## DELETE THIS IN 1.0.0
       warn( "json is deprecated, please use `render( :json => ... )'" )
       @response['Content-Type'] = 'application/json'
       d.to_json
@@ -113,22 +119,66 @@ module Capcode
   #     end
   #   end
   #
-  # Do the same (r500 and r501) to customize 500 and 501 errors
+  # Do the same (r500, r501, r403) to customize 500, 501, 403 errors
   class HTTPError
-    def initialize(app)#:nodoc:
+    def initialize(app, root)#:nodoc:
       @app = app
+      @root = root
     end
 
     def call(env) #:nodoc:
-      status, headers, body = @app.call(env)
+      @env = env
+      @status, @headers, @body = @app.call(@env)
       
-      if self.methods.include? "r#{status}"
-        body = self.send( "r#{status}", env['REQUEST_PATH'] )
-        headers['Content-Length'] = body.length.to_s
+      if @status == 404
+        if @env["PATH_INFO"].include? ".."
+          @status = 403
+          @headers = {}
+          @body = '403 - Invalid path'
+          error
+        end
+        
+        @path = File.join(@root, @env["PATH_INFO"])
+        begin
+          if File.file?(@path) && File.readable?(@path)
+            serving
+          else
+            tmpPath = File.join(@root, @env["PATH_INFO"], "index.html")
+            if File.file?(tmpPath) && File.readable?(tmpPath) # @env["PATH_INFO"][-1].chr == "/" && 
+              @path = tmpPath
+              serving
+            else
+              raise Errno::EPERM
+            end
+          end
+        rescue SystemCallError
+          error
+        end
+      else
+        error
+      end
+    end
+    
+    def serving #:nodoc:
+      body = open(@path).read
+      size = body.size
+      
+      [200, {
+        "Last-Modified"  => File.mtime(@path).httpdate,
+        "Content-Type"   => (MIME::Types.type_for(@path)[0] || '/text/plain').to_s,
+        "Content-Length" => size.to_s
+      }, body]
+    end
+    
+    def error #:nodoc:
+      if self.methods.include? "r#{@status}"
+        @body = self.send( "r#{@status}", @env['REQUEST_PATH'] )
+        @headers['Content-Length'] = @body.length.to_s
       end
       
-      [status, headers, body]
+      [@status, @headers, @body]
     end
+    
   end
   
   class << self
@@ -279,6 +329,8 @@ module Capcode
     # * <tt>:pid</tt> = PID file (default: $0.pid)
     # * <tt>:daemonize</tt> = Daemonize application (default: false)
     # * <tt>:db_config</tt> = database configuration file (default: database.yml)
+    # * <tt>:root</tt> = root directory (default: "." -- relative to the working directory)
+    # * <tt>:working_directory</tt> = Working directory (default: directory of the main.rb)
     def run( args = {} )
       conf = {
         :port => args[:port]||3000, 
@@ -288,79 +340,87 @@ module Capcode
         :session => args[:session]||{},
         :pid => args[:pid]||"#{$0}.pid",
         :daemonize => args[:daemonize]||false,
-        :db_config => args[:db_config]||"database.yml"
+        :db_config => args[:db_config]||"database.yml",
+        :root => args[:root]||".",
+        :working_directory => args[:working_directory]||File.expand_path(File.dirname($0))
       }
       
-      # Check that mongrel exists 
-      if conf[:server].nil? || conf[:server] == "mongrel"
-        begin
-          require 'mongrel'
-          conf[:server] = "mongrel"
-        rescue LoadError 
-          puts "!! could not load mongrel. Falling back to webrick."
-          conf[:server] = "webrick"
+      # Run in the Working directory
+      Dir.chdir( conf[:working_directory] ) do
+        # Set root directory for helpers
+        Capcode::Helpers.root = File.expand_path( conf[:root] )
+        
+        # Check that mongrel exists 
+        if conf[:server].nil? || conf[:server] == "mongrel"
+          begin
+            require 'mongrel'
+            conf[:server] = "mongrel"
+          rescue LoadError 
+            puts "!! could not load mongrel. Falling back to webrick."
+            conf[:server] = "webrick"
+          end
         end
-      end
-          
-      Capcode.constants.each do |k|
-        begin
-          if eval "Capcode::#{k}.public_methods(true).include?( '__urls__' )"
-            u, m, c = eval "Capcode::#{k}.__urls__"
-            u.keys.each do |_u|
-              raise Capcode::RouteError, "Route `#{_u}' already define !", caller if @@__ROUTES.keys.include?(_u)
-              @@__ROUTES[_u] = c.new
+            
+        Capcode.constants.each do |k|
+          begin
+            if eval "Capcode::#{k}.public_methods(true).include?( '__urls__' )"
+              u, m, c = eval "Capcode::#{k}.__urls__"
+              u.keys.each do |_u|
+                raise Capcode::RouteError, "Route `#{_u}' already define !", caller if @@__ROUTES.keys.include?(_u)
+                @@__ROUTES[_u] = c.new
+              end
             end
+          rescue => e
+            raise e.message
           end
-        rescue => e
-          raise e.message
         end
-      end
-      
-      app = Rack::URLMap.new(@@__ROUTES)
-      app = Rack::Session::Cookie.new( app, conf[:session] )
-      app = Capcode::HTTPError.new(app)
-      app = Rack::ContentLength.new(app)
-      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]) )
-      
-      # From rackup !!!
-      if conf[:daemonize]
-        if RUBY_VERSION < "1.9"
-          exit if fork
-          Process.setsid
-          exit if fork
-          # Dir.chdir "/"
-          File.umask 0000
-          STDIN.reopen "/dev/null"
-          STDOUT.reopen "/dev/null", "a"
-          STDERR.reopen "/dev/null", "a"
-        else
-          Process.daemon
+        
+        app = Rack::URLMap.new(@@__ROUTES)
+        app = Rack::Session::Cookie.new( app, conf[:session] )
+        app = Capcode::HTTPError.new(app, conf[:root])
+        app = Rack::ContentLength.new(app)
+        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]) )
+        
+        # From rackup !!!
+        if conf[:daemonize]
+          if RUBY_VERSION < "1.9"
+            exit if fork
+            Process.setsid
+            exit if fork
+            # Dir.chdir "/"
+            File.umask 0000
+            STDIN.reopen "/dev/null"
+            STDOUT.reopen "/dev/null", "a"
+            STDERR.reopen "/dev/null", "a"
+          else
+            Process.daemon
+          end
+        
+          File.open(conf[:pid], 'w'){ |f| f.write("#{Process.pid}") }
+          at_exit { File.delete(conf[:pid]) if File.exist?(conf[:pid]) }
+        end
+        
+        # Start database
+        if self.methods.include? "db_connect"
+          db_connect( conf[:db_config], conf[:log] )
+        end
+        
+        # Start server
+        case conf[:server]
+        when "mongrel"
+          puts "** Starting Mongrel on #{conf[:host]}:#{conf[:port]}"
+          Rack::Handler::Mongrel.run( app, {:Port => conf[:port], :Host => conf[:host]} ) { |server|
+            trap "SIGINT", proc { server.stop }
+          }
+        when "webrick"
+          puts "** Starting WEBrick on #{conf[:host]}:#{conf[:port]}"
+          Rack::Handler::WEBrick.run( app, {:Port => conf[:port], :BindAddress => conf[:host]} ) { |server|
+            trap "SIGINT", proc { server.shutdown }
+          }
         end
-
-        File.open(conf[:pid], 'w'){ |f| f.write("#{Process.pid}") }
-        at_exit { File.delete(conf[:pid]) if File.exist?(conf[:pid]) }
-      end
-      
-      # Start database
-      if self.methods.include? "db_connect"
-        db_connect( conf[:db_config], conf[:log] )
-      end
-      
-      # Start server
-      case conf[:server]
-      when "mongrel"
-        puts "** Starting Mongrel on #{conf[:host]}:#{conf[:port]}"
-        Rack::Handler::Mongrel.run( app, {:Port => conf[:port], :Host => conf[:host]} ) { |server|
-          trap "SIGINT", proc { server.stop }
-        }
-      when "webrick"
-        puts "** Starting WEBrick on #{conf[:host]}:#{conf[:port]}"
-        Rack::Handler::WEBrick.run( app, {:Port => conf[:port], :BindAddress => conf[:host]} ) { |server|
-          trap "SIGINT", proc { server.shutdown }
-        }
       end
     end
 

data/lib/capcode/render/erb.rb

@@ -2,9 +2,9 @@ require 'erb'
 
 module Capcode
   module Helpers
-    @@__ERB_PATH__ = File.expand_path( "." )
+    @@__ERB_PATH__ = "."
     def self.erb_path=( p )
-      @@__ERB_PATH__ = File.expand_path( p )
+      @@__ERB_PATH__ = p
     end
     
     def render_erb( f )
@@ -12,7 +12,11 @@ module Capcode
       if f.include? '..'
         return [403, {}, '403 - Invalid path']
       end
-          
+      
+      unless( @@__ERB_PATH__[0].chr == "/" )
+        @@__ERB_PATH__ = File.expand_path( File.join(@@__ROOT_DIRECTORY, @@__ERB_PATH__) )
+      end
+      
       f = f + ".rhtml" if File.extname( f ) != ".rhtml"
       file = File.join( @@__ERB_PATH__, f )
       ERB.new(open(file).read).result(binding)

data/lib/capcode/render/haml.rb

@@ -2,9 +2,9 @@ require "haml"
 
 module Capcode
   module Helpers
-    @@__HAML_PATH__ = File.expand_path( "." )
+    @@__HAML_PATH__ = "."
     def self.haml_path=( p )
-      @@__HAML_PATH__ = File.expand_path( p )
+      @@__HAML_PATH__ = p
     end
     
     def render_haml( f ) #:nodoc:
@@ -12,7 +12,11 @@ module Capcode
       if f.include? '..'
         return [403, {}, '403 - Invalid path']
       end
-          
+      
+      unless( @@__HAML_PATH__[0].chr == "/" )
+        @@__HAML_PATH__ = File.expand_path( File.join(@@__ROOT_DIRECTORY, @@__HAML_PATH__) )
+      end
+       
       f = f + ".haml" if File.extname( f ) != ".haml"
       file = File.join( @@__HAML_PATH__, f )
       Haml::Engine.new( open( file ).read ).to_html( self )

data/lib/capcode/version.rb

@@ -1,3 +1,3 @@
 module Capcode
-  CAPCOD_VERION="0.5.0"
+  CAPCOD_VERION="0.6.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: Capcode
 version: !ruby/object:Gem::Version 
-  version: 0.5.0
+  version: 0.6.0
 platform: ruby
 authors: 
 - "Gr\xC3\xA9goire Lejeune"
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-05-07 00:00:00 +02:00
+date: 2009-06-09 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -22,6 +22,16 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: "0"
     version: 
+- !ruby/object:Gem::Dependency 
+  name: mime-types
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+    version: 
 description: Capcode is a web microframework
 email: gregoire.lejeune@free.fr
 executables: []
@@ -40,6 +50,7 @@ files:
 - setup.rb
 - doc/rdoc/classes/Capcode/Helpers.html
 - doc/rdoc/classes/Capcode/HTTPError.html
+- doc/rdoc/classes/Capcode/RenderError.html
 - doc/rdoc/classes/Capcode/Views.html
 - doc/rdoc/classes/Capcode.html
 - doc/rdoc/created.rid
@@ -70,13 +81,19 @@ files:
 - examples/my_blog.db
 - examples/sample.rb
 - examples/session.rb
+- examples/test/index.html
 has_rdoc: true
 homepage: http://algorithmique.net
 licenses: []
 
-post_install_message: |-
-  For more information about Capcode,
-  see http://capcode.rubyforge.org
+post_install_message: |+
+  
+  If you want to use Markaby renderer, you must install Markaby.
+  If you want to use HAML renderer, you must install haml.
+  
+  If For more information about Capcode, see 
+    http://capcode.rubyforge.org"
+  
 rdoc_options: 
 - --quiet
 - --title
@@ -106,7 +123,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: capcode
-rubygems_version: 1.3.3
+rubygems_version: 1.3.4
 signing_key: 
 specification_version: 3
 summary: Capcode is a web microframework