padrino-core 0.14.4 → 0.15.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d970982e5c919bfa97c39b3898bd59d396681d17c5b9eaf17854667ce52715ff
-  data.tar.gz: 4be78f1700017e77554317d4eeca9f94ccc00a685a1c47f1139e2b80816b80f7
+  metadata.gz: 5520efda2e9601c24dc69dbb5cb9bdb80cf27e615067349e29182c0dea990ea8
+  data.tar.gz: a7051cfec9da81eda972e3d15c0d7fd8a740d06edb7ac4fc6626d66d33c9bf18
 SHA512:
-  metadata.gz: 0cbf8c80aba78a17cab9ff325110d4045eb8363803ce47f94cc8b40b022bdeb3864e0a3804434cb5250c5bcb49df3b92c3577e87945b5c1642bf188d3ba59b7e
-  data.tar.gz: 4fcc0feb28750c7fe358162a7f40d2da0c73147610baa8e61b36d24eda1bc7119e31694178b59fed06a8d9eb865513b3ef250c8f2a5c0849de593b344081a826
+  metadata.gz: d671957c0b9c0812edfc15e25a0b6c55b161b3cfc0f7f6333095b5a854d2f5a322230bc8b5963e0a2d8e799f8776a98f53ac04f5e89a298fef202c5cdc80e378
+  data.tar.gz: b60663258c732efbd194056184ff26328c6cf23c0800d46b13701f3a7bb8a3bc78c6b20772fa25bd834bfd83d94b8146ae9e4420c6aa77d43359fd001ff99f96

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

@@ -19,7 +19,7 @@ module Padrino
       if File.file?(binstub)
         exec Gem.ruby, binstub, *ARGV
       else
-        puts 'Please run `bundler install --binstubs` from your project root to generate bundle-specific executables'
+        puts 'Please run `bundle install --binstubs` from your project root to generate bundle-specific executables'
         exit!
       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, MTIMES) # might call #safe_load recursively
+      Storage.prepare(file) # 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, MTIMES)
+        Storage.rollback(file)
         raise
       end
     end

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

@@ -18,13 +18,12 @@ module Padrino
         files.delete(name)
       end
 
-      def prepare(name, mtimes)
+      def prepare(name)
         file = remove(name)
         @old_entries ||= {}
         @old_entries[name] = {
           :constants => object_classes,
-          :features  => old_features = Set.new($LOADED_FEATURES.dup),
-          :mtimes => mtimes.dup
+          :features  => old_features = Set.new($LOADED_FEATURES.dup)
         }
         features = file && file[:features] || []
         features.each{ |feature| Reloader.safe_load(feature, :force => true) }
@@ -40,11 +39,14 @@ module Padrino
         @old_entries.delete(name)
       end
 
-      def rollback(name, mtimes)
-        new_constants = new_classes(@old_entries[name][:constants]).reject do |constant|
-          newly_commited_constant?(constant, mtimes, @old_entries[name][:mtimes])
+      def rollback(name)
+        new_classes(@old_entries[name][:constants]).each do |klass|
+          loaded_in_name = files.each do |file, data|
+                             next if file == name
+                             break if data[:constants].include?(klass)
+                           end
+          Reloader.remove_constant(klass) if loaded_in_name
         end
-        new_constants.each{ |klass| Reloader.remove_constant(klass) }
         @old_entries.delete(name)
       end
 
@@ -81,26 +83,6 @@ 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/version.rb

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

data/padrino-core.gemspec

@@ -5,7 +5,6 @@ require File.expand_path("../lib/padrino-core/version.rb", __FILE__)
 
 Gem::Specification.new do |s|
   s.name = "padrino-core"
-  s.rubyforge_project = "padrino-core"
   s.authors = ["Padrino Team", "Nathan Esquenazi", "Davide D'Agostino", "Arthur Chiu"]
   s.email = "padrinorb@gmail.com"
   s.summary = "The required Padrino core gem"

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

@@ -0,0 +1,2 @@
+class OOO < RRR
+end

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

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

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

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

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

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

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

@@ -0,0 +1,8 @@
+class RollbackTarget
+  def self.hello
+    "hello"
+  end
+end
+
+class SSS < OOO
+end

data/test/test_dependencies.rb

@@ -76,5 +76,34 @@ describe "Dependencies" do
       end
       assert_equal "hello", M.hello
     end
+
+
+    describe "change log level for :devel" do
+      before do
+        @log_level_devel = Padrino::Logger::Config[:test]
+        @io = StringIO.new
+        Padrino::Logger::Config[:test] = { :log_level => :devel, :stream => @io }
+        Padrino::Logger.setup!
+      end
+
+      after do
+        Padrino::Logger::Config[:test] = @log_level_devel
+        Padrino::Logger.setup!
+      end
+
+      it 'should resolve interdependence by out/in side nested require_dependencies' do
+        capture_io do
+          Padrino.require_dependencies(
+            Padrino.root("fixtures/dependencies/nested/ooo.rb"),
+            Padrino.root("fixtures/dependencies/nested/ppp.rb"),
+            Padrino.root("fixtures/dependencies/nested/qqq.rb")
+          )
+        end
+        assert_equal "hello", RRR.hello
+        assert_equal "hello", OOO.hello
+        assert_equal "hello", RollbackTarget.hello
+        assert_match /Removed constant RollbackTarget from Object/, @io.string
+      end
+    end
   end
 end

data/test/test_routing.rb

@@ -2122,7 +2122,7 @@ describe "Routing" do
     mock_app { set :environment, :development }
     get "/"
     assert_equal 404, status
-    assert_match %r{(Sinatra doesn&rsquo;t know this ditty.|<h1>Not Found</h1>)}, body
+    assert_match %r{GET /}, 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.14.4
+  version: 0.15.0
 platform: ruby
 authors:
 - Padrino Team
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-11-05 00:00:00.000000000 Z
+date: 2020-05-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: padrino-support
@@ -19,14 +19,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.14.4
+        version: 0.15.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.14.4
+        version: 0.15.0
 - !ruby/object:Gem::Dependency
   name: sinatra
   requirement: !ruby/object:Gem::Requirement
@@ -159,6 +159,11 @@ files:
 - test/fixtures/dependencies/nested/l.rb
 - test/fixtures/dependencies/nested/m.rb
 - test/fixtures/dependencies/nested/n.rb
+- test/fixtures/dependencies/nested/ooo.rb
+- test/fixtures/dependencies/nested/ppp.rb
+- test/fixtures/dependencies/nested/qqq.rb
+- test/fixtures/dependencies/nested/rrr.rb
+- test/fixtures/dependencies/nested/sss.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
@@ -202,9 +207,85 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: 1.3.6
 requirements: []
-rubyforge_project: padrino-core
-rubygems_version: 2.7.8
+rubygems_version: 3.0.6
 signing_key: 
 specification_version: 4
 summary: The required Padrino core gem
-test_files: []
+test_files:
+- test/fixtures/app_gem/Gemfile
+- test/fixtures/app_gem/app/app.rb
+- test/fixtures/app_gem/app_gem.gemspec
+- test/fixtures/app_gem/lib/app_gem.rb
+- test/fixtures/app_gem/lib/app_gem/version.rb
+- test/fixtures/apps/complex.rb
+- test/fixtures/apps/concerned/app.rb
+- test/fixtures/apps/concerned/models/mixins/badmodule.rb
+- test/fixtures/apps/custom_dependencies/custom_dependencies.rb
+- test/fixtures/apps/custom_dependencies/my_dependencies/my_dependency.rb
+- test/fixtures/apps/demo_app.rb
+- test/fixtures/apps/demo_demo.rb
+- test/fixtures/apps/demo_project/api/app.rb
+- test/fixtures/apps/demo_project/api/lib/api_lib.rb
+- test/fixtures/apps/demo_project/app.rb
+- test/fixtures/apps/external_apps/fake_lib.rb
+- test/fixtures/apps/external_apps/fake_root.rb
+- test/fixtures/apps/helpers/class_methods_helpers.rb
+- test/fixtures/apps/helpers/instance_methods_helpers.rb
+- test/fixtures/apps/helpers/system_helpers.rb
+- test/fixtures/apps/kiq.rb
+- test/fixtures/apps/lib/myklass.rb
+- test/fixtures/apps/lib/myklass/mysubklass.rb
+- test/fixtures/apps/models/child.rb
+- test/fixtures/apps/models/parent.rb
+- test/fixtures/apps/mountable_apps/rack_apps.rb
+- test/fixtures/apps/mountable_apps/static.html
+- test/fixtures/apps/precompiled_app.rb
+- test/fixtures/apps/simple.rb
+- test/fixtures/apps/static.rb
+- test/fixtures/apps/stealthy/app.rb
+- test/fixtures/apps/stealthy/helpers/stealthy_class_helpers.rb
+- test/fixtures/apps/system.rb
+- test/fixtures/apps/system_class_methods_demo.rb
+- test/fixtures/apps/system_instance_methods_demo.rb
+- test/fixtures/dependencies/a.rb
+- test/fixtures/dependencies/b.rb
+- test/fixtures/dependencies/c.rb
+- test/fixtures/dependencies/circular/e.rb
+- test/fixtures/dependencies/circular/f.rb
+- test/fixtures/dependencies/circular/g.rb
+- 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/dependencies/nested/ooo.rb
+- test/fixtures/dependencies/nested/ppp.rb
+- test/fixtures/dependencies/nested/qqq.rb
+- test/fixtures/dependencies/nested/rrr.rb
+- test/fixtures/dependencies/nested/sss.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
+- test/helper.rb
+- test/test_application.rb
+- test/test_configuration.rb
+- test/test_core.rb
+- test/test_csrf_protection.rb
+- test/test_dependencies.rb
+- test/test_filters.rb
+- test/test_flash.rb
+- test/test_locale.rb
+- test/test_logger.rb
+- test/test_mounter.rb
+- test/test_params_protection.rb
+- test/test_reloader_complex.rb
+- test/test_reloader_external.rb
+- test/test_reloader_simple.rb
+- test/test_reloader_storage.rb
+- test/test_reloader_system.rb
+- test/test_restful_routing.rb
+- test/test_router.rb
+- test/test_routing.rb