move type and layout values to contants

Author: blackjid

lib/jekyll/commands/draft.rb

@@ -19,8 +19,13 @@ def self.init_with_program(prog)
       def self.process(args = [], options = {})
         raise ArgumentError.new('You must specify a name.') if args.empty?
 
+<<<<<<< HEAD
         type = options["type"] || "md"
         layout = options["layout"] || "post"
+=======
+        type = options["type"].nil? ? Jekyll::Compose::DEFAULT_TYPE : options["type"]
+        layout = options["layout"].nil? ? Jekyll::Compose::DEFAULT_LAYOUT : options["layout"]
+>>>>>>> move type and layout values to contants
 
         title = args.shift
         name = title.gsub(' ', '-').downcase
@@ -38,7 +43,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
 

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"])
 

lib/jekyll/compose.rb

@@ -0,0 +1,12 @@
+require "jekyll/compose/version"
+
+module Jekyll
+  module Compose
+    DEFAULT_TYPE = "md"
+    DEFAULT_LAYOUT = "post"
+  end
+end
+
+require "jekyll/commands/draft"
+require "jekyll/commands/post"
+require "jekyll/commands/publish"