padrino-core 0.12.9 → 0.13.0.beta1

data/lib/padrino-core/reloader.rb

@@ -73,9 +73,8 @@ module Padrino
     # We lock dependencies sets to prevent reloading of protected constants
     #
     def lock!
-      klasses = Storage.send(:object_classes) do |klass|
-        original_klass_name = klass._orig_klass_name
-        original_klass_name.split('::').first if original_klass_name
+      klasses = ObjectSpace.classes do |klass|
+        klass._orig_klass_name.split('::').first
       end
       klasses |= Padrino.mounted_apps.map(&:app_class)
       exclude_constants.merge(klasses)
@@ -222,9 +221,7 @@ module Padrino
     #
     def files_for_rotation
       files = Set.new
-      Padrino.dependency_paths.each do |path|
-        files += Dir.glob(path)
-      end
+      files += Dir.glob("#{Padrino.root}/{lib,models,shared}/**/*.rb")
       reloadable_apps.each do |app|
         files << app.app_file
         files += Dir.glob(app.app_obj.prerequisites)
@@ -254,13 +251,18 @@ module Padrino
     #
     def external_constant?(const)
       sources = object_sources(const)
-      # consider methodless constants not external
-      return false if sources.empty?
+      begin
+        if sample = ObjectSpace.each_object(const).first
+          sources += object_sources(sample)
+        end
+      rescue RuntimeError => error # JRuby 1.7.12 fails to ObjectSpace.each_object
+        raise unless RUBY_PLATFORM =='java' && error.message.start_with?("ObjectSpace is disabled")
+      end
       !sources.any?{ |source| source.start_with?(Padrino.root) }
     end
 
     ##
-    # Gets all the sources in which target class is defined.
+    # Gets all the sources in which target's class or instance methods are defined.
     #
     # Note: Method#source_location is for Ruby 1.9.3+ only.
     #
@@ -269,14 +271,7 @@ module Padrino
       target.methods.each do |method_name|
         next unless method_name.kind_of?(Symbol)
         method_object = target.method(method_name)
-        if method_object.owner == target.singleton_class
-          sources << method_object.source_location.first
-        end
-      end
-      target.instance_methods.each do |method_name|
-        next unless method_name.kind_of?(Symbol)
-        method_object = target.instance_method(method_name)
-        if method_object.owner == target
+        if method_object.owner == (target.class == Class ? target.singleton_class : target.class)
           sources << method_object.source_location.first
         end
       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.9' unless defined?(Padrino::VERSION)
+  VERSION = '0.13.0.beta1' unless defined?(Padrino::VERSION)
 
   #
   # The current Padrino version.

data/lib/padrino-core.rb

@@ -1,7 +1,6 @@
 require 'sinatra/base'
 require 'padrino-core/version'
 require 'padrino-support'
-require 'padrino-core/configuration'
 require 'padrino-core/application'
 
 require 'padrino-core/caller'
@@ -26,7 +25,6 @@ module Padrino
   class ApplicationLoadError < RuntimeError # @private
   end
 
-  extend Configuration
   extend Loader
 
   class << self

data/padrino-core.gemspec

@@ -24,8 +24,14 @@ Gem::Specification.new do |s|
   s.rdoc_options  = ["--charset=UTF-8"]
 
   s.add_dependency("padrino-support", Padrino.version)
-  s.add_dependency("sinatra", ">= 1.4.6")
-  s.add_dependency("http_router", "~> 0.11.0")
+  if ENV["SINATRA_EDGE"]
+    s.add_dependency("sinatra")
+  else
+    # remove this rack dependency after Sinatra > 1.4.5
+    s.add_dependency("rack", "< 1.6.0")
+    s.add_dependency("sinatra", "~> 1.4.2")
+  end
+  s.add_dependency("mustermann19")
   s.add_dependency("thor", "~> 0.18")
   s.add_dependency("activesupport", ">= 3.1")
   s.add_dependency("rack-protection", ">= 1.5.0")

data/test/fixtures/apps/helpers/support.rb

@@ -0,0 +1 @@
+require 'active_support/logger_silence'

data/test/fixtures/apps/{rack_apps.rb → mountable_apps/rack_apps.rb}

@@ -3,10 +3,6 @@ class RackApp
   def self.call(_)
     [200, {}, ["hello rack app"]]
   end
-
-  def self.prerequisites
-    super
-  end
 end
 
 RackApp2 = lambda{|_| [200, {}, ["hello rack app2"]] }

data/test/fixtures/apps/precompiled_app.rb

@@ -0,0 +1,19 @@
+PADRINO_ROOT = File.dirname(__FILE__) unless defined? PADRINO_ROOT
+
+Padrino.configure_apps do
+  set :precompile_routes, true
+end
+
+module PrecompiledApp
+  class App < Padrino::Application
+    10.times{|n| get("/#{n}"){} }
+  end
+  class SubApp < Padrino::Application
+    10.times{|n| get("/#{n}"){} }
+  end
+end
+
+Padrino.mount("PrecompiledApp::SubApp").to("/subapp")
+Padrino.mount("PrecompiledApp::App").to("/")
+
+Padrino.load!

data/test/fixtures/apps/system.rb

@@ -1,5 +1,3 @@
-# frozen_string_literal: true
-
 PADRINO_ROOT = File.dirname(__FILE__) unless defined? PADRINO_ROOT
 
 class SystemDemo < Padrino::Application

data/test/helper.rb

@@ -9,10 +9,10 @@ require 'builder'
 require 'rack/test'
 require 'yaml'
 require 'padrino-core'
-require 'tilt/haml'
 
 require 'ext/minitest-spec'
 require 'ext/rack-test-methods'
+require 'ext/rack-test-utils'
 
 class MiniTest::Spec
   include Rack::Test::Methods

data/test/test_application.rb

@@ -86,16 +86,16 @@ describe "Application" do
     end
 
     it 'should have different session values in different session management' do
-      class PadrinoTestApp3 < Padrino::Application
+      class PadrinoTestApp4 < Padrino::Application
         enable :sessions
       end
-      class PadrinoTestApp4 < Padrino::Application
+      class PadrinoTestApp5 < Padrino::Application
         set :sessions, :use => Rack::Session::Pool
       end
-      Padrino.mount("PadrinoTestApp3").to("/write")
-      Padrino.mount("PadrinoTestApp4").to("/read")
-      PadrinoTestApp3.get('/') { session[:foo] = "cookie" }
-      PadrinoTestApp4.get('/') { session[:foo] }
+      Padrino.mount("PadrinoTestApp4").to("/write")
+      Padrino.mount("PadrinoTestApp5").to("/read")
+      PadrinoTestApp4.get('/') { session[:foo] = "cookie" }
+      PadrinoTestApp5.get('/') { session[:foo] }
       @app = Padrino.application
       get '/write'
       get '/read'
@@ -158,6 +158,18 @@ describe "Application" do
       end
     end
 
+    describe "pre-compile routes" do
+      it "should compile routes before first request if enabled the :precompile_routes option" do
+        require File.expand_path(File.dirname(__FILE__) + '/fixtures/apps/precompiled_app')
+        assert_instance_of Padrino::PathRouter::Compiler, PrecompiledApp::App.compiled_router.engine
+        assert_instance_of Padrino::PathRouter::Compiler, PrecompiledApp::SubApp.compiled_router.engine
+        assert_equal true, PrecompiledApp::App.compiled_router.engine.compiled?
+        assert_equal true, PrecompiledApp::SubApp.compiled_router.engine.compiled?
+        assert_equal 20, PrecompiledApp::App.compiled_router.engine.regexps.length
+        assert_equal 20, PrecompiledApp::SubApp.compiled_router.engine.regexps.length
+      end
+    end
+
     describe 'global prerequisites' do
       after do
         Padrino::Application.prerequisites.clear

data/test/test_csrf_protection.rb

@@ -6,7 +6,6 @@ describe "Application" do
   describe 'CSRF protection' do
     describe "with CSRF protection on" do
       before do
-        @token = Rack::Protection::AuthenticityToken.random_token rescue "a_token"
         mock_app do
           enable :sessions
           enable :protect_from_csrf
@@ -20,24 +19,25 @@ describe "Application" do
       end
 
       it 'should allow requests with correct tokens' do
-        post "/", {"authenticity_token" => @token}, 'rack.session' => {:csrf => @token}
+        post "/", {"authenticity_token" => "a"}, 'rack.session' => {:csrf => "a"}
         assert_equal 200, status
       end
 
       it 'should not allow requests with incorrect tokens' do
-        post "/", {"authenticity_token" => "b"}, 'rack.session' => {:csrf => @token}
+        post "/", {"authenticity_token" => "a"}, 'rack.session' => {:csrf => "b"}
         assert_equal 403, status
       end
 
       it 'should allow requests with correct X-CSRF-TOKEN' do
-        post "/", {}, 'rack.session' => {:csrf => @token}, 'HTTP_X_CSRF_TOKEN' => @token
+        post "/", {}, 'rack.session' => {:csrf => "a"}, 'HTTP_X_CSRF_TOKEN' => "a"
         assert_equal 200, status
       end
 
       it 'should not allow requests with incorrect X-CSRF-TOKEN' do
-        post "/", {}, 'rack.session' => {:csrf => @token}, 'HTTP_X_CSRF_TOKEN' => "b"
+        post "/", {}, 'rack.session' => {:csrf => "a"}, 'HTTP_X_CSRF_TOKEN' => "b"
         assert_equal 403, status
       end
+
     end
 
     describe "without CSRF protection on" do
@@ -142,7 +142,6 @@ describe "Application" do
 
     describe "with custom protection options" do
       before do
-        @token = Rack::Protection::AuthenticityToken.random_token rescue "a_token"
         mock_app do
           enable :sessions
           set :protect_from_csrf, :authenticity_param => 'foobar', :message => 'sucker!'
@@ -151,7 +150,7 @@ describe "Application" do
       end
 
       it 'should allow configuring protection options' do
-        post "/a", {"foobar" => @token}, 'rack.session' => {:csrf => @token}
+        post "/a", {"foobar" => "a"}, 'rack.session' => {:csrf => "a"}
         assert_equal 200, status
       end
 

data/test/test_filters.rb

@@ -300,6 +300,24 @@ describe "Filters" do
     assert_equal 'before', test
   end
 
+  it 'should ensure the call of before_filter at the first time' do
+    once = ''
+    mock_app do
+      before do
+        once += 'before'
+      end
+      get :index do
+        raise Exception, 'Oops'
+      end
+      post :index do
+        raise Exception, 'Oops'
+      end
+    end
+
+    post '/'
+    assert_equal 'before', once
+  end
+
   it 'should call before filters only once' do
     once = ''
     mock_app do
@@ -368,5 +386,4 @@ describe "Filters" do
     assert_equal 'We broke after', body
     assert_equal 'Been now and after', doodle
   end
-
 end

data/test/test_logger.rb

@@ -1,7 +1,5 @@
-#coding:utf-8
 require File.expand_path(File.dirname(__FILE__) + '/helper')
 require 'logger'
-require 'tempfile'
 
 describe "PadrinoLogger" do
   before do
@@ -38,28 +36,6 @@ describe "PadrinoLogger" do
         Padrino::Logger.setup!
         assert_equal my_stream, Padrino.logger.log
       end
-
-      it 'should use a custom file path' do
-        tempfile = Tempfile.new('app.txt')
-        path = tempfile.path
-        tempfile.unlink
-        Padrino::Logger::Config[:test][:stream] = :to_file
-        Padrino::Logger::Config[:test][:log_path] = path
-        Padrino::Logger.setup!
-        assert_file_exists path
-        File.unlink(path)
-      end
-
-      it 'should use a custom log directory' do
-        tmpdir = Dir.mktmpdir
-        Padrino::Logger::Config[:test][:stream] = :to_file
-        Padrino::Logger::Config[:test][:log_path] = tmpdir
-        Padrino::Logger.setup!
-        log_path = File.join(tmpdir, 'test.log')
-        assert_file_exists log_path
-        File.unlink(log_path)
-        Dir.rmdir(tmpdir)
-      end
     end
 
     it 'should log something' do
@@ -82,30 +58,6 @@ describe "PadrinoLogger" do
       assert_match /log via alias/, @log.string
     end
 
-    it 'should not blow up on mixed or broken encodings' do
-      setup_logger(:log_level => :error, :auto_flush => false)
-      binary_data = "\xD0".force_encoding('BINARY')
-      utf8_data = 'фыв'
-      @logger.error binary_data
-      @logger.error utf8_data
-      @logger.flush
-      assert @log.string.include?(utf8_data)
-      assert @log.string.force_encoding('BINARY').include?(binary_data)
-    end
-
-    it 'should sanitize mixed or broken encodings if said so' do
-      encoding = 'windows-1251'
-      setup_logger(:log_level => :error, :auto_flush => false, :sanitize_encoding => encoding)
-      @log.string.encode! encoding
-      binary_data = "\xD0".force_encoding('BINARY')
-      utf8_data = 'фыв'
-      @logger.error binary_data
-      @logger.error utf8_data
-      @logger.flush
-      assert @log.string.force_encoding(encoding).include?("?\n".encode(encoding))
-      assert @log.string.force_encoding(encoding).include?(utf8_data.encode(encoding))
-    end
-
     it 'should log an application' do
       mock_app do
         enable :logging
@@ -310,7 +262,7 @@ describe "options :source_location" do
 
   it 'should output source_location if :source_location is set to true' do
     stub_root { Padrino.logger.debug("hello world") }
-    assert_match /\[test\/test_logger\.rb:#{__LINE__-1}\] hello world/, Padrino.logger.log.string
+    assert_match /\[test\/test_logger\.rb:264\] hello world/, Padrino.logger.log.string
   end
 
   it 'should output source_location if file path is relative' do

data/test/test_mounter.rb

@@ -181,7 +181,7 @@ describe "Mounter" do
       assert_equal "posts show", first_route.identifier.to_s
       assert_equal "(:posts, :show)", first_route.name
       assert_equal "GET", first_route.verb
-      assert_equal "/posts/show/:id(.:format)", first_route.path
+      assert_equal "/posts/show/:id(.:format)?", first_route.path
       another_route = Padrino.mounted_apps[1].named_routes[2]
       assert_equal "users create", another_route.identifier.to_s
       assert_equal "(:users, :create)", another_route.name
@@ -255,7 +255,7 @@ describe "Mounter" do
     end
 
     it 'should support the Rack Application' do
-      path = File.expand_path(File.dirname(__FILE__) + '/fixtures/apps/rack_apps')
+      path = File.expand_path(File.dirname(__FILE__) + '/fixtures/apps/mountable_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')
@@ -269,7 +269,6 @@ describe "Mounter" do
       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
-      assert_equal [], RackApp.prerequisites
     end
 
     it 'should support the Rack Application inside padrino project' do
@@ -288,7 +287,6 @@ describe "Mounter" do
     end
 
     it "should not load dependency files if app's root isn't started with Padrino.root" do
-      Object.send(:remove_const, :FakeLib) if defined?(FakeLib)
       path = File.expand_path(File.dirname(__FILE__) + '/fixtures/apps/demo_project/app')
       fake_path = File.expand_path(File.dirname(__FILE__) + "/fixtures/apps/external_apps/fake_root")
       require path

data/test/test_params_protection.rb

@@ -1,4 +1,5 @@
 require File.expand_path(File.dirname(__FILE__) + '/helper')
+require 'active_support/core_ext/hash/conversions'
 
 describe "Padrino::ParamsProtection" do
   before do
@@ -6,7 +7,6 @@ describe "Padrino::ParamsProtection" do
     @kim = { 'name' => 'Kim Bauer', 'position' => 'daughter', 'child' => @teri }
     @jack = { 'name' => 'Jack Bauer', 'position' => 'terrorist', 'child' => @kim }
     @family = { 'name' => 'Bauer', 'persons' => { 1 => @teri, 2 => @kim, 3 => @jack } }
-    @jack_query = Padrino::Utils.build_uri_query(@jack)
   end
 
   it 'should drop all parameters except allowed ones' do
@@ -17,7 +17,7 @@ describe "Padrino::ParamsProtection" do
         ''
       end
     end
-    post '/basic?' + @jack_query
+    post '/basic?' + @jack.to_query
     assert_equal({ 'name' => @jack['name'] }, result)
   end
 
@@ -29,7 +29,7 @@ describe "Padrino::ParamsProtection" do
         ''
       end
     end
-    post '/basic?' + @jack_query
+    post '/basic?' + @jack.to_query
     assert_equal(@jack, result)
   end
 
@@ -41,7 +41,7 @@ describe "Padrino::ParamsProtection" do
         ''
       end
     end
-    post '/basic?' + @jack_query
+    post '/basic?' + @jack.to_query
     assert_equal(
       [
         { 'name' => @jack['name'], 'child' => { 'name' => @kim['name'], 'child' => { 'name' => @teri['name'] } } },
@@ -59,7 +59,7 @@ describe "Padrino::ParamsProtection" do
         ''
       end
     end
-    post '/basic?' + @jack_query
+    post '/basic?' + @jack.to_query
     assert_equal({ 'name' => @jack['name'], 'position' => 'anti-terrorist' }, result)
   end
 
@@ -71,7 +71,7 @@ describe "Padrino::ParamsProtection" do
         ''
       end
     end
-    post '/basic/24/42?' + @jack_query
+    post '/basic/24/42?' + @jack.to_query
     assert_equal({ 'name' => @jack['name'], 'id' => '24', 'tag' => '42' }, result)
   end
 
@@ -83,7 +83,7 @@ describe "Padrino::ParamsProtection" do
         ''
       end
     end
-    post '/basic/24?' + @jack_query
+    post '/basic/24?' + @jack.to_query
     assert_equal({ 'id' => '24' }, result)
   end
 
@@ -99,9 +99,9 @@ describe "Padrino::ParamsProtection" do
         ''
       end
     end
-    get '/hide/1?' + @jack_query
+    get '/hide/1?' + @jack.to_query
     assert_equal({"id"=>"1"}, result)
-    get '/show/1?' + @jack_query
+    get '/show/1?' + @jack.to_query
     assert_equal({"id"=>"1"}.merge(@jack), result)
   end
 
@@ -133,13 +133,13 @@ describe "Padrino::ParamsProtection" do
         end
       end
     end
-    post '/persons/create?' + @jack_query
+    post '/persons/create?' + @jack.to_query
     assert_equal({ 'name' => @jack['name'], 'position' => 'terrorist' }, result)
     post '/persons/update/1?name=Chloe+O\'Brian&position=hacker'
     assert_equal({ 'id' => '1', 'name' => 'Chloe O\'Brian' }, result)
-    post '/persons/delete?' + @jack_query
+    post '/persons/delete?' + @jack.to_query
     assert_equal(@jack, result)
-    post '/persons/destroy/1?' + @jack_query
+    post '/persons/destroy/1?' + @jack.to_query
     assert_equal({"id"=>"1"}, result)
     get '/noparam?a=1;b=2'
     assert_equal({}, result)
@@ -153,7 +153,7 @@ describe "Padrino::ParamsProtection" do
         ''
       end
     end
-    post '/family?' + Padrino::Utils.build_uri_query(@family)
+    post '/family?' + @family.to_query
     assert_equal({"persons" => {"3" => {"name" => @jack["name"]}, "2" => {"name" => @kim["name"]}, "1" => {"name" => @teri["name"]}}}, result)
   end
 
@@ -165,7 +165,7 @@ describe "Padrino::ParamsProtection" do
         ''
       end
     end
-    post '/family?' + Padrino::Utils.build_uri_query(:names => %w{Jack Kim Teri})
+    post '/family?' + { :names => %w{Jack Kim Teri} }.to_query
     assert_equal({"names" => %w[Jack Kim Teri]}, result)
   end
 
@@ -177,7 +177,7 @@ describe "Padrino::ParamsProtection" do
         ''
       end
     end
-    post '/i?' + Padrino::Utils.build_uri_query(:gotta => { :what => 'go', :who => 'self' })
+    post '/i?' + { :gotta => { :what => 'go', :who => 'self' } }.to_query
     assert_equal({"gotta" => {"what" => "go"}}, result)
   end