padrino-core 0.12.3 → 0.12.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b0c4e1103a6097258ff654c266fbc979a4115409
-  data.tar.gz: be1ce195a701fc3a868069bdfee1847d87bfedfe
+  metadata.gz: f87c42ee6dafccf2f672e07adc52c3bb79102e09
+  data.tar.gz: b25c8da4bc6a104c7a688b7a62e69b17aeb5ad50
 SHA512:
-  metadata.gz: 08c3823803340970a7c3e5138e0705439a7db34880f075de1f886725ac44792d1cba96f7c396aadb4f2fa7e153313dda9611468721a66d71bc80c4a9c4e31630
-  data.tar.gz: cf6e3a2954d7541a981318094e9600d266a593189852b3028a91d3c9316b03a39b2719087e231eac55f800ca65be5f9a7d455d55b9f2083f0ddbf462df1ccd8b
+  metadata.gz: fb6c04b20312a6fd49a9a75343a1fc75fb19a2a359e0321ba4dd67132c7e15d83e063a41f0125b34570476344fc327cd9bbb51b089761764487152404f369fc4
+  data.tar.gz: 57ca2a537531341e765ba190ed9be1b1a6510846d1964bef9f65a734cfc73fcbcee0ea1071bef87e0d680c1e5b422f8dd2bd8547a6f77b030d0395416a7ca240

data/lib/padrino-core/application.rb

@@ -65,7 +65,6 @@ module Padrino
         reset_router!
         Padrino.require_dependencies(settings.app_file, :force => true)
         require_dependencies
-        default_filters
         default_routes
         default_errors
         I18n.reload! if defined?(I18n)
@@ -149,7 +148,7 @@ module Padrino
           'controllers.rb',
           'helpers/**/*.rb',
           'helpers.rb',
-        ].map { |file| Dir.glob(File.join(settings.root, file)) }.flatten
+        ].flat_map{ |file| Dir.glob(File.join(settings.root, file)) }
       end
 
       ##

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

@@ -42,7 +42,6 @@ module Padrino
       def setup_application!
         return if @_configured
         require_dependencies
-        default_filters
         default_routes
         default_errors
         setup_locale
@@ -109,16 +108,6 @@ module Padrino
         setup_application!
       end
 
-      ##
-      # This filter it's used for know the format of the request, and
-      # automatically set the content type.
-      #
-      def default_filters
-        before do
-          response['Content-Type'] = 'text/html;charset=utf-8' unless @_content_type
-        end
-      end
-
       ##
       # We need to add almost __sinatra__ images.
       #

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

@@ -1,6 +1,6 @@
 begin
   require 'active_support/core_ext/object/deep_dup' # AS 4.1
-rescue LoadError => ex
+rescue LoadError
   require 'active_support/core_ext/hash/deep_dup' # AS >= 3.1
 end
 
@@ -99,8 +99,8 @@ module Padrino
           type = allowed_params[key]
           next if value.kind_of?(Array) && type
           case
-          when type.kind_of?(Hash)
-            if key == key.pluralize
+          when type.kind_of?(Hash) && value.kind_of?(Hash)
+            if key == key.pluralize && value.values.first.kind_of?(Hash)
               value.each do |array_index,array_value|
                 value[array_index] = filter_params!(array_value, type)
               end

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

@@ -367,6 +367,21 @@ module Padrino
         end
       end
 
+      ##
+      # Processes the existing path and prepends the 'parent' parameters onto the route
+      # Used for calculating path in route method.
+      #
+      def process_path_for_parent_params(path, parent_params)
+        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
+        end
+
+        [parent_prefix, path].flatten.join("")
+      end
+
       private
 
       CONTROLLER_OPTIONS = [ :parent, :provides, :use_format, :cache, :expires, :map, :conditions, :accepts, :params ].freeze
@@ -517,7 +532,10 @@ module Padrino
         end
 
         # Add Sinatra conditions.
-        options.each{ |option, args| route.respond_to?(option) ? route.send(option, *args) : send(option, *args) }
+        options.each do |option, _args|
+          option = :provides_format if option == :provides
+          route.respond_to?(option) ? route.send(option, *_args) : send(option, *_args)
+        end
         conditions, @conditions = @conditions, []
         route.custom_conditions.concat(conditions)
 
@@ -576,8 +594,8 @@ module Padrino
         
           options.delete(:accepts) if options[:accepts].nil?
 
-          if @_use_format or format_params = options[:provides]
-            process_path_for_provides(path, format_params)
+          if @_use_format || options[:provides]
+            process_path_for_provides(path)
             # options[:add_match_with] ||= {}
             # options[:add_match_with][:format] = /[^\.]+/
           end
@@ -636,26 +654,11 @@ module Padrino
         end.join("/"))
       end
 
-      ##
-      # Processes the existing path and prepends the 'parent' parameters onto the route
-      # Used for calculating path in route method.
-      #
-      def process_path_for_parent_params(path, parent_params)
-        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
-        end
-
-        [parent_prefix, path].flatten.join("")
-      end
-
       ##
       # Processes the existing path and appends the 'format' suffix onto the route.
       # Used for calculating path in route method.
       #
-      def process_path_for_provides(path, format_params)
+      def process_path_for_provides(path)
         path << "(.:format)" unless path[-10, 10] == '(.:format)'
       end
 
@@ -688,6 +691,10 @@ module Padrino
       #
       def provides(*types)
         @_use_format = true
+        provides_format(*types)
+      end
+
+      def provides_format(*types)
         mime_types = types.map{ |type| mime_type(CONTENT_TYPE_ALIASES[type] || type) }
         condition do
           return provides_format?(types, params[:format].to_sym) if params[:format]
@@ -843,11 +850,11 @@ module Padrino
       #
       # Method for deliver static files.
       #
-      def static!
+      def static!(options = {})
         if path = static_file?(request.path_info)
           env['sinatra.static_file'] = path
           cache_control(*settings.static_cache_control) if settings.static_cache_control?
-          send_file(path, :disposition => nil)
+          send_file(path, options)
         end
       end
 

data/lib/padrino-core/ext/http_router.rb

@@ -178,4 +178,24 @@ class HttpRouter
       #{"end" unless route.match_partially}"
     end
   end
+
+  class Node::FreeRegex
+    def to_code
+      id = root.next_counter
+      "whole_path#{id} = \"/\#{request.joined_path}\"
+      if match = #{matcher.inspect}.match(whole_path#{id}) and match[0].size == whole_path#{id}.size
+        request.extra_env['router.regex_match'] = match
+        old_path = request.path
+        request.path = ['']
+        " << (use_named_captures? ?
+        "match.names.size.times{|i| request.params << match[i + 1]} if match.respond_to?(:names) && match.names" : "") << "
+        #{super}
+        request.path = old_path
+        request.extra_env.delete('router.regex_match')
+        " << (use_named_captures? ?
+        "request.params.slice!(-match.names.size, match.names.size)" : ""
+        ) << "
+      end"
+    end
+  end
 end

data/lib/padrino-core/filter.rb

@@ -3,7 +3,11 @@ module Padrino
     attr_reader :block
 
     def initialize(mode, scoped_controller, options, args, &block)
-      @mode, @scoped_controller, @options, @args, @block = mode, scoped_controller, options, args, block
+      @mode = mode
+      @scoped_controller = scoped_controller
+      @options = options
+      @args = args
+      @block = block
     end
 
     def apply?(request)
@@ -27,7 +31,8 @@ module Padrino
     end
 
     def match_with_arguments?(request)
-      route, path = request.route_obj, request.path_info
+      route = request.route_obj
+      path = request.path_info
       @args.any? do |argument|
         if argument.instance_of?(Symbol)
           next unless route

data/lib/padrino-core/loader.rb

@@ -130,10 +130,10 @@ module Padrino
     #
     def require_dependencies(*paths)
       options = paths.extract_options!.merge( :cyclic => true )
-      files = paths.flatten.map{ |path| Dir.glob(path).sort_by{ |filename| filename.count('/') } }.flatten.uniq
+      files = paths.flatten.flat_map{ |path| Dir.glob(path).sort_by{ |filename| filename.count('/') } }.uniq
 
       until files.empty?
-        error, fatal, loaded = nil, nil, nil
+        error = fatal = loaded = nil
 
         files.dup.each do |file|
           begin

data/lib/padrino-core/mounter.rb

@@ -1,3 +1,5 @@
+require 'delegate'
+
 module Padrino
   ##
   # Represents a particular mounted Padrino application.
@@ -12,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 prerequisite
+        @__prerequisite ||= []
+      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(prerequisite)
+            Padrino.require_dependencies(dependencies, :force => true)
+            true
+          end
+      end
+    end
+
     attr_accessor :name, :uri_root, :app_file, :app_class, :app_root, :app_obj, :app_host, :cascade
 
     ##
@@ -32,12 +83,19 @@ 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!
+      @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]) : []
       Padrino::Reloader.exclude_constants << @app_class
     end
 
+    def padrino_application?
+      @app_obj.ancestors.include?(Padrino::Application)
+    rescue NameError
+      false
+    end
+
     ##
     # Registers the mounted application onto Padrino.
     #
@@ -82,14 +140,20 @@ module Padrino
     #   @app.map_onto(router)
     #
     def map_onto(router)
-      app_data, app_obj = self, @app_obj
-      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
+      app_data = self
+      app_obj = @app_obj
+      if padrino_application?
+        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      = 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 => app_data.uri_root, :host => app_data.app_host)
     end

data/lib/padrino-core/reloader.rb

@@ -269,6 +269,7 @@ module Padrino
     def object_sources(target)
       sources = Set.new
       target.methods.each do |method_name|
+        next unless method_name.kind_of?(Symbol)
         method_object = target.method(method_name)
         if method_object.owner == (target.class == Class ? target.singleton_class : target.class)
           sources << method_object.source_location.first
@@ -289,7 +290,10 @@ module Padrino
     # Return the apps that allow reloading.
     #
     def reloadable_apps
-      Padrino.mounted_apps.select{ |app| app.app_obj.respond_to?(:reload) && app.app_obj.reload? }
+      Padrino.mounted_apps.select do |app|
+        next unless app.app_file.start_with?(Padrino.root)
+        app.app_obj.respond_to?(:reload) && app.app_obj.reload?
+      end
     end
 
     ##

data/lib/padrino-core/server.rb

@@ -103,7 +103,7 @@ module Padrino
     # Parses an array of server options.
     #
     def self.parse_server_options(options)
-      parsed_server_options = Array(options).map{ |option| option.split('=', 2) }.flatten
+      parsed_server_options = Array(options).flat_map{ |option| option.split('=', 2) }
       Hash[*parsed_server_options].symbolize_keys
     end
 

data/lib/padrino-core/version.rb

@@ -6,7 +6,7 @@
 #
 module Padrino
   # The version constant for the current version of Padrino.
-  VERSION = '0.12.3' unless defined?(Padrino::VERSION)
+  VERSION = '0.12.4' unless defined?(Padrino::VERSION)
 
   #
   # The current Padrino version.

data/test/fixtures/apps/demo_project/api/app.rb

@@ -0,0 +1,7 @@
+module DemoProject
+  class API
+    def self.call(_)
+      [200, {}, ["api app"]]
+    end
+  end
+end

data/test/fixtures/apps/demo_project/api/lib/api_lib.rb

@@ -0,0 +1,3 @@
+module DemoProject
+  APILib = Class.new
+end

data/test/fixtures/apps/demo_project/app.rb

@@ -0,0 +1,7 @@
+module DemoProject
+  class App < Padrino::Application
+    get :index do
+      "padrino app"
+    end
+  end
+end

data/test/fixtures/apps/rack_apps.rb

@@ -0,0 +1,15 @@
+
+class RackApp
+  def self.call(_)
+    [200, {}, ["hello rack app"]]
+  end
+end
+
+RackApp2 = lambda{|_| [200, {}, ["hello rack app2"]] }
+
+class SinatraApp < Sinatra::Base
+  set :public_folder, File.dirname(__FILE__)
+  get "/" do
+    "hello sinatra app"
+  end
+end

data/test/fixtures/apps/static.html

@@ -0,0 +1 @@
+hello static file

data/test/fixtures/reloadable_apps/external/app/app.rb

@@ -0,0 +1,6 @@
+
+module ReloadableApp
+  class External < Padrino::Application
+    set :reload, true
+  end
+end

data/test/fixtures/reloadable_apps/external/app/controllers/base.rb

@@ -0,0 +1,6 @@
+
+ReloadableApp::External.controller :base do
+  get :index do
+    "Hello External App"
+  end
+end

data/test/fixtures/reloadable_apps/main/app.rb

@@ -0,0 +1,10 @@
+require File.expand_path(File.dirname(__FILE__) + '/../external/app/app')
+
+module ReloadableApp
+  class Main < Padrino::Application
+    set :reload, true
+    get :index do
+      "hey"
+    end
+  end
+end

data/test/test_core.rb

@@ -29,11 +29,6 @@ describe "Core" do
       assert_equal Encoding.default_internal, Encoding::UTF_8
     end
 
-    it 'should have load paths' do
-    skip
-      assert_equal [Padrino.root('lib'), Padrino.root('models'), Padrino.root('shared')], Padrino.load_paths
-    end
-
     it 'should raise application error if I instantiate a new padrino application without mounted apps' do
       text = capture_io { Padrino.application }
       assert_match /No apps are mounted/, text.to_s

data/test/test_mounter.rb

@@ -253,5 +253,37 @@ describe "Mounter" do
       assert_equal AppGem::App, mounter.app_obj
       assert_equal Padrino.root('public'), mounter.app_obj.public_folder
     end
+
+    it 'should support the Rack Application' do
+      path = File.expand_path(File.dirname(__FILE__) + '/fixtures/apps/rack_apps')
+      require path
+      Padrino.mount('rack_app', :app_class => 'RackApp', :app_file => path).to('/rack_app')
+      Padrino.mount('rack_app2', :app_class => 'RackApp2', :app_file => path).to('/rack_app2')
+      Padrino.mount('sinatra_app', :app_class => 'SinatraApp', :app_file => path).to('/sinatra_app')
+      app = Padrino.application
+      res = Rack::MockRequest.new(app).get("/rack_app")
+      assert_equal "hello rack app", res.body
+      res = Rack::MockRequest.new(app).get("/rack_app2")
+      assert_equal "hello rack app2", res.body
+      res = Rack::MockRequest.new(app).get("/sinatra_app")
+      assert_equal "hello sinatra app", res.body
+      res = Rack::MockRequest.new(app).get("/sinatra_app/static.html")
+      assert_equal "hello static file\n", res.body
+    end
+
+    it 'should support the Rack Application inside padrino project' do
+      path = File.expand_path(File.dirname(__FILE__) + '/fixtures/apps/demo_project/app')
+      api_path = File.expand_path(File.dirname(__FILE__) + '/fixtures/apps/demo_project/api/app')
+      require path
+      require api_path
+      Padrino.mount('api_app', :app_class => 'DemoProject::API', :app_file => api_path).to('/api')
+      Padrino.mount('main_app', :app_class => 'DemoProject::App').to('/')
+      app = Padrino.application
+      res = Rack::MockRequest.new(app).get("/")
+      assert_equal "padrino app", res.body
+      res = Rack::MockRequest.new(app).get("/api/hey")
+      assert_equal "api app", res.body
+      assert defined?(DemoProject::APILib)
+    end
   end
 end

data/test/test_params_protection.rb

@@ -156,4 +156,28 @@ describe "Padrino::ParamsProtection" do
     post '/family?names[]=Jack&names[]=Kim&names[]=Teri'
     assert_equal({"names" => %w[Jack Kim Teri]}, result)
   end
+
+  it 'should tolerate weird inflections' do
+    result = nil
+    mock_app do
+      post :i, :params => [ :gotta => [ :what ] ] do
+        result = params
+        ''
+      end
+    end
+    post '/i?gotta[what]=go&gotta[who]=self'
+    assert_equal({"gotta" => {"what" => "go"}}, result)
+  end
+
+  it 'should drop the key if the data type does not match route configuration' do
+    result = nil
+    mock_app do
+      post :i, :params => [ :gotta => [ :what ] ] do
+        result = params
+        ''
+      end
+    end
+    post '/i?gotta=go'
+    assert_equal({}, result)
+  end
 end

data/test/test_reloader_complex.rb

@@ -43,8 +43,8 @@ describe "ComplexReloader" do
 
       new_phrase = "The magick number is: #{rand(2**255)}!"
       buffer     = File.read(Complex1Demo.app_file)
-      new_buffer = buffer.gsub(/The magick number is: \d+!/, new_phrase)
-      new_buffer.gsub!(/get\(:destroy\)/, 'get(:destroy, :with => :id)')
+      new_buffer = buffer.sub(/The magick number is: \d+!/, new_phrase)
+      new_buffer.sub!(/get\(:destroy\)/, 'get(:destroy, :with => :id)')
       begin
         File.open(Complex1Demo.app_file, "w") { |f| f.write(new_buffer) }
         Time.stub(:now, Time.now + 2) { get "/complex_2_demo" }

data/test/test_reloader_external.rb

@@ -0,0 +1,21 @@
+require File.expand_path(File.dirname(__FILE__) + '/helper')
+require File.expand_path(File.dirname(__FILE__) + '/fixtures/reloadable_apps/main/app')
+
+describe "ExternalReloader" do
+  describe "for external app" do
+    before do
+      Padrino.clear!
+      Padrino.mount("ReloadableApp::External").to("/reloadable/external")
+      Padrino.mount("ReloadableApp::Main").to("/reloadable")
+      Padrino.load!
+    end
+
+    it "should avoid reloading the file if its path is not started with Padrino.root" do
+      @app = Padrino.application
+      Padrino.stub(:root, File.expand_path(File.dirname(__FILE__) + '/fixtures/reloadable_apps/main')) do
+        get "/reloadable/external/base"
+      end
+      assert_equal "Hello External App", body
+    end
+  end
+end

data/test/test_reloader_simple.rb

@@ -61,7 +61,7 @@ describe "SimpleReloader" do
       assert ok?
       new_phrase = "The magick number is: #{rand(2**255)}!"
       buffer     = File.read(SimpleDemo.app_file)
-      new_buffer = buffer.gsub(/The magick number is: \d+!/, new_phrase)
+      new_buffer = buffer.sub(/The magick number is: \d+!/, new_phrase)
       begin
         File.open(SimpleDemo.app_file, "w") { |f| f.write(new_buffer) }
         Time.stub(:now, Time.now + 2) { get "/" }
@@ -79,7 +79,7 @@ describe "SimpleReloader" do
       get "/rand"
       assert ok?
       last_body = body
-      assert_equal 2, @app.filters[:before].size # one is ours the other is default_filter for content type
+      assert_equal 1, @app.filters[:before].size
       assert_equal 1, @app.errors.size
       assert_equal 2, @app.filters[:after].size # app + content-type + padrino-flash
       assert_equal 0, @app.middleware.size
@@ -89,7 +89,7 @@ describe "SimpleReloader" do
       @app.reload!
       get "/rand"
       refute_equal last_body, body
-      assert_equal 2, @app.filters[:before].size # one is ours the other is default_filter for content type
+      assert_equal 1, @app.filters[:before].size
       assert_equal 1, @app.errors.size
       assert_equal 2, @app.filters[:after].size
       assert_equal 0, @app.middleware.size

data/test/test_reloader_system.rb

@@ -46,16 +46,6 @@ describe "SystemReloader" do
       end
     end
 
-    it 'should tamper with LOAD_PATH' do
-    skip
-      SystemDemo.load_paths.each do |lib_dir|
-        assert_includes $LOAD_PATH, lib_dir
-      end
-      Padrino.send(:default_load_paths).each do |lib_dir|
-        assert_includes $LOAD_PATH, lib_dir
-      end
-    end
-
     it 'should not fail horribly on reload event with non-padrino apps' do
       Padrino.mount("kiq").to("/")
       Padrino.reload!

data/test/test_routing.rb

@@ -30,6 +30,22 @@ describe "Routing" do
     assert_equal headers['Cache-Control'], 'public, must-revalidate, max-age=300'
   end # static max_age
 
+  it 'should render static files with custom status via options' do
+    mock_app do
+      set :static, true
+      set :public_folder, File.dirname(__FILE__)
+
+      post '/*' do
+        static!(:status => params[:status])
+      end
+    end
+
+    post "/#{File.basename(__FILE__)}?status=422"
+    assert_equal response.status, 422
+    assert_equal File.size(__FILE__).to_s, response['Content-Length']
+    assert response.headers.include?('Last-Modified')
+  end
+
   it 'should ignore trailing delimiters for basic route' do
     mock_app do
       get("/foo"){ "okey" }
@@ -1824,8 +1840,6 @@ describe "Routing" do
   end
 
   it 'should reset provides for routes that did not use it' do
-    skip
-    #FIXME
     mock_app do
       get('/foo', :provides => :js){}
       get('/bar'){}
@@ -2124,4 +2138,30 @@ describe "Routing" do
     get '/users//'
     assert_equal 404, status
   end
+
+  it "should support splat params" do
+    # This test will be fixed with the new router
+    skip
+    mock_app do
+      get "/say/*/to/*" do
+        params[:splat].inspect
+      end
+    end
+    get "/say/hello/to/world"
+    assert_equal ["hello", "world"], body
+  end
+
+  it "should match correctly paths even if the free regex route exists" do
+    mock_app do
+      get %r{/b/(?<aa>\w+)/(?<bb>\w+)} do
+        "free regex"
+      end
+
+      put '/b/:b/:c', :csrf_protection => false do
+        params.inspect
+      end
+    end
+    put "/b/x/y"
+    assert_equal '{"b"=>"x", "c"=>"y"}', body
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: padrino-core
 version: !ruby/object:Gem::Version
-  version: 0.12.3
+  version: 0.12.4
 platform: ruby
 authors:
 - Padrino Team
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-13 00:00:00.000000000 Z
+date: 2014-10-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: padrino-support
@@ -19,14 +19,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.12.3
+        version: 0.12.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.12.3
+        version: 0.12.4
 - !ruby/object:Gem::Dependency
   name: sinatra
   requirement: !ruby/object:Gem::Requirement
@@ -153,6 +153,9 @@ files:
 - test/fixtures/apps/complex.rb
 - test/fixtures/apps/demo_app.rb
 - test/fixtures/apps/demo_demo.rb
+- test/fixtures/apps/demo_project/api/app.rb
+- test/fixtures/apps/demo_project/api/lib/api_lib.rb
+- test/fixtures/apps/demo_project/app.rb
 - test/fixtures/apps/helpers/class_methods_helpers.rb
 - test/fixtures/apps/helpers/instance_methods_helpers.rb
 - test/fixtures/apps/helpers/support.rb
@@ -162,7 +165,9 @@ files:
 - test/fixtures/apps/lib/myklass/mysubklass.rb
 - test/fixtures/apps/models/child.rb
 - test/fixtures/apps/models/parent.rb
+- test/fixtures/apps/rack_apps.rb
 - test/fixtures/apps/simple.rb
+- test/fixtures/apps/static.html
 - test/fixtures/apps/static.rb
 - test/fixtures/apps/system.rb
 - test/fixtures/apps/system_class_methods_demo.rb
@@ -174,6 +179,9 @@ files:
 - test/fixtures/dependencies/circular/f.rb
 - test/fixtures/dependencies/circular/g.rb
 - test/fixtures/dependencies/d.rb
+- test/fixtures/reloadable_apps/external/app/app.rb
+- test/fixtures/reloadable_apps/external/app/controllers/base.rb
+- test/fixtures/reloadable_apps/main/app.rb
 - test/helper.rb
 - test/test_application.rb
 - test/test_core.rb
@@ -186,6 +194,7 @@ files:
 - test/test_mounter.rb
 - test/test_params_protection.rb
 - test/test_reloader_complex.rb
+- test/test_reloader_external.rb
 - test/test_reloader_simple.rb
 - test/test_reloader_system.rb
 - test/test_restful_routing.rb
@@ -225,6 +234,9 @@ test_files:
 - test/fixtures/apps/complex.rb
 - test/fixtures/apps/demo_app.rb
 - test/fixtures/apps/demo_demo.rb
+- test/fixtures/apps/demo_project/api/app.rb
+- test/fixtures/apps/demo_project/api/lib/api_lib.rb
+- test/fixtures/apps/demo_project/app.rb
 - test/fixtures/apps/helpers/class_methods_helpers.rb
 - test/fixtures/apps/helpers/instance_methods_helpers.rb
 - test/fixtures/apps/helpers/support.rb
@@ -234,7 +246,9 @@ test_files:
 - test/fixtures/apps/lib/myklass/mysubklass.rb
 - test/fixtures/apps/models/child.rb
 - test/fixtures/apps/models/parent.rb
+- test/fixtures/apps/rack_apps.rb
 - test/fixtures/apps/simple.rb
+- test/fixtures/apps/static.html
 - test/fixtures/apps/static.rb
 - test/fixtures/apps/system.rb
 - test/fixtures/apps/system_class_methods_demo.rb
@@ -246,6 +260,9 @@ test_files:
 - test/fixtures/dependencies/circular/f.rb
 - test/fixtures/dependencies/circular/g.rb
 - test/fixtures/dependencies/d.rb
+- test/fixtures/reloadable_apps/external/app/app.rb
+- test/fixtures/reloadable_apps/external/app/controllers/base.rb
+- test/fixtures/reloadable_apps/main/app.rb
 - test/helper.rb
 - test/test_application.rb
 - test/test_core.rb
@@ -258,6 +275,7 @@ test_files:
 - test/test_mounter.rb
 - test/test_params_protection.rb
 - test/test_reloader_complex.rb
+- test/test_reloader_external.rb
 - test/test_reloader_simple.rb
 - test/test_reloader_system.rb
 - test/test_restful_routing.rb