From e169f88a5a0bdab95b20491047747c2cc46dab30 Mon Sep 17 00:00:00 2001 From: Artem Baguinski Date: Fri, 22 Mar 2013 18:22:16 +0100 Subject: [PATCH 1/2] fix 'needs_to_reload?' regexps - remove stray ^ that would cause regexp to never match - remove '_helper' suffix as it isn't required for helpers --- middleman-core/lib/middleman-core/preview_server.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/middleman-core/lib/middleman-core/preview_server.rb b/middleman-core/lib/middleman-core/preview_server.rb index c2506c17..b9f659ec 100644 --- a/middleman-core/lib/middleman-core/preview_server.rb +++ b/middleman-core/lib/middleman-core/preview_server.rb @@ -189,8 +189,8 @@ module Middleman def needs_to_reload?(paths) match_against = [ %r{^config\.rb}, - %r{^lib/^[^\.](.*)\.rb$}, - %r{^helpers/^[^\.](.*)_helper\.rb$} + %r{^lib/[^\.](.*)\.rb$}, + %r{^helpers/[^\.](.*)\.rb$} ] if @options[:reload_paths] From e07bd036d129b5d556fafda3583fd3b2371fc1cc Mon Sep 17 00:00:00 2001 From: Artem Baguinski Date: Fri, 22 Mar 2013 18:28:38 +0100 Subject: [PATCH 2/2] just call needs_to_reload? once --- middleman-core/lib/middleman-core/preview_server.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/middleman-core/lib/middleman-core/preview_server.rb b/middleman-core/lib/middleman-core/preview_server.rb index b9f659ec..f75888a8 100644 --- a/middleman-core/lib/middleman-core/preview_server.rb +++ b/middleman-core/lib/middleman-core/preview_server.rb @@ -101,7 +101,7 @@ module Middleman added_and_modified = (modified + added) # See if the changed file is config.rb or lib/*.rb - if needs_to_reload?(added_and_modified) || needs_to_reload?(removed) + if needs_to_reload?(added_and_modified + removed) reload else added_and_modified.each do |path| @@ -164,7 +164,7 @@ module Middleman @webrick ||= setup_webrick(@options[:debug] || false) start_file_watcher - + rack_app = app.class.to_rack_app # Add in the meta pages application