From eb1a658b25a1d74104c1abbce9bec6d47400d770 Mon Sep 17 00:00:00 2001 From: Thomas Reynolds Date: Fri, 26 Dec 2014 14:11:58 -0800 Subject: [PATCH] over calling change callbacks which are unnecessary. --- middleman-core/lib/middleman-core/sitemap/store.rb | 4 ++-- middleman-core/lib/middleman-core/sources.rb | 2 +- middleman-core/lib/middleman-core/version.rb | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/middleman-core/lib/middleman-core/sitemap/store.rb b/middleman-core/lib/middleman-core/sitemap/store.rb index 067f3f33..04ffd9b9 100644 --- a/middleman-core/lib/middleman-core/sitemap/store.rb +++ b/middleman-core/lib/middleman-core/sitemap/store.rb @@ -146,9 +146,9 @@ module Middleman # Get the URL path for an on-disk file # @param [String] file # @return [String] - Contract IsA['Middleman::SourceFile'] => String + Contract Or[Pathname, IsA['Middleman::SourceFile']] => String def file_to_path(file) - relative_path = file[:relative_path].to_s + relative_path = file.is_a?(Pathname) ? file.to_s : file[:relative_path].to_s # Replace a file name containing automatic_directory_matcher with a folder unless @app.config[:automatic_directory_matcher].nil? diff --git a/middleman-core/lib/middleman-core/sources.rb b/middleman-core/lib/middleman-core/sources.rb index 493c6bc0..f7f8bd7f 100644 --- a/middleman-core/lib/middleman-core/sources.rb +++ b/middleman-core/lib/middleman-core/sources.rb @@ -339,7 +339,7 @@ module Middleman valid_updated = updated_files.select { |f| f[:types].include?(callback[:type]) } valid_removed = removed_files.select { |f| f[:types].include?(callback[:type]) } - callback[:proc].call(valid_updated, valid_removed) + callback[:proc].call(valid_updated, valid_removed) unless valid_updated.empty? && valid_removed.empty? end end end diff --git a/middleman-core/lib/middleman-core/version.rb b/middleman-core/lib/middleman-core/version.rb index efd6097d..09f63d7d 100644 --- a/middleman-core/lib/middleman-core/version.rb +++ b/middleman-core/lib/middleman-core/version.rb @@ -1,5 +1,5 @@ module Middleman # Current Version # @return [String] - VERSION = '4.0.0.alpha.4' unless const_defined?(:VERSION) + VERSION = '4.0.0.alpha.5' unless const_defined?(:VERSION) end