From e586105b46a8c8369899660a316b00112466f654 Mon Sep 17 00:00:00 2001 From: Martin Jorn Rogalla Date: Wed, 4 Mar 2015 20:01:27 +0100 Subject: [PATCH] Extracted `sanitize_filename` from site.rb into reader.rb - Extracted - Updated References - Ran Tests Signed-off-by: Martin Jorn Rogalla --- lib/jekyll/reader.rb | 6 ++++++ lib/jekyll/site.rb | 8 +------- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/lib/jekyll/reader.rb b/lib/jekyll/reader.rb index d8f6eac4..86edde60 100644 --- a/lib/jekyll/reader.rb +++ b/lib/jekyll/reader.rb @@ -73,5 +73,11 @@ module Jekyll SafeYAML.load_file(path) end end + + def sanitize_filename(name) + name.gsub!(/[^\w\s_-]+/, '') + name.gsub!(/(^|\b\s)\s+($|\s?\b)/, '\\1\\2') + name.gsub(/\s+/, '_') + end end end \ No newline at end of file diff --git a/lib/jekyll/site.rb b/lib/jekyll/site.rb index ff964d7e..f708f095 100644 --- a/lib/jekyll/site.rb +++ b/lib/jekyll/site.rb @@ -232,7 +232,7 @@ module Jekyll path = reader.in_source_dir(dir, entry) next if File.symlink?(path) && safe - key = sanitize_filename(File.basename(entry, '.*')) + key = reader.sanitize_filename(File.basename(entry, '.*')) if File.directory?(path) read_data_to(path, data[key] = {}) else @@ -464,11 +464,5 @@ module Jekyll def site_cleaner @site_cleaner ||= Cleaner.new(self) end - - def sanitize_filename(name) - name.gsub!(/[^\w\s_-]+/, '') - name.gsub!(/(^|\b\s)\s+($|\s?\b)/, '\\1\\2') - name.gsub(/\s+/, '_') - end end end