rack-unreloader 1.4.0 → 1.8.0

data/spec/unreloader_spec.rb

@@ -1,76 +1,6 @@
-require File.join(File.dirname(File.expand_path(__FILE__)), '../lib/rack/unreloader')
-gem 'minitest'
-require 'minitest/autorun'
-require 'minitest/hooks'
-
-module ModifiedAt
-  def set_modified_time(file, time)
-    modified_times[File.expand_path(file)] = time
-  end
-
-  def modified_times
-    @modified_times ||= {}
-  end
-
-  private
-
-  def modified_at(file)
-    modified_times[file] || super
-  end
-end
+require File.join(File.dirname(File.expand_path(__FILE__)), 'spec_helper')
 
 describe Rack::Unreloader do
-  def code(i)
-    "class App; def self.call(env) @a end; @a ||= []; @a << #{i}; end"
-  end
-
-  def update_app(code, file=@filename)
-    ru.reloader.set_modified_time(file, @i += 1) if ru.reloader
-    File.open(file, 'wb'){|f| f.write(code)}
-  end
-
-  def logger
-    return @logger if @logger
-    @logger = []
-    def @logger.method_missing(meth, log)
-      self << log
-    end
-    @logger
-  end
-
-  def base_ru(opts={})
-    block = opts[:block] || proc{App}
-    @ru = Rack::Unreloader.new({:logger=>logger, :cooldown=>0}.merge(opts), &block)
-    @ru.reloader.extend ModifiedAt if @ru.reloader
-    Object.const_set(:RU, @ru)
-  end
-
-  def ru(opts={})
-    return @ru if @ru
-    base_ru(opts)
-    update_app(opts[:code]||code(1))
-    @ru.require @filename
-    @ru
-  end
-
-  def log_match(*logs)
-    @logger.length.must_equal logs.length
-    logs.zip(@logger).each{|l, log| l.is_a?(String) ? log.must_equal(l) : log.must_match(l)}
-  end
-
-  before do
-    @i = 0
-    @filename = 'spec/app.rb'
-  end
-
-  after do
-    ru.reloader.clear! if ru.reloader
-    Object.send(:remove_const, :RU)
-    Object.send(:remove_const, :App) if defined?(::App)
-    Object.send(:remove_const, :App2) if defined?(::App2)
-    Dir['spec/app*.rb'].each{|f| File.delete(f)}
-  end
-
   it "should not reload files automatically if cooldown option is nil" do
     ru(:cooldown => nil).call({}).must_equal [1]
     update_app(code(2))
@@ -100,6 +30,16 @@ describe Rack::Unreloader do
               %r{\ANew classes in .*spec/app\.rb: App\z}
   end
 
+  it "should stop monitoring file for changes if it is deleted constants contained in file and reload file if file changes" do
+    ru.call({}).must_equal [1]
+    file_delete('spec/app.rb')
+    proc{ru.call({})}.must_raise NameError
+    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"
+  end
+
   it "should check constants using ObjectSpace if require proc returns :ObjectSpace" do
     base_ru
     update_app(code(1))
@@ -191,7 +131,7 @@ describe Rack::Unreloader do
   end
 
   it "should not unload modules by name if :subclasses option used and module not present" do
-    ru(:subclasses=>'Foo', :code=>"module App; def self.call(env) @a end; @a ||= []; @a << 1; end").call({}).must_equal [1]
+    ru(:subclasses=>'Foo', :code=>"module App; def self.call(env) @a end; class << self; alias call call; end; @a ||= []; @a << 1; end").call({}).must_equal [1]
     update_app("module App; def self.call(env) @a end; @a ||= []; @a << 2; end")
     ru.call({}).must_equal [1, 2]
     log_match %r{\ALoading.*spec/app\.rb\z},
@@ -203,7 +143,29 @@ describe Rack::Unreloader do
     ru.call({}).must_equal [1]
     update_app("module App; def self.call(env) @a end; @a ||= []; raise 'foo'; end")
     proc{ru.call({})}.must_raise RuntimeError
-    defined?(::App).must_equal nil
+    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 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},
@@ -256,7 +218,7 @@ describe Rack::Unreloader do
 
   it "should allow specifying proc for which constants get removed" do
     base_ru
-    update_app("class App; def self.call(env) [@a, App2.a] end; @a ||= []; @a << 1; end; class App2; def self.a; @a end; @a ||= []; @a << 2; end")
+    update_app("class App; def self.call(env) [@a, App2.a] end; class << self; alias call call; end; @a ||= []; @a << 1; end; class App2; def self.a; @a end; class << self; alias a a; end; @a ||= []; @a << 2; end")
     @ru.require('spec/app.rb'){|f| File.basename(f).sub(/\.rb/, '').capitalize}
     ru.call({}).must_equal [[1], [2]]
     update_app("class App; def self.call(env) [@a, App2.a] end; @a ||= []; @a << 3; end; class App2; def self.a; @a end; @a ||= []; @a << 4; end")
@@ -326,6 +288,20 @@ describe Rack::Unreloader do
     ru.call({}).must_equal 4
   end
 
+  it "should handle modules where name raises an exception" do
+    m = Module.new{def self.name; raise end}
+    ru(:code=>"module App; def self.call(env) @a end; @a ||= []; @a << 1; end").call({}).must_equal [1]
+    update_app("module App; def self.call(env) @a end; @a ||= []; @a << 2; end")
+    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{\ANew classes in .*spec/app\.rb: App\z}
+    m
+  end
+
   describe "with a directory" do
     include Minitest::Hooks
 
@@ -336,7 +312,7 @@ describe Rack::Unreloader do
     end
 
     after do
-      Dir['spec/dir/**/*.rb'].each{|f| File.delete(f)}
+      Dir['spec/dir/**/*.rb'].each{|f| file_delete(f)}
     end
 
     after(:all) do
@@ -391,7 +367,7 @@ describe Rack::Unreloader do
       ru.call({}).must_equal 3
       update_app("module C; B = 4; end", 'spec/dir/subdir2/app_mod2.rb')
       ru.call({}).must_equal 4
-      File.delete 'spec/dir/subdir/app_mod.rb'
+      file_delete 'spec/dir/subdir/app_mod.rb'
       ru.call({}).must_equal 0
     end
 
@@ -412,7 +388,7 @@ describe Rack::Unreloader do
       ru.call({}).must_equal 561
       update_app("class App; end", 'spec/dir/appa.rb')
       ru.call({}).must_equal 61
-      File.delete 'spec/dir/appb.rb'
+      file_delete 'spec/dir/appb.rb'
       ru.call({}).must_equal 1
     end
 
@@ -478,7 +454,7 @@ describe Rack::Unreloader do
       update_app("App.call[:foo] = 1", 'spec/dir/a.rb')
       @ru.require('spec/app.rb')
       ru.call({}).must_equal(:foo=>1)
-      File.delete('spec/dir/a.rb')
+      file_delete('spec/dir/a.rb')
       update_app("App.call[:foo] = 2", 'spec/dir/b.rb')
       ru.call({}).must_equal(:foo=>2)
       log_match %r{\ALoading.*spec/app\.rb\z},
@@ -495,7 +471,7 @@ describe Rack::Unreloader do
       update_app("App.call[:foo] = 1", 'spec/dir/subdir/a.rb')
       @ru.require('spec/app.rb')
       ru.call({}).must_equal(:foo=>1)
-      File.delete('spec/dir/subdir/a.rb')
+      file_delete('spec/dir/subdir/a.rb')
       update_app("App.call[:foo] = 2", 'spec/dir/subdir/b.rb')
       ru.call({}).must_equal(:foo=>2)
       log_match %r{\ALoading.*spec/app\.rb\z},
@@ -505,5 +481,35 @@ describe Rack::Unreloader do
                 %r{\AUnloading .*/spec/dir/subdir/a.rb\z},
                 %r{\ALoading.*spec/dir/subdir/b\.rb\z}
     end
+
+    it "should call hook when dropping files deleted from the directory" do
+      base_ru
+      deletes = []
+      Object.const_set(:Deletes, deletes)
+      update_app("class App; @a = {}; def self.call(env=nil) @a end; end; RU.require('spec/dir', :delete_hook=>proc{|f| Deletes << f})")
+      update_app("App.call[:foo] = 1", 'spec/dir/a.rb')
+      @ru.require('spec/app.rb', :delete_hook=>proc{|f| deletes << f})
+      ru.call({}).must_equal(:foo=>1)
+      file_delete('spec/dir/a.rb')
+      update_app("App.call[:foo] = 2", 'spec/dir/b.rb')
+      ru.call({}).must_equal(:foo=>2)
+      deletes.must_equal [File.expand_path('spec/dir/a.rb')]
+      file_delete('spec/dir/b.rb')
+      ru.call({}).must_equal(:foo=>2)
+      deletes.must_equal [File.expand_path('spec/dir/a.rb'), File.expand_path('spec/dir/b.rb')]
+      file_delete('spec/app.rb')
+      proc{ru.call({})}.must_raise NameError
+      deletes.must_equal [File.expand_path('spec/dir/a.rb'), File.expand_path('spec/dir/b.rb'), File.expand_path('spec/app.rb')]
+      log_match %r{\ALoading.*spec/app\.rb\z},
+                %r{\ALoading.*spec/dir/a\.rb\z},
+                %r{\ANew classes in .*spec/app\.rb: App\z},
+                %r{\ANew features in .*spec/app\.rb: .*spec/dir/a\.rb\z},
+                %r{\AUnloading .*/spec/dir/a.rb\z},
+                %r{\ALoading.*spec/dir/b\.rb\z},
+                %r{\AUnloading .*/spec/dir/b.rb\z},
+                %r{\AUnloading .*/spec/app.rb\z},
+                %r{\ARemoved constant App\z}
+      Object.send(:remove_const, :Deletes)
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rack-unreloader
 version: !ruby/object:Gem::Version
-  version: 1.4.0
+  version: 1.8.0
 platform: ruby
 authors:
 - Jeremy Evans
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-15 00:00:00.000000000 Z
+date: 2021-10-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest
@@ -38,6 +38,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: minitest-global_expectations
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: |
   Rack::Unreloader is a rack middleware that reloads application files when it
   detects changes, unloading constants defined in those files before reloading.
@@ -55,11 +69,17 @@ files:
 - Rakefile
 - lib/rack/unreloader.rb
 - lib/rack/unreloader/reloader.rb
+- spec/spec_helper.rb
+- spec/strip_paths_spec.rb
 - spec/unreloader_spec.rb
 homepage: http://github.com/jeremyevans/rack-unreloader
 licenses:
 - MIT
-metadata: {}
+metadata:
+  bug_tracker_uri: https://github.com/jeremyevans/rack-unreloader/issues
+  changelog_uri: https://github.com/jeremyevans/rack-unreloader/blob/master/CHANGELOG
+  mailing_list_uri: https://github.com/jeremyevans/rack-unreloader/discussions
+  source_code_uri: https://github.com/jeremyevans/rack-unreloader
 post_install_message: 
 rdoc_options:
 - "--quiet"
@@ -75,15 +95,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.8.7
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 3.2.22
 signing_key: 
 specification_version: 4
 summary: Reload application when files change, unloading constants first