padrino-core 0.14.2 → 0.14.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 55469df6bfe7c7ffb26bb239433a9f76b3096a34
-  data.tar.gz: 9f5711bd6b352aa64fd1fd4e744f8028dfce6f98
+SHA256:
+  metadata.gz: d970982e5c919bfa97c39b3898bd59d396681d17c5b9eaf17854667ce52715ff
+  data.tar.gz: 4be78f1700017e77554317d4eeca9f94ccc00a685a1c47f1139e2b80816b80f7
 SHA512:
-  metadata.gz: 84f5833bf11cd189aaa0c08c921c21594acca9e7afed57e47fae5a551f4f263cfe445b44009bca6eb69b8f4e69878a9d286d30e0913eab627f2c8a8d5ff117a3
-  data.tar.gz: 15726f751b0d60914c96637b3493b78ace6c02b8e8e1a0d68b7dc0fe002b5a2d864dc2b0d36a541d2979c9c782111aedb854ba9235b6f75d2a39dc9317bccf83
+  metadata.gz: 0cbf8c80aba78a17cab9ff325110d4045eb8363803ce47f94cc8b40b022bdeb3864e0a3804434cb5250c5bcb49df3b92c3577e87945b5c1642bf188d3ba59b7e
+  data.tar.gz: 4fcc0feb28750c7fe358162a7f40d2da0c73147610baa8e61b36d24eda1bc7119e31694178b59fed06a8d9eb865513b3ef250c8f2a5c0849de593b344081a826

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

@@ -929,10 +929,8 @@ module Padrino
       end
 
       def dispatch!
-        unless @params
-          @params = defined?(Sinatra::IndifferentHash) ? Sinatra::IndifferentHash[@request.params] : indifferent_params(@request.params)
-          force_encoding(@params)
-        end
+        @params = defined?(Sinatra::IndifferentHash) ? Sinatra::IndifferentHash[@request.params] : indifferent_params(@request.params)
+        force_encoding(@params)
         invoke do
           static! if settings.static? && (request.get? || request.head?)
           route!

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

@@ -21,7 +21,7 @@ module Padrino
       def match(pattern)
         if match_data = handler.match(pattern)
           match_data
-        elsif mustermann? && pattern != "/" && pattern.end_with?("/")
+        elsif pattern != "/" && pattern.end_with?("/")
           handler.match(pattern[0..-2])
         end
       end

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

@@ -18,12 +18,13 @@ module Padrino
         files.delete(name)
       end
 
-      def prepare(name)
+      def prepare(name, mtimes)
         file = remove(name)
         @old_entries ||= {}
         @old_entries[name] = {
           :constants => object_classes,
-          :features  => old_features = Set.new($LOADED_FEATURES.dup)
+          :features  => old_features = Set.new($LOADED_FEATURES.dup),
+          :mtimes => mtimes.dup
         }
         features = file && file[:features] || []
         features.each{ |feature| Reloader.safe_load(feature, :force => true) }
@@ -39,8 +40,10 @@ module Padrino
         @old_entries.delete(name)
       end
 
-      def rollback(name)
-        new_constants = new_classes(@old_entries[name][:constants])
+      def rollback(name, mtimes)
+        new_constants = new_classes(@old_entries[name][:constants]).reject do |constant|
+          newly_commited_constant?(constant, mtimes, @old_entries[name][:mtimes])
+        end
         new_constants.each{ |klass| Reloader.remove_constant(klass) }
         @old_entries.delete(name)
       end
@@ -78,6 +81,26 @@ module Padrino
           snapshot.include?(klass) ? nil : klass
         end
       end
+
+      ##
+      # Returns true if and only if constant is commited after prepare
+      #
+      def newly_commited_constant?(constant, mtimes, old_mtimes)
+        newly_commited_files(files, mtimes, old_mtimes).each do |_, entry|
+          return true if entry[:constants].include?(constant)
+        end
+        false
+      end
+
+      ##
+      # Returns a list of entries in "files" that is commited after prepare
+      #
+      def newly_commited_files(files, mtimes, old_mtimes)
+        files.select do |file, _|
+          next true unless old_mtimes[file]
+          old_mtimes[file] < mtimes[file]
+        end
+      end
     end
   end
 end

data/lib/padrino-core/reloader.rb

@@ -90,7 +90,7 @@ module Padrino
       return unless options[:force] || file_changed?(file)
       return require(file) if feature_excluded?(file)
 
-      Storage.prepare(file) # might call #safe_load recursively
+      Storage.prepare(file, MTIMES) # might call #safe_load recursively
       logger.devel(file_new?(file) ? :loading : :reload, began_at, file)
       begin
         with_silence{ require(file) }
@@ -101,7 +101,7 @@ module Padrino
           logger.exception exception, :short
           logger.error "Failed to load #{file}; removing partially defined constants"
         end
-        Storage.rollback(file)
+        Storage.rollback(file, MTIMES)
         raise
       end
     end

data/lib/padrino-core/version.rb

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

data/padrino-core.gemspec

@@ -24,8 +24,6 @@ Gem::Specification.new do |s|
   s.rdoc_options  = ["--charset=UTF-8"]
 
   s.add_dependency("padrino-support", Padrino.version)
-  s.add_dependency("sinatra", ">= 1.4.6")
-  s.add_dependency("mustermann19")
+  s.add_dependency("sinatra", ">= 2.0.0")
   s.add_dependency("thor", "~> 0.18")
-  s.add_dependency("rack-protection", ">= 1.5.0")
 end

data/test/fixtures/dependencies/nested/j.rb

@@ -0,0 +1,2 @@
+class J < K
+end

data/test/fixtures/dependencies/nested/k.rb

@@ -0,0 +1,2 @@
+class K
+end

data/test/fixtures/dependencies/nested/l.rb

@@ -0,0 +1,4 @@
+Padrino.require_dependencies(
+  Padrino.root("fixtures/dependencies/nested/m.rb"),
+  Padrino.root("fixtures/dependencies/nested/n.rb")
+)

data/test/fixtures/dependencies/nested/m.rb

@@ -0,0 +1,5 @@
+class M
+  def self.hello
+    "hello"
+  end
+end

data/test/fixtures/dependencies/nested/n.rb

@@ -0,0 +1,2 @@
+class N < J
+end

data/test/test_dependencies.rb

@@ -65,5 +65,16 @@ describe "Dependencies" do
         end
       end
     end
+
+    it 'should not remove constants that are newly commited in nested require_dependencies' do
+      capture_io do
+        Padrino.require_dependencies(
+          Padrino.root("fixtures/dependencies/nested/j.rb"),
+          Padrino.root("fixtures/dependencies/nested/k.rb"),
+          Padrino.root("fixtures/dependencies/nested/l.rb")
+        )
+      end
+      assert_equal "hello", M.hello
+    end
   end
 end

data/test/test_routing.rb

@@ -156,6 +156,16 @@ describe "Routing" do
     assert_equal "My lucky number: 99 99", body
   end
 
+  it 'should ignore trailing slashes' do
+    mock_app do
+      get(%r./trailing.) { "slash" }
+    end
+    get "/trailing"
+    assert_equal "slash", body
+    get "/trailing/"
+    assert_equal "slash", body
+  end
+
   it 'should accept regexp routes with generate with :generate_with' do
     mock_app do
       get(%r{/fob|/baz}, :name => :foo, :generate_with => '/fob') { "regexp" }
@@ -2255,7 +2265,6 @@ describe "Routing" do
   end
 
   it "should support named captures like %r{/hello/(?<person>[^/?#]+)} on Ruby >= 1.9" do
-    next if RUBY_VERSION < '1.9'
     mock_app do
       get Regexp.new('/hello/(?<person>[^/?#]+)') do
         "Hello #{params['person']}"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: padrino-core
 version: !ruby/object:Gem::Version
-  version: 0.14.2
+  version: 0.14.4
 platform: ruby
 authors:
 - Padrino Team
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-01-02 00:00:00.000000000 Z
+date: 2018-11-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: padrino-support
@@ -19,42 +19,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.14.2
+        version: 0.14.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.14.2
+        version: 0.14.4
 - !ruby/object:Gem::Dependency
   name: sinatra
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.4.6
+        version: 2.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.4.6
-- !ruby/object:Gem::Dependency
-  name: mustermann19
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.0.0
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement
@@ -69,20 +55,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.18'
-- !ruby/object:Gem::Dependency
-  name: rack-protection
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.5.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.5.0
 description: The Padrino core gem required for use of this framework
 email: padrinorb@gmail.com
 executables:
@@ -182,6 +154,11 @@ files:
 - test/fixtures/dependencies/d.rb
 - test/fixtures/dependencies/linear/h.rb
 - test/fixtures/dependencies/linear/i.rb
+- test/fixtures/dependencies/nested/j.rb
+- test/fixtures/dependencies/nested/k.rb
+- test/fixtures/dependencies/nested/l.rb
+- test/fixtures/dependencies/nested/m.rb
+- test/fixtures/dependencies/nested/n.rb
 - test/fixtures/reloadable_apps/external/app/app.rb
 - test/fixtures/reloadable_apps/external/app/controllers/base.rb
 - test/fixtures/reloadable_apps/main/app.rb
@@ -226,7 +203,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.6
 requirements: []
 rubyforge_project: padrino-core
-rubygems_version: 2.6.12
+rubygems_version: 2.7.8
 signing_key: 
 specification_version: 4
 summary: The required Padrino core gem