padrino-core 0.9.24 → 0.9.25

data/lib/padrino-core/application.rb

@@ -63,7 +63,7 @@ module Padrino
       #   MyApp.reset_routes!
       #
       def reset_routes!
-        router.reset!
+        reset_router!
         default_routes!
       end
 
@@ -84,7 +84,6 @@ module Padrino
       #
       def setup_application!
         return if @_configured
-        self.calculate_paths
         self.register_initializers
         self.require_load_paths
         self.disable :logging # We need do that as default because Sinatra use commonlogger.
@@ -134,7 +133,9 @@ module Padrino
           set :padrino_logging, true
           set :method_override, true
           set :sessions, false
-          set :public, Proc.new { Padrino.root('public', self.uri_root) }
+          set :public, Proc.new { Padrino.root('public', uri_root) }
+          set :views, Proc.new { File.join(root,   "views") }
+          set :images_path, Proc.new { File.join(public, "images") }
           # Padrino specific
           set :uri_root, "/"
           set :reload, Proc.new { development? }
@@ -184,23 +185,13 @@ module Padrino
           end
         end
 
-        ##
-        # Calculates any required paths after app_file and root have been properly configured
-        # Executes as part of the setup_application! method
-        #
-        def calculate_paths
-          raise ApplicationSetupError.new("Please define 'app_file' option for #{self.name} app!") unless self.app_file
-          set :views, find_view_path if find_view_path
-          set :images_path, File.join(self.public, "/images") unless self.respond_to?(:images_path)
-        end
-
         ##
         # Requires the Padrino middleware
         #
         def register_initializers
-          use Padrino::Logger::Rack    if Padrino.logger && (Padrino.logger.level == 0 && padrino_logging?)
-          use Padrino::Reloader::Rack  if reload?
-          use Rack::Flash              if flash? && sessions?
+          use Padrino::Logger::Rack, uri_root if Padrino.logger && (Padrino.logger.level == 0 && padrino_logging?)
+          use Padrino::Reloader::Rack         if reload?
+          use Rack::Flash                     if flash?
         end
 
         ##
@@ -218,12 +209,10 @@ module Padrino
           load_paths.each { |path| Padrino.require_dependencies(File.join(self.root, path)) }
         end
 
-        ##
-        # Returns the path to the views directory from root by returning the first that is found
-        #
-        def find_view_path
-          @view_paths = ["views"].collect { |path| File.join(self.root, path) }
-          @view_paths.find { |path| Dir[File.join(path, '/**/*')].any? }
+      private
+        def setup_sessions(builder)
+          return unless sessions
+          builder.use Rack::Session::Cookie, :secret => session_secret, :path => uri_root
         end
     end # self
 

data/lib/padrino-core/application/rendering.rb

@@ -88,6 +88,8 @@ module Padrino
     end
 
     module InstanceMethods
+      attr_reader :current_engine
+
       def content_type(type=nil, params={}) #:nodoc:
         type.nil? ? @_content_type : super(type, params)
       end
@@ -114,8 +116,8 @@ module Padrino
           # If an engine is a string then this is a likely a path to be resolved
           data, engine = *resolve_template(engine, options) if data.nil?
 
-          # Sinatra 1.0 requires an outvar for erb and erubis templates
-          options[:outvar] ||= '@_out_buf' if [:erb, :erubis] & [engine]
+          # Setup root
+          root = settings.respond_to?(:root) ? settings.root : ""
 
           # Resolve layouts similar to in Rails
           if (options[:layout].nil? || options[:layout] == true) && !settings.templates.has_key?(:layout)
@@ -123,14 +125,21 @@ module Padrino
             options[:layout] = layout_path || false # We need to force layout false so sinatra don't try to render it
             options[:layout] = false unless layout_engine == engine # TODO allow different layout engine
             options[:layout_engine] = layout_engine || engine if options[:layout]
-            logger.debug "Resolving layout #{options[:layout]}" if defined?(logger) && options[:layout].present?
+            logger.debug "Resolving layout #{root}/views#{options[:layout]}" if defined?(logger) && options[:layout].present?
           elsif options[:layout].present?
             options[:layout] = settings.fetch_layout_path(options[:layout])
-            logger.debug "Resolving layout #{options[:layout]}" if defined?(logger)
+            logger.debug "Resolving layout #{root}/views#{options[:layout]}" if defined?(logger)
           end
 
+          # Cleanup the template
+          @current_engine, engine_was = engine, @current_engine
+          @_out_buf,  _buf_was = "", @_out_buf
+
           # Pass arguments to Sinatra render method
           super(engine, data, options.dup, locals, &block)
+        ensure
+          @current_engine = engine_was
+          @_out_buf = _buf_was
         end
 
         ##

data/lib/padrino-core/application/routing.rb

@@ -1,6 +1,60 @@
 require 'http_router' unless defined?(HttpRouter)
 require 'padrino-core/support_lite' unless defined?(SupportLite)
 
+class Sinatra::Request
+  attr_accessor :route_obj
+
+  def controller
+    route_obj && route_obj.controller
+  end
+end
+
+class HttpRouter #:nodoc:
+  attr_accessor :runner
+  class Route #:nodoc:
+    attr_reader :before_filters, :after_filters
+    attr_accessor :custom_conditions, :use_layout, :controller, :cache
+
+    def add_before_filter(filter)
+      @before_filters ||= []
+      @before_filters << filter
+      arbitrary { |req, params|
+        if req.testing_405?
+          true
+        else
+          old_params = router.runner.params
+          result = catch(:pass) {
+            router.runner.params ||= {}
+            router.runner.params.merge!(params)
+            router.runner.instance_eval(&filter)
+            true
+          } == true
+          router.runner.params = old_params
+          result
+        end
+      }
+    end
+
+    def add_after_filter(filter)
+      @after_filters ||= []
+      @after_filters << filter
+    end
+
+    def before_filters=(filters)
+      filters.each { |filter| add_before_filter(filter) } if filters
+    end
+
+    def after_filters=(filters)
+      filters.each { |filter| add_after_filter(filter) } if filters
+    end
+
+    def custom_conditions=(custom_conditions)
+      custom_conditions.each { |blk| arbitrary { |req, params| router.runner.instance_eval(&blk) != false } } if custom_conditions
+      @custom_conditions = custom_conditions
+    end
+  end
+end
+
 module Padrino
   ##
   # Padrino provides advanced routing definition support to make routes and url generation much easier.
@@ -12,67 +66,6 @@ module Padrino
   module Routing
     CONTENT_TYPE_ALIASES = { :htm => :html }
 
-    class ::HttpRouter #:nodoc:
-      attr_accessor :runner
-      class Route #:nodoc:
-        attr_reader :before_filters, :after_filters
-        attr_accessor :custom_conditions, :use_layout, :controller, :cache
-
-        def add_before_filter(filter)
-          @before_filters ||= []
-          @before_filters << filter
-          arbitrary { |req, params, dest|
-            old_params = router.runner.params
-            result = catch(:pass) {
-              router.runner.params ||= {}
-              router.runner.params.merge!(params)
-              router.runner.instance_eval(&filter)
-              true
-            } == true
-            router.runner.params = old_params
-            result
-          }
-        end
-
-        def add_after_filter(filter)
-          @after_filters ||= []
-          @after_filters << filter
-        end
-
-        def before_filters=(filters)
-          filters.each { |filter| add_before_filter(filter) } if filters
-        end
-
-        def after_filters=(filters)
-          filters.each { |filter| add_after_filter(filter) } if filters
-        end
-
-        def custom_conditions=(custom_conditions)
-          custom_conditions.each { |blk| arbitrary { |req, params, dest| router.runner.instance_eval(&blk) != false } } if custom_conditions
-          @custom_conditions = custom_conditions
-        end
-      end
-    end
-
-    module ::Sinatra #:nodoc:
-      class Request #:nodoc:
-        attr_accessor :match
-
-        def controller
-          route && route.controller
-        end
-
-        def route
-          if match.nil?
-            path = Rack::Utils.unescape(path_info)
-            path.empty? ? "/" : path
-          else
-            match.path.route
-          end
-        end
-      end # Request
-    end # Sinatra
-
     class UnrecognizedException < RuntimeError #:nodoc:
     end
 
@@ -240,6 +233,10 @@ module Padrino
       end
       alias :urls :router
 
+      def reset_router!
+        @router = HttpRouter.new
+      end
+
       ##
       # Instance method for url generation like:
       #
@@ -254,9 +251,8 @@ module Padrino
         names, params_array = args.partition{|a| a.is_a?(Symbol)}
         name = names.join("_").to_sym    # route name is concatenated with underscores
         if params.is_a?(Hash)
-          params.delete_if { |k,v| v.nil? }
-          params[:format] = params[:format].to_s if params.has_key?(:format)
-          params.each { |k,v| params[k] = v.to_param if v.respond_to?(:to_param) }
+          params[:format] = params[:format].to_s unless params[:format].nil?
+          params = value_to_param(params)
         end
         url = if params_array.empty?
           router.url(name, params)
@@ -287,6 +283,21 @@ module Padrino
       def head(path, *args, &bk);   route 'HEAD',   path, *args, &bk end
 
       private
+        # Parse params from the url method
+        def value_to_param(value)
+          case value
+            when Array
+              value.map { |v| value_to_param(v) }.compact
+            when Hash
+              value.inject({}) do |memo, (k,v)|
+                v = value_to_param(v)
+                memo[k] = v unless v.nil?
+                memo
+              end
+            when nil then nil
+            else value.respond_to?(:to_param) ? value.to_param : value
+          end
+        end
 
         # Add prefix slash if its not present and remove trailing slashes.
         def conform_uri(uri_string)
@@ -317,19 +328,18 @@ module Padrino
         #
         def route(verb, path, *args, &block)
           options = case args.size
-          when 2
-            args.last.merge(:map => args.first)
-          when 1
-            map = args.shift if args.first.is_a?(String)
-            if args.first.is_a?(Hash)
-              map ? args.first.merge(:map => map) : args.first
-            else
-              {:map => map || args.first}
-            end
-          when 0
-            {}
-          else
-            raise
+            when 2
+              args.last.merge(:map => args.first)
+            when 1
+              map = args.shift if args.first.is_a?(String)
+              if args.first.is_a?(Hash)
+                map ? args.first.merge(:map => map) : args.first
+              else
+                {:map => map || args.first}
+              end
+            when 0
+              {}
+            else raise
           end
 
           # Do padrino parsing. We dup options so we can build HEAD request correctly
@@ -343,7 +353,11 @@ module Padrino
           unbound_method = instance_method("#{verb} #{path}")
           block =
             if block.arity != 0
-              proc { unbound_method.bind(self).call(*@block_params) }
+              block_arity = block.arity
+              proc {
+                @block_params = @block_params.slice(0, block_arity) if block_arity > 0
+                unbound_method.bind(self).call(*@block_params)
+              }
             else
               proc { unbound_method.bind(self).call }
             end
@@ -356,8 +370,11 @@ module Padrino
           route.cache = options.key?(:cache) ? options.delete(:cache) : @_cache
           route.send(verb.downcase.to_sym)
           route.host(options.delete(:host)) if options.key?(:host)
-          route.condition(:user_agent => options.delete(:agent)) if options.key?(:agent)
-          route.default_values = options.delete(:default_values)
+          route.user_agent(options.delete(:agent)) if options.key?(:agent)
+          if options.key?(:default_values)
+            defaults = options.delete(:default_values)
+            route.default(defaults) if defaults
+          end
           options.delete_if do |option, args|
             if route.send(:significant_variable_names).include?(option)
               route.matching(option => Array(args).first)
@@ -366,7 +383,13 @@ module Padrino
           end
 
           # Add Sinatra conditions
-          options.each { |option, args| send(option, *args) }
+          options.each { |option, args|
+            if route.respond_to?(option)
+              route.send(option, *args)
+            else
+              send(option, *args)
+            end
+          }
           conditions, @conditions = @conditions, []
           route.custom_conditions = conditions
 
@@ -383,6 +406,43 @@ module Padrino
             route.after_filters  = @filters[:after]  || []
           end
 
+          route.arbitrary_with_continue do |req, params|
+            if req.testing_405?
+              req.continue[true]
+            else
+              base = self
+              processed = false
+              router.runner.instance_eval do
+                request.route_obj = route
+                @_response_buffer = nil
+                if path.is_a?(Regexp)
+                  params_list = req.extra_env['router.regex_match'].to_a
+                  params_list.shift
+                  @block_params = params_list
+                  @params.update({:captures => params_list}.merge(@params || {}))
+                else
+                  @block_params = req.params
+                  @params.update(params.merge(@params || {}))
+                end
+                pass_block = catch(:pass) do
+                  # If present set current controller layout
+                  parent_layout = base.instance_variable_get(:@layout)
+                  base.instance_variable_set(:@layout, route.use_layout) if route.use_layout
+                  # Provide access to the current controller to the request
+                  # Now we can eval route, but because we have "throw halt" we need to be
+                  # (en)sure to reset old layout and run controller after filters.
+                  begin
+                    @_response_buffer = catch(:halt) { route_eval(&block) }
+                    processed = true
+                  ensure
+                    base.instance_variable_set(:@layout, parent_layout) if route.use_layout
+                    (@_pending_after_filters ||= []).concat(route.after_filters) if route.after_filters
+                  end
+                end
+              end
+              req.continue[processed]
+            end
+          end
           route.to(block)
           route
         end
@@ -420,10 +480,12 @@ module Padrino
 
             if @_use_format or format_params = options[:provides]
               process_path_for_provides(path, format_params)
+              options[:matching] ||= {}
+              options[:matching][:format] = /[^\.]+/
             end
 
             # Build our controller
-            controller = Array(@_controller).collect { |c| c.to_s }
+            controller = Array(@_controller).map { |c| c.to_s }
 
             absolute_map = map && map[0] == ?/
 
@@ -451,6 +513,7 @@ module Padrino
             path = "#{@_map}/#{path}".squeeze('/') unless absolute_map or @_map.blank?
 
             # Small reformats
+            path.gsub!(%r{/\?$}, '(/)')                 # Remove index path
             path.gsub!(%r{/?index/?}, '/')                 # Remove index path
             path.gsub!(%r{//$}, '/')                       # Remove index path
             path[0,0] = "/" unless path =~ %r{^\(?/}       # Paths must start with a /
@@ -469,7 +532,7 @@ module Padrino
         # Used for calculating path in route method
         #
         def process_path_for_with_params(path, with_params)
-          File.join(path, Array(with_params).collect(&:inspect).join("/"))
+          File.join(path, Array(with_params).map(&:inspect).join("/"))
         end
 
         ##
@@ -477,7 +540,7 @@ module Padrino
         # Used for calculating path in route method
         #
         def process_path_for_parent_params(path, parent_params)
-          parent_prefix = parent_params.flatten.compact.uniq.collect do |param|
+          parent_prefix = parent_params.flatten.compact.uniq.map do |param|
             map  = (param.respond_to?(:map) && param.map ? param.map : param.to_s)
             part = "#{map}/:#{param}_id/"
             part = "(#{part})" if param.respond_to?(:optional) && param.optional?
@@ -531,7 +594,8 @@ module Padrino
 
             # per rfc2616-sec14:
             # Assume */* if no ACCEPT header is given.
-            if accepts.empty? || accepts.any? { |a| a == "*/*" }
+            accepts.delete "*/*"
+            if accepts.empty?
               matching_types  = mime_types.slice(0,1)
             else
               matching_types  = (accepts & mime_types)
@@ -552,15 +616,9 @@ module Padrino
             # per rfc2616-sec14:
             # answer with 406 if accept is given but types to not match any
             # provided type
-            if !url_format && !accepts.empty? && !matched_format
-              halt 406
-            end
-
-            if settings.respond_to?(:treat_format_as_accept) && settings.treat_format_as_accept
-              if url_format && !matched_format
-                halt 406
-              end
-            end
+            halt 406 if
+              (!url_format && !accepts.empty? && !matched_format) ||
+              (settings.respond_to?(:treat_format_as_accept) && settings.treat_format_as_accept && url_format && !matched_format)
 
             if matched_format
               @_content_type = url_format || accept_format || :html
@@ -639,39 +697,14 @@ module Padrino
         #
         def route!(base=self.class, pass_block=nil)
           base.router.runner = self
-          if base.router and match = base.router.recognize(@request)
-            if match.first.respond_to?(:path)
-              match.each do |matched_path|
-                request.match = matched_path
-                if request.match.path.route.regex?
-                  params_list = @request.env['rack.request.query_hash']['router.regex_match'].to_a
-                  params_list.shift
-                  @block_params = params_list
-                  @params.update({:captures => params_list}.merge(@params || {}))
-                else
-                  @block_params = matched_path.param_values
-                  @params.update(matched_path.params.merge(@params || {}))
-                end
-                pass_block = catch(:pass) do
-                  # If present set current controller layout
-                  parent_layout = base.instance_variable_get(:@layout)
-                  base.instance_variable_set(:@layout, matched_path.path.route.use_layout) if matched_path.path.route.use_layout
-                  # Provide access to the current controller to the request
-                  # Now we can eval route, but because we have "throw halt" we need to be
-                  # (en)sure to reset old layout and run controller after filters.
-                  begin
-                    @_response_buffer = catch(:halt) { route_eval(&matched_path.path.route.dest) }
-                    throw :halt, @_response_buffer
-                  ensure
-                    base.instance_variable_set(:@layout, parent_layout) if matched_path.path.route.use_layout
-                    matched_path.path.route.after_filters.each { |aft| throw :pass if instance_eval(&aft) == false } if matched_path.path.route.after_filters
-                  end
-                end
-              end
-            elsif match
+          if base.router and match = base.router.recognize(@request.env)
+            if match.respond_to?(:path)
+              throw :halt, @_response_buffer
+            elsif match.respond_to?(:each)
               route_eval do
                 match[1].each {|k,v| response[k] = v}
                 status match[0]
+                route_missing if match[0] == 404
               end
             end
           end
@@ -685,6 +718,8 @@ module Padrino
           route_eval(&pass_block) if pass_block
 
           route_missing
+        ensure
+          @_pending_after_filters.each { |aft| instance_eval(&aft) } if @_pending_after_filters
         end
     end # InstanceMethods
   end # Routing

data/lib/padrino-core/cli/base.rb

@@ -25,6 +25,7 @@ module Padrino
 
       desc "stop", "Stops the Padrino application"
       def stop
+        prepare :stop
         require File.expand_path(File.dirname(__FILE__) + "/adapter")
         Padrino::Cli::Adapter.stop
       end

data/lib/padrino-core/cli/console.rb

@@ -10,7 +10,7 @@ def applications
     puts " * %-10s mapped to      %s" % [app.name, app.uri_root]
   end
   puts
-  Padrino.mounted_apps.collect { |app| "#{app.name} => #{app.uri_root}" }
+  Padrino.mounted_apps.map { |app| "#{app.name} => #{app.uri_root}" }
 end
 
 # Load apps

data/lib/padrino-core/cli/rake.rb

@@ -28,6 +28,11 @@ task :environment do
   end
 end
 
+desc "Generate a secret key"
+task :secret do
+  shell.say '%x' % rand(2**255)
+end
+
 # lists all routes of a given app
 def list_app_routes(app, args)
   app_routes = app.named_routes

data/lib/padrino-core/loader.rb

@@ -43,7 +43,7 @@ module Padrino
       set_load_paths(*load_paths) # We set the padrino load paths
       Padrino.logger # Initialize our logger
       before_load.each { |bl| bl.call } # Run before hooks
-      dependency_paths.each { |path| require_dependency(path) }
+      dependency_paths.each { |path| require_dependencies(path) }
       Reloader::Stat.run! # We need to fill our Stat::CACHE
       after_load.each { |al| al.call } # Run after hooks
       Thread.current[:padrino_loaded] = true
@@ -109,7 +109,6 @@ module Padrino
         files.each do |file|
           begin
             Reloader::Stat.safe_load(file)
-            files.delete(file)
           rescue LoadError => e
             errors << e
             failed << file
@@ -122,11 +121,10 @@ module Padrino
         end
 
         # Stop processing if nothing loads or if everything has loaded
-        raise errors.last if files.size == size_at_start && files.present?
-        break if files.empty?
+        raise errors.last if failed.size == size_at_start
+        break if failed.empty?
       end
     end
-    alias :require_dependency :require_dependencies
 
     ##
     # Returns default list of path globs to load as dependencies
@@ -160,7 +158,6 @@ module Padrino
         FileSet.glob(path) { |file| load(file) }
       end
     end
-    alias :load_dependency :load_dependencies
 
     ##
     # Concat to $LOAD_PATH the given paths

data/lib/padrino-core/logger.rb

@@ -30,6 +30,7 @@ module Padrino
     attr_reader   :buffer
     attr_reader   :log
     attr_reader   :init_args
+    attr_accessor :log_static
 
     ##
     # Ruby (standard) logger levels:
@@ -63,6 +64,7 @@ module Padrino
     #   added. Defaults to true.
     # :format_datetime:: Format of datetime. Defaults to: "%d/%b/%Y %H:%M:%S"
     # :format_message:: Format of message. Defaults to: ""%s - - [%s] \"%s\"""
+    # :log_static:: Whether or not to show log messages for static files. Defaults to: false
     #
     # ==== Examples
     #
@@ -146,6 +148,7 @@ module Padrino
     #   added. Defaults to true.
     # :format_datetime:: Format of datetime. Defaults to: "%d/%b/%Y %H:%M:%S"
     # :format_message:: Format of message. Defaults to: ""%s - - [%s] \"%s\"""
+    # :log_static:: Whether or not to show log messages for static files. Defaults to: false
     #
     def initialize(options={})
       @buffer            = []
@@ -156,6 +159,7 @@ module Padrino
       @mutex             = @@mutex[@log] ||= Mutex.new
       @format_datetime   = options[:format_datetime] || "%d/%b/%Y %H:%M:%S"
       @format_message    = options[:format_message]  || "%s - [%s] \"%s\""
+      @log_static        = options.has_key?(:log_static) ? options[:log_static] : false
     end
 
     ##
@@ -271,10 +275,11 @@ module Padrino
       # "lilith.local - - GET / HTTP/1.1 500 -"
       #  %{%s - %s %s %s%s %s - %d %s %0.4f}
       #
-      FORMAT = %{%s - %s %s %s%s %s - %d %s %0.4f}
+      FORMAT = %{%s (%0.4fms) %s - %s %s%s%s %s - %d %s}
 
-      def initialize(app)
+      def initialize(app, uri_root)
         @app = app
+        @uri_root = uri_root.sub(/\/$/,"")
       end
 
       def call(env)
@@ -289,16 +294,19 @@ module Padrino
           now = Time.now
           length = extract_content_length(header)
 
+          return if env['sinatra.static_file'] and !logger.log_static
+
           logger.debug FORMAT % [
+            env["REQUEST_METHOD"],
+            now - began_at,
             env['HTTP_X_FORWARDED_FOR'] || env["REMOTE_ADDR"] || "-",
             env["REMOTE_USER"] || "-",
-            env["REQUEST_METHOD"],
+            @uri_root || "",
             env["PATH_INFO"],
             env["QUERY_STRING"].empty? ? "" : "?" + env["QUERY_STRING"],
             env["HTTP_VERSION"],
             status.to_s[0..3],
-            length,
-            now - began_at ]
+            length]
         end
 
         def extract_content_length(headers)

data/lib/padrino-core/mounter.rb

@@ -15,7 +15,7 @@ module Padrino
     attr_accessor :name, :uri_root, :app_file, :app_class, :app_root, :app_obj, :app_host
 
     def initialize(name, options={})
-      @name      = name.to_s.underscore
+      @name      = name.to_s
       @app_class = options[:app_class] || @name.camelize
       @app_file  = options[:app_file]  || locate_app_file
       @app_obj   = options[:app_obj]   || app_constant || locate_app_object
@@ -115,45 +115,44 @@ module Padrino
     end
 
     protected
-
-    ##
-    # Locates and requires the file to load the app constant
-    #
-    def locate_app_object
-      @_app_object ||= begin
-        ensure_app_file!
-        Padrino.require_dependencies(app_file)
-        app_constant
+      ##
+      # Locates and requires the file to load the app constant
+      #
+      def locate_app_object
+        @_app_object ||= begin
+          ensure_app_file!
+          Padrino.require_dependencies(app_file)
+          app_constant
+        end
       end
-    end
 
-    ##
-    # Returns the determined location of the mounted application main file
-    #
-    def locate_app_file
-      candidates  = []
-      candidates << app_constant.app_file if app_constant.respond_to?(:app_file) && File.exist?(app_constant.app_file.to_s)
-      candidates << Padrino.first_caller if File.identical?(Padrino.first_caller.to_s, Padrino.called_from.to_s)
-      candidates << Padrino.mounted_root(name, "app.rb")
-      candidates << Padrino.root("app", "app.rb")
-      candidates.find { |candidate| File.exist?(candidate) }
-    end
+      ##
+      # Returns the determined location of the mounted application main file
+      #
+      def locate_app_file
+        candidates  = []
+        candidates << app_constant.app_file if app_constant.respond_to?(:app_file) && File.exist?(app_constant.app_file.to_s)
+        candidates << Padrino.first_caller if File.identical?(Padrino.first_caller.to_s, Padrino.called_from.to_s)
+        candidates << Padrino.mounted_root(name, "app.rb")
+        candidates << Padrino.root("app", "app.rb")
+        candidates.find { |candidate| File.exist?(candidate) }
+      end
 
-    ###
-    # Raises an exception unless app_file is located properly
-    #
-    def ensure_app_file!
-      message = "Unable to locate source file for app '#{name}', try with :app_file => '/path/app.rb'"
-      raise MounterException, message unless @app_file
-    end
+      ###
+      # Raises an exception unless app_file is located properly
+      #
+      def ensure_app_file!
+        message = "Unable to locate source file for app '#{app_class}', try with :app_file => '/path/app.rb'"
+        raise MounterException, message unless @app_file
+      end
 
-    ###
-    # Raises an exception unless app_obj is defined properly
-    #
-    def ensure_app_object!
-      message = "Unable to locate app for '#{name}', try with :app_class => 'MyAppClass'"
-      raise MounterException, message unless @app_obj
-    end
+      ###
+      # Raises an exception unless app_obj is defined properly
+      #
+      def ensure_app_object!
+        message = "Unable to locate app for '#{app_class}', try with :app_class => 'MyAppClass'"
+        raise MounterException, message unless @app_obj
+      end
   end
 
   class << self

data/lib/padrino-core/reloader.rb

@@ -34,10 +34,10 @@ module Padrino
 
     ##
     # Specified folders can be excluded from the code reload detection process.
-    # Default excluded directories at Padrino.root are: test, spec, features, tmp, config, lib, db and public
+    # Default excluded directories at Padrino.root are: test, spec, features, tmp, config, db and public
     #
     def self.exclude
-      @_exclude ||= %w(test spec tmp features config lib public db).map { |path| Padrino.root(path) }
+      @_exclude ||= %w(test spec tmp features config public db).map { |path| Padrino.root(path) }
     end
 
     ##
@@ -83,7 +83,7 @@ module Padrino
             # We skip to next file if it is not new and not modified
             next unless new_file || mtime > previous_mtime
             # If the file is related to their app (i.e. a controller/mailer/helper)
-            if app = Padrino.mounted_apps.find { |a| file =~ /^#{File.dirname(a.app_file)}/ }
+            Padrino.mounted_apps.find_all { |a| file =~ /^#{File.dirname(a.app_file)}/ }.each do |app|
               # We need to reload their own app
               app.app_obj.reload!
               # App reloading will also perform safe_load of itself so we can go next
@@ -254,4 +254,4 @@ module Padrino
       end # self
     end # Stat
   end # Reloader
-end # Padrino
+end # Padrino

data/lib/padrino-core/support_lite.rb

@@ -52,7 +52,7 @@ if defined?(ActiveSupport::CoreExtensions::Hash) && !Hash.method_defined?(:slice
 
     def ordered_collect(&block)
       keys = self.stringify_keys.keys.sort
-      keys.collect { |key| block.call(key, self[key.to_sym]) }
+      keys.map { |key| block.call(key, self[key.to_sym]) }
     end
   end
 end

data/lib/padrino-core/version.rb

@@ -5,7 +5,7 @@
 # without include full padrino core.
 #
 module Padrino
-  VERSION = '0.9.24' unless defined?(Padrino::VERSION)
+  VERSION = '0.9.25' unless defined?(Padrino::VERSION)
   ##
   # Return the current Padrino version
   #

data/padrino-core.gemspec

@@ -17,8 +17,9 @@ Gem::Specification.new do |s|
   s.files = %w(.document .gitignore LICENSE README.rdoc Rakefile padrino-core.gemspec) + Dir.glob("{bin,lib,test}/**/*")
   s.rdoc_options = ["--charset=UTF-8"]
   s.require_path = "lib"
-  s.add_dependency("sinatra", "~> 1.2.0")
-  s.add_dependency("http_router", "~> 0.5.4")
+  s.add_dependency("tilt", "~> 1.3.0")
+  s.add_dependency("sinatra", "~> 1.2.3")
+  s.add_dependency("http_router", "~> 0.7.4")
   s.add_dependency("thor", ">=0.14.3")
   s.add_dependency("activesupport", ">= 3.0.0")
   s.add_dependency("tzinfo")

data/test/fixtures/apps/simple.rb

@@ -14,7 +14,7 @@ end
 
 SimpleDemo.controllers do
   get "/" do
-    'The magick number is: 39!' # Change only the number!!!
+    'The magick number is: 4!' # Change only the number!!!
   end
 
   get "/rand" do

data/test/test_logger.rb

@@ -48,8 +48,25 @@ class TestPadrinoLogger < Test::Unit::TestCase
       mock_app { get("/"){ "Foo" } }
       get "/"
       assert_equal "Foo", body
-      assert_match /GET \/  - 200/, Padrino.logger.log.string
+      assert_match /GET/, Padrino.logger.log.string
     end
 
+    context "static asset logging" do
+      should 'not log static assets by default' do
+        mock_app { get("/images/something.png"){ env["sinatra.static_file"] = '/public/images/something.png'; "Foo" } }
+        get "/images/something.png"
+        assert_equal "Foo", body
+        assert_match "", Padrino.logger.log.string
+      end
+
+      should 'allow turning on static assets logging' do
+        Padrino.logger.instance_eval{ @log_static = true }
+        mock_app { get("/images/something.png"){ env["sinatra.static_file"] = '/public/images/something.png'; "Foo" } }
+        get "/images/something.png"
+        assert_equal "Foo", body
+        assert_match /GET/, Padrino.logger.log.string
+        Padrino.logger.instance_eval{ @log_static = false }
+      end
+    end
   end
 end

data/test/test_mounter.rb

@@ -3,9 +3,14 @@ require File.expand_path(File.dirname(__FILE__) + '/helper')
 class TestMounter < Test::Unit::TestCase
 
   def setup
+    $VERBOSE, @_verbose_was = nil, $VERBOSE
     Padrino.mounted_apps.clear
   end
 
+  def teardown
+    $VERBOSE = @_verbose_was
+  end
+
   context 'for mounter functionality' do
 
     should 'check methods' do
@@ -36,16 +41,16 @@ class TestMounter < Test::Unit::TestCase
       class ::AnApp < Padrino::Application; end
       Padrino.mount("an_app").to("/")
       assert_equal AnApp, Padrino.mounted_apps.first.app_obj
-      assert_equal ["an_app"], Padrino.mounted_apps.collect(&:name)
+      assert_equal ["an_app"], Padrino.mounted_apps.map(&:name)
     end
-    
+
     should 'correctly mount an app in a namespace' do
       module ::SomeNamespace
         class AnApp < Padrino::Application; end
       end
       Padrino.mount("some_namespace/an_app").to("/")
       assert_equal SomeNamespace::AnApp, Padrino.mounted_apps.first.app_obj
-      assert_equal ["some_namespace/an_app"], Padrino.mounted_apps.collect(&:name)
+      assert_equal ["some_namespace/an_app"], Padrino.mounted_apps.map(&:name)
     end
 
     should 'mount a primary app to root uri' do
@@ -91,7 +96,7 @@ class TestMounter < Test::Unit::TestCase
       assert_equal OneApp, Padrino.mounted_apps[0].app_obj
       assert_equal TwoApp, Padrino.mounted_apps[1].app_obj
       assert_equal 2, Padrino.mounted_apps.size, "should not mount duplicate apps"
-      assert_equal ["one_app", "two_app"], Padrino.mounted_apps.collect(&:name)
+      assert_equal ["one_app", "two_app"], Padrino.mounted_apps.map(&:name)
     end
 
     should 'change mounted_root' do

data/test/test_reloader_complex.rb

@@ -9,8 +9,8 @@ class TestComplexReloader < Test::Unit::TestCase
       Padrino.mounted_apps.clear
       Padrino.mount("complex_1_demo").to("/complex_1_demo")
       Padrino.mount("complex_2_demo").to("/complex_2_demo")
-      assert_equal ["/complex_1_demo", "/complex_2_demo"], Padrino.mounted_apps.collect(&:uri_root)
-      assert_equal ["complex_1_demo", "complex_2_demo"], Padrino.mounted_apps.collect(&:name)
+      assert_equal ["/complex_1_demo", "/complex_2_demo"], Padrino.mounted_apps.map(&:uri_root)
+      assert_equal ["complex_1_demo", "complex_2_demo"], Padrino.mounted_apps.map(&:name)
       assert Complex1Demo.reload?
       assert Complex2Demo.reload?
       assert_match %r{fixtures/apps/complex.rb}, Complex1Demo.app_file
@@ -39,26 +39,28 @@ class TestComplexReloader < Test::Unit::TestCase
       new_phrase = "The magick number is: #{rand(100)}!"
       buffer     = File.read(Complex1Demo.app_file)
       new_buffer = buffer.gsub(/The magick number is: \d+!/, new_phrase)
-      File.open(Complex1Demo.app_file, "w") { |f| f.write(new_buffer) }
-      sleep 1.2 # We need at least a cooldown of 1 sec.
-      get "/complex_2_demo"
-      assert_equal new_phrase, body
+      begin
+        File.open(Complex1Demo.app_file, "w") { |f| f.write(new_buffer) }
+        sleep 1.2 # We need at least a cooldown of 1 sec.
+        get "/complex_2_demo"
+        assert_equal new_phrase, body
 
-      # Re-Check that we didn't forget any route
-      get "/complex_1_demo"
-      assert_equal "Given random #{LibDemo.give_me_a_random}", body
-
-      get "/complex_2_demo"
-      assert_equal 200, status
+        # Re-Check that we didn't forget any route
+        get "/complex_1_demo"
+        assert_equal "Given random #{LibDemo.give_me_a_random}", body
 
-      get "/complex_1_demo/old"
-      assert_equal 200, status
+        get "/complex_2_demo"
+        assert_equal 200, status
 
-      get "/complex_2_demo/old"
-      assert_equal 200, status
+        get "/complex_1_demo/old"
+        assert_equal 200, status
 
-      # Now we need to prevent to commit a new changed file so we revert it
-      File.open(Complex1Demo.app_file, "w") { |f| f.write(buffer) }
+        get "/complex_2_demo/old"
+        assert_equal 200, status
+      ensure
+        # Now we need to prevent to commit a new changed file so we revert it
+        File.open(Complex1Demo.app_file, "w") { |f| f.write(buffer) }
+      end
     end
   end
 end

data/test/test_reloader_simple.rb

@@ -47,7 +47,7 @@ class TestSimpleReloader < Test::Unit::TestCase
     should 'correctly instantiate SimpleDemo fixture' do
       Padrino.mounted_apps.clear
       Padrino.mount("simple_demo").to("/")
-      assert_equal ["simple_demo"], Padrino.mounted_apps.collect(&:name)
+      assert_equal ["simple_demo"], Padrino.mounted_apps.map(&:name)
       assert SimpleDemo.reload?
       assert_match %r{fixtures/apps/simple.rb}, SimpleDemo.app_file
     end
@@ -71,6 +71,7 @@ class TestSimpleReloader < Test::Unit::TestCase
 
     should 'correctly reset SimpleDemo fixture' do
       @app = SimpleDemo
+      @app.reload!
       get "/rand"
       assert ok?
       last_body = body

data/test/test_router.rb

@@ -106,8 +106,8 @@ class TestRouter < Test::Unit::TestCase
   should "works with padrino core applications" do
     Padrino.mounted_apps.clear
     Padrino.mount("simple_demo").host("padrino.org")
-    assert_equal ["simple_demo"], Padrino.mounted_apps.collect(&:name)
-    assert_equal ["padrino.org"], Padrino.mounted_apps.collect(&:app_host)
+    assert_equal ["simple_demo"], Padrino.mounted_apps.map(&:name)
+    assert_equal ["padrino.org"], Padrino.mounted_apps.map(&:app_host)
 
     res = Rack::MockRequest.new(Padrino.application).get("/")
     assert res.not_found?

data/test/test_routing.rb

@@ -4,11 +4,6 @@ class FooError < RuntimeError; end
 
 
 class TestRouting < Test::Unit::TestCase
-  should 'use padrinos url method' do
-    mock_app { }
-    assert_equal @app.method(:url).owner, Padrino::Routing::ClassMethods
-  end
-
   should 'ignore trailing delimiters for basic route' do
     mock_app do
       get("/foo"){ "okey" }
@@ -35,23 +30,6 @@ class TestRouting < Test::Unit::TestCase
     }
   end
 
-  should_eventually 'generate a url using route string with params' do
-    mock_app do
-      get("/show/:id/:name"){ "okey" }
-    end
-
-    assert_equal "/show/1/foo", @app.url_for("/show/:id/:name", :id => 1, :name => "foo")
-  end
-
-  should 'work correctly with sinatra redirects' do
-    mock_app do
-      get(:index){ redirect url(:index) }
-    end
-
-    get "/"
-    assert_equal "http://example.org/", headers['Location']
-  end
-
   should 'accept regexp routes' do
     mock_app do
       get(%r{/fob|/baz}) { "regexp" }
@@ -128,7 +106,7 @@ class TestRouting < Test::Unit::TestCase
     assert_equal ["POST"], app.routes[2].as_options[:conditions][:request_method]
   end
 
-  should 'generate basic urls'do
+  should 'generate basic urls' do
     mock_app do
       get(:foo){ "/foo" }
       get(:foo, :with => :id){ |id| "/foo/#{id}" }
@@ -252,6 +230,31 @@ class TestRouting < Test::Unit::TestCase
     assert_equal 'json', body
   end
 
+  should "send the appropriate number of params" do
+    mock_app do
+      get('/id/:user_id', :provides => [:json]) { |user_id| user_id}
+    end
+    get '/id/5.json'
+    assert_equal '5', body
+  end
+
+  should "allow .'s in param values" do
+    mock_app do
+      get('/id/:email', :provides => [:json]) { |email, format| [email, format] * '/' }
+    end
+    get '/id/foo@bar.com.json'
+    assert_equal 'foo@bar.com/json', body
+  end
+
+  should "set correct content_type for Accept not equal to */* even if */* also provided" do
+    mock_app do
+      get("/foo", :provides => [:html, :js, :xml]) { content_type.to_s }
+    end
+
+    get '/foo', {}, { 'HTTP_ACCEPT' => 'application/javascript, */*;q=0.5' }
+    assert_equal 'js', body
+  end
+
   should "return the first content type in provides if accept header is empty" do
     mock_app do
       get(:a, :provides => [:js]){ content_type.to_s }
@@ -326,7 +329,7 @@ class TestRouting < Test::Unit::TestCase
   should "should inject the route into the request" do
     mock_app do
       controller :posts do
-        get(:index) { request.route.named.to_s }
+        get(:index) { request.route_obj.named.to_s }
       end
     end
     get "/posts"
@@ -863,6 +866,14 @@ class TestRouting < Test::Unit::TestCase
     assert_equal 'html', body
   end
 
+  should "set content_type to :js if Accept includes both application/javascript and */*;q=0.5" do
+    mock_app do
+      get("/foo", :provides => [:html, :js]) { content_type.to_s }
+    end
+    get '/foo', {}, { 'HTTP_ACCEPT' => 'application/javascript, */*;q=0.5' }
+    assert_equal 'js', body
+  end
+
   should 'allows custom route-conditions to be set via route options and halt' do
     protector = Module.new do
       def protect(*args)
@@ -1132,7 +1143,6 @@ class TestRouting < Test::Unit::TestCase
     assert_equal "This is the get index.json", body
     get "/.js"
     assert_equal 404, status
-    assert_match "Sinatra doesn't know this ditty", body
     post "/.json"
     assert_equal "This is the post index.json", body
     post "/.js"
@@ -1330,4 +1340,39 @@ class TestRouting < Test::Unit::TestCase
     assert_equal 200, status
     assert_equal 'okay', body
   end
+
+  should 'parse nested params' do
+    mock_app do
+      get(:index) { params.inspect }
+    end
+    get "/?account[name]=foo&account[surname]=bar"
+    assert_equal '{"account"=>{"name"=>"foo", "surname"=>"bar"}}', body
+    get @app.url(:index, "account[name]" => "foo", "account[surname]" => "bar")
+    assert_equal '{"account"=>{"name"=>"foo", "surname"=>"bar"}}', body
+  end
+
+  should 'render sinatra NotFound page' do
+    mock_app { set :environment, :development }
+    get "/"
+    assert_equal 404, status
+    assert_match /Sinatra doesn\'t know this ditty./, body
+  end
+
+  should 'render a custom NotFound page' do
+    mock_app do
+      error(Sinatra::NotFound) { "not found" }
+    end
+    get "/"
+    assert_equal 404, status
+    assert_match /not found/, body
+  end
+
+  should 'render a custom 404 page' do
+    mock_app do
+      error(404) { "not found" }
+    end
+    get "/"
+    assert_equal 404, status
+    assert_match /not found/, body
+  end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: padrino-core
 version: !ruby/object:Gem::Version 
-  hash: 11
+  hash: 9
   prerelease: 
   segments: 
   - 0
   - 9
-  - 24
-  version: 0.9.24
+  - 25
+  version: 0.9.25
 platform: ruby
 authors: 
 - Padrino Team
@@ -18,45 +18,61 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-28 00:00:00 +02:00
+date: 2011-04-27 00:00:00 +02:00
 default_executable: padrino
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: sinatra
+  name: tilt
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 31
+        hash: 27
         segments: 
         - 1
-        - 2
+        - 3
         - 0
-        version: 1.2.0
+        version: 1.3.0
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  name: http_router
+  name: sinatra
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 3
+        hash: 25
+        segments: 
+        - 1
+        - 2
+        - 3
+        version: 1.2.3
+  type: :runtime
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  name: http_router
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 11
         segments: 
         - 0
-        - 5
+        - 7
         - 4
-        version: 0.5.4
+        version: 0.7.4
   type: :runtime
-  version_requirements: *id002
+  version_requirements: *id003
 - !ruby/object:Gem::Dependency 
   name: thor
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -68,11 +84,11 @@ dependencies:
         - 3
         version: 0.14.3
   type: :runtime
-  version_requirements: *id003
+  version_requirements: *id004
 - !ruby/object:Gem::Dependency 
   name: activesupport
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -84,11 +100,11 @@ dependencies:
         - 0
         version: 3.0.0
   type: :runtime
-  version_requirements: *id004
+  version_requirements: *id005
 - !ruby/object:Gem::Dependency 
   name: tzinfo
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -98,7 +114,7 @@ dependencies:
         - 0
         version: "0"
   type: :runtime
-  version_requirements: *id005
+  version_requirements: *id006
 description: The Padrino core gem required for use of this framework
 email: padrinorb@gmail.com
 executables: