rack-unreloader 1.0.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4e78994d15fb3130a66a1b0c4cddd957bbc7ed5a
-  data.tar.gz: 3151916048c0f97a461e6bd1a3e5d06cb5945943
+  metadata.gz: 8eacfdd6cd0d57685d8835bcfbc35bb716cc0241
+  data.tar.gz: eed0b264873367b89e234d9b74f1b47805ce48f3
 SHA512:
-  metadata.gz: 184ff5f426d8c587377e045954d2968b562dd8bd3e823c3968efda3556104a33b8df68fafb3aec4269770f7014973e46382302756fddeaf1c99191a39f80dbb9
-  data.tar.gz: 0877f19d6d65db719317c4d52a0cc1acb283f68b121af8a54b296c1e97cf7303d76bf59d33d293e9e3a06101d38add35a70fb4fe99d356877ead32d3bf3dd0b2
+  metadata.gz: 61c47de205a000b7048f516d3c841cc4dc20c88b565be214330e868a3c47a7e2561f90d4bcb7a9ed23eb10d62133639ae0e437e23b528a2f4ff362c8fb179def
+  data.tar.gz: 0eb1923fb9131e0a84b4ad020b54538bbd69ae7665bcf6f3bd5dc328685491a67aaec2c522baa01a00e1a4669bbebe0f803d65bc00f8f9eea31b1cd38e40fa40

data/CHANGELOG

@@ -1,3 +1,9 @@
+= 1.1.0 (2014-09-25)
+
+* Allow monitoring of directories, so that new files can be picked up, and deleted files removed (jeremyevans)
+
+* Support ruby 1.8.7 (jeremyevans)
+
 = 1.0.0 (2014-08-12)
 
 * Ignore anonymous classes/modules (jeremyevans)

data/README.rdoc

@@ -146,10 +146,19 @@ full path:
 
   Unreloader.require '/path/to/app.rb'
 
-You can use the usual file globbing:
+You can use the usual file globbing to load multiple files:
 
   Unreloader.require 'models/*.rb'
 
+If you want to load all files in a given directory you should just give
+the directory path:
+
+  Unreloader.require 'models'
+
+The advantage for doing this is that new files added to the directory will be
+picked up automatically, and files deleted from the directory will be removed
+automatically.
+
 == Speeding Things Up
 
 By default, <tt>Rack::Unreloader</tt> uses +ObjectSpace+ before and after requiring each
@@ -165,7 +174,7 @@ of constants to unload.  If you do this, <tt>Rack::Unreloader</tt> will no longe
 to use +ObjectSpace+, which substantially speeds up startup.  For example, if all of
 your models just use a capitalized version of the filename:
 
-  Unreloader.require('models/*.rb'){|f| File.basename(f).sub(/\.rb\z/, '').capitalize}
+  Unreloader.require('models'){|f| File.basename(f).sub(/\.rb\z/, '').capitalize}
 
 == History
 

data/lib/rack/unreloader.rb

@@ -21,6 +21,12 @@ module Rack
         # with values being the last modified time (or nil if the file has not yet been loaded).
         @monitor_files = {}
 
+        # Hash of directories being monitored for changes, keyed by absolute path of directory name,
+        # with values being the an array with the last modified time (or nil if the directory has not
+        # yet been loaded), an array of files in the directory, and a block to pass to
+        # require_dependency for new files.
+        @monitor_dirs = {}
+
         # Hash of procs returning constants defined in files, keyed by absolute path
         # of file name.  If there is no proc, must call ObjectSpace before and after
         # loading files to detect changes, which is slower.
@@ -55,6 +61,10 @@ module Rack
       # If there are any changed files, reload them.  If there are no changed
       # files, do nothing.
       def reload!
+        @monitor_dirs.keys.each do |dir|
+          check_monitor_dir(dir)
+        end
+
         @monitor_files.to_a.each do |file, time|
           if file_changed?(file, time)
             safe_load(file)
@@ -62,6 +72,25 @@ module Rack
         end
       end
 
+      # Check a monitored directory for changes, adding new files and removing
+      # deleted files.
+      def check_monitor_dir(dir)
+        time, files, block = @monitor_dirs[dir]
+
+        if file_changed?(dir, time)
+          cur_files = Dir.new(dir).grep(/\.rb\z/).map{|f| F.join(dir, f)}
+
+          (files - cur_files).each do |f|
+            remove(f)
+            @monitor_files.delete(f)
+          end
+
+          require_dependencies(cur_files - files, &block)
+
+          files.replace(cur_files)
+        end
+      end
+
       # Require the given dependencies, monitoring them for changes.
       # Paths should be a file glob or an array of file globs.
       def require_dependencies(paths, &block)
@@ -76,8 +105,15 @@ module Rack
           uniq.
           each do |file|
 
-          @constants_defined[file] = block
-          @monitor_files[file] = nil
+          if F.directory?(file)
+            @monitor_dirs[file] = [nil, [], block]
+            check_monitor_dir(file)
+            next
+          else
+            @constants_defined[file] = block
+            @monitor_files[file] = nil
+          end
+
           begin
             safe_load(file, options)
           rescue NameError, LoadError => error
@@ -285,7 +321,7 @@ module Rack
     # Call the app with the environment.
     def call(env)
       if @cooldown && Time.now > @last + @cooldown
-        Thread.exclusive{@reloader.reload!}
+        Thread.respond_to?(:exclusive) ? Thread.exclusive{@reloader.reload!} : @reloader.reload!
         @last = Time.now
       end
       @app_block.call.call(env)

data/spec/unreloader_spec.rb

@@ -1,5 +1,16 @@
 require File.join(File.dirname(File.expand_path(__FILE__)), '../lib/rack/unreloader')
 
+if defined?(RSpec)
+  require 'rspec/version'
+  if RSpec::Version::STRING >= '2.11.0'
+    RSpec.configure do |config|
+      config.expect_with :rspec do |c|
+        c.syntax = :should
+      end
+    end
+  end
+end
+
 module ModifiedAt
   def set_modified_time(file, time)
     modified_times[File.expand_path(file)] = time
@@ -256,4 +267,60 @@ describe Rack::Unreloader do
               "Error removing constant: Foo",
               %r{\ARemoved feature .*/spec/app.rb\z}
   end
+
+  describe "with a directory" do
+    before do
+      Dir.mkdir('spec/dir')
+    end
+
+    after do
+      Dir['spec/dir/*.rb'].each{|f| File.delete(f)}
+      Dir.rmdir('spec/dir')
+    end
+
+    it "should pick up changes to files in that directory" do
+      base_ru
+      update_app("class App; @a = {}; def self.call(env=nil) @a end; end; RU.require 'spec/dir'")
+      update_app("App.call[:foo] = 1", 'spec/dir/a.rb')
+      @ru.require('spec/app.rb')
+      ru.call({}).should == {:foo=>1}
+      update_app("App.call[:foo] = 2", 'spec/dir/a.rb')
+      ru.call({}).should == {:foo=>2}
+      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{\AReloading .*/spec/dir/a.rb\z},
+                %r{\ARemoved feature .*/spec/dir/a.rb\z}
+    end
+
+    it "should pick up new files added to the directory" do
+      base_ru
+      update_app("class App; @a = {}; def self.call(env=nil) @a end; end; RU.require 'spec/dir'")
+      @ru.require('spec/app.rb')
+      ru.call({}).should == {}
+      update_app("App.call[:foo] = 2", 'spec/dir/a.rb')
+      ru.call({}).should == {:foo=>2}
+      log_match %r{\ALoading.*spec/app\.rb\z},
+                %r{\ANew classes in .*spec/app\.rb: App\z},
+                %r{\ALoading.*spec/dir/a\.rb\z}
+    end
+
+    it "should drop files deleted from the directory" do
+      base_ru
+      update_app("class App; @a = {}; def self.call(env=nil) @a end; end; RU.require 'spec/dir'")
+      update_app("App.call[:foo] = 1", 'spec/dir/a.rb')
+      @ru.require('spec/app.rb')
+      ru.call({}).should == {:foo=>1}
+      File.delete('spec/dir/a.rb')
+      update_app("App.call[:foo] = 2", 'spec/dir/b.rb')
+      ru.call({}).should == {:foo=>2}
+      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{\ARemoved feature .*/spec/dir/a.rb\z},
+                %r{\ALoading.*spec/dir/b\.rb\z}
+    end
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rack-unreloader
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors:
 - Jeremy Evans
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-12 00:00:00.000000000 Z
+date: 2014-09-25 00:00:00.000000000 Z
 dependencies: []
 description: |
   Rack::Unreloader is a rack middleware that reloads application files when it