[Padrino loader] configはrollback対象外とnested require_dependencies直す差分を取り組みます

padrino-core/lib/padrino-core/loader.rb

@@ -129,8 +129,9 @@ def loaded?
     #   require_dependencies("#{Padrino.root}/lib/**/*.rb")
     #
     def require_dependencies(*paths)
-      options = paths.extract_options!.merge( :cyclic => true )
-      files = paths.flatten.map{ |path| Dir.glob(path).sort_by{ |filename| filename.count('/') } }.flatten.uniq
+      options = { :cyclic => true }.update(paths.last.is_a?(Hash) ? paths.pop : {})
+
+      files = paths.flatten.flat_map{ |path| Dir.glob(path).sort_by{ |filename| filename.count('/') } }.uniq
 
       until files.empty?
         error, fatal, loaded = nil, nil, nil
@@ -141,6 +142,7 @@ def require_dependencies(*paths)
             files.delete(file)
             loaded = true
           rescue NameError, LoadError => error
+            raise if Reloader.exclude.any?{ |path| file.start_with?(path) } || options[:cyclic] == false
             logger.devel "Cyclic dependency reload for #{error.class}: #{error.message}"
           rescue Exception => fatal
             break

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

@@ -41,7 +41,13 @@ def commit(name)
 
       def rollback(name)
         new_constants = ObjectSpace.new_classes(@old_entries[name][:constants])
-        new_constants.each{ |klass| Reloader.remove_constant(klass) }
+        new_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
         @old_entries.delete(name)
       end
 

padrino-core/test/fixtures/dependencies/linear/h.rb

@@ -0,0 +1 @@
+raise LoadError

padrino-core/test/fixtures/dependencies/linear/i.rb

@@ -0,0 +1 @@
+fail

padrino-core/test/fixtures/dependencies/nested/j.rb

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

padrino-core/test/fixtures/dependencies/nested/k.rb

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

padrino-core/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")
+)

padrino-core/test/fixtures/dependencies/nested/m.rb

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

padrino-core/test/fixtures/dependencies/nested/n.rb

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

padrino-core/test/fixtures/dependencies/nested/ooo.rb

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

padrino-core/test/fixtures/dependencies/nested/ppp.rb

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

padrino-core/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")
+)

padrino-core/test/fixtures/dependencies/nested/rrr.rb

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

padrino-core/test/fixtures/dependencies/nested/sss.rb

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

padrino-core/test/test_dependencies.rb

@@ -53,5 +53,57 @@
       assert_equal ["name"], F.fields
       assert_equal "", @io.string
     end
+
+    it 'should not silence LoadError raised in dependencies excluded from reloading' do
+      capture_io do
+        assert_raises(LoadError) 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"),
+          )
+        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
+
+
+    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