padrino-core 0.15.1 → 0.15.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 34666b69f252023ab8f1a972e23b14c060e4219834ad088dd13f04987087c700
-  data.tar.gz: dec853c3b9402dec32d39470da681522cc65245bf4e838c10893cd9a30b40310
+  metadata.gz: 936bbc8899b2e4f9d72e9bc438d3a645c7caa27d90a87a3076bf612ce2081266
+  data.tar.gz: 391dd038f7b3c928bb141bbdf583a5e01b9b9a08528c05cc957378369cb6cc35
 SHA512:
-  metadata.gz: e71c9a7c41a7ed7b28c9668424dd6757fed139b39ec4b481b1403328664ffd57446912665c90f66a60cc4ca6b36a483346ef6d83137c5fb395f5aae319764a7a
-  data.tar.gz: d7f454ef23ab20bfc18a4f041a8b7561ff6952da095549ff35919dcbb9395b0ab0a51e053af1d4bf533878c4c3ff0efcdc7408a8e6031795191a84510f3b4ed5
+  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/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.1' 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("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,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: padrino-core
 version: !ruby/object:Gem::Version
-  version: 0.15.1
+  version: 0.15.2
 platform: ruby
 authors:
 - Padrino Team
@@ -11,7 +11,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-04-25 00:00:00.000000000 Z
+date: 2022-12-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: padrino-support
@@ -19,28 +19,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.15.1
+        version: 0.15.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.15.1
+        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