padrino-core 0.12.8.1 → 0.12.9

data/lib/padrino-core/mounter.rb

@@ -1,4 +1,4 @@
-require 'delegate'
+require 'padrino-core/mounter/application_extension'
 
 module Padrino
   ##
@@ -14,55 +14,6 @@ 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
 
     ##
@@ -83,7 +34,10 @@ 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?
+      unless padrino_application?
+        @app_obj.extend ApplicationExtension
+        @app_obj.mounter_options = options
+      end
       @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]) : []
@@ -142,20 +96,23 @@ 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,       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 :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 :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)
+        app_obj.uri_root      = uri_root
+        app_obj.public_folder = Padrino.root('public', uri_root) unless public_folder_exists
       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)
+      router.map(:to => app_obj, :path => uri_root, :host => app_data.app_host)
     end
 
     ###
@@ -174,7 +131,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
@@ -231,8 +188,10 @@ module Padrino
     # Returns the determined location of the mounted application main file.
     #
     def locate_app_file
+      app_const = app_constant
+
       candidates  = []
-      candidates << app_constant.app_file if app_constant.respond_to?(:app_file) && File.exist?(app_constant.app_file.to_s)
+      candidates << app_const.app_file if app_const.respond_to?(:app_file)
       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/reloader/rack.rb

@@ -11,12 +11,15 @@ module Padrino
         @app = app
         @cooldown = cooldown
         @last = (Time.now - cooldown)
+        @mutex = Mutex.new
       end
 
       # Invoked in order to perform the reload as part of the request stack.
       def call(env)
         if @cooldown && Time.now > @last + @cooldown
-          Thread.list.size > 1 ? Thread.exclusive { Padrino.reload! } : Padrino.reload!
+          @mutex.synchronize do
+            Padrino.reload!
+          end
           @last = Time.now
         end
         @app.call(env)

data/lib/padrino-core/reloader/storage.rb

@@ -22,7 +22,7 @@ module Padrino
         file = remove(name)
         @old_entries ||= {}
         @old_entries[name] = {
-          :constants => ObjectSpace.classes,
+          :constants => object_classes,
           :features  => old_features = Set.new($LOADED_FEATURES.dup)
         }
         features = file && file[:features] || []
@@ -32,7 +32,7 @@ module Padrino
 
       def commit(name)
         entry = {
-          :constants => ObjectSpace.new_classes(@old_entries[name][:constants]),
+          :constants => new_classes(@old_entries[name][:constants]),
           :features  => Set.new($LOADED_FEATURES) - @old_entries[name][:features] - [name]
         }
         files[name] = entry
@@ -40,7 +40,7 @@ module Padrino
       end
 
       def rollback(name)
-        new_constants = ObjectSpace.new_classes(@old_entries[name][:constants])
+        new_constants = new_classes(@old_entries[name][:constants])
         new_constants.each{ |klass| Reloader.remove_constant(klass) }
         @old_entries.delete(name)
       end
@@ -50,6 +50,34 @@ module Padrino
       def files
         @files ||= {}
       end
+
+      ##
+      # Returns all the classes in the object space.
+      #
+      def object_classes
+        klasses = Set.new
+
+        ObjectSpace.each_object(Class).each do |klass|
+          if block_given?
+            if filtered_class = yield(klass)
+              klasses << filtered_class
+            end
+          else
+            klasses << klass
+          end
+        end
+
+        klasses
+      end
+
+      ##
+      # Returns a list of object space classes that are not included in "snapshot".
+      #
+      def new_classes(snapshot)
+        object_classes do |klass|
+          snapshot.include?(klass) ? nil : klass
+        end
+      end
     end
   end
 end

data/lib/padrino-core/reloader.rb

@@ -73,7 +73,7 @@ module Padrino
     # We lock dependencies sets to prevent reloading of protected constants
     #
     def lock!
-      klasses = ObjectSpace.classes do |klass|
+      klasses = Storage.send(:object_classes) do |klass|
         original_klass_name = klass._orig_klass_name
         original_klass_name.split('::').first if original_klass_name
       end
@@ -222,7 +222,9 @@ module Padrino
     #
     def files_for_rotation
       files = Set.new
-      files += Dir.glob("#{Padrino.root}/{lib,models,shared}/**/*.rb")
+      Padrino.dependency_paths.each do |path|
+        files += Dir.glob(path)
+      end
       reloadable_apps.each do |app|
         files << app.app_file
         files += Dir.glob(app.app_obj.prerequisites)

data/lib/padrino-core/version.rb

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

data/lib/padrino-core.rb

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

data/padrino-core.gemspec

@@ -24,13 +24,7 @@ Gem::Specification.new do |s|
   s.rdoc_options  = ["--charset=UTF-8"]
 
   s.add_dependency("padrino-support", Padrino.version)
-  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("sinatra", ">= 1.4.6")
   s.add_dependency("http_router", "~> 0.11.0")
   s.add_dependency("thor", "~> 0.18")
   s.add_dependency("activesupport", ">= 3.1")

data/test/fixtures/apps/custom_dependencies/custom_dependencies.rb

@@ -0,0 +1,11 @@
+PADRINO_ROOT = File.dirname(__FILE__) unless defined? PADRINO_ROOT
+
+class CustomDependencies < Padrino::Application
+  set :reload, true
+end
+
+CustomDependencies.controllers do
+  get "/" do
+    "foo"
+  end
+end

data/test/fixtures/apps/external_apps/fake_lib.rb

@@ -0,0 +1 @@
+FakeLib = 1

data/test/fixtures/apps/external_apps/fake_root.rb

@@ -0,0 +1,2 @@
+class FakeRoot < Sinatra::Base
+end

data/test/fixtures/apps/rack_apps.rb

@@ -3,6 +3,10 @@ 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/simple.rb

@@ -1,7 +1,6 @@
 PADRINO_ROOT = File.dirname(__FILE__) unless defined? PADRINO_ROOT
 # Remove this comment if you want do some like this: ruby RACK_ENV=test app.rb
 #
-# require 'rubygems'
 # require 'padrino-core'
 #
 

data/test/fixtures/apps/system.rb

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

data/test/helper.rb

@@ -1,21 +1,18 @@
 ENV['RACK_ENV'] = 'test'
 PADRINO_ROOT = File.dirname(__FILE__) unless defined?(PADRINO_ROOT)
 
-require File.expand_path('../../../load_paths', __FILE__)
 require 'minitest/autorun'
 require 'minitest/pride'
 require 'i18n'
-require 'padrino-support'
-require 'padrino-core'
 require 'json'
 require 'builder'
 require 'rack/test'
-require 'rack'
 require 'yaml'
+require 'padrino-core'
+require 'tilt/haml'
 
-# Rubies < 1.9 don't handle hashes in the properly order so to prevent
-# this issue for now we remove extra values from mimetypes.
-Rack::Mime::MIME_TYPES.delete(".xsl") # In this way application/xml respond only to .xml
+require 'ext/minitest-spec'
+require 'ext/rack-test-methods'
 
 class MiniTest::Spec
   include Rack::Test::Methods
@@ -30,23 +27,4 @@ class MiniTest::Spec
   def app
     Rack::Lint.new(@app)
   end
-
-  # Asserts that a file matches the pattern
-  def assert_match_in_file(pattern, file)
-    assert File.exist?(file), "File '#{file}' does not exist!"
-    assert_match pattern, File.read(file)
-  end
-
-  # Delegate other missing methods to response.
-  def method_missing(name, *args, &block)
-    if response && response.respond_to?(name)
-      response.send(name, *args, &block)
-    else
-      super(name, *args, &block)
-    end
-  rescue Rack::Test::Error # no response yet
-    super(name, *args, &block)
-  end
-
-  alias :response :last_response
 end

data/test/test_application.rb

@@ -148,6 +148,14 @@ describe "Application" do
         assert_equal 1, @app.errors.size
         assert_equal 'custom error', body
       end
+
+      it 'should raise NameError even if Kernel.require is extended' do
+        assert_raises NameError do
+          ConstTest = Class.new(Padrino::Application)
+          require 'active_support/dependencies'
+          ConstTest::UninitializedConstant
+        end
+      end
     end
 
     describe 'global prerequisites' do

data/test/test_configuration.rb

@@ -0,0 +1,29 @@
+require File.expand_path(File.dirname(__FILE__) + '/helper')
+
+describe "PadrinoConfiguration" do
+  it 'should be able to store values' do
+    Padrino.config.val1 = 12345
+    assert_equal 12345, Padrino.config.val1
+  end
+
+  it 'should be able to configure with block' do
+    Padrino.configure do |config|
+      config.val2 = 54321
+    end
+    assert_equal 54321, Padrino.config.val2
+  end
+
+  it 'should be able to configure with block' do
+    Padrino.configure :test do |config|
+      config.test1 = 54321
+    end
+    Padrino.configure :development do |config|
+      config.test1 = 12345
+    end
+    Padrino.configure :test, :development do |config|
+      config.both1 = 54321
+    end
+    assert_equal 54321, Padrino.config.test1
+    assert_equal 54321, Padrino.config.both1
+  end
+end

data/test/test_core.rb

@@ -77,5 +77,17 @@ describe "Core" do
       assert_equal @app.settings.zoo, :baz
       assert_equal @app.settings.moo, :bam
     end
+
+    it 'should return a friendly 500' do
+      mock_app do
+        enable :show_exceptions
+        get(:index){ raise StandardError }
+      end
+
+      get "/"
+      assert_equal 500, status
+      assert body.include?("StandardError")
+      assert body.include?("<code>show_exceptions</code> setting")
+    end
   end
 end

data/test/test_csrf_protection.rb

@@ -6,6 +6,7 @@ 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
@@ -19,25 +20,24 @@ describe "Application" do
       end
 
       it 'should allow requests with correct tokens' do
-        post "/", {"authenticity_token" => "a"}, 'rack.session' => {:csrf => "a"}
+        post "/", {"authenticity_token" => @token}, 'rack.session' => {:csrf => @token}
         assert_equal 200, status
       end
 
       it 'should not allow requests with incorrect tokens' do
-        post "/", {"authenticity_token" => "a"}, 'rack.session' => {:csrf => "b"}
+        post "/", {"authenticity_token" => "b"}, 'rack.session' => {:csrf => @token}
         assert_equal 403, status
       end
 
       it 'should allow requests with correct X-CSRF-TOKEN' do
-        post "/", {}, 'rack.session' => {:csrf => "a"}, 'HTTP_X_CSRF_TOKEN' => "a"
+        post "/", {}, 'rack.session' => {:csrf => @token}, 'HTTP_X_CSRF_TOKEN' => @token
         assert_equal 200, status
       end
 
       it 'should not allow requests with incorrect X-CSRF-TOKEN' do
-        post "/", {}, 'rack.session' => {:csrf => "a"}, 'HTTP_X_CSRF_TOKEN' => "b"
+        post "/", {}, 'rack.session' => {:csrf => @token}, 'HTTP_X_CSRF_TOKEN' => "b"
         assert_equal 403, status
       end
-
     end
 
     describe "without CSRF protection on" do
@@ -142,6 +142,7 @@ 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!'
@@ -150,7 +151,7 @@ describe "Application" do
       end
 
       it 'should allow configuring protection options' do
-        post "/a", {"foobar" => "a"}, 'rack.session' => {:csrf => "a"}
+        post "/a", {"foobar" => @token}, 'rack.session' => {:csrf => @token}
         assert_equal 200, status
       end
 

data/test/test_logger.rb

@@ -1,5 +1,7 @@
+#coding:utf-8
 require File.expand_path(File.dirname(__FILE__) + '/helper')
 require 'logger'
+require 'tempfile'
 
 describe "PadrinoLogger" do
   before do
@@ -36,6 +38,28 @@ 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
@@ -58,6 +82,30 @@ 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
@@ -248,3 +296,48 @@ describe "options :colorize_logging" do
     end
   end
 end
+
+describe "options :source_location" do
+  before do
+    Padrino::Logger::Config[:test][:source_location] = true
+    Padrino::Logger.setup!
+  end
+
+  def stub_root(base_path = File.expand_path("."), &block)
+    callable = proc{ |*args| File.join(base_path, *args) }
+    Padrino.stub(:root, callable, &block)
+  end
+
+  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
+  end
+
+  it 'should output source_location if file path is relative' do
+    stub_message = "test/test_logger.rb:269:in `test'"
+    Padrino::Logger.logger.stub(:caller, [stub_message]){ stub_root { Padrino.logger.debug("hello relative path") }}
+    assert_match /\[test\/test_logger\.rb:269\] hello relative path/, Padrino.logger.log.string
+  end
+
+  it 'should not output source_location if :source_location is set to false' do
+    Padrino::Logger::Config[:test][:source_location] = false
+    Padrino::Logger.setup!
+    stub_root { Padrino.logger.debug("hello world") }
+    assert_match /hello world/, Padrino.logger.log.string
+    refute_match /\[.+?\] hello world/, Padrino.logger.log.string
+  end
+
+  it 'should not output source_location unless file path is not started with Padrino.root' do
+    stub_root("/unknown/path/") { Padrino.logger.debug("hello boy") }
+    assert_match /hello boy/, Padrino.logger.log.string
+    refute_match /\[.+?\] hello boy/, Padrino.logger.log.string
+  end
+
+  it 'should not output source_location if source file path is started with Padrino.root + vendor' do
+    base_path = File.expand_path(File.dirname(__FILE__) + '/fixtures/')
+    stub_message = File.expand_path(File.dirname(__FILE__) + '/fixtures/vendor/logger.rb') + ":291:in `test'"
+    Padrino::Logger.logger.stub(:caller, [stub_message]) { stub_root(base_path) { Padrino.logger.debug("hello vendor") } }
+    assert_match /hello vendor/, Padrino.logger.log.string
+    refute_match /\[.+?\] hello vendor/, Padrino.logger.log.string
+  end
+end

data/test/test_mounter.rb

@@ -269,6 +269,7 @@ 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
@@ -285,5 +286,19 @@ describe "Mounter" do
       assert_equal "api app", res.body
       assert defined?(DemoProject::APILib)
     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
+      require fake_path
+      Padrino.mount("fake_root", :app_class => "FakeRoot").to('/fake_root')
+      Padrino.mount('main_app', :app_class => 'DemoProject::App').to('/')
+      Padrino.stub(:root, File.expand_path(File.dirname(__FILE__) + "/fixtures/apps/demo_project")) do
+        Padrino.application
+      end
+      assert !defined?(FakeLib)
+    end
   end
 end