padrino-core 0.15.3 → 0.16.0.pre2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e7b0401b770a137f350c55ea76cc2edc52718927473c036e3fad135c2b8022ce
-  data.tar.gz: 0154f48a45c976b9bc672fc919d276b8e5826ab751e7640326ce9a5249a5aaa5
+  metadata.gz: 3ffca6fa25ca85cc3069a546003e95cdac56d3f698cc029605bb9dd0879d8b7a
+  data.tar.gz: 24940f3ae7f52a7840fef5a75c6687a66e2546226e00f4418e4c790b4320893b
 SHA512:
-  metadata.gz: 10c221aa6fec0c7d6d3cf2aa0827c6d4701af14caf03cc24b40ec886ae38461d1b8a71b4ffafdda0975b3b8cf78f16e37d789a9d684aa17067f7f9720d09a737
-  data.tar.gz: 482ad64bee105627b9cb4600e1296cfc050a3fbb5813aa919c11ca26a4f09a36961ba288a0059f653edcd99a57ec2370a233bc78eef4b10a5f1e5572e572ffa3
+  metadata.gz: 851fcbda9f0d0c6a5801817e847078396b9c9031da520051e4099085c02dc48627c0d94ef21f32e7ced19945564ecb17e00fe2ed1551fcb4b5020231c08d3ae3
+  data.tar.gz: 31650ff7315f876de58e5149a19b1ce1bf5baddecdcb6311ece275f2acc43d3477cecebb1e92dfd5b8a2ca56cf05a4a5abbf02b643e561e1b3814632bc8ded71

data/bin/padrino

@@ -2,7 +2,7 @@
 require 'padrino-core/cli/binstub'
 Padrino.replace_with_binstub('padrino')
 
-padrino_core_path = File.expand_path('../../lib', __FILE__)
+padrino_core_path = File.expand_path('../lib', __dir__)
 $:.unshift(padrino_core_path) if File.directory?(padrino_core_path) && !$:.include?(padrino_core_path)
 
 require 'padrino-core/cli/base'

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

@@ -95,7 +95,7 @@ module Padrino
           '/models.rb',
           '/models/**/*.rb',
           '/lib.rb',
-          '/lib/**/*.rb',
+          '/lib/**/*.rb'
         ].map{ |glob| File.join(settings.root, glob) }
       end
 
@@ -134,7 +134,7 @@ module Padrino
         configure :production do
           error ::Exception do
             logger.exception env['sinatra.error']
-            halt(500, { 'Content-Type' => 'text/html' }, ['<h1>Internal Server Error</h1>'])
+            halt(500, { 'content-type' => 'text/html' }, ['<h1>Internal Server Error</h1>'])
           end unless errors.has_key?(::Exception)
         end
       end

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

@@ -440,10 +440,9 @@ module Padrino
         when Array
           object.map { |item| value_to_param(item) }.compact
         when Hash
-          object.inject({}) do |all, (key, value)|
+          object.each_with_object({}) do |(key, value), all|
             next all if value.nil?
             all[key] = value_to_param(value)
-            all
           end
         when nil
         else
@@ -453,7 +452,7 @@ module Padrino
 
       # Add prefix slash if its not present and remove trailing slashes.
       def conform_uri(uri_string)
-        uri_string.gsub(/^(?!\/)(.*)/, '/\1').gsub(/[\/]+$/, '')
+        uri_string.gsub(/^(?!\/)(.*)/, '/\1').gsub(/\/+$/, '')
       end
 
       ##
@@ -863,7 +862,7 @@ module Padrino
         path = File.expand_path(public_dir + unescape(path_info))
         return unless path.start_with?(public_dir)
         return unless File.file?(path)
-        return path
+        path
       end
 
       #
@@ -993,7 +992,7 @@ module Padrino
         filter! :before if first_time
 
         catch(:pass) do
-          begin
+          
               (route.before_filters - settings.filters[:before]).each{|block| instance_eval(&block) }
               @layout = route.use_layout if route.use_layout
               route.custom_conditions.each {|block| pass if block.bind(self).call == false }
@@ -1002,7 +1001,7 @@ module Padrino
               halt(route_response)
           ensure
             (route.after_filters - settings.filters[:after]).each {|block| instance_eval(&block) }
-          end
+          
         end
       end
 

data/lib/padrino-core/application.rb

@@ -138,7 +138,7 @@ module Padrino
           'controllers/**/*.rb',
           'controllers.rb',
           'helpers/**/*.rb',
-          'helpers.rb',
+          'helpers.rb'
         ].flat_map{ |file| Dir.glob(File.join(settings.root, file)) }
       end
 

data/lib/padrino-core/caller.rb

@@ -19,7 +19,7 @@ module Padrino
     %r{custom_require\.rb$},
     %r{active_support},
     %r{/thor},
-    %r{/lib/bundler},
+    %r{/lib/bundler}
   ] unless defined?(PADRINO_IGNORE_CALLERS)
 
   ##
@@ -27,7 +27,6 @@ module Padrino
   #
   PADRINO_IGNORE_CALLERS.concat(RUBY_IGNORE_CALLERS) if defined?(RUBY_IGNORE_CALLERS)
 
-  private
   ##
   # The filename for the file that is the direct caller (first caller).
   #
@@ -48,7 +47,7 @@ module Padrino
   def self.caller_files
     caller(1).
       map    { |line| line.split(/:(?=\d|in )/)[0,2] }.
-      reject { |file,line| PADRINO_IGNORE_CALLERS.any? { |pattern| file =~ pattern } }.
-      map    { |file,line| file }
+      reject { |file,_line| PADRINO_IGNORE_CALLERS.any? { |pattern| file =~ pattern } }.
+      map    { |file,_line| file }
   end
 end

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

@@ -16,7 +16,7 @@ module Padrino
         ARGV.clear
         ARGV.concat(args)
         puts "=> Executing Rake #{ARGV.join(' ')} ..."
-        load File.expand_path('../rake.rb', __FILE__)
+        load File.expand_path('rake.rb', __dir__)
         Rake.application.init
         Rake.application.instance_variable_set(:@rakefile, __FILE__)
         load File.expand_path('Rakefile')
@@ -27,10 +27,10 @@ module Padrino
       map "c" => :console
       def console(*args)
         prepare :console
-        require File.expand_path("../../version", __FILE__)
+        require File.expand_path('../version', __dir__)
         require File.expand_path('config/boot.rb')
         puts "=> Loading #{Padrino.env} console (Padrino v.#{Padrino.version})"
-        require File.expand_path('../console', __FILE__)
+        require File.expand_path('console', __dir__)
         ARGV.clear
         if defined? Pry
           Pry.start
@@ -47,18 +47,18 @@ module Padrino
       desc "generate", "Executes the Padrino generator with given options (alternatively use 'gen' or 'g')."
       map ["gen", "g"] => :generate
       def generate(*args)
-        begin
+        
           # We try to load the vendored padrino-gen if exist
-          padrino_gen_path = File.expand_path('../../../../../padrino-gen/lib', __FILE__)
+          padrino_gen_path = File.expand_path('../../../../padrino-gen/lib', __dir__)
           $:.unshift(padrino_gen_path) if File.directory?(padrino_gen_path) && !$:.include?(padrino_gen_path)
           require 'padrino-core/command'
           require 'padrino-gen/command'
           ARGV.shift
           ARGV << 'help' if ARGV.empty?
           Padrino.bin_gen(*ARGV)
-        rescue
+        rescue StandardError
           puts "<= You need padrino-gen! Run: gem install padrino-gen"
-        end
+        
       end
 
       desc "version", "Show current Padrino version."

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

@@ -14,7 +14,7 @@ module Padrino
       project_root = project_root.rpartition('/').first
     end
 
-    if %w(Gemfile .components).all? { |file| File.file?(File.join(project_root, file)) }
+    if %w[Gemfile .components].all? { |file| File.file?(File.join(project_root, file)) }
       binstub = File.join(project_root, 'bin', executable)
       if File.file?(binstub)
         exec Gem.ruby, binstub, *ARGV

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

@@ -21,7 +21,7 @@ module Padrino
       method_option :server_options,   :type => :boolean, :desc => "Tells the current server handler's options that can be used with --options"
       def start(*args)
         prepare :start
-        require File.expand_path("../adapter", __FILE__)
+        require File.expand_path('adapter', __dir__)
         require File.expand_path('config/boot.rb')
 
         if options[:server_options]
@@ -36,7 +36,7 @@ module Padrino
       method_option :pid, :type => :string,  :aliases => "-p", :desc => "File to store pid", :default => 'tmp/pids/server.pid'
       def stop
         prepare :stop
-        require File.expand_path("../adapter", __FILE__)
+        require File.expand_path('adapter', __dir__)
         Padrino::Cli::Adapter.stop(options)
       end
 
@@ -44,7 +44,7 @@ module Padrino
 
       # https://github.com/rack/rack/blob/master/lib/rack/server.rb\#L100
       def server_options(options)
-        begin
+        
           info = []
           server = Rack::Handler.get(options[:server]) || Rack::Handler.default(options)
           if server && server.respond_to?(:valid_options)
@@ -57,12 +57,12 @@ module Padrino
               info << "  -O %-21s %s" % [name, description]
               has_options = true
             end
-            return "" if !has_options
+            return "" unless has_options
           end
           info.join("\n")
         rescue NameError
-          return "Warning: Could not find handler specified (#{options[:server] || 'default'}) to determine handler-specific options"
-        end
+          "Warning: Could not find handler specified (#{options[:server] || 'default'}) to determine handler-specific options"
+        
       end
 
       protected

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

@@ -1,4 +1,4 @@
-require File.expand_path('../../tasks', __FILE__)
+require File.expand_path('../tasks', __dir__)
 require 'rake'
 require 'rake/dsl_definition'
 require 'thor'
@@ -10,8 +10,12 @@ end
 
 module PadrinoTasks
   def self.init(init=false)
-    Padrino::Tasks.files.flatten.uniq.each { |rakefile| Rake.application.add_import(rakefile) rescue puts "<= Failed load #{ext}" }
-    load(File.expand_path('../rake_tasks.rb', __FILE__))
+    Padrino::Tasks.files.flatten.uniq.each { |rakefile| begin
+                                                          Rake.application.add_import(rakefile)
+                                                        rescue StandardError
+                                                          puts "<= Failed load #{ext}"
+                                                        end }
+    load(File.expand_path('rake_tasks.rb', __dir__))
     Rake.application.load_imports
   end
 

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

@@ -49,7 +49,7 @@ rescue ArgumentError
 end
 
 desc "Displays a listing of the named routes within a project, optionally only those matched by [query]"
-task :routes, [:query] => :environment do |t, args|
+task :routes, [:query] => :environment do |_t, args|
   Padrino.mounted_apps.each do |app|
     list_app_routes(app, args)
   end
@@ -57,16 +57,16 @@ end
 
 desc "Displays a listing of the named routes a given app [app]"
 namespace :routes do
-  task :app, [:app] => :environment do |t, args|
+  task :app, [:app] => :environment do |_t, args|
     app = Padrino.mounted_apps.find { |app| app.app_class == args.app }
     list_app_routes(app, args) if app
   end
 end
 
 Dir["{lib/tasks/**,tasks/**,test,spec}/*.rake"].each do |file|
-  begin
+  
     load(File.expand_path(file))
   rescue LoadError => e
     warn "#{file}: #{e.message}"
-  end
+  
 end

data/lib/padrino-core/command.rb

@@ -14,7 +14,7 @@ module Padrino
   #   Padrino.bin('start', '-e production')
   #
   def self.bin(*args)
-    @_padrino_bin ||= [self.ruby_command, File.expand_path("../../../bin/padrino", __FILE__)]
+    @_padrino_bin ||= [self.ruby_command, File.expand_path('../../bin/padrino', __dir__)]
     args.empty? ? @_padrino_bin : system(args.unshift(@_padrino_bin).join(" "))
   end
 

data/lib/padrino-core/loader.rb

@@ -150,7 +150,7 @@ module Padrino
         error = fatal = loaded = nil
 
         files.dup.each do |file|
-          begin
+          
             Reloader.safe_load(file, options)
             files.delete(file)
             loaded = true
@@ -159,14 +159,13 @@ module Padrino
             logger.devel "Cyclic dependency reload for #{error.class}: #{error.message}"
           rescue Exception => fatal
             break
-          end
+          
         end
 
-        if fatal || !loaded
-          exception = fatal || error
-          logger.exception exception, :short
-          raise exception
-        end
+        next unless fatal || !loaded
+        exception = fatal || error
+        logger.exception exception, :short
+        raise exception
       end
     end
 
@@ -196,7 +195,7 @@ module Padrino
         "#{root}/lib/**/*.rb",
         "#{root}/models/**/*.rb",
         "#{root}/shared/**/*.rb",
-        "#{root}/config/apps.rb",
+        "#{root}/config/apps.rb"
       ]
     end
   end

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

@@ -55,7 +55,7 @@ module Padrino
         @path
       end
   
-      SIGNIFICANT_VARIABLES_REGEX = /(^|[^\\])[:\*]([a-zA-Z0-9_]+)/.freeze
+      SIGNIFICANT_VARIABLES_REGEX = /(^|[^\\])[:*]([a-zA-Z0-9_]+)/.freeze
 
       ##
       # Returns signficant variable names.

data/lib/padrino-core/reloader.rb

@@ -24,7 +24,7 @@ module Padrino
     # Default excluded directories at Padrino.root are: test, spec, features, tmp, config, db and public
     #
     def exclude
-      @_exclude ||= Set.new %w(test spec tmp features config public db).map{ |path| Padrino.root(path) }
+      @_exclude ||= Set.new(%w[test spec tmp features config public db].map{ |path| Padrino.root(path) })
     end
 
     ##

data/lib/padrino-core/router.rb

@@ -58,8 +58,8 @@ module Padrino
       raise ArgumentError, "app is required" if app.nil?
 
       path  = path.chomp('/')
-      match = Regexp.new("^#{Regexp.quote(path).gsub('/', '/+')}(.*)", nil, 'n')
-      host  = Regexp.new("^#{Regexp.quote(host)}$", true, 'n') unless host.nil? || host.is_a?(Regexp)
+      match = Regexp.new("^#{Regexp.quote(path).gsub('/', '/+')}(.*)", Regexp::NOENCODING)
+      host  = Regexp.new("^#{Regexp.quote(host)}$", Regexp::NOENCODING) unless host.nil? || host.is_a?(Regexp)
 
       @mapping << [host, path, match, app]
     end
@@ -74,7 +74,7 @@ module Padrino
 
       @mapping.each do |host, path, match, app|
         next unless host.nil? || http_host =~ host
-        next unless path_info =~ match && rest = $1
+        next unless path_info =~ match && rest = ::Regexp.last_match(1)
         next unless rest.empty? || rest[0] == ?/
 
         rest = "/" if rest.empty?
@@ -91,7 +91,7 @@ module Padrino
         env['SCRIPT_NAME'] = script_name
         env['PATH_INFO'] = path_info
         Padrino::Logger::Rack.new(nil,'/').send(:log, env, 404, {}, began_at) if logger.debug?
-        [404, {"Content-Type" => "text/plain", "X-Cascade" => "pass"}, ["Not Found: #{path_info}"]]
+        [404, {"content-type" => "text/plain", "x-cascade" => "pass"}, ["Not Found: #{path_info}"]]
       end
     end
   end

data/lib/padrino-core/server.rb

@@ -12,7 +12,6 @@ module Padrino
     Server.start(*detect_application(options))
   end
 
-  private
 
   #
   #
@@ -22,7 +21,7 @@ module Padrino
       config_file ||= default_config_file
       fail "Rack config file `#{config_file}` must have `.ru` extension" unless config_file =~ /\.ru$/
       rack_app, rack_options = Rack::Builder.parse_file(config_file)
-      [rack_app, rack_options.merge(options)]
+      [rack_app, (rack_options || {}).merge(options)]
     else
       [Padrino.application, options]
     end
@@ -31,7 +30,7 @@ module Padrino
   ##
   # This module builds a Padrino server to run the project based on available handlers.
   #
-  class Server < Rack::Server
+  class Server < Rackup::Server
     DEFAULT_ADDRESS = { :Host => '127.0.0.1', :Port => 3000 }
 
     # Server Handlers
@@ -65,16 +64,11 @@ module Padrino
     end
 
     # The application the server will run.
-    def app
-      @app
-    end
+    attr_reader :app
     alias :wrapped_app :app
 
-    def options
-      @options
-    end
+    attr_reader :options
 
-    private
 
     # Detects the supported handler to use.
     #
@@ -83,11 +77,11 @@ module Padrino
     #
     def self.detect_rack_handler
       Handlers.each do |handler|
-        begin
+        
           return handler if Rack::Handler.get(handler.to_s.downcase)
         rescue LoadError
         rescue NameError
-        end
+        
       end
       fail "Server handler (#{Handlers.join(', ')}) not found."
     end
@@ -110,7 +104,7 @@ module Padrino
     # Detects Host and Port for Rack server.
     #
     def self.detect_address(options)
-      address = DEFAULT_ADDRESS.merge options.select{ |key| [:Host, :Port].include?(key) }
+      address = DEFAULT_ADDRESS.merge(options.select{ |key| [:Host, :Port].include?(key) })
       address[:Host] = options[:host] if options[:host]
       address[:Port] = options[:port] if options[:port]
       address

data/lib/padrino-core/version.rb

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

data/padrino-core.gemspec

@@ -1,7 +1,5 @@
 #!/usr/bin/env gem build
-# encoding: utf-8
-
-require File.expand_path("../lib/padrino-core/version.rb", __FILE__)
+require File.expand_path('lib/padrino-core/version.rb', __dir__)
 
 Gem::Specification.new do |s|
   s.name = "padrino-core"
@@ -23,6 +21,7 @@ Gem::Specification.new do |s|
   s.rdoc_options  = ["--charset=UTF-8"]
 
   s.add_dependency("padrino-support", Padrino.version)
-  s.add_dependency("sinatra", ">= 2.2.4")
+  s.add_dependency("rackup", "~> 2.1")
+  s.add_dependency("sinatra", "~> 4")
   s.add_dependency("thor", "~> 1.0")
 end

data/test/fixtures/app_gem/app_gem.gemspec

@@ -1,11 +1,10 @@
-# -*- encoding: utf-8 -*-
-require File.expand_path('../lib/app_gem/version', __FILE__)
+require File.expand_path('lib/app_gem/version', __dir__)
 
 Gem::Specification.new do |gem|
   gem.authors       = ["Florian Gilcher"]
   gem.email         = ["florian.gilcher@asquera.de"]
-  gem.description   = %q{TODO: Write a gem description}
-  gem.summary       = %q{TODO: Write a gem summary}
+  gem.description   = 'TODO: Write a gem description'
+  gem.summary       = 'TODO: Write a gem summary'
   gem.homepage      = ""
 
   gem.files         = `git ls-files`.split($\)

data/test/fixtures/apps/mountable_apps/rack_apps.rb

@@ -13,7 +13,7 @@ class RackApp
   end
 end
 
-RackApp2 = lambda{|_| [200, {}, ["hello rack app2"]] }
+RackApp2 = ->(_){ [200, {}, ["hello rack app2"]] }
 
 class SinatraApp < Sinatra::Base
   set :public_folder, File.dirname(__FILE__)

data/test/fixtures/apps/stealthy/helpers/stealthy_class_helpers.rb

@@ -5,8 +5,7 @@ class Boo
 end
 
 class Woo < Boo
-  def poo
-  end
+  def poo; end
 end
 
 class Soo < Boo

data/test/fixtures/dependencies/circular/e.rb

@@ -7,7 +7,5 @@ class E
     subclass.fields.replace fields.dup
   end
 
-  G
-
   fields << "name"
 end

data/test/helper.rb

@@ -13,7 +13,7 @@ require 'padrino-core'
 require 'ext/minitest-spec'
 require 'ext/rack-test-methods'
 
-class MiniTest::Spec
+class Minitest::Spec
   include Rack::Test::Methods
 
   # Sets up a Sinatra::Base subclass defined with the block

data/test/test_application.rb

@@ -128,7 +128,7 @@ describe "Application" do
       it 'should have not mapped errors on development' do
         mock_app { get('/'){ 'HI' } }
         get "/"
-        assert @app.errors.empty?
+        assert_empty @app.errors
       end
 
       it 'should have mapped errors on production' do
@@ -150,7 +150,7 @@ describe "Application" do
 
       it 'should pass Routing#parent to Module#parent' do
         # see naming collision in issue #1814
-        begin
+        
           ConstTest = Class.new(Padrino::Application)
           class Module
             def parent
@@ -160,7 +160,7 @@ describe "Application" do
           assert_equal :dirty, ConstTest.parent
         ensure
           Module.instance_eval{ undef :parent }
-        end
+        
       end
     end
 

data/test/test_configuration.rb

@@ -2,28 +2,28 @@ 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
+    Padrino.config.val1 = 12_345
+    assert_equal 12_345, Padrino.config.val1
   end
 
   it 'should be able to configure with block' do
     Padrino.configure do |config|
-      config.val2 = 54321
+      config.val2 = 54_321
     end
-    assert_equal 54321, Padrino.config.val2
+    assert_equal 54_321, Padrino.config.val2
   end
 
   it 'should be able to configure with block' do
     Padrino.configure :test do |config|
-      config.test1 = 54321
+      config.test1 = 54_321
     end
     Padrino.configure :development do |config|
-      config.test1 = 12345
+      config.test1 = 12_345
     end
     Padrino.configure :test, :development do |config|
-      config.both1 = 54321
+      config.both1 = 54_321
     end
-    assert_equal 54321, Padrino.config.test1
-    assert_equal 54321, Padrino.config.both1
+    assert_equal 54_321, Padrino.config.test1
+    assert_equal 54_321, Padrino.config.both1
   end
 end

data/test/test_core.rb

@@ -19,13 +19,13 @@ describe "Core" do
 
     it 'should validate global helpers' do
       assert_equal :test, Padrino.env
-      assert_match /\/test/, Padrino.root
+      assert_match(/\/test/, Padrino.root)
       assert Padrino.version
     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
+      assert_match(/No apps are mounted/, text.to_s)
     end
 
     it 'should check before/after padrino load hooks' do
@@ -46,7 +46,7 @@ describe "Core" do
         def call(env)
           status, headers, body = @app.call(env)
           headers["Middleware-Called"] = "yes"
-          return status, headers, body
+          [status, headers, body]
         end
       }
 
@@ -80,8 +80,8 @@ describe "Core" do
 
       get "/"
       assert_equal 500, status
-      assert body.include?("StandardError")
-      assert body.include?("<code>show_exceptions</code> setting")
+      assert_includes body, "StandardError"
+      assert_includes body, "<code>show_exceptions</code> setting"
     end
   end
 end

data/test/test_csrf_protection.rb

@@ -6,7 +6,11 @@ describe "Application" do
   describe 'CSRF protection' do
     describe "with CSRF protection on" do
       before do
-        @token = Rack::Protection::AuthenticityToken.random_token rescue "a_token"
+        @token = begin
+                   Rack::Protection::AuthenticityToken.random_token
+                 rescue StandardError
+                   "a_token"
+                 end
         mock_app do
           enable :sessions
           enable :protect_from_csrf
@@ -142,7 +146,11 @@ describe "Application" do
 
     describe "with custom protection options" do
       before do
-        @token = Rack::Protection::AuthenticityToken.random_token rescue "a_token"
+        @token = begin
+                   Rack::Protection::AuthenticityToken.random_token
+                 rescue StandardError
+                   "a_token"
+                 end
         mock_app do
           enable :sessions
           set :protect_from_csrf, :authenticity_param => 'foobar', :message => 'sucker!'

data/test/test_dependencies.rb

@@ -26,7 +26,7 @@ describe "Dependencies" do
         end
       end
       assert_equal 1, D
-      assert_match /RuntimeError - SomeThing/, @io.string
+      assert_match(/RuntimeError - SomeThing/, @io.string)
     end
 
     it 'should resolve dependency problems' do
@@ -60,7 +60,7 @@ describe "Dependencies" do
           Padrino::Reloader.exclude << Padrino.root("fixtures/dependencies/linear/h.rb")
           Padrino.require_dependencies(
             Padrino.root("fixtures/dependencies/linear/h.rb"),
-            Padrino.root("fixtures/dependencies/linear/i.rb"),
+            Padrino.root("fixtures/dependencies/linear/i.rb")
           )
         end
       end
@@ -102,7 +102,7 @@ describe "Dependencies" do
         assert_equal "hello", RRR.hello
         assert_equal "hello", OOO.hello
         assert_equal "hello", RollbackTarget.hello
-        assert_match /Removed constant RollbackTarget from Object/, @io.string
+        assert_match(/Removed constant RollbackTarget from Object/, @io.string)
       end
     end
   end

data/test/test_flash.rb

@@ -66,7 +66,7 @@ describe Padrino::Flash do
     end
   end
 
-  routes = Proc.new do
+  routes = proc do
     get :index do
       params[:key] ? flash[params[:key].to_sym].to_s : flash.now.inspect
     end

data/test/test_locale.rb

@@ -1,7 +1,7 @@
 require File.expand_path(File.dirname(__FILE__) + '/helper')
 
 describe "Locales" do
-  Dir[File.expand_path("../../lib/padrino-core/locale/*.yml", __FILE__)].each do |file|
+  Dir[File.expand_path('../lib/padrino-core/locale/*.yml', __dir__)].each do |file|
     base_original = YAML.load_file(file)
     name = File.basename(file, '.yml')
     it "should should have correct locale for #{name}" do

data/test/test_logger.rb

@@ -75,11 +75,11 @@ describe "PadrinoLogger" do
     it 'should respond to #write for Rack::CommonLogger' do
       setup_logger(:log_level => :error)
       @logger.error "Error message"
-      assert_match /Error message/, @log.string
+      assert_match(/Error message/, @log.string)
       @logger << "logged anyways"
-      assert_match /logged anyways/, @log.string
+      assert_match(/logged anyways/, @log.string)
       @logger.write "log via alias"
-      assert_match /log via alias/, @log.string
+      assert_match(/log via alias/, @log.string)
     end
 
     it 'should not blow up on mixed or broken encodings' do
@@ -89,8 +89,8 @@ describe "PadrinoLogger" do
       @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)
+      assert_includes @log.string, utf8_data
+      assert_includes @log.string.force_encoding('BINARY'), binary_data
     end
 
     it 'should sanitize mixed or broken encodings if said so' do
@@ -102,8 +102,7 @@ describe "PadrinoLogger" do
       @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))
+      assert_match(/\.*фыв/m, @log.string.encode(Encoding.default_external))
     end
 
     it 'should log an application' do
@@ -113,7 +112,7 @@ describe "PadrinoLogger" do
       end
       get "/"
       assert_equal "Foo", body
-      assert_match /GET/, Padrino.logger.log.string
+      assert_match(/GET/, Padrino.logger.log.string)
     end
 
     it 'should log an application\'s status code' do
@@ -122,7 +121,7 @@ describe "PadrinoLogger" do
         get("/"){ "Foo" }
       end
       get "/"
-      assert_match /\e\[1;9m200\e\[0m OK/, Padrino.logger.log.string
+      assert_match(/\e\[1;9m200\e\[0m OK/, Padrino.logger.log.string)
     end
 
     describe "static asset logging" do
@@ -144,7 +143,7 @@ describe "PadrinoLogger" do
         end
         get "/images/something.png"
         assert_equal "Foo", body
-        assert_match /GET/, Padrino.logger.log.string
+        assert_match(/GET/, Padrino.logger.log.string)
         Padrino.logger.instance_eval{ @log_static = false }
       end
     end
@@ -161,11 +160,11 @@ describe "PadrinoLogger" do
       it 'should output under debug level' do
         Padrino.logger.instance_eval{ @level = Padrino::Logger::Levels[:debug] }
         access_to_mock_app
-        assert_match /\e\[0;36m  DEBUG\e\[0m/, Padrino.logger.log.string
+        assert_match(/\e\[0;36m  DEBUG\e\[0m/, Padrino.logger.log.string)
 
         Padrino.logger.instance_eval{ @level = Padrino::Logger::Levels[:devel] }
         access_to_mock_app
-        assert_match /\e\[0;36m  DEBUG\e\[0m/, Padrino.logger.log.string
+        assert_match(/\e\[0;36m  DEBUG\e\[0m/, Padrino.logger.log.string)
       end
 
       it 'should not output over debug level' do
@@ -208,7 +207,7 @@ describe "alternate logger" do
   it 'should annotate the logger to support additional Padrino fancyness' do
     Padrino.logger.debug("Debug message")
     assert_match(/Debug message/, @log.string)
-    Padrino.logger.exception(Exception.new 'scary message')
+    Padrino.logger.exception(Exception.new('scary message'))
     assert_match(/Exception - scary message/, @log.string)
   end
 
@@ -221,7 +220,7 @@ describe "alternate logger" do
     end
     get "/"
 
-    assert_match /\e\[1;9m200\e\[0m OK/, @log.string
+    assert_match(/\e\[1;9m200\e\[0m OK/, @log.string)
   end
 end
 
@@ -273,7 +272,7 @@ describe "alternate logger: stdlib logger" do
     end
     get "/"
 
-    assert_match /\e\[1;9m200\e\[0m OK/, @log.string
+    assert_match(/\e\[1;9m200\e\[0m OK/, @log.string)
   end
 end
 
@@ -305,7 +304,7 @@ describe "options :colorize_logging" do
       Padrino::Logger.setup!
 
       access_to_mock_app
-      assert_match /\e\[1;9m200\e\[0m OK/, Padrino.logger.log.string
+      assert_match(/\e\[1;9m200\e\[0m OK/, Padrino.logger.log.string)
     end
   end
 
@@ -317,7 +316,7 @@ describe "options :colorize_logging" do
 
     it 'should not use colorize logging' do
       access_to_mock_app
-      assert_match /200 OK/, Padrino.logger.log.string
+      assert_match(/200 OK/, Padrino.logger.log.string)
     end
   end
 end
@@ -335,34 +334,34 @@ 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:#{__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
+    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
+    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
+    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
+    assert_match(/hello vendor/, Padrino.logger.log.string)
+    refute_match(/\[.+?\] hello vendor/, Padrino.logger.log.string)
   end
 end

data/test/test_mounter.rb

@@ -92,7 +92,7 @@ describe "Mounter" do
     end
 
     it 'should raise error when app has no located file' do
-      # TODO enabling this screws minitest
+      # TODO: enabling this screws minitest
       # assert_raises(Padrino::Mounter::MounterException) { Padrino.mount("tester_app").to('/test') }
       assert_equal 0, Padrino.mounted_apps.size
     end
@@ -229,7 +229,7 @@ describe "Mounter" do
     it 'should not clobber the public setting when mounting an app' do
       class ::PublicApp < Padrino::Application
         set :root, "/root"
-        set :public_folder, File.expand_path(File.dirname(__FILE__))
+        set :public_folder, __dir__
       end
 
       Padrino.mount("public_app").to("/public")
@@ -269,7 +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
+      assert_empty RackApp.prerequisites
     end
 
     it 'should support the Rack Application with cascading style' do

data/test/test_params_protection.rb

@@ -36,7 +36,7 @@ describe "Padrino::ParamsProtection" do
   it 'should work with recursive data' do
     result = nil
     mock_app do
-      post :basic, :params => [ :name, :child => [ :name, :child => [ :name ] ] ] do
+      post :basic, :params => [ :name, {:child => [ :name, {:child => [ :name ]} ]} ] do
         result = [params, original_params]
         ''
       end
@@ -54,7 +54,7 @@ describe "Padrino::ParamsProtection" do
   it 'should be able to process the data' do
     result = nil
     mock_app do
-      post :basic, :params => [ :name, :position => proc{ |v| 'anti-'+v } ] do
+      post :basic, :params => [ :name, {:position => proc{ |v| 'anti-'+v }} ] do
         result = params
         ''
       end
@@ -142,7 +142,7 @@ describe "Padrino::ParamsProtection" do
     post '/persons/destroy/1?' + @jack_query
     assert_equal({"id"=>"1"}, result)
     get '/noparam?a=1;b=2'
-    assert_equal({}, result)
+    assert_empty(result)
   end
 
   it 'should successfully filter hashes' do
@@ -165,7 +165,7 @@ describe "Padrino::ParamsProtection" do
         ''
       end
     end
-    post '/family?' + Padrino::Utils.build_uri_query(:names => %w{Jack Kim Teri})
+    post '/family?' + Padrino::Utils.build_uri_query(:names => %w[Jack Kim Teri])
     assert_equal({"names" => %w[Jack Kim Teri]}, result)
   end
 
@@ -190,6 +190,6 @@ describe "Padrino::ParamsProtection" do
       end
     end
     post '/i?gotta=go'
-    assert_equal({}, result)
+    assert_empty(result)
   end
 end

data/test/test_reloader_simple.rb

@@ -32,13 +32,13 @@ describe "SimpleReloader" do
       assert_equal 200, status
       get "/__sinatra__/404.png"
       assert_equal 200, status
-      assert_match /image\/png/, response["Content-Type"]
+      assert_match(/image\/png/, response["Content-Type"])
       @app.reset_routes!
       get "/"
       assert_equal 404, status
       get "/__sinatra__/404.png"
       assert_equal 200, status
-      assert_match /image\/png/, response["Content-Type"]
+      assert_match(/image\/png/, response["Content-Type"])
     end
   end
 

data/test/test_reloader_storage.rb

@@ -22,7 +22,7 @@ describe "Padrino::Reloader::Storage" do
 
       assert_equal (klasses.size > 1), true
       klasses.each do |klass|
-        assert_match /^Padrino::/, klass.to_s
+        assert_match(/^Padrino::/, klass.to_s)
       end
     end
   end

data/test/test_routing.rb

@@ -1,4 +1,3 @@
-#encoding: utf-8
 require File.expand_path(File.dirname(__FILE__) + '/helper')
 
 class FooError < RuntimeError; end
@@ -67,7 +66,7 @@ describe "Routing" do
     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')
+    assert_includes response.headers, 'Last-Modified'
   end
 
   it 'should ignore trailing delimiters for basic route' do
@@ -146,12 +145,12 @@ describe "Routing" do
 
   it 'should accept regexp routes' do
     mock_app do
-      get(%r./fob|/baz.) { "regexp" }
+      get(%r{/fob|/baz}) { "regexp" }
       get("/foo")        { "str" }
-      get %r./([0-9]+)/. do |num|
+      get %r{/([0-9]+)/} do |num|
         "Your lucky number: #{num} #{params[:captures].first}"
       end
-      get %r./page/([0-9]+)|/. do |num|
+      get %r{/page/([0-9]+)|/} do |num|
         "My lucky number: #{num} #{params[:captures].first}"
       end
     end
@@ -169,7 +168,7 @@ describe "Routing" do
 
   it 'should ignore trailing slashes' do
     mock_app do
-      get(%r./trailing.) { "slash" }
+      get(%r{/trailing}) { "slash" }
     end
     get "/trailing"
     assert_equal "slash", body
@@ -306,7 +305,7 @@ describe "Routing" do
       post(:foo, '', :with => :id){ |id| "/#{id}" }
       delete(:drugs, :with => [:id, 'destroy']){ |id| "/drugs/#{id}/destroy" }
       delete(:drugs, '', :with => [:id, 'destroy']){ |id| "/#{id}/destroy" }
-      get(:splatter, "/splatter/*/*"){ |a, b| url(:splatter, :splat => ["123", "456"])  }
+      get(:splatter, "/splatter/*/*"){ |_a, _b| url(:splatter, :splat => ["123", "456"])  }
     end
     get "/foo"
     assert_equal "/foo", body
@@ -519,7 +518,7 @@ describe "Routing" do
 
   it 'should send the appropriate number of params' do
     mock_app do
-      get('/id/:user_id', :provides => [:json]) { |user_id, format| user_id}
+      get('/id/:user_id', :provides => [:json]) { |user_id, _format| user_id}
     end
     get '/id/5.json'
     assert_equal '5', body
@@ -766,7 +765,7 @@ describe "Routing" do
     assert_equal "js", body
     get "/b"
     assert_equal "any", body
-    # TODO randomly fails in minitest :(
+    # TODO: randomly fails in minitest :(
     # assert_raises(RuntimeError) { get "/b.foo" }
     get "/c"
     assert_equal 200, status
@@ -1009,7 +1008,7 @@ describe "Routing" do
         id
       end
 
-      get 'format/:id', :provides => [:json, :html] do |id, format|
+      get 'format/:id', :provides => [:json, :html] do |_id, format|
         format
       end
     end
@@ -1958,7 +1957,7 @@ describe "Routing" do
     counter = 0
 
     mock_app do
-      self.class.send(:define_method, :increment!) do |*args|
+      self.class.send(:define_method, :increment!) do |*_args|
         condition { counter += 1 }
       end
 
@@ -2142,7 +2141,7 @@ describe "Routing" do
     end
     get "/"
     assert_equal 404, status
-    assert_match /not found/, body
+    assert_match(/not found/, body)
   end
 
   it 'should render a custom 404 page using not_found' do
@@ -2246,7 +2245,7 @@ describe "Routing" do
       end
     end
     get "/say/hello/to/world"
-    assert_equal %Q[["hello", "world"]], body
+    assert_equal %(["hello", "world"]), body
   end
 
   it "should recognize the route containing splat params if path is ended with slash" do
@@ -2340,7 +2339,7 @@ describe "Routing" do
     env = Rack::MockRequest.env_for("/mock_sample")
     assert_equal :mock_sample, @app.router.recognize(env).first.name
     env = Rack::MockRequest.env_for("/invalid")
-    assert_equal [], @app.router.recognize(env)
+    assert_empty @app.router.recognize(env)
   end
 
   it "should be able to use params after sending request" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: padrino-core
 version: !ruby/object:Gem::Version
-  version: 0.15.3
+  version: 0.16.0.pre2
 platform: ruby
 authors:
 - Padrino Team
@@ -11,7 +11,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-02-25 00:00:00.000000000 Z
+date: 2024-08-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: padrino-support
@@ -19,28 +19,42 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.15.3
+        version: 0.16.0.pre2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.15.3
+        version: 0.16.0.pre2
+- !ruby/object:Gem::Dependency
+  name: rackup
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.1'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.1'
 - !ruby/object:Gem::Dependency
   name: sinatra
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.2.4
+        version: '4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.2.4
+        version: '4'
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement
@@ -203,11 +217,11 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: 1.3.6
+      version: 1.3.1
 requirements: []
-rubygems_version: 3.0.8
+rubygems_version: 3.2.3
 signing_key:
 specification_version: 4
 summary: The required Padrino core gem