octopress 3.0.0.rc.12 → 3.0.0.rc.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: af8aa291d4f97bb0fe20c1fc5965758ee4701999
-  data.tar.gz: 4f995072d9b4192bc48a12449f21ff35eaacc8a3
+  metadata.gz: fead3f71ad05e8d4ae9bb9037cd98bf46f2dcc6c
+  data.tar.gz: 9d4cbd900dcd2b381282d46acbb4cc103c133c24
 SHA512:
-  metadata.gz: 58c2b53290232258b67eb395d03297b8ebe9bb01b21c5be8e1c4acd87e33bc95aef431e8d1f65a3612a2d14b41b9270502a0447d7146f30fcd6d3d7e586f698d
-  data.tar.gz: 5edb343188cb88856c57fc0cb8f20ca4d7037611ff4e1edaf715f6840d5be92732fd2c292a73fa339e59b6063e93326ad43cd7e06c6443c833e08a1482b973de
+  metadata.gz: 40a3dd0146e0a4d5ab3d3d911f595a774fae90de19522e5b602065d622dfbcc4f31eaac3888ff28e63b9c02a3aa0628d6b0d13dfb913f7c1e6da2d89c77cfb7a
+  data.tar.gz: 79683e347d84488151bfdde5848f4383ffb40b206adafbea9470ab216810622f32f3997b2d4d9d1ecbf06b2737d896c35863deaa44325c11fc16d22823f1230e

data/.gitignore

@@ -18,3 +18,4 @@ tmp
 .sass-cache
 .code-highlighter-cache
 test-site
+.DS_Store

data/CHANGELOG.md

@@ -1,13 +1,20 @@
 # Octopress Changelog
 
 ## Current released version
-### 3.0.0 RC11 - 2014-05-23
 
-- Change: Default page template no longer includes a date.
-- Improved date management when publishing a draft.
+### 3.0.0 RC13 - 2014-07-24
+
+- Templates are no longer required unless passed as an option.
+- Drafts template default doesn't have a date anymore.
+- Now using octopress filters for titlecase
 
 ## Past versions
 
+### 3.0.0 RC12 - 2014-05-23
+
+- Change: Default page template no longer includes a date.
+- Improved date management when publishing a draft.
+
 ### 3.0.0 RC11 - 2014-05-07
 
 - Replaced Hash extensions with Jekyll utility methods.

data/bin/octopress

@@ -7,11 +7,6 @@ require 'octopress'
 
 Octopress.require_blessed_gems
 
-if defined? Octopress::Ink
-  require 'octopress/docs'
-  Octopress::Ink.register_plugin(Octopress::CLIDocs)
-end
-
 if ENV['BUNDLE_BIN_PATH'] || ENV['BUNDLE_GEMFILE']
   begin
     require 'bundler'

data/lib/octopress.rb

@@ -1,7 +1,7 @@
 require 'mercenary'
+require 'octopress-filters'
 
 module Octopress
-  require 'octopress/utils'
   require 'octopress/configuration'
   require 'octopress/command'
   require 'octopress/version'

data/lib/octopress/draft.rb

@@ -95,10 +95,15 @@ module Octopress
         read
       end
     end
+    
+    def default_template
+      'draft'
+    end
 
     # Draft template defaults
     #
     def default_content
+
       if @options['date']
         front_matter %w{layout title date}
       else

data/lib/octopress/page.rb

@@ -63,7 +63,9 @@ module Octopress
     def set_default_options
       @options['type']      ||= 'page'
       @options['layout']      = @config['page_layout']
-      @options['date']        = convert_date @options['date']
+      if @options['date']
+        @options['date']        = convert_date @options['date']
+      end
       @options['extension'] ||= @config['page_ext']
       @options['template']  ||= @config['page_template']
     end
@@ -95,8 +97,10 @@ module Octopress
         file = File.join(source, '_templates', file) if file
         if File.exist? file
           parse_template File.open(file).read
-        else
+        elsif @options['template']
           abort "No #{@options['type']} template found at #{file}"
+        else
+          parse_template default_content
         end
       else
         parse_template default_content
@@ -110,19 +114,26 @@ module Octopress
     # Render Liquid vars in YAML front-matter.
     def parse_template(input)
 
-      Octopress::Utils.titlecase!(@options['title']) if @config['titlecase']
+      if @config['titlecase']
+        @options['title'] = Octopress::Filters.titlecase(@options['title'])
+      end
       # 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}(.+)?/m
-        template = Liquid::Template.parse($1)
-        "---\n#{template.render(@options).strip}\n---\n#{$2}"
+        input = $1
+        content = $2
+        if @options['date'] && !(input =~ /date:/)
+          input += "\ndate: #{@options['date']}"
+        end
       else
-        template = Liquid::Template.parse(input)
-        "---\n#{template.render(@options).strip}\n---\n"
+        content = ''
       end
+
+      template = Liquid::Template.parse(input)
+      "---\n#{template.render(@options).strip}\n---\n#{content}"
     end
 
     def date_slug

data/lib/octopress/version.rb

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

data/octopress.gemspec

@@ -20,6 +20,7 @@ Gem::Specification.new do |spec|
 
   spec.add_runtime_dependency "mercenary", "~> 0.3.2"
   spec.add_runtime_dependency "jekyll", "~> 2.0"
+  spec.add_runtime_dependency "octopress-filters", "~> 1.1"
 
   spec.add_development_dependency "octopress-ink"
   spec.add_development_dependency "bundler", "~> 1.3"

data/scaffold/_templates/draft

@@ -0,0 +1,4 @@
+---
+layout: {{ layout }}
+title: {{ title }}
+---

data/test/Gemfile

@@ -0,0 +1,4 @@
+source 'https://rubygems.org'
+
+gem 'octopress', path: '../'
+gem 'pry-debugger'

data/test/expected/_templates/draft

@@ -0,0 +1,4 @@
+---
+layout: {{ layout }}
+title: {{ title }}
+---

data/test/test.rb

@@ -157,6 +157,6 @@ end
 # Build the site
 #
 system "cd test-site; octopress build; cd -"
-test_dirs('Compare directories', 'test-site', 'expected')
+test_dirs('Compare directories', 'expected', 'test-site')
 
 print_results

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: octopress
 version: !ruby/object:Gem::Version
-  version: 3.0.0.rc.12
+  version: 3.0.0.rc.13
 platform: ruby
 authors:
 - Brandon Mathis
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-23 00:00:00.000000000 Z
+date: 2014-07-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mercenary
@@ -39,6 +39,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.0'
+- !ruby/object:Gem::Dependency
+  name: octopress-filters
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.1'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.1'
 - !ruby/object:Gem::Dependency
   name: octopress-ink
   requirement: !ruby/object:Gem::Requirement
@@ -134,8 +148,10 @@ files:
 - lib/octopress/version.rb
 - octopress.gemspec
 - scaffold/_octopress.yml
+- scaffold/_templates/draft
 - scaffold/_templates/page
 - scaffold/_templates/post
+- test/Gemfile
 - test/expected/_config.yml
 - test/expected/_drafts/stupid-idea.markdown
 - test/expected/_layouts/page.html
@@ -160,6 +176,7 @@ files:
 - test/expected/_site/index.html
 - test/expected/_site/okay-page/index.html
 - test/expected/_templates/date_page
+- test/expected/_templates/draft
 - test/expected/_templates/other_page
 - test/expected/_templates/page
 - test/expected/_templates/post
@@ -197,6 +214,7 @@ specification_version: 4
 summary: Octopress is an obsessively designed framework for Jekyll blogging. It’s
   easy to configure and easy to deploy. Sweet huh?
 test_files:
+- test/Gemfile
 - test/expected/_config.yml
 - test/expected/_drafts/stupid-idea.markdown
 - test/expected/_layouts/page.html
@@ -221,6 +239,7 @@ test_files:
 - test/expected/_site/index.html
 - test/expected/_site/okay-page/index.html
 - test/expected/_templates/date_page
+- test/expected/_templates/draft
 - test/expected/_templates/other_page
 - test/expected/_templates/page
 - test/expected/_templates/post