octopress 3.0.0.rc.13 → 3.0.0.rc.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fead3f71ad05e8d4ae9bb9037cd98bf46f2dcc6c
-  data.tar.gz: 9d4cbd900dcd2b381282d46acbb4cc103c133c24
+  metadata.gz: ffe17080aee39ad3f2fae040eca71842cbd65f84
+  data.tar.gz: a699d7ff76b6b0ec4d4b062a488180eb5cbabcfb
 SHA512:
-  metadata.gz: 40a3dd0146e0a4d5ab3d3d911f595a774fae90de19522e5b602065d622dfbcc4f31eaac3888ff28e63b9c02a3aa0628d6b0d13dfb913f7c1e6da2d89c77cfb7a
-  data.tar.gz: 79683e347d84488151bfdde5848f4383ffb40b206adafbea9470ab216810622f32f3997b2d4d9d1ecbf06b2737d896c35863deaa44325c11fc16d22823f1230e
+  metadata.gz: e5bf0d1a2d1543581a9e895db7d3f16eca165e3716990d3697dc36724e827dc043c78c188fa786521320106a34f46ee9aed34e88b9fe87f9ed57065437ec65e7
+  data.tar.gz: a9bc9fc37b590ce5f1c638a312ff1032ed56e4af9f946f3fbb875fae7c3216150b43be6e4404b61f41974e01fbb5912a50873e27222e72970b632a542b5b416e

data/CHANGELOG.md

@@ -2,14 +2,19 @@
 
 ## Current released version
 
-### 3.0.0 RC13 - 2014-07-24
+### 3.0.0 RC14 - 2014-07-26
 
-- 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
+- Simplified configuration management.
+- Now requiring titlecase gem directly.
 
 ## Past versions
 
+### 3.0.0 RC13 - 2014-07-24
+
+- Templates are no longer required unless passed as an option.
+- The default drafts template doesn't have a date anymore.
+- Now using octopress filters for titlecase.
+
 ### 3.0.0 RC12 - 2014-05-23
 
 - Change: Default page template no longer includes a date.

data/README.md

@@ -95,7 +95,7 @@ title: "My Title"
 date: YYYY-MM-DDTHH:MM:SS-00:00
 ```
 
-"OK, great? What else can I do?" Great question! Check out these other options:
+"OK, great. What else can I do?" Great question! Check out these other options:
 
 | Option               | Description                             |
 |:---------------------|:----------------------------------------|
@@ -121,8 +121,9 @@ $ octopress new page about.html          # ./about.html
 | `--force`            | Overwrite existing file.                |
 
 Note: The default page template doesn't expect a date. If you want to add dates
-to your posts, consider adding `date: {{ date }}` to the default template
-`_templates/page`, or create a new template to use for dated pages.
+to your pages, consider adding `date: {{ date }}` to the default template
+`_templates/page`, or create a new template to use for dated pages. Otherwise,
+you will have the `--date` option to add a date to a page.
 
 ### New Draft
 

data/lib/octopress.rb

@@ -1,5 +1,5 @@
 require 'mercenary'
-require 'octopress-filters'
+require 'titlecase'
 
 module Octopress
   require 'octopress/configuration'

data/lib/octopress/configuration.rb

@@ -9,22 +9,34 @@ module Octopress
       'titlecase' => true
     }
 
+    # Read _octopress.yml and merge with defaults
+    #
     def self.config(options={})
-      return @config if @config
 
-      file = options['octopress-config'] || '_octopress.yml'
-      user_config = {}
+      # Cache loading the config file
+      unless @user_config
+        file = options['octopress-config'] || '_octopress.yml'
 
-      if File.exist? file
-        user_config = SafeYAML.load_file(file) || {}
-      end
+        if File.exist? file
+          config = SafeYAML.load_file(file) || {}
+        else
+          config = {}
+        end
+        
+        # Allow cli extensioins to override default user configuration
+        if options['override']
+          config = Jekyll::Utils.deep_merge_hashes(config, options['override'])
+        end
 
-      user_config = Jekyll::Utils.deep_merge_hashes(user_config, options['override'] || {})
-      user_config = Jekyll::Utils.deep_merge_hashes(options['defaults'] || {}, user_config)
+        # Merge Octopress defaults
+        @user_config = Jekyll::Utils.deep_merge_hashes(DEFAULTS, config)
+      end
 
-      @config = Jekyll::Utils.deep_merge_hashes(DEFAULTS, user_config)
+      @user_config
     end
 
+    # Read Jekyll's _config.yml merged with Jekyll's defaults
+    #
     def self.jekyll_config(options={})
       return @jekyll_config if @jekyll_config
 

data/lib/octopress/page.rb

@@ -115,7 +115,7 @@ module Octopress
     def parse_template(input)
 
       if @config['titlecase']
-        @options['title'] = Octopress::Filters.titlecase(@options['title'])
+        @options['title'].titlecase!
       end
       # If possible only parse the YAML front matter.
       # If YAML front-matter dashes aren't present parse the whole 

data/lib/octopress/version.rb

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

data/octopress.gemspec

@@ -20,7 +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_runtime_dependency "titlecase"
 
   spec.add_development_dependency "octopress-ink"
   spec.add_development_dependency "bundler", "~> 1.3"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: octopress
 version: !ruby/object:Gem::Version
-  version: 3.0.0.rc.13
+  version: 3.0.0.rc.14
 platform: ruby
 authors:
 - Brandon Mathis
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-25 00:00:00.000000000 Z
+date: 2014-07-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mercenary
@@ -40,19 +40,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '2.0'
 - !ruby/object:Gem::Dependency
-  name: octopress-filters
+  name: titlecase
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: octopress-ink
   requirement: !ruby/object:Gem::Requirement