From 628012846fa847e9a48384bdc104c7ea6d94b03e Mon Sep 17 00:00:00 2001 From: Juan Ignacio Donoso Date: Wed, 7 Jan 2015 21:40:18 -0300 Subject: [PATCH 1/2] changes default markdown extension to md --- lib/jekyll/commands/draft.rb | 6 +++--- lib/jekyll/commands/post.rb | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/lib/jekyll/commands/draft.rb b/lib/jekyll/commands/draft.rb index e48523f..adc064c 100644 --- a/lib/jekyll/commands/draft.rb +++ b/lib/jekyll/commands/draft.rb @@ -18,8 +18,8 @@ def self.init_with_program(prog) def self.process(args, options = {}) raise ArgumentError.new('You must specify a name.') if args.empty? - - type = options["type"].nil? ? "markdown" : options["type"] + + type = options["type"].nil? ? "md" : options["type"] layout = options["layout"].nil? ? "post" : options["layout"] title = args.shift @@ -38,7 +38,7 @@ def self.process(args, options = {}) # Internal: Gets the filename of the draft to be created # # Returns the filename of the draft, as a String - def self.draft_name(name, ext='markdown') + def self.draft_name(name, ext='md') "_drafts/#{name}.#{ext}" end diff --git a/lib/jekyll/commands/post.rb b/lib/jekyll/commands/post.rb index 185895d..5962016 100644 --- a/lib/jekyll/commands/post.rb +++ b/lib/jekyll/commands/post.rb @@ -19,8 +19,8 @@ def self.init_with_program(prog) def self.process(args, options = {}) raise ArgumentError.new('You must specify a name.') if args.empty? - - type = options["type"].nil? ? "markdown" : options["type"] + + type = options["type"].nil? ? "md" : options["type"] layout = options["layout"].nil? ? "post" : options["layout"] date = options["date"].nil? ? Time.now : DateTime.parse(options["date"]) From c206f0813b650ca4270699b5527be14b6ca7b63d Mon Sep 17 00:00:00 2001 From: Juan Ignacio Donoso Date: Wed, 7 Jan 2015 23:37:30 -0300 Subject: [PATCH 2/2] move type and layout values to contants --- lib/jekyll/commands/draft.rb | 6 +++--- lib/jekyll/commands/post.rb | 4 ++-- lib/jekyll/compose.rb | 2 ++ 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/lib/jekyll/commands/draft.rb b/lib/jekyll/commands/draft.rb index adc064c..0325738 100644 --- a/lib/jekyll/commands/draft.rb +++ b/lib/jekyll/commands/draft.rb @@ -19,8 +19,8 @@ def self.init_with_program(prog) def self.process(args, options = {}) raise ArgumentError.new('You must specify a name.') if args.empty? - type = options["type"].nil? ? "md" : options["type"] - layout = options["layout"].nil? ? "post" : options["layout"] + type = options["type"].nil? ? Jekyll::Compose::DEFAULT_TYPE : options["type"] + layout = options["layout"].nil? ? Jekyll::Compose::DEFAULT_LAYOUT : options["layout"] title = args.shift name = title.gsub(' ', '-').downcase @@ -38,7 +38,7 @@ def self.process(args, options = {}) # Internal: Gets the filename of the draft to be created # # Returns the filename of the draft, as a String - def self.draft_name(name, ext='md') + def self.draft_name(name, ext=Jekyll::Compose::DEFAULT_TYPE) "_drafts/#{name}.#{ext}" end diff --git a/lib/jekyll/commands/post.rb b/lib/jekyll/commands/post.rb index 5962016..87eb335 100644 --- a/lib/jekyll/commands/post.rb +++ b/lib/jekyll/commands/post.rb @@ -20,8 +20,8 @@ def self.init_with_program(prog) def self.process(args, options = {}) raise ArgumentError.new('You must specify a name.') if args.empty? - type = options["type"].nil? ? "md" : options["type"] - layout = options["layout"].nil? ? "post" : options["layout"] + type = options["type"].nil? ? Jekyll::Compose::DEFAULT_TYPE : options["type"] + layout = options["layout"].nil? ? Jekyll::Compose::DEFAULT_LAYOUT : options["layout"] date = options["date"].nil? ? Time.now : DateTime.parse(options["date"]) diff --git a/lib/jekyll/compose.rb b/lib/jekyll/compose.rb index 38b80b5..c3c3b51 100644 --- a/lib/jekyll/compose.rb +++ b/lib/jekyll/compose.rb @@ -2,6 +2,8 @@ module Jekyll module Compose + DEFAULT_TYPE = "md" + DEFAULT_LAYOUT = "post" end end