octopress 3.0.0.alpha8 → 3.0.0.rc.1

data/lib/octopress/configuration.rb

@@ -2,10 +2,10 @@ module Octopress
   module Configuration
 
     DEFAULTS = {
-      'new_post_extension' => 'markdown',
-      'new_page_extension' => 'html',
-      'new_post_layout' => 'post',
-      'new_page_layout' => 'page',
+      'post_ext' => 'markdown',
+      'page_ext' => 'html',
+      'post_layout' => 'post',
+      'page_layout' => 'page',
       'titlecase' => true
     }
 
@@ -13,22 +13,30 @@ module Octopress
       return @config if @config
 
       file = options['octopress-config'] || '_octopress.yml'
-      config = {}
+      user_config = {}
+
       if File.exist? file
-        config = YAML.safe_load(File.open(file))
+        user_config = YAML.safe_load(File.open(file).read) || {}
       end
-      @config = DEFAULTS.deep_merge(config)
+
+      user_config = user_config.deep_merge(options['override'] || {})
+      user_config = (options['defaults'] || {}).deep_merge(user_config)
+
+      @config = DEFAULTS.deep_merge(user_config)
     end
 
     def self.jekyll_config(options={})
       return @jekyll_config if @jekyll_config
 
-      log_level = Jekyll.logger.log_level
-      Jekyll.logger.log_level = Jekyll::Stevenson::WARN
-      jekyll_config = Jekyll.configuration(options)
-      Jekyll.logger.log_level = log_level
+      configs = Jekyll::Configuration::DEFAULTS
+
+      (options['config'] || ['_config.yml']).each do |file|
+        if File.exist? file
+          configs = configs.deep_merge YAML.safe_load(File.open(file)) 
+        end
+      end
 
-      @jekyll_config = jekyll_config
+      @jekyll_config = configs
     end
   end
 end

data/lib/octopress/draft.rb

@@ -1,40 +1,71 @@
 module Octopress
   class Draft < Post
 
+    def set_default_options
+      super
+      @options['type'] = 'draft' 
+    end
+
+    def path
+      name = "#{title_slug}.#{extension}"
+      File.join(source, '_drafts', name)
+    end
+
+    # -----
+    # Methods for publishing drafts
+    # -----
+
+    # Create a new post from draft file
+    #
+    # Sets post options based on draft file contents
+    # and options passed to the publish command
+    #
     def publish
+
       post_options = {
         'title'   => read_draft_title,
+        'slug'    => publish_slug,
+        'date'    => @options['date'],
         'content' => read_draft_content,
         'type'    => 'post from draft'
       }
+
+      # Create a new post file
+      #
       Post.new(post_options).write
+      
+      # Remove the old draft file
+      #
       FileUtils.rm @options['path']
-    end
 
-    def set_default_options
-      super
-      @options['type'] = 'draft' 
     end
 
-    def path
-      name = "#{title_slug}.#{extension}"
-      File.join(source, '_drafts', name)
+    # Get the slug from options or filename
+    #
+    def publish_slug
+      @options['slug'] || File.basename(@options['path'], '.*')
     end
 
+    # Reads the file from _drafts/[path]
+    #
     def read
       if @draft_content
         @draft_content
       else
         file = @options['path']
         abort "File #{file} not found." if !File.exist? file
-        @draft_content = Pathname.new(file).read
+        @draft_content = File.open(file).read
       end
     end
 
+    # Get title from draft post file
+    #
     def read_draft_title
       read.match(/title:\s+(.+)?$/)[1]
     end
     
+    # Get content from draft post file
+    #
     def read_draft_content
       read.sub(/date:\s+.+?$/, "date: #{@options['date']}")
     end

data/lib/octopress/ext/titlecase.rb

@@ -0,0 +1,37 @@
+class String
+  def titlecase
+    small_words = %w(a an and as at but by en for if in of on or the to v v. via vs vs.)
+
+    x = split(" ").map do |word|
+      # note: word could contain non-word characters!
+      # downcase all small_words, capitalize the rest
+      small_words.include?(word.gsub(/\W/, "").downcase) ? word.downcase! : word.smart_capitalize!
+      word
+    end
+    # capitalize first and last words
+    x.first.to_s.smart_capitalize!
+    x.last.to_s.smart_capitalize!
+    # small words are capitalized after colon, period, exclamation mark, question mark
+    x.join(" ").gsub(/(:|\.|!|\?)\s?(\W*#{small_words.join("|")}\W*)\s/) { "#{$1} #{$2.smart_capitalize} " }
+  end
+
+  def titlecase!
+    replace(titlecase)
+  end
+
+  def smart_capitalize
+    target = dup
+    # ignore any leading crazy characters and capitalize the first real character
+    if target =~ /^['"\(\[']*([a-z])/
+      i = index($1)
+      x = target[i,target.length]
+      # word with capitals and periods mid-word are left alone
+      target[i,1] = target[i,1].upcase unless x =~ /[A-Z]/ or x =~ /\.\w+/
+    end
+    target
+  end
+
+  def smart_capitalize!
+    replace(smart_capitalize)
+  end
+end

data/lib/octopress/page.rb

@@ -5,6 +5,15 @@ module Octopress
       @config = Octopress.config(options)
       @options = options
       set_default_options
+
+      # Ensure title
+      #
+      @options['title'] ||= ''
+
+      # Ensure a quoted title
+      #
+      @options['title'] = "\"#{@options['title']}\""
+
       @content = options['content'] || content
     end
 
@@ -37,9 +46,11 @@ module Octopress
       raise "You must specify a path." unless file
 
       # If path ends with a slash, make it an index
+      #
       file += "index" if file =~ /\/$/
 
       # if path has no extension, add the default extension
+      #
       file += ".#{extension}" unless file =~ /\.\w+$/
 
       @path = File.join(source, file)
@@ -50,31 +61,44 @@ module Octopress
     end
 
     def set_default_options
-      @options['type'] ||= 'page'
-      @options['layout']      =  @config['new_page_layout']
+      @options['type']      ||= 'page'
+      @options['layout']      =  @config['page_layout']
       @options['date']        = convert_date @options['date']
-      @options['extension'] ||= @config['new_page_extension']
-      @options['template'] ||= @config['new_page_template']
+      @options['extension'] ||= @config['page_ext']
+      @options['template']  ||= @config['page_template']
     end
 
     def convert_date(date)
       if date
-        begin
-          Time.parse(date.to_s).iso8601
-        rescue => error
-          abort 'Could not parse date. Try formatting it like YYYY-MM-DD HH:MM'
+        if @options['date'] == 'now'
+          @options['date'] = Time.now.iso8601
+        else
+          begin
+            Time.parse(date.to_s).iso8601
+          rescue => error
+            puts 'Could not parse date. Try formatting it like YYYY-MM-DD HH:MM'
+            abort error.message
+          end
         end
       end
     end
 
-    # Load the user provide or default template for a new post.
+    # Load the user provide or default template for a new post or page.
     #
     def content
+
+      # Handle case where user passes the full path
+      #
       file = @options['template']
-      file = File.join(source, '_templates', file) if file
-      if file 
-        abort "No template found at #{file}" unless File.exist? file
-        parse_template Pathname.new(file).read
+
+      if file
+        file.sub(/^_templates\//, '')
+        file = File.join(source, '_templates', file) if file
+        if File.exist? file
+          parse_template File.open(file).read
+        else
+          abort "No #{@options['type']} template found at #{file}"
+        end
       else
         parse_template default_content
       end
@@ -83,45 +107,37 @@ module Octopress
     # Render Liquid vars in YAML front-matter.
     def parse_template(input)
 
+      @options['title'].titlecase! if @config['titlecase']
       # If possible only parse the YAML front matter.
       # If YAML front-matter dashes aren't present parse the whole 
       # template and add dashes.
       #
       parsed = if input =~ /\A-{3}\s+(.+?)\s+-{3}\s+(.+)/m
         template = Liquid::Template.parse($1)
-        "---\n#{template.render(@options)}\n---\n\n#{$2}"
+        "---\n#{template.render(@options).strip}\n---\n\n#{$2}"
       else
         template = Liquid::Template.parse(input)
-        "---\n#{template.render(@options)}\n---\n\n"
+        "---\n#{template.render(@options).strip}\n---\n\n"
       end
     end
 
     def date_slug
-      Time.parse(@options['date']).strftime('%Y-%m-%d')
+      @options['date'].split('T')[0]
     end
 
-    # Returns a string which is url compatible.
-    #
-    def title_slug
-      value = @options['title'].gsub(/[^\x00-\x7F]/u, '')
-      value.gsub!(/(&|&)+/, 'and')
-      value.gsub!(/[']+/, '')
-      value.gsub!(/\W+/, ' ')
-      value.strip!
-      value.downcase!
-      value.gsub!(' ', '-')
-      value
+    def front_matter(vars)
+      fm = []
+      vars.each do |v| 
+        fm << "#{v}: {{ #{v} }}" if @options[v]
+      end
+      fm.join("\n")
     end
 
     # Page template defaults
     #
     def default_content
-      <<-TEMPLATE
----
-layout: {{ layout }}
-title: {{ title }}
----
-TEMPLATE
+      front_matter %w{layout title date}
     end
+
   end
 end

data/lib/octopress/post.rb

@@ -2,12 +2,12 @@ module Octopress
   class Post < Page
 
     def set_default_options
-      @options['type'] ||= 'post'
-      @options['layout'] =  @config['new_post_layout']
-      @options['date'] = convert_date @options['date'] || Time.now
-      @options['extension'] ||= @config['new_post_extension']
-      @options['template'] ||= @config['new_post_template']
-      raise "You must specify a title." if @options['title'].nil?
+      @options['type']      ||= 'post'
+      @options['layout']      = @config['post_layout']
+      @options['date']      ||= Time.now.iso8601
+      @options['date']        = convert_date @options['date']
+      @options['extension'] ||= @config['post_ext']
+      @options['template']  ||= @config['post_template']
     end
 
     def path
@@ -15,17 +15,18 @@ module Octopress
       File.join(source, '_posts', name)
     end
 
-    # Post template defaults
+    # Returns a string which is url compatible.
     #
-    def default_content
-      <<-TEMPLATE
----
-layout: {{ layout }}
-title: {{ title }}
-date: {{ date }}
-categories: {{ categories }}
----
-TEMPLATE
+    def title_slug
+      value = (@options['slug'] || @options['title']).downcase
+      value.gsub!(/[^\x00-\x7F]/u, '')
+      value.gsub!(/(&amp;|&)+/, 'and')
+      value.gsub!(/[']+/, '')
+      value.gsub!(/\W+/, ' ')
+      value.strip!
+      value.gsub!(' ', '-')
+      value
     end
+
   end
 end

data/lib/octopress/scaffold.rb

@@ -0,0 +1,26 @@
+module Octopress
+  class Scaffold
+    attr_reader :path, :force
+
+    def initialize(args, options)
+      @path  = File.expand_path(args.join(" "), Dir.pwd)
+      @force = !!options['force']
+    end
+    
+    def write
+      if !force && (File.exist?(path + '/_templates') ||
+        File.exist?(path + '/_octopress.yml'))
+        abort "Some files already exist.  Use --force to overwrite."
+      end
+
+      FileUtils.cp_r scaffold_path + '/.', path
+
+      puts "Octopress scaffold added to #{path}."
+    end
+
+    def scaffold_path
+      Octopress.expand_gem_path('scaffold')
+    end
+    
+  end
+end

data/lib/octopress/version.rb

@@ -1,3 +1,3 @@
 module Octopress
-  VERSION = "3.0.0.alpha8"
+  VERSION = "3.0.0.rc.1"
 end

data/octopress.gemspec

@@ -19,7 +19,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_runtime_dependency "mercenary", "~> 0.3.1"
-  spec.add_runtime_dependency "jekyll", "~> 1.4.2"
+  spec.add_runtime_dependency "jekyll", "~> 1.4.3"
 
   spec.add_development_dependency "bundler", "~> 1.3"
   spec.add_development_dependency "pry-debugger"

data/scaffold/_octopress.yml

@@ -0,0 +1,11 @@
+# Default extension for new posts and pages
+post_ext: markdown
+page_ext: html
+
+# Default templates for posts and pages
+# Found in _templates/
+post_layout: post
+page_layout: page
+
+# Format titles with titlecase?
+titlecase: true

data/scaffold/_templates/page

@@ -0,0 +1,6 @@
+---
+layout: {{ layout }}
+title: {{ title }}
+date: {{ date }}
+---
+

data/scaffold/_templates/post

@@ -0,0 +1,6 @@
+---
+layout: {{ layout }}
+title: {{ title }}
+date: {{ date }}
+---
+

data/test/expected/_drafts/stupid-idea.markdown

@@ -0,0 +1,6 @@
+---
+layout: post
+title: "Stupid Idea"
+date: 2014-03-10T15:20:00Z
+---
+

data/test/expected/_layouts/page.html

@@ -0,0 +1 @@
+<div class='page'>{{ page.title }}{{ content }}</div>

data/test/expected/_layouts/post.html

@@ -0,0 +1 @@
+<div class='post'>{{ page.title }}{{ content }}</div>