padrino-core 0.16.2 → 0.18.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f357abd6bcc045b4befc0d85f7b02e733c2a10194d3521d7a81bc1e87f950439
-  data.tar.gz: ca8317ab9f147001058495aea8ccbaa1c2b1e9d34c26ac41500386d527343d34
+  metadata.gz: 60c8ed53139a3e9558b1e665205eeb798960a6049ac0788e3454f8f6f4280de0
+  data.tar.gz: '08dc99355571157c9113a0083c8acacd9970c7f64e407008265fdc177e590572'
 SHA512:
-  metadata.gz: 14cf763eaa96876bc8e94deb85d558d034221a4b0bc6e23b87658e9c5e7320f19942a5e7bec4c5a04131ee0d3378dabbd52676252cba72afbd51e422c2b1752f
-  data.tar.gz: cb531a9aecd3da407516bc334821cdb88250bb624976dc7700b2f496b3d362de11636fb2e2400bddad8eed002e08603735f633d634d3912c8f5a1b5edee7c7a5
+  metadata.gz: 50d10641e73dd6b858b2a6490cdc77372055ace5232683d7727e44b45a85267d8bd56fa2c5ce49852c51e5c017169a7449ecb0d297b6b5d67a6896b8f7396b93
+  data.tar.gz: 79af9aed08ab7c2189d162b75772e9d40f37ca45189abf26d18c9c42f0ca62d149d30756c77088fdaa119683192c76c94b8e9acf07b6b2abb8d0f72cd214155e

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

@@ -60,7 +60,10 @@ module Padrino
         set :views,         proc { File.join(root, 'views') }
 
         set :uri_root,      '/'
-        set :public_folder, proc { Padrino.root('public', uri_root) }
+        set :public_folder, proc {
+          app_public = Padrino.root('public', uri_root)
+          File.exist?(app_public) ? app_public : Padrino.root('public')
+        }
         set :images_path,   proc { File.join(public_folder, 'images') }
         set :base_url,      'http://localhost'
       end
@@ -111,16 +114,31 @@ module Padrino
         builder.use Rack::Head
         register Padrino::Flash
         setup_protection builder
+        setup_host_authorization builder if host_authorization_set?
         setup_csrf_protection builder
         setup_application!
       end
 
+      ##
+      # Sinatra 4.1+ checks the Host header against its host_authorization
+      # setting. Its default permits only local hosts in development, so
+      # Padrino applies the setting only when it is set to a Hash on the app,
+      # a Padrino application it inherits from or in Padrino.configure_apps,
+      # and apps that don't set it keep answering any host.
+      #
+      def host_authorization_set?
+        respond_to?(:setup_host_authorization, true) &&
+          method(:host_authorization).owner != Sinatra::Base.singleton_class &&
+          host_authorization.is_a?(Hash)
+      end
+
       ##
       # We need to add almost __sinatra__ images.
       #
       def default_routes
         configure :development do
           get '*__sinatra__/:image.png' do
+            halt 404 unless %w[404 500].include?(params[:image])
             content_type :png
             send_file("#{__dir__}/../images/#{params[:image]}.png")
           end

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

@@ -341,7 +341,7 @@ module Padrino
         params = args.last.is_a?(Hash) ? args.pop : {}
         fragment = params.delete(:fragment) || params.delete(:anchor)
         path = make_path_with_params(args, value_to_param(params))
-        rebase_url(fragment ? path << '#' << fragment.to_s : path)
+        rebase_url(fragment ? "#{path}##{fragment}" : path)
       end
       alias url_for url
 
@@ -372,7 +372,7 @@ module Padrino
 
       def rebase_url(url)
         if url.start_with?('/')
-          new_url = ''
+          new_url = String.new
           new_url << conform_uri(ENV['RACK_BASE_URI']) if ENV['RACK_BASE_URI']
           new_url << conform_uri(uri_root) if defined?(uri_root)
           new_url << url
@@ -381,6 +381,20 @@ module Padrino
         end
       end
 
+      ##
+      # The project's shared public/ for an app mounted under a sub-path whose
+      # public folder is the default public/<uri_root>. Static files and asset
+      # stamps fall back to it for files public/<uri_root> doesn't have. Nil for
+      # standalone Sinatra apps that only register Padrino::Routing.
+      #
+      # @api private
+      def shared_public_folder
+        return unless respond_to?(:uri_root) && Padrino.respond_to?(:root)
+        return if uri_root.nil? || uri_root == '/' || !public_folder
+
+        Padrino.root('public') if File.expand_path(public_folder) == Padrino.root('public', uri_root)
+      end
+
       ##
       # Processes the existing path and prepends the 'parent' parameters onto the route
       # Used for calculating path in route method.
@@ -599,12 +613,14 @@ module Padrino
         # path i.e :index or :show
         if path.is_a?(Symbol)
           name = path
-          path = map&.dup || (path == :index ? '/' : path.to_s)
+          path = map&.dup || (path == :index ? '/' : path.to_s.dup)
         end
 
         # Build our controller
         controller = Array(@_controller).map(&:to_s)
 
+        path = path.dup if path.is_a?(String)
+
         case path
         when String # path i.e "/index" or "/show"
           # Now we need to parse our 'with' params
@@ -855,15 +871,20 @@ module Padrino
 
       ##
       # This is mostly just a helper so request.path_info isn't changed when
-      # serving files from the public directory.
+      # serving files from the public directory. An app mounted under a sub-path
+      # falls back to the shared public/ for files missing from public/<uri_root>.
       #
       def static_file?(path_info)
         return unless (public_dir = settings.public_folder)
-        public_dir = File.expand_path(public_dir)
-        path = File.expand_path(public_dir + unescape(path_info))
-        return unless path.start_with?(public_dir)
-        return unless File.file?(path)
-        path
+        # Decode the path the way Sinatra's static! and the router do: %XX only, so '+' stays a plus.
+        file = Rack::Utils.unescape_path(path_info.b).force_encoding(Encoding::UTF_8)
+        [File.expand_path(public_dir), settings.shared_public_folder].compact.each do |dir|
+          path = "#{dir}#{file}"
+          next unless Rack::Utils.valid_path?(path)
+          path = File.expand_path(path)
+          return path if path.start_with?("#{dir}/") && File.file?(path)
+        end
+        nil
       end
 
       #
@@ -963,7 +984,7 @@ module Padrino
           verb = request.request_method
           candidacies, allows = routes.partition { |route| route.verb == verb }
           if candidacies.empty?
-            response['Allows'] = allows.map(&:verb).join(', ')
+            response['Allow'] = allows.map(&:verb).uniq.join(', ')
             halt 405
           end
         end

data/lib/padrino-core/application.rb

@@ -119,15 +119,22 @@ module Padrino
       end
 
       ##
-      # Returns default list of path globs to load as dependencies.
-      # Appends custom dependency patterns to the be loaded for your Application.
+      # Returns the files to load as dependencies of your Application: those matching
+      # the default globs below, under the application's root. The list is built again
+      # on each call, so appending to it has no effect; to load more files, override
+      # the method and add them to +super+. Add file paths (expand globs with Dir.glob)
+      # under Padrino.root: the reloader watches these files and reloads the application
+      # when one changes.
       #
-      # @return [Array]
-      #   list of path globs to load as dependencies
+      # @return [Array<String>]
+      #   paths of the files to load as dependencies
       #
       # @example
-      #   MyApp.dependencies << "#{Padrino.root}/uploaders/**/*.rb"
-      #   MyApp.dependencies << Padrino.root('other_app', 'controllers.rb')
+      #   class MyApp < Padrino::Application
+      #     def self.dependencies
+      #       super + Dir.glob(Padrino.root('uploaders', '**', '*.rb'))
+      #     end
+      #   end
       #
       def dependencies
         [

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

@@ -61,7 +61,7 @@ module Padrino
         require 'padrino-gen/command'
         ARGV.shift
         ARGV << 'help' if ARGV.empty?
-        Padrino.bin_gen(*ARGV)
+        exit 1 unless Padrino.bin_gen(*ARGV)
       rescue StandardError
         puts '<= You need padrino-gen! Run: gem install padrino-gen'
       end
@@ -82,6 +82,7 @@ module Padrino
         abort 'Please specify code or file' if code_or_file.nil?
 
         require File.expand_path('config/boot.rb')
+        Padrino.mounted_apps.each(&:setup_application!)
 
         if File.exist?(code_or_file)
           eval(File.read(code_or_file), nil, code_or_file)

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

@@ -21,7 +21,8 @@ module Padrino
     if File.file?(binstub)
       exec Gem.ruby, binstub, *ARGV
     else
-      puts 'Please run `bundle install --binstubs` from your project root to generate bundle-specific executables'
+      # exit! skips the flush of buffered output, so write to the unbuffered stderr. Not warn: -W0 silences it.
+      $stderr.puts 'Please run `bundle install && bundle binstubs --all` from your project root to generate bundle-specific executables'
       exit!
     end
   end

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

@@ -16,5 +16,5 @@ end
 # Load apps
 Padrino.mounted_apps.each do |app|
   puts "=> Loading Application #{app.app_class}"
-  app.app_obj.setup_application!
+  app.setup_application!
 end

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

@@ -18,7 +18,7 @@ module Padrino
       method_option :pid,            type: :string,  aliases: '-i', desc: 'File to store pid.'
       method_option :debug,          type: :boolean,                desc: 'Set debugging flags.'
       method_option :options,        type: :array,   aliases: '-O', desc: <<~DESC.chomp
-        --options NAME=VALUE NAME2=VALUE2'. pass VALUE to the server as option NAME. If no VALUE, sets it to true. Run '#{$PROGRAM_NAME} --server_options
+        --options NAME=VALUE NAME2=VALUE2. pass VALUE to the server as option NAME. If no VALUE, sets it to true. Run '#{$PROGRAM_NAME} start --server_options'
       DESC
       method_option :server_options, type: :boolean,                desc: "Tells the current server handler's options that can be used with --options"
 
@@ -48,7 +48,7 @@ module Padrino
       # https://github.com/rack/rack/blob/master/lib/rack/server.rb\#L100
       def server_options(options)
         info = []
-        server = Rack::Handler.get(options[:server]) || Rack::Handler.default(options)
+        server = Rackup::Handler.get(options[:server]) || Rackup::Handler.default
         if server.respond_to?(:valid_options)
           info << ''
           info << "Server-specific options for #{server.name}:"
@@ -62,7 +62,7 @@ module Padrino
           return '' unless has_options
         end
         info.join("\n")
-      rescue NameError
+      rescue NameError, LoadError
         "Warning: Could not find handler specified (#{options[:server] || 'default'}) to determine handler-specific options"
       end
 

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

@@ -13,8 +13,6 @@ module PadrinoTasks
   def self.init(init = false)
     Padrino::Tasks.files.flatten.uniq.each do |rakefile|
       Rake.application.add_import(rakefile)
-    rescue StandardError
-      puts "<= Failed load #{ext}"
     end
 
     load(File.expand_path('rake_tasks.rb', __dir__))

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

@@ -1,17 +1,27 @@
+# Model paths that :skeleton left out, loaded by a later :environment in the same run
+# (e.g. `rake ar:migrate db:seed`).
+# ceiling: they load after config/apps.rb and the after_load hooks, so a hook that walks the models
+# doesn't see them in that case; loading them before the hooks would mean re-running Padrino.load!.
+skipped_model_paths = []
+
 # Loads the Padrino applications mounted within the project.
 # Setting up the required environment for Padrino.
 task :environment do
   require File.expand_path('config/boot.rb', Rake.application.original_dir)
-
-  Padrino.mounted_apps.each do |app|
-    app.app_obj.setup_application!
+  unless skipped_model_paths.empty?
+    Padrino.dependency_paths.concat(skipped_model_paths)
+    Padrino.require_dependencies(*skipped_model_paths)
+    skipped_model_paths.clear
   end
+
+  Padrino.mounted_apps.each(&:setup_application!)
 end
 
 task :skeleton do
   PADRINO_ROOT ||= Rake.application.original_dir
   require 'padrino-core'
-  Padrino.send(:dependency_paths).reject! { |path| path.include?('/models/') }
+  skipped_model_paths.concat(Padrino.dependency_paths.select { |path| path.include?('/models/') })
+  Padrino.dependency_paths.reject! { |path| path.include?('/models/') }
   require File.expand_path('config/boot.rb', Rake.application.original_dir)
 end
 

data/lib/padrino-core/loader.rb

@@ -31,7 +31,7 @@ module Padrino
     #
     # @example
     #   after_load do
-    #     DataMapper.finalize
+    #     SomeORM.finalize
     #   end
     #
     def after_load(&block)
@@ -150,7 +150,7 @@ module Padrino
         error = fatal = loaded = nil
 
         files.dup.each do |file|
-          Reloader.safe_load(file, options)
+          Reloader.enabled? || options[:force] ? Reloader.safe_load(file, options) : Reloader.untracked_load(file)
           files.delete(file)
           loaded = true
         rescue NameError, LoadError => error

data/lib/padrino-core/logger.rb

@@ -30,6 +30,10 @@ module Padrino
   #
   # @example using ruby default logger
   #   require 'logger'
+  #   Padrino.logger = ::Logger.new(STDOUT)
+  #
+  # @example using ruby default logger with Padrino formatting and #colorize!
+  #   require 'logger'
   #   new_logger = ::Logger.new(STDOUT)
   #   new_logger.extend(Padrino::Logger::Extensions)
   #   Padrino.logger = new_logger
@@ -85,8 +89,8 @@ module Padrino
           if args.size > 1
             bench(args[0], args[1], args[2], name)
           else
-            location = resolve_source_location(caller(1).shift)
-            args.unshift(location) if location && enable_source_location?
+            location = resolve_source_location(caller(1).shift) if enable_source_location?
+            args.unshift(location) if location
             push(args * '', name)
           end
         end
@@ -94,7 +98,7 @@ module Padrino
         define_method(:"#{name}?") { number >= level }
       end
 
-      SOURCE_LOCATION_REGEXP = /^(.*?):(\d+?)(?::in `.+?')?$/
+      SOURCE_LOCATION_REGEXP = /^(.*?):(\d+?)(?::in [`'].+?')?$/
 
       ##
       # Returns true if :source_location is set to true.
@@ -111,7 +115,11 @@ module Padrino
         return unless path && line
 
         root = Padrino.root
-        path = File.realpath(path) if Pathname.new(path).relative?
+        if Pathname.new(path).relative?
+          return unless File.exist?(path) # code from irb, eval or ruby -e has no file
+
+          path = File.realpath(path)
+        end
         return unless path.start_with?(root) && !path.start_with?(Padrino.root('vendor'))
 
         "[#{path.gsub("#{root}/", '')}:#{line}] "
@@ -240,6 +248,33 @@ module Padrino
       end
     end
 
+    ##
+    # Plain versions of the Padrino-specific methods of {Extensions}. A logger assigned
+    # without {Extensions} gets the ones it lacks, so Padrino can log to it while its
+    # standard logging methods stay untouched.
+    #
+    module Fallbacks
+      def devel(*); end
+
+      def devel?
+        false
+      end
+
+      def bench(action, began_at, message, level = :debug, _color = :yellow)
+        return unless Levels.key?(level)
+
+        public_send level, "#{action.to_s.upcase} (#{Kernel.format('%0.4fs', Time.now - began_at)}) #{message}"
+      end
+
+      def exception(boom, verbosity = :long, level = :error)
+        Extensions.instance_method(:exception).bind(self).call(boom, verbosity, level)
+      end
+
+      def colorize(string, *_colors)
+        string
+      end
+    end
+
     module Colorize
       # Colors for levels
       unless defined?(ColoredLevels)
@@ -332,16 +367,25 @@ module Padrino
     end
 
     def self.logger=(logger)
-      unless logger.class.ancestors.include?(Padrino::Logger::Extensions)
-        warn <<~MESSAGE
-          WARNING! `Padrino.logger = new_logger` no longer extends it with #colorize! and other features.
-                    To do it with a custom logger you have to manually `new_logger.extend(Padrino::Logger::Extensions)`
-                    before passing to `Padrino.logger = new_logger`.
-        MESSAGE
-      end
+      add_fallbacks(logger) unless logger.is_a?(Padrino::Logger::Extensions)
       @_logger = logger
     end
 
+    ##
+    # Defines the {Fallbacks} methods a logger does not have yet.
+    #
+    def self.add_fallbacks(logger)
+      return if logger.nil?
+
+      missing = Fallbacks.instance_methods.reject { |name| logger.respond_to?(name) }
+      return if missing.empty?
+      return warn("WARNING! Padrino.logger is frozen and lacks #{missing.join(', ')}, logging from Padrino will fail.") if logger.frozen?
+
+      fallbacks = ::Module.new
+      missing.each { |name| fallbacks.send(:define_method, name, Fallbacks.instance_method(name)) }
+      logger.extend(fallbacks)
+    end
+
     ##
     # Setup a new logger.
     #
@@ -443,7 +487,11 @@ module Padrino
       return unless @buffer.size.positive?
       self.class.mutex.synchronize do
         @buffer.each do |line|
-          line.encode!(@sanitize_encoding, invalid: :replace, undef: :replace) if @sanitize_encoding
+          if @sanitize_encoding
+            line = line.encode(@sanitize_encoding, invalid: :replace, undef: :replace)
+          elsif line.encoding != Encoding::UTF_8
+            line = line.encode(@log.external_encoding || Encoding::UTF_8, invalid: :replace, undef: :replace)
+          end
           @log.write(line)
         end
         @buffer.clear
@@ -475,7 +523,7 @@ module Padrino
     #   The message
     #
     def <<(message = nil)
-      message << "\n" unless message[-1] == "\n"
+      message += "\n" unless message[-1] == "\n"
       self.class.mutex.synchronize { @buffer << message }
       flush if @auto_flush
       message
@@ -483,7 +531,8 @@ module Padrino
     alias write <<
 
     def format(message, level)
-      Kernel.format(@format_message, stylized_level(level), colorize(Time.now.strftime(@format_datetime), :yellow), message.to_s.strip)
+      datetime = @format_datetime.empty? ? '' : Time.now.strftime(@format_datetime)
+      Kernel.format(@format_message, stylized_level(level), colorize(datetime, :yellow), message.to_s.strip)
     end
 
     ##

data/lib/padrino-core/module.rb

@@ -34,8 +34,9 @@ module Padrino
     end
 
     ##
-    # Returns the list of path globs to load as dependencies.
-    # Appends custom dependency patterns to the be loaded for Padrino.
+    # Returns the path globs of the module's files to load as dependencies. The list
+    # is built again on each call, so appending to it has no effect; to load more
+    # files, override the method and add globs to +super+.
     #
     # @return [Array<String>]
     #   The dependency paths.
@@ -44,9 +45,11 @@ module Padrino
     #   module MyModule
     #     extend Padrino::Module
     #     gem! 'my_gem'
-    #   end
     #
-    #   Module.dependency_paths << "#{MyModule.root}/uploaders/*.rb"
+    #     def self.dependency_paths
+    #       super + ["#{root}/uploaders/*.rb"]
+    #     end
+    #   end
     #
     def dependency_paths
       [

data/lib/padrino-core/mounter/application_extension.rb

@@ -25,7 +25,7 @@ module Padrino
       end
 
       def app_name
-        @__app_name ||= mounter_options[:app_name] || self.to_s.underscore.to_sym
+        @__app_name ||= mounter_options[:app_name] || Inflections.underscore(self.to_s).to_sym
       end
 
       def setup_application!

data/lib/padrino-core/mounter.rb

@@ -87,17 +87,13 @@ module Padrino
     end
 
     ##
-    # Maps Padrino application onto a Padrino::Router.
-    # For use in constructing a Rack application.
-    #
-    # @param [Padrino::Router]
-    #
-    # @return [Padrino::Router]
+    # Applies the mount settings (uri_root, root, public folder, cascade) to the
+    # application and sets it up, so its routes, controllers and mailers are loaded.
     #
     # @example
-    #   @app.map_onto(router)
+    #   @app.setup_application!
     #
-    def map_onto(router)
+    def setup_application!
       app_data = self
       app_obj = @app_obj
 
@@ -117,7 +113,22 @@ module Padrino
         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: uri_root, host: app_data.app_host)
+    end
+
+    ##
+    # Maps Padrino application onto a Padrino::Router.
+    # For use in constructing a Rack application.
+    #
+    # @param [Padrino::Router]
+    #
+    # @return [Padrino::Router]
+    #
+    # @example
+    #   @app.map_onto(router)
+    #
+    def map_onto(router)
+      setup_application!
+      router.map(to: app_obj, path: uri_root, host: app_host)
     end
 
     ###
@@ -183,7 +194,8 @@ module Padrino
     def locate_app_object
       @_app_object ||= begin
         ensure_app_file!
-        Padrino.require_dependencies(app_file)
+        # Always tracked, since Application#reload! must re-run the app file.
+        Reloader.safe_load(app_file) if File.file?(app_file)
         app_constant
       end
     end

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

@@ -70,6 +70,8 @@ module Padrino
       # Returns a instance of PathRouter::Route if path is matched with current regexp
       #
       def match?(offset, path)
+        return unless path
+
         @routes[offset..].find do |route|
           route.regexp === path || (path.end_with?('/') && route.regexp === path[0..-2])
         end
@@ -88,10 +90,14 @@ module Padrino
       end
 
       ##
-      # Decode env["PATH_INFO"]
+      # Decode env["PATH_INFO"]. Returns nil when the path doesn't decode to valid text
+      # (a malformed or non-UTF-8 escape such as "/%ff"), so it matches no route.
       #
       def decode_pattern(pattern)
-        decode_uri(encode_default_external(pattern))
+        decoded = decode_uri(encode_default_external(pattern))
+        decoded if decoded.valid_encoding?
+      rescue ArgumentError, EncodingError
+        nil
       end
 
       ##
@@ -105,7 +111,7 @@ module Padrino
       # Decode uri escape sequences
       #
       def decode_uri(string)
-        string.split(/%2F|%2f/, -1).map { |part| Rack::Utils.unescape(part) }.join('%2F')
+        string.split(/%2F|%2f/, -1).map { |part| Rack::Utils.unescape(part.gsub('+', '%2B')) }.join('%2F')
       end
     end
   end

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

@@ -20,6 +20,7 @@ module Padrino
 
       def prepare(name)
         file = remove(name)
+        reset_concerns(name)
         @old_entries ||= {}
         @old_entries[name] = {
           constants: object_classes,
@@ -57,6 +58,24 @@ module Padrino
         @files ||= {}
       end
 
+      ##
+      # Resets the ActiveSupport::Concern modules first defined in the file. Unlike classes
+      # they are kept on reload, so that classes including them keep working and namespaces
+      # keep their constants, but their state is reset so the file can define them again.
+      #
+      def reset_concerns(file)
+        return unless defined?(::ActiveSupport::Concern)
+
+        ObjectSpace.each_object(::Module) do |mod|
+          # Module#=== doesn't call mod, which can be a DeprecatedConstantProxy that warns on any call.
+          next unless ::ActiveSupport::Concern === mod && mod.name
+          next unless Object.const_source_location(mod.name)&.first == file
+          Reloader.reset_concern(mod) if Object.const_get(mod.name).equal?(mod)
+        rescue NameError
+          next
+        end
+      end
+
       ##
       # Returns all the classes in the object space.
       #