rack-unreloader 1.6.0 → 1.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 63e0754f2064aacba7745d52c60d136019dd5fdf
-  data.tar.gz: 31d3d8223106f59d5fa739b429cbf08d6d47db31
+SHA256:
+  metadata.gz: 513c06d3763473095bfcfb9b22a55d5bff7e5ede857a957934923062dd72473f
+  data.tar.gz: 03bc800248c21507ac209104593019e3fc69a398f32a02b7e4e3371d4824d162
 SHA512:
-  metadata.gz: 6645aa444fd1c88c52c09f0de56894f640cf9404624f0e25197071b1498d1aa7745a1bb9a8e9416f3cc7d8aeacf4f993e552adaa06f4b1386be95db43aef4272
-  data.tar.gz: 26811ff5218e1fe20e15f0619dcfb4d4dbabcba2819c82e8c46f428fdfb1714a3348a12a931ba8065d5f6cb182336e989e6d98d93e7a2ac633f4c6c7d783fc43
+  metadata.gz: 83c6ad5ee6aa7650bf5de240949a20c54b4560c1ef943f3ebc8599a22788cd88c96214ee0f26d540f17eb16f26fe282357f52c1cd4b415980250bc18281675d7
+  data.tar.gz: 96a012e44fc868f4a3a2aa1395c5710156ef9302f36e23a3718af364e03e4f5bd411959c8fa2cf590eede2201208117ab4a47a36def1c6e95a5bb87c0c045978

data/CHANGELOG

@@ -1,3 +1,7 @@
+= 1.7.0 (2019-03-18)
+
+* Add :handle_reload_errors option, for returning backtrace with error if there is an exception when reloading (jeremyevans)
+
 = 1.6.0 (2017-02-24)
 
 * Add Unreloader#strip_path_prefix, designed to support chrooting (jeremyevans)

data/README.rdoc

@@ -62,6 +62,11 @@ When the +:subclasses+ option is given, only subclasses of the given classes
 will be unloaded before reloading the file.  It is recommended that
 you use a +:subclasses+ option when using <tt>Rack::Unreloader</tt>.
 
+When the +:handle_reload_errors+ option is given, most exceptions raised during
+reloading will cause the backtrace to be returned, instead of raising the error
+externally.  This can be useful if no middleware that wrap the Unreloader are
+rescuing exceptions.
+
 == Dependency Handling
 
 If your +app.rb+ requires a +models.rb+ file that you also want to get reloaded:

data/lib/rack/unreloader.rb

@@ -58,12 +58,13 @@ module Rack
       @app_block = block
       if opts.fetch(:reload, true)
         @cooldown = opts.fetch(:cooldown, 1)
+        @handle_reload_errors = opts[:handle_reload_errors]
         @last = Time.at(0)
         Kernel.require 'rack/unreloader/reloader'
         @reloader = Reloader.new(opts)
         reload!
       else
-        @reloader = @cooldown = false
+        @reloader = @cooldown = @handle_reload_errors = false
       end
     end
 
@@ -71,7 +72,13 @@ module Rack
     # Call the app with the environment.
     def call(env)
       if @cooldown && Time.now > @last + @cooldown
-        MUTEX.synchronize{reload!}
+        begin
+          MUTEX.synchronize{reload!}
+        rescue StandardError, ScriptError => e
+          raise unless @handle_reload_errors
+          content = "#{e.class}: #{e}\n#{e.backtrace.join("\n")}"
+          return [500, {'Content-Type' => 'text/plain', 'Content-Length' => content.bytesize.to_s}, [content]]
+        end
         @last = Time.now
       end
       @app_block.call.call(env)

data/spec/spec_helper.rb

@@ -1,6 +1,7 @@
 require File.join(File.dirname(File.expand_path(__FILE__)), '../lib/rack/unreloader')
 require 'rubygems'
 $: << 'lib'
+ENV['MT_NO_PLUGINS'] = '1' # Work around stupid autoloading of plugins
 gem 'minitest'
 require 'minitest/autorun'
 require 'minitest/hooks'

data/spec/unreloader_spec.rb

@@ -157,6 +157,28 @@ describe Rack::Unreloader do
               %r{\ANew classes in .*spec/app\.rb: App\z}
   end
 
+  it "should support :handle_reload_errors option to return backtrace if there is an error reloading" do
+    ru(:handle_reload_errors=>true).call({}).must_equal [1]
+    update_app("module App; def self.call(env) @a end; @a ||= []; raise 'foo'; end")
+    rack_response = ru.call({})
+    rack_response[0].must_equal 500
+    rack_response[1]['Content-Type'].must_equal 'text/plain'
+    rack_response[1]['Content-Length'].must_match(rack_response[2][0].bytesize.to_s)
+    rack_response[2][0].must_match(/\/spec\/app\.rb:1/)
+    defined?(::App).must_be_nil
+    update_app(code(2))
+    ru.call({}).must_equal [2]
+    log_match %r{\ALoading.*spec/app\.rb\z},
+              %r{\ANew classes in .*spec/app\.rb: App\z},
+              %r{\AUnloading.*spec/app\.rb\z},
+              "Removed constant App",
+              %r{\ALoading.*spec/app\.rb\z},
+              %r{\AFailed to load .*spec/app\.rb; removing partially defined constants\z},
+              "Removed constant App",
+              %r{\ALoading.*spec/app\.rb\z},
+              %r{\ANew classes in .*spec/app\.rb: App\z}
+  end
+
   it "should unload classes in namespaces" do
     ru(:code=>"class Array::App; def self.call(env) @a end; @a ||= []; @a << 1; end", :block=>proc{Array::App}).call({}).must_equal [1]
     update_app("class Array::App; def self.call(env) @a end; @a ||= []; @a << 2; end")

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rack-unreloader
 version: !ruby/object:Gem::Version
-  version: 1.6.0
+  version: 1.7.0
 platform: ruby
 authors:
 - Jeremy Evans
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-02-24 00:00:00.000000000 Z
+date: 2019-03-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest
@@ -84,8 +84,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.8
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Reload application when files change, unloading constants first