padrino-core 0.12.9 → 0.13.0.beta1

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    Zjc3MmQyN2MyYjcyOTU2N2YyYTE0YWJmZTExM2MxODAwZTYwNTEyMg==
-  data.tar.gz: !binary |-
-    ZGYwNjcyNDY1YTRkMjFlOGU5YTUwNjZiNTUwNzhjNTljNDczMzkwOA==
+SHA1:
+  metadata.gz: dd190eb5ae35578b80e7e1f3917864308bf6be3a
+  data.tar.gz: 8927013bd7f6c5c190a894780efd38d842e9bc87
 SHA512:
-  metadata.gz: !binary |-
-    YTM0ZjYxOThkNGViZjhmYzI1YzdmYjk4MTBjOTIxOGQzYTYyYWM3ODczMjlj
-    MTkzOTM5ZDQ0YjMzMWQ2Nzg0YjkwN2Q2ZGMyMTE3ZTQ2NzdkMTg5NDA0MTdm
-    N2Y1Mzk0YTgwMmYyN2Y2MTRhODhlNjliMjUzZDI1MjU0NmExNmM=
-  data.tar.gz: !binary |-
-    OTRhOTFhZGYzN2M2MmZjYzBjNTIxNzdhNWE2MWFlM2E5MTY1YjExM2ZmNDUw
-    ODgyODU1NmZhNjZlMjZmNTNkMjE3ZTQ1OWUxMGNlY2E2NzFkODU0MWUzNGFi
-    NmZlZjc4NDYyZmY4ODdlNTBkMDZiNGQzNjllYjMzMmM5MDFjYmY=
+  metadata.gz: 6b1db6d4f4ebfd97f9a0b1383f94a8f19e8d10f4b9b71d33ee7a8b8be6ba2e5d9a5227dda9b5a57ed28595127646a508fd8cc7bce4dfa1e52400757f1bc5b468
+  data.tar.gz: a5ccf5a769094f21b189f30fbdf06914ad977c3c7a7caf794cbf4bf56ec361bcc5514c144b91f9c0e96c5a3de875bac84a863d27b142b23f8745b856cdd47e73

data/bin/padrino

@@ -1,6 +1,5 @@
 #!/usr/bin/env ruby
-require 'padrino-core/cli/binstub'
-Padrino.replace_with_binstub('padrino')
+require 'bundler/setup' if %w(Gemfile .components).all? { |f| File.exist?(f) }
 
 padrino_core_path = File.expand_path('../../lib', __FILE__)
 $:.unshift(padrino_core_path) if File.directory?(padrino_core_path) && !$:.include?(padrino_core_path)

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

@@ -22,11 +22,6 @@ module Padrino
         set :method_override, true
         set :default_builder, 'StandardFormBuilder'
 
-        # TODO: Remove this hack after getting rid of thread-unsafe http_router:
-        if RUBY_PLATFORM == "java"
-          set :init_mutex, Mutex.new
-        end
-
         default_paths
         default_security
         global_configuration
@@ -45,9 +40,19 @@ module Padrino
         default_routes
         default_errors
         setup_locale
+        precompile_routes!
         @_configured = true
       end
 
+      def precompile_routes?
+        settings.respond_to?(:precompile_routes) && settings.precompile_routes?
+      end
+
+      def precompile_routes!
+        compiled_router.prepare!
+        compiled_router.engine.compile!
+      end
+
       private
 
       def default_paths
@@ -57,7 +62,6 @@ module Padrino
         set :uri_root,      '/'
         set :public_folder, proc { Padrino.root('public', uri_root) }
         set :images_path,   proc { File.join(public_folder, 'images') }
-        set :base_url,      'http://localhost'
       end
 
       def default_security

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

@@ -1,3 +1,9 @@
+begin
+  require 'active_support/core_ext/object/deep_dup' # AS 4.1
+rescue LoadError
+  require 'active_support/core_ext/hash/deep_dup' # AS >= 3.1
+end
+
 module Padrino
   ##
   # Padrino application module providing means for mass-assignment protection.
@@ -39,7 +45,7 @@ module Padrino
       def params(*allowed_params)
         allowed_params = prepare_allowed_params(allowed_params)
         condition do
-          @original_params = Utils.deep_dup(params)
+          @original_params = params.deep_dup
           filter_params!(params, allowed_params)
         end
       end

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

@@ -1,6 +1,6 @@
 require 'padrino-support'
+require 'padrino-core/path_router' unless defined?(PathRouter)
 require 'padrino-core/ext/sinatra'
-require 'padrino-core/ext/http_router'
 require 'padrino-core/filter'
 
 module Padrino
@@ -21,6 +21,14 @@ module Padrino
     # Raised when a route was invalid or cannot be processed.
     class UnrecognizedException < RuntimeError; end
 
+    # Raised when block arity was nonzero and was not same with
+    # captured parameter length.
+    class BlockArityError < ArgumentError
+      def initialize(path, block_arity, required_arity)
+        super "route block arity does not match path '#{path}' (#{block_arity} for #{required_arity})"
+      end
+    end
+
     class Parent < String
       attr_reader :map
       attr_reader :optional
@@ -250,16 +258,14 @@ module Padrino
       end
 
       ##
-      # Using HttpRouter, for features and configurations.
+      # Using PathRouter, for features and configurations.
       #
       # @example
       #   router.add('/greedy/:greed')
       #   router.recognize('/simple')
       #
-      # @see http://github.com/joshbuddy/http_router
-      #
       def router
-        @router ||= HttpRouter.new
+        @router ||= PathRouter.new
         block_given? ? yield(@router) : @router
       end
       alias :urls :router
@@ -268,13 +274,12 @@ module Padrino
         if @deferred_routes
           deferred_routes.each do |routes|
             routes.each do |(route, dest)|
-              route.to(dest)
+              route.to(&dest)
               route.before_filters.flatten!
               route.after_filters.flatten!
             end
           end
           @deferred_routes = nil
-          router.sort!
         end
         router
       end
@@ -311,9 +316,8 @@ module Padrino
       #   # => [:foo_bar, :id => :mine]
       #
       def recognize_path(path)
-        responses = @router.recognize(Rack::MockRequest.env_for(path))
-        responses = responses[0] if responses[0].is_a?(Array)
-        [responses[0].path.route.name, responses[0].params]
+        responses = @router.recognize_path(path)
+        [responses[0], responses[1]]
       end
 
       ##
@@ -336,18 +340,10 @@ module Padrino
         params = args.extract_options!
         fragment = params.delete(:fragment) || params.delete(:anchor)
         path = make_path_with_params(args, value_to_param(params.symbolize_keys))
-        rebase_url(fragment ? path << '#' << fragment : path)
+        rebase_url(fragment ? path << '#' << fragment.to_s : path)
       end
       alias :url_for :url
 
-      ##
-      # Returns absolute url. By default adds 'http://localhost' before generated url.
-      # To change that `set :base_url, 'http://example.com'` in your app.
-      #
-      def absolute_url(*args)
-        base_url + url(*args)
-      end
-
       def get(path, *args, &block)
         conditions = @conditions.dup
         route('GET', path, *args, &block)
@@ -384,7 +380,7 @@ module Padrino
         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.to_s.singularize}_id/"
-          part = "(#{part})" if param.respond_to?(:optional) && param.optional?
+          part = "(#{part})?" if param.respond_to?(:optional) && param.optional?
           part
         end
 
@@ -403,7 +399,7 @@ module Padrino
         replace_instance_variable(:@_controller, args)
         replace_instance_variable(:@_defaults, options)
         replace_instance_variable(:@filters, :before => @filters[:before].dup, :after => @filters[:after].dup)
-        replace_instance_variable(:@layout, @layout)
+        replace_instance_variable(:@layout, nil)
 
         yield
 
@@ -424,7 +420,7 @@ module Padrino
         names, params_array = args.partition{ |arg| arg.is_a?(Symbol) }
         name = names[0, 2].join(" ").to_sym
         compiled_router.path(name, *(params_array << params))
-      rescue HttpRouter::InvalidRouteException
+      rescue PathRouter::InvalidRouteException
         raise Padrino::Routing::UnrecognizedException, "Route mapping for url(#{name.inspect}) could not be found"
       end
 
@@ -488,7 +484,6 @@ module Padrino
           else raise
         end
 
-        # Do padrino parsing. We dup options so we can build HEAD request correctly.
         route_options = options.dup
         route_options[:provides] = @_provides if @_provides
         route_options[:accepts]  = @_accepts if @_accepts
@@ -509,7 +504,8 @@ module Padrino
         method_name = "#{verb} #{path}"
         unbound_method = generate_method(method_name, &block)
 
-        block = if block.arity == 0
+        block_arity = block.arity
+        block = if block_arity == 0
                   proc{ |request, _| unbound_method.bind(request).call }
                 else
                   proc{ |request, block_params| unbound_method.bind(request).call(*block_params) }
@@ -517,8 +513,8 @@ module Padrino
 
         invoke_hook(:route_added, verb, path, block)
 
-        # HTTPRouter route construction
-        route = router.add(path, route_options)
+        path[0, 0] = "/" if path == "(.:format)?"
+        route = router.add(verb, path, route_options)
         route.name = name if name
         route.action = action
         priority_name = options.delete(:priority) || :normal
@@ -526,16 +522,16 @@ module Padrino
         route.cache = options.key?(:cache) ? options.delete(:cache) : @_cache
         route.cache_expires = options.key?(:expires) ? options.delete(:expires) : @_expires
         route.parent = route_parents ? (route_parents.count == 1 ? route_parents.first : route_parents) : route_parents
-        route.add_request_method(verb.downcase.to_sym)
         route.host = options.delete(:host) if options.key?(:host)
         route.user_agent = options.delete(:agent) if options.key?(:agent)
         if options.key?(:default_values)
           defaults = options.delete(:default_values)
-          route.add_default_values(defaults) if defaults
+          #route.options[:default_values] = defaults if defaults
+          route.default_values = defaults if defaults
         end
-        options.delete_if do |option, _args|
+        options.delete_if do |option, captures|
           if route.significant_variable_names.include?(option)
-            route.add_match_with(option => Array(_args).first)
+            route.capture[option] = Array(captures).first
             true
           end
         end
@@ -550,6 +546,11 @@ module Padrino
 
         invoke_hook(:padrino_route_added, route, verb, path, args, options, block)
 
+        block_parameter_length = route.block_parameter_length
+        if block_arity > 0 && block_parameter_length != block_arity
+          fail BlockArityError.new(route.path, block_arity, block_parameter_length)
+        end
+
         # Add Application defaults.
         route.before_filters << @filters[:before]
         route.after_filters << @filters[:after]
@@ -570,7 +571,6 @@ module Padrino
       # controllers, parents, 'with' parameters, and other options.
       #
       def parse_route(path, options, verb)
-        path = path.dup if path.kind_of?(String)
         route_options = {}
 
         if options[:params] == true
@@ -669,7 +669,7 @@ module Padrino
       # Used for calculating path in route method.
       #
       def process_path_for_provides(path)
-        path << "(.:format)" unless path[-10, 10] == '(.:format)'
+        path << "(.:format)?" unless path[-11, 11] == '(.:format)?'
       end
 
       ##
@@ -723,9 +723,10 @@ module Padrino
 
           accept_format = CONTENT_TYPE_ALIASES[type] || type
           if types.include?(accept_format)
-            content_type(accept_format || :html)
+            content_type(accept_format || :html, :charset => 'utf-8')
           else
-            catch_all ? true : halt(406)
+            halt 406 unless catch_all
+            false
           end
         end
       end
@@ -743,7 +744,7 @@ module Padrino
         mime_types = types.map{ |type| mime_type(CONTENT_TYPE_ALIASES[type] || type) }
         condition do
           halt 406 unless mime_types.include?(request.media_type)
-          content_type(mime_symbol(request.media_type))
+          content_type(mime_symbol(request.media_type), :charset => 'utf-8')
         end
       end
 
@@ -886,6 +887,7 @@ module Padrino
       #
       def content_type(type=nil, params={})
         return @_content_type unless type
+        params.delete(:charset) if type == :json
         super(type, params)
         @_content_type = type
       end
@@ -895,7 +897,7 @@ module Padrino
       def provides_any?(formats)
         accepted_format = formats.first
         type = accepted_format ? mime_symbol(accepted_format) : :html
-        content_type(CONTENT_TYPE_ALIASES[type] || type)
+        content_type(CONTENT_TYPE_ALIASES[type] || type, :charset => 'utf-8')
       end
 
       def provides_format?(types, format)
@@ -905,7 +907,7 @@ module Padrino
           halt 406 if settings.respond_to?(:treat_format_as_accept) && settings.treat_format_as_accept
           false
         else
-          content_type(format || :html)
+          content_type(format || :html, :charset => 'utf-8')
         end
       end
 
@@ -918,8 +920,6 @@ module Padrino
       end
 
       def dispatch!
-        @params = defined?(Sinatra::IndifferentHash) ? Sinatra::IndifferentHash[@request.params] : indifferent_params(@request.params)
-        force_encoding(@params)
         invoke do
           static! if settings.static? && (request.get? || request.head?)
           route!
@@ -935,19 +935,26 @@ module Padrino
         end
       end
 
-      def route!(base=settings, pass_block=nil)
+      def route!(base = settings, pass_block = nil)
         Thread.current['padrino.instance'] = self
+        first_time = true
+
+        routes = base.compiled_router.call(@request) do |route, params|
+          next if route.user_agent && !(route.user_agent =~ @request.user_agent)
+          original_params, parent_layout = @params.dup, @layout
+          returned_pass_block = invoke_route(route, params, first_time)
+          pass_block = returned_pass_block if returned_pass_block
+          first_time = false if first_time
+          @params, @layout = original_params, parent_layout
+        end
 
-        if base.compiled_router && result = base.compiled_router.call(@request.env)
-          if result.respond_to?(:each)
-            route_eval do
-              response.headers.merge!(result[1])
-              route_missing if status(result[0]) == 404
-              route_missing if (allow = response['Allow']) && allow.include?(request.env['REQUEST_METHOD'])
-            end
+        if routes.present?
+          verb = request.request_method
+          candidacies, allows = routes.partition{|route| route.verb == verb }
+          if candidacies.empty?
+            response["Allows"] = allows.map(&:verb).join(", ")
+            halt 405
           end
-        else
-          filter! :before
         end
 
         if base.superclass.respond_to?(:router)
@@ -956,9 +963,40 @@ module Padrino
         end
 
         route_eval(&pass_block) if pass_block
-
         route_missing
       end
+
+      def invoke_route(route, params, first_time)
+        @_response_buffer = nil
+        @route = request.route_obj = route
+        captured_params = captures_from_params(params)
+
+        @params.merge!(params) if params.kind_of?(Hash)
+        @params.merge!(:captures => captured_params) if !captured_params.empty? && route.path.is_a?(Regexp)
+
+        filter! :before if first_time
+
+        catch(:pass) do
+          begin
+              (route.before_filters - settings.filters[:before]).each{|block| instance_eval(&block) }
+              @layout = route.use_layout if route.use_layout
+              route.custom_conditions.each {|block| pass if block.bind(self).call == false }
+              route_response = route.block[self, captured_params]
+              @_response_buffer = route_response.instance_of?(Array) ? route_response.last : route_response
+              halt(route_response)
+          ensure
+            (route.after_filters - settings.filters[:after]).each {|block| instance_eval(&block) }
+          end
+        end
+      end
+
+      def captures_from_params(params)
+        if params[:captures].instance_of?(Array) && params[:captures].present?
+          params.delete(:captures)
+        else
+          params.values_at(*route.matcher.names).flatten
+        end
+      end
     end
   end
 end

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

@@ -4,6 +4,35 @@ module Padrino
   #
   # @private
   class ShowExceptions < Sinatra::ShowExceptions
+    if Sinatra::VERSION <= '1.4.5'
+      def call(env)
+        @app.call(env)
+      rescue Exception => e
+        errors, env["rack.errors"] = env["rack.errors"], @@eats_errors
+
+        if prefers_plain_text?(env)
+          content_type = "text/plain"
+          exception_string = dump_exception(e)
+        else
+          content_type = "text/html"
+          exception_string = pretty(env, e)
+        end
+
+        env["rack.errors"] = errors
+
+        # Post 893a2c50 in rack/rack, the #pretty method above, implemented in
+        # Rack::ShowExceptions, returns a String instead of an array.
+        body = Array(exception_string)
+
+        [
+          500,
+         {"Content-Type" => content_type,
+          "Content-Length" => Rack::Utils.bytesize(body.join).to_s},
+         body
+        ]
+      end
+    end
+
     private
 
     def frame_class(frame)

data/lib/padrino-core/application.rb

@@ -26,19 +26,6 @@ module Padrino
       Padrino.logger
     end
 
-    # TODO: Remove this hack (issue #863) after getting rid of thread-unsafe http_router:
-    if RUBY_PLATFORM == "java"
-      alias_method :original_call, :call
-      def call(*args)
-        settings.init_mutex.synchronize do
-          instance_eval{ undef :call }
-          class_eval{ alias_method :call, :original_call }
-          instance_eval{ undef :original_call }
-          super(*args)
-        end
-      end
-    end
-
     class << self
       def inherited(base)
         begun_at = Time.now
@@ -175,12 +162,6 @@ module Padrino
         set(option, *args, &block) unless respond_to?(option)
       end
 
-      # Deprecated
-      def load_paths
-        warn 'Padrino::Application#load_paths is deprecated. Please, use #prerequisites'
-        []
-      end
-
       protected
 
       ##