提交 624b1186 编写于 作者: T thedarkone

Use shorter class-level File methods instead of going through File.stat.

上级 02691d35
...@@ -161,7 +161,7 @@ def build_query(path, details) ...@@ -161,7 +161,7 @@ def build_query(path, details)
# Returns the file mtime from the filesystem. # Returns the file mtime from the filesystem.
def mtime(p) def mtime(p)
File.stat(p).mtime File.mtime(p)
end end
# Extract handler and formats from path. If a format cannot be a found neither # Extract handler and formats from path. If a format cannot be a found neither
......
...@@ -481,7 +481,7 @@ def test_audio_tag ...@@ -481,7 +481,7 @@ def test_audio_tag
end end
def test_timebased_asset_id def test_timebased_asset_id
expected_time = File.stat(File.expand_path(File.dirname(__FILE__) + "/../fixtures/public/images/rails.png")).mtime.to_i.to_s expected_time = File.mtime(File.expand_path(File.dirname(__FILE__) + "/../fixtures/public/images/rails.png")).to_i.to_s
assert_equal %(<img alt="Rails" src="/images/rails.png?#{expected_time}" />), image_tag("rails.png") assert_equal %(<img alt="Rails" src="/images/rails.png?#{expected_time}" />), image_tag("rails.png")
end end
...@@ -512,7 +512,7 @@ def test_image_tag_interpreting_email_adding_optional_alt_tag ...@@ -512,7 +512,7 @@ def test_image_tag_interpreting_email_adding_optional_alt_tag
def test_timebased_asset_id_with_relative_url_root def test_timebased_asset_id_with_relative_url_root
@controller.config.relative_url_root = "/collaboration/hieraki" @controller.config.relative_url_root = "/collaboration/hieraki"
expected_time = File.stat(File.expand_path(File.dirname(__FILE__) + "/../fixtures/public/images/rails.png")).mtime.to_i.to_s expected_time = File.mtime(File.expand_path(File.dirname(__FILE__) + "/../fixtures/public/images/rails.png")).to_i.to_s
assert_equal %(<img alt="Rails" src="#{@controller.config.relative_url_root}/images/rails.png?#{expected_time}" />), image_tag("rails.png") assert_equal %(<img alt="Rails" src="#{@controller.config.relative_url_root}/images/rails.png?#{expected_time}" />), image_tag("rails.png")
end end
......
...@@ -22,7 +22,7 @@ def initialize(paths, calculate=false, &block) ...@@ -22,7 +22,7 @@ def initialize(paths, calculate=false, &block)
end end
def updated_at def updated_at
paths.map { |path| File.stat(path).mtime }.max paths.map { |path| File.mtime(path) }.max
end end
def execute_if_updated def execute_if_updated
......
...@@ -30,7 +30,7 @@ def calculate_directory_statistics(directory, pattern = /.*\.rb$/) ...@@ -30,7 +30,7 @@ def calculate_directory_statistics(directory, pattern = /.*\.rb$/)
stats = { "lines" => 0, "codelines" => 0, "classes" => 0, "methods" => 0 } stats = { "lines" => 0, "codelines" => 0, "classes" => 0, "methods" => 0 }
Dir.foreach(directory) do |file_name| Dir.foreach(directory) do |file_name|
if File.stat(directory + "/" + file_name).directory? and (/^\./ !~ file_name) if File.directory?(directory + "/" + file_name) and (/^\./ !~ file_name)
newstats = calculate_directory_statistics(directory + "/" + file_name, pattern) newstats = calculate_directory_statistics(directory + "/" + file_name, pattern)
stats.each { |k, v| stats[k] += newstats[k] } stats.each { |k, v| stats[k] += newstats[k] }
end end
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册