padrino-core 0.12.9 → 0.13.0.beta1

data/lib/padrino-core/caller.rb

@@ -18,8 +18,7 @@ module Padrino
     %r{rake_test_loader\.rb},
     %r{custom_require\.rb$},
     %r{active_support},
-    %r{/thor},
-    %r{/lib/bundler},
+    %r{/thor}
   ] unless defined?(PADRINO_IGNORE_CALLERS)
 
   ##

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

@@ -28,20 +28,16 @@ module Padrino
       def console(*args)
         prepare :console
         require File.expand_path("../../version", __FILE__)
+        ARGV.clear
+        require 'irb'
+        begin
+          require "irb/completion"
+        rescue LoadError
+        end
         require File.expand_path('config/boot.rb')
         puts "=> Loading #{Padrino.env} console (Padrino v.#{Padrino.version})"
         require File.expand_path('../console', __FILE__)
-        ARGV.clear
-        if defined? Pry
-          Pry.start
-        else
-          require 'irb'
-          begin
-            require "irb/completion"
-          rescue LoadError
-          end
-          IRB.start
-        end
+        IRB.start
       end
 
       desc "generate", "Executes the Padrino generator with given options (alternatively use 'gen' or 'g')."

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

@@ -1,3 +1,11 @@
+Dir["{lib/tasks/**,tasks/**,test,spec}/*.rake"].each do |file|
+  begin
+    load(file)
+  rescue LoadError => e
+    warn "#{file}: #{e.message}"
+  end
+end
+
 # Loads the Padrino applications mounted within the project.
 # Setting up the required environment for Padrino.
 task :environment do
@@ -35,19 +43,6 @@ def list_app_routes(app, args)
   end
 end
 
-def env_migration_version
-  version = ENV["MIGRATION_VERSION"]
-  if version.nil? && ENV["VERSION"]
-    deprecated = true
-    warn "Environment variable VERSION is deprecated, use MIGRATION_VERSION"
-    version = ENV["VERSION"]
-  end
-  version ? Integer(version) : nil
-rescue ArgumentError
-  warn "Environment variable #{deprecated ? '' : 'MIGRATION_'}VERSION=#{version} should be non-existant or Integer"
-  nil
-end
-
 desc "Displays a listing of the named routes within a project, optionally only those matched by [query]"
 task :routes, [:query] => :environment do |t, args|
   Padrino.mounted_apps.each do |app|
@@ -62,11 +57,3 @@ namespace :routes do
     list_app_routes(app, args) if app
   end
 end
-
-Dir["{lib/tasks/**,tasks/**,test,spec}/*.rake"].each do |file|
-  begin
-    load(File.expand_path(file))
-  rescue LoadError => e
-    warn "#{file}: #{e.message}"
-  end
-end

data/lib/padrino-core/loader.rb

@@ -58,9 +58,22 @@ module Padrino
       require_dependencies(*dependency_paths)
       after_load.each(&:call)
       logger.devel "Loaded Padrino in #{Time.now - began_at} seconds"
+      precompile_all_routes!
       Thread.current[:padrino_loaded] = true
     end
 
+    ##
+    # Precompiles all routes if :precompile_routes is set to true
+    #
+    def precompile_all_routes!
+      mounted_apps.each do |app|
+        app_obj = app.app_obj
+        next unless app_obj.respond_to?(:precompile_routes?) && app_obj.precompile_routes?
+        app_obj.setup_application!
+        logger.devel "Precompiled routes of #{app_obj} (routes size #{app_obj.compiled_router.routes.size})"
+      end
+    end
+
     ##
     # Clear the padrino env.
     #
@@ -170,18 +183,6 @@ module Padrino
       @_dependency_paths ||= default_dependency_paths + modules_dependency_paths
     end
 
-    # Deprecated
-    def set_load_paths(*)
-      warn 'Padrino.set_load_paths is deprecated. Please, use $LOAD_PATH.concat(paths)'
-      []
-    end
-
-    # Deprecated
-    def load_paths
-      warn 'Padrino.load_paths is deprecated. Please, use Padrino::Application#prerequisites'
-      []
-    end
-
     private
 
     def modules_dependency_paths

data/lib/padrino-core/logger.rb

@@ -73,7 +73,7 @@ module Padrino
             bench(args[0], args[1], args[2], name)
           else
             if location = resolve_source_location(caller(1).shift)
-              args.unshift(location)
+              args.prepend(location)
             end if enable_source_location?
             push(args * '', name)
           end
@@ -264,9 +264,6 @@ module Padrino
     #
     # :log_level:: Once of [:fatal, :error, :warn, :info, :debug]
     # :stream:: Once of [:to_file, :null, :stdout, :stderr] our your custom stream
-    # :log_path:: Defines log file path or directory if :stream is :to_file
-    #   If it's a file, its location is created by mkdir_p.
-    #   If it's a directory, it must exist. In this case log name is '<env>.log'
     # :log_level::
     #   The log level from, e.g. :fatal or :info. Defaults to :warn in the
     #   production environment and :debug otherwise.
@@ -282,10 +279,6 @@ module Padrino
     #   Padrino::Logger::Config[:development] = { :log_level => :debug, :stream => :to_file }
     #   # or you can edit our defaults
     #   Padrino::Logger::Config[:development][:log_level] = :error
-    #   # or change log file path
-    #   Padrino::Logger::Config[:development][:log_path] = 'logs/app-development.txt'
-    #   # or change log file directory
-    #   Padrino::Logger::Config[:development][:log_path] = '/var/logs/padrino'
     #   # or you can use your stream
     #   Padrino::Logger::Config[:development][:stream] = StringIO.new
     #
@@ -336,18 +329,8 @@ module Padrino
 
         stream = case config[:stream]
           when :to_file
-            if filename = config[:log_path]
-              filename = Padrino.root(filename) unless Pathname.new(filename).absolute?
-              if File.directory?(filename)
-                filename = File.join(filename, "#{Padrino.env}.log")
-              else
-                FileUtils.mkdir_p(File.dirname(filename))
-              end
-              File.new(filename, 'a+')
-            else
-              FileUtils.mkdir_p(Padrino.root('log')) unless File.exist?(Padrino.root('log'))
-              File.new(Padrino.root('log', "#{Padrino.env}.log"), 'a+')
-            end
+            FileUtils.mkdir_p(Padrino.root('log')) unless File.exist?(Padrino.root('log'))
+            File.new(Padrino.root('log', "#{Padrino.env}.log"), 'a+')
           when :null   then StringIO.new
           when :stdout then $stdout
           when :stderr then $stderr
@@ -385,12 +368,6 @@ module Padrino
     # @option options [Symbol] :colorize_logging (true)
     #   Whether or not to colorize log messages. Defaults to: true.
     #
-    # @option options [Symbol] :sanitize_encoding (false)
-    #   Logger will replace undefined or broken characters with
-    #   “uFFFD” for Unicode and “?” otherwise.
-    #   Can be an encoding, false or true.
-    #   If it's true, logger sanitizes to Encoding.default_external.
-    #
     def initialize(options={})
       @buffer           = []
       @auto_flush       = options.has_key?(:auto_flush) ? options[:auto_flush] : true
@@ -402,8 +379,6 @@ module Padrino
       @log_static       = options.has_key?(:log_static) ? options[:log_static] : false
       @colorize_logging = options.has_key?(:colorize_logging) ? options[:colorize_logging] : true
       @source_location  = options[:source_location]
-      @sanitize_encoding = options[:sanitize_encoding] || false
-      @sanitize_encoding = Encoding.default_external if @sanitize_encoding == true
       colorize! if @colorize_logging
     end
 
@@ -417,10 +392,7 @@ module Padrino
     def flush
       return unless @buffer.size > 0
       @@mutex.synchronize do
-        @buffer.each do |line|
-          line.encode!(@sanitize_encoding, :invalid => :replace, :undef => :replace) if @sanitize_encoding
-          @log.write(line)
-        end
+        @log.write(@buffer.join(''))
         @buffer.clear
       end
     end

data/lib/padrino-core/mounter.rb

@@ -1,4 +1,4 @@
-require 'padrino-core/mounter/application_extension'
+require 'delegate'
 
 module Padrino
   ##
@@ -14,6 +14,55 @@ module Padrino
     class MounterException < RuntimeError
     end
 
+    class ApplicationWrapper < SimpleDelegator
+      attr_accessor :uri_root
+      attr_writer :public_folder
+
+      def initialize(app, options = {})
+        @options = options
+        super(app)
+      end
+
+      def dependencies
+        @__dependencies ||= Dir["#{root}/**/*.rb"]
+      end
+
+      def prerequisites
+        @__prerequisites ||= []
+      end
+
+      def app_file
+        return @__app_file if @__app_file
+        obj = __getobj__
+        @__app_file = obj.respond_to?(:app_file) ? obj.app_file : @options[:app_file]
+      end
+
+      def root
+        return @__root if @__root
+        obj = __getobj__
+        @__root = obj.respond_to?(:root) ? obj.root : File.expand_path("#{app_file}/../")
+      end
+
+      def public_folder
+        return @public_folder if @public_folder
+        obj = __getobj__
+        @public_folder = obj.respond_to?(:public_folder) ? obj.public_folder : ""
+      end
+
+      def app_name
+        @__app_name ||= @options[:app_name] || __getobj__.to_s.underscore.to_sym
+      end
+
+      def setup_application!
+        @configured ||=
+          begin
+            $LOAD_PATH.concat(prerequisites)
+            Padrino.require_dependencies(dependencies, :force => true) if root.start_with?(Padrino.root)
+            true
+          end
+      end
+    end
+
     attr_accessor :name, :uri_root, :app_file, :app_class, :app_root, :app_obj, :app_host, :cascade
 
     ##
@@ -34,10 +83,7 @@ module Padrino
       @app_file  = options[:app_file]  || locate_app_file
       @app_obj   = options[:app_obj]   || app_constant || locate_app_object
       ensure_app_file! || ensure_app_object!
-      unless padrino_application?
-        @app_obj.extend ApplicationExtension
-        @app_obj.mounter_options = options
-      end
+      @app_obj   = ApplicationWrapper.new(@app_obj, options) unless padrino_application?
       @app_root  = options[:app_root]  || (@app_obj.respond_to?(:root) && @app_obj.root || File.dirname(@app_file))
       @uri_root  = "/"
       @cascade   = options[:cascade] ? true == options[:cascade] ? DEFAULT_CASCADE.dup : Array(options[:cascade]) : []
@@ -96,23 +142,20 @@ module Padrino
     def map_onto(router)
       app_data = self
       app_obj = @app_obj
-
-      uri_root             = app_data.uri_root
-      public_folder_exists = File.exist?(app_obj.public_folder)
-
       if padrino_application?
-        app_obj.set :uri_root,       uri_root
-        app_obj.set :app_name,       app_obj.app_name.to_s
-        app_obj.set :root,           app_data.app_root
-        app_obj.set :public_folder,  Padrino.root('public', uri_root) unless public_folder_exists
-        app_obj.set :static,         public_folder_exists
+        app_obj.set :uri_root,       app_data.uri_root
+        app_obj.set :app_name,       app_data.app_obj.app_name.to_s
+        app_obj.set :app_file,       app_data.app_file unless File.exist?(app_obj.app_file)
+        app_obj.set :root,           app_data.app_root unless app_data.app_root.blank?
+        app_obj.set :public_folder,  Padrino.root('public', app_data.uri_root) unless File.exist?(app_obj.public_folder)
+        app_obj.set :static,         File.exist?(app_obj.public_folder) if app_obj.nil?
         app_obj.set :cascade,        app_data.cascade
       else
-        app_obj.uri_root      = uri_root
-        app_obj.public_folder = Padrino.root('public', uri_root) unless public_folder_exists
+        app_obj.uri_root      = app_data.uri_root
+        app_obj.public_folder = Padrino.root('public', app_data.uri_root) unless File.exist?(app_obj.public_folder)
       end
       app_obj.setup_application! # Initializes the app here with above settings.
-      router.map(:to => app_obj, :path => uri_root, :host => app_data.app_host)
+      router.map(:to => app_obj, :path => app_data.uri_root, :host => app_data.app_host)
     end
 
     ###
@@ -131,7 +174,7 @@ module Padrino
     def named_routes
       app_obj.routes.map { |route|
         route_name = route.name.to_s
-        route_name =
+        route_name = 
           if route.controller
             route_name.split(" ", 2).map{|name| ":#{name}" }.join(", ")
           else
@@ -188,10 +231,8 @@ module Padrino
     # Returns the determined location of the mounted application main file.
     #
     def locate_app_file
-      app_const = app_constant
-
       candidates  = []
-      candidates << app_const.app_file if app_const.respond_to?(:app_file)
+      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.downcase, "app.rb")
       simple_name = name.split("::").last.downcase

data/lib/padrino-core/path_router/compiler.rb

@@ -0,0 +1,110 @@
+module Padrino
+  module PathRouter
+    #
+    # High performance engine for finding all routes which are matched with pattern
+    #
+    class Compiler
+      # All regexps generated by recursive compiler
+      attr_reader :regexps
+
+      ##
+      # Constructs an instance of Padrino::PathRouter::Compiler
+      #
+      def initialize(routes)
+        @routes = routes
+      end
+  
+      ##
+      # Compiles all routes into regexps.
+      #
+      def compile!
+        return if compiled?
+        @regexps = @routes.map.with_index do |route, index|
+          route.index = index
+          /(?<_#{index}>#{route.matcher.to_regexp})/
+        end
+        @regexps = recursive_compile(@regexps)
+        @compiled = true
+      end
+
+      ##
+      # Returns true if all routes has been compiled.
+      #
+      def compiled?
+        !!@compiled
+      end
+
+      ##
+      # Finds routes by using request or env.
+      #
+      def find_by(request_or_env)
+        request = request_or_env.is_a?(Hash) ? Sinatra::Request.new(request_or_env) : request_or_env
+        pattern = encode_default_external(request.path_info)
+        verb    = request.request_method
+        rotation { |offset| match?(offset, pattern) }.select { |route| route.verb == verb }
+      end
+
+      ##
+      # Calls routes by using request.
+      #
+      def call_by_request(request)
+        rotation do |offset|
+          pattern  = encode_default_external(request.path_info)
+          if route = match?(offset, pattern)
+            params = route.params_for(pattern, request.params)
+            yield(route, params) if route.verb == request.request_method
+            route
+          end
+        end
+      end
+
+      ##
+      # Finds routes by using PATH_INFO.
+      #
+      def find_by_pattern(pattern)
+        pattern = pattern.encode(Encoding.default_external)
+        rotation { |offset| match?(offset, pattern) }
+      end
+  
+      private
+
+      ##
+      # Returns a instance of PathRouter::Route if path is matched with current regexp
+      #
+      def match?(offset, path)
+        current_regexp = @regexps[offset]
+        return unless current_regexp === path || current_regexp === path[0..-2]
+        @routes[offset..-1].detect{ |route| Regexp.last_match["_#{route.index}"] }
+      end
+
+      ##
+      # Runs through all regexps to find routes.
+      #
+      def rotation(offset = 0)
+        compile! unless compiled?
+        loop.with_object([]) do |_, candidacies|
+          return candidacies unless route = yield(offset)
+          candidacies << route
+          offset = route.index.next
+        end
+      end
+
+      ##
+      # Compiles routes into regexp recursively.
+      #
+      def recursive_compile(regexps, paths = [])
+        return paths if regexps.length.zero?
+        paths << Regexp.union(regexps)
+        regexps.shift
+        recursive_compile(regexps, paths)
+      end
+
+      ##
+      # Encode string with Encoding.default_external
+      #
+      def encode_default_external(string)
+        string.encode(Encoding.default_external)
+      end
+    end
+  end
+end

data/lib/padrino-core/path_router/error_handler.rb

@@ -0,0 +1,8 @@
+module Padrino
+  module PathRouter
+    ##
+    # @see PathRouter::Router#path
+    #
+    InvalidRouteException = Class.new(ArgumentError)
+  end
+end