@@ -9,7 +9,7 @@ $SILENT = true class SlideDown USAGE = "The SlideDown command line interface takes a .md (Markdown) file as its only required argument. It will convert the file to HTML in standard out. Options: - -t, --template [TEMPLATE] the .erb files in /templates directory. Default is -t default, which prints stylesheets and javascripts inline. The import template uses link and script tags." + -t, --template [TEMPLATE] the .erb files in /templates directory. Default is -t default, which prints stylesheets and javascripts inline. The import template uses link and script tags. This can also accept an absolute path for templates outside the /templates directory." attr_accessor :stylesheets, :title attr_reader :classes @@ -63,9 +63,13 @@ class SlideDown end def render(name) - directory = File.join(File.dirname(__FILE__), "..", "templates") - path = File.join(directory, "#{name}.erb") - template = File.read(path) + if is_absolute_path?(name) + template = File.read("#{name}.erb") + else + directory = File.join(File.dirname(__FILE__), "..", "templates") + path = File.join(directory, "#{name}.erb") + template = File.read(path) + end ERB.new(template).result(binding) end @@ -100,4 +104,8 @@ class SlideDown '' end end + + def is_absolute_path?(path) + path == File.expand_path(path) + end end lib/slidedown.rb @@ -20,6 +20,16 @@ describe 'slidedown commandline tool' do result_file_content.should == reference_file_content end + it "accepts -t /full/path/to/template-filename" do + import_template_path = File.join(root_path, 'templates', 'import.erb') + other_template_path = Tempfile.new("slidedown-template").path + File.copy(import_template_path, "#{other_template_path}.erb") + + run_slidedown("-t #{other_template_path}") + + result_file_content.should == reference_file_content("slides-import") + end + def run_slidedown(opts = "") `#{slidedown_path} #{source_path} #{opts} > #{result_file_path}` end spec/commandline_spec.rb c421288aec5021e660414551330cf156bcae9a9e Jason Morrison jmorrison@thoughtbot.com http://github.com/nakajima/slidedown/commit/0afb72495845c1532b0ab3edac07b45b42e25dc1 0afb72495845c1532b0ab3edac07b45b42e25dc1 2009-09-02T11:58:23-07:00 2009-09-02T11:58:23-07:00 Allow the -t commandline argument to accept absolute paths for template files 788008cae1c65fc152279e9bec2bbad3b00a12f9 Jason Morrison jmorrison@thoughtbot.com