Permalink
Browse files

Allow FileUpdateChecker to work with globs.

  • Loading branch information...
1 parent 5c234ab commit 57e0c038d627fe0c5d85883a0a29c17257f9c4e5 @josevalim josevalim committed Dec 12, 2011
View
4 activesupport/lib/active_support/file_update_checker.rb
@@ -22,7 +22,9 @@ def initialize(paths, calculate=false, &block)
end
def updated_at
- paths.map { |path| File.mtime(path) }.max
+ # TODO: Use Enumerable check once we get rid of 1.8.7
+ all = paths.is_a?(Array) ? paths : Dir[paths]
+ all.map { |path| File.mtime(path) }.max
end
def execute_if_updated
View
24 activesupport/test/file_update_checker_test.rb
@@ -4,7 +4,7 @@
MTIME_FIXTURES_PATH = File.expand_path("../fixtures", __FILE__)
-class FileUpdateCheckerTest < Test::Unit::TestCase
+module FileUpdateCheckerSuite
FILES = %w(1.txt 2.txt 3.txt)
def setup
@@ -15,6 +15,10 @@ def teardown
FileUtils.rm(FILES)
end
+ def args
+ raise NotImplementedError
+ end
+
def test_should_not_execute_the_block_if_no_paths_are_given
i = 0
checker = ActiveSupport::FileUpdateChecker.new([]){ i += 1 }
@@ -24,32 +28,42 @@ def test_should_not_execute_the_block_if_no_paths_are_given
def test_should_invoke_the_block_on_first_call_if_it_does_not_calculate_last_updated_at_on_load
i = 0
- checker = ActiveSupport::FileUpdateChecker.new(FILES){ i += 1 }
+ checker = ActiveSupport::FileUpdateChecker.new(args){ i += 1 }
checker.execute_if_updated
assert_equal 1, i
end
def test_should_not_invoke_the_block_on_first_call_if_it_calculates_last_updated_at_on_load
i = 0
- checker = ActiveSupport::FileUpdateChecker.new(FILES, true){ i += 1 }
+ checker = ActiveSupport::FileUpdateChecker.new(args, true){ i += 1 }
checker.execute_if_updated
assert_equal 0, i
end
def test_should_not_invoke_the_block_if_no_file_has_changed
i = 0
- checker = ActiveSupport::FileUpdateChecker.new(FILES){ i += 1 }
+ checker = ActiveSupport::FileUpdateChecker.new(args){ i += 1 }
5.times { checker.execute_if_updated }
assert_equal 1, i
end
def test_should_invoke_the_block_if_a_file_has_changed
i = 0
- checker = ActiveSupport::FileUpdateChecker.new(FILES){ i += 1 }
+ checker = ActiveSupport::FileUpdateChecker.new(args){ i += 1 }
checker.execute_if_updated
sleep(1)
FileUtils.touch(FILES)
checker.execute_if_updated
assert_equal 2, i
end
end
+
+class FileUpdateCheckerWithEnumerableTest < Test::Unit::TestCase
+ include FileUpdateCheckerSuite
+ def args; FILES; end
+end
+
+class FileUpdateCheckerWithStringTest < Test::Unit::TestCase
+ include FileUpdateCheckerSuite
+ def args; "{1,2,3}.txt"; end
+end

0 comments on commit 57e0c03

Please sign in to comment.