From 0bfd5d6e7bea17c520f290699d864e6ffb9613f9 Mon Sep 17 00:00:00 2001 From: Darren Oakley Date: Tue, 29 May 2012 15:28:26 +0100 Subject: [PATCH] Extract out some duplication into a helper function. --- lib/gollum/frontend/app.rb | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/lib/gollum/frontend/app.rb b/lib/gollum/frontend/app.rb index 5756b4917..456f4bf9a 100644 --- a/lib/gollum/frontend/app.rb +++ b/lib/gollum/frontend/app.rb @@ -70,6 +70,11 @@ def extract_path(file_path) def extract_name(file_path) file_path.split("/").last end + + # Extrace the 'format' from the file name + def extract_format(filename) + $1 if filename =~ /^.+\.(\w+)$/ + end end get '/login' do @@ -118,14 +123,10 @@ def extract_name(file_path) authentication_required! @path = extract_path(params[:splat].first) @name = extract_name(params[:splat].first) + @format = extract_format(@name) wiki_options = settings.wiki_options.merge({ :page_file_dir => @path }) wiki = Gollum::Wiki.new(settings.gollum_path, wiki_options) - @format = nil - if @name =~ /^.+\.(\w+)$/ - @format = $1 - end - if page = wiki.page(@name) if page.format.to_s.include?('markdown') redirect '/livepreview/index.html?page=' + encodeURIComponent(@name) @@ -320,11 +321,8 @@ def show_page_or_file(name) content_type file.mime_type file.raw_data else - @name = name - @format = nil - if name =~ /^.+\.(\w+)$/ - @format = $1 - end + @name = name + @format = extract_format(@name) mustache :create end end