padrino-core 0.15.0 → 0.15.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5520efda2e9601c24dc69dbb5cb9bdb80cf27e615067349e29182c0dea990ea8
-  data.tar.gz: a7051cfec9da81eda972e3d15c0d7fd8a740d06edb7ac4fc6626d66d33c9bf18
+  metadata.gz: 936bbc8899b2e4f9d72e9bc438d3a645c7caa27d90a87a3076bf612ce2081266
+  data.tar.gz: 391dd038f7b3c928bb141bbdf583a5e01b9b9a08528c05cc957378369cb6cc35
 SHA512:
-  metadata.gz: d671957c0b9c0812edfc15e25a0b6c55b161b3cfc0f7f6333095b5a854d2f5a322230bc8b5963e0a2d8e799f8776a98f53ac04f5e89a298fef202c5cdc80e378
-  data.tar.gz: b60663258c732efbd194056184ff26328c6cf23c0800d46b13701f3a7bb8a3bc78c6b20772fa25bd834bfd83d94b8146ae9e4420c6aa77d43359fd001ff99f96
+  metadata.gz: 62a09f99b3330e75cf04caea5b69beae228fe9f65b7254ba292e3327c9620b6bf9806fd2a7ca1059890f53c4e653a76835ecc826e1a4dd9d185446686f8ad628
+  data.tar.gz: 6ea735209558b4f7579ebde9004437b980e61af0e77cc898bad8d331d13f31c93a477e3c18e54158dd3a447600b0cbd05deb769c22b6b2af911bc5e88e4183e4

data/lib/padrino-core/application.rb

@@ -29,13 +29,16 @@ module Padrino
     class << self
       def inherited(base)
         begun_at = Time.now
-        CALLERS_TO_IGNORE.concat(PADRINO_IGNORE_CALLERS)
         super(base)
         base.prerequisites.replace(self.prerequisites.dup)
         base.default_configuration!
         logger.devel :setup, begun_at, base
       end
 
+      def callers_to_ignore
+        @callers_to_ignore ||= super + PADRINO_IGNORE_CALLERS
+      end
+
       ##
       # Reloads the application files from all defined load paths.
       #

data/lib/padrino-core/logger.rb

@@ -22,19 +22,28 @@ module Padrino
   # Set the padrino logger.
   #
   # @param [Object] value
-  #   an object that respond to <<, write, puts, debug, warn etc..
+  #   an object that respond to <<, write, puts, debug, warn, devel, etc..
   #
   # @return [Object]
   #   The given value.
   #
   # @example using ruby default logger
   #   require 'logger'
-  #   Padrino.logger = Logger.new(STDOUT)
+  #   new_logger = ::Logger.new(STDOUT)
+  #   new_logger.extend(Padrino::Logger::Extensions)
+  #   Padrino.logger = new_logger
   #
   # @example using ActiveSupport
   #   require 'active_support/buffered_logger'
   #   Padrino.logger = Buffered.new(STDOUT)
   #
+  # @example using custom logger class
+  #   require 'logger'
+  #   class CustomLogger < ::Logger
+  #     include Padrino::Logger::Extensions
+  #   end
+  #   Padrino.logger = CustomLogger.new(STDOUT)
+  #
   def self.logger=(value)
     Padrino::Logger.logger = value
   end

data/lib/padrino-core/path_router.rb

@@ -58,8 +58,10 @@ module Padrino
         params = args.last.is_a?(Hash) ? args.pop : {}
         candidates = @routes.select { |route| route.name == name }
         fail InvalidRouteException if candidates.empty?
+        i = 0
         route = candidates.sort_by! { |candidate|
-          (params.keys.map(&:to_s) - candidate.matcher.names).length }.shift
+          # Tries to find the route that matches more, but with fewer names, in stable order
+          [(params.keys.map(&:to_s) - candidate.matcher.names).length, candidate.matcher.names.size, i += 1] }.shift
         matcher = route.matcher
         params_for_expand = params.dup
         if !args.empty? && matcher.mustermann?

data/lib/padrino-core/version.rb

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

data/padrino-core.gemspec

@@ -23,6 +23,6 @@ Gem::Specification.new do |s|
   s.rdoc_options  = ["--charset=UTF-8"]
 
   s.add_dependency("padrino-support", Padrino.version)
-  s.add_dependency("sinatra", ">= 2.0.0")
-  s.add_dependency("thor", "~> 0.18")
+  s.add_dependency("sinatra", ">= 2.2.4")
+  s.add_dependency("thor", "~> 1.0")
 end

data/test/test_application.rb

@@ -51,7 +51,7 @@ describe "Application" do
     end
 
     it 'should have shared sessions accessible in project' do
-      Padrino.configure_apps { enable :sessions; set :session_secret, 'secret' }
+      Padrino.configure_apps { enable :sessions; set :session_secret, PadrinoTestApp2.session_secret }
       Padrino.mount("PadrinoTestApp").to("/write")
       Padrino.mount("PadrinoTestApp2").to("/read")
       PadrinoTestApp.send :default_configuration!

data/test/test_routing.rb

@@ -96,6 +96,17 @@ describe "Routing" do
     assert_equal "/1234.json?baz=baz", @app.url_for(:index, :id => "1234", :format => "json", :baz => "baz")
   end
 
+  it 'should recognize route even if paths are duplicated, in reverse order' do
+    mock_app do
+      get(:index, :with => :id, :provides => :json) {}
+      get(:index, :with => :id) {}
+      get(:index) {}
+    end
+    assert_equal "/", @app.url_for(:index)
+    assert_equal "/1234", @app.url_for(:index, :id => "1234")
+    assert_equal "/1234.json?baz=baz", @app.url_for(:index, :id => "1234", :format => "json", :baz => "baz")
+  end
+
   it 'should fail with unrecognized route exception when not found' do
     mock_app do
       get(:index){ "okey" }
@@ -192,7 +203,7 @@ describe "Routing" do
     mock_app do
       get('/щч') { 'success!' }
     end
-    get(URI.escape('/щч'))
+    get('/' + CGI.escape('щч'))
     assert_equal 'success!', body
   end
 
@@ -2122,7 +2133,7 @@ describe "Routing" do
     mock_app { set :environment, :development }
     get "/"
     assert_equal 404, status
-    assert_match %r{GET /}, body
+    assert_match %r{Not Found}, body
   end
 
   it 'should render a custom NotFound page' do

metadata

@@ -1,17 +1,17 @@
 --- !ruby/object:Gem::Specification
 name: padrino-core
 version: !ruby/object:Gem::Version
-  version: 0.15.0
+  version: 0.15.2
 platform: ruby
 authors:
 - Padrino Team
 - Nathan Esquenazi
 - Davide D'Agostino
 - Arthur Chiu
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-05-14 00:00:00.000000000 Z
+date: 2022-12-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: padrino-support
@@ -19,42 +19,42 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.15.0
+        version: 0.15.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.15.0
+        version: 0.15.2
 - !ruby/object:Gem::Dependency
   name: sinatra
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: 2.2.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: 2.2.4
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.18'
+        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.18'
+        version: '1.0'
 description: The Padrino core gem required for use of this framework
 email: padrinorb@gmail.com
 executables:
@@ -191,7 +191,7 @@ homepage: http://www.padrinorb.com
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options:
 - "--charset=UTF-8"
 require_paths:
@@ -207,8 +207,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: 1.3.6
 requirements: []
-rubygems_version: 3.0.6
-signing_key: 
+rubygems_version: 3.0.8
+signing_key:
 specification_version: 4
 summary: The required Padrino core gem
 test_files: