octopress 3.0.0.rc.10 → 3.0.0.rc.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0325806e004cef3b206f8cb47b889917b433c317
-  data.tar.gz: 48e047752fde08f395320585e883cff474c66d74
+  metadata.gz: f890b49b0468bf8cea9498b00ab637505eb9bf62
+  data.tar.gz: 8e9b290d772534b231f13eef5cedf218aa4f46e3
 SHA512:
-  metadata.gz: e10d7cdd4c2ac285b224be35b81294c9e78e8a37d696a3de83b5a62eb222bfd930ff2fb19f24c69f0dff9b1448fb073b8d54411e1aaae2f19626de0dc2f785c2
-  data.tar.gz: 07c8b7c503637fad940ca72c9ccd476f591c40e7887cbfb3b4251de463929bb1e2c6084bf92d21e01dce360292f0d7b214552c27b4e5ef14077126ac789b911b
+  metadata.gz: 0bad3975b63a5d5c4d35451f62b1fd6609824df851ce780d3534c12ad88fb85e67832a0c7a6ccfa8856e5b83dd04d02fa83bad193308ef52c4beaeb5ae77fd6f
+  data.tar.gz: 49f2e67e03d06fba6f38c11eba0f98436cb0f0c7f711907974493658fbd1042beb7924eeef79db1f4e8a51b0708aeda99a58d6dbe4f5805454b30fa217ff9826

data/CHANGELOG.md

@@ -2,9 +2,16 @@
 
 ## Current released version
 
+### 3.0.0 RC11 - 2014-19-07
+
+- Replaced Hash extensions with Jekyll utility methods
+- Replaced String extension "titlecase" with Octopress utility method
+
+## Past versions
+
 ### 3.0.0 RC10 - 2014-05-07
 
-- Now using SafeYAML.load instead of YAML.safe_load
+- Now using SafeYAML.load instead of YAML.safe_load [#38](https://github.com/octopress/octopress/issues/38)
 
 ### 3.0.0 RC9 - 2014-05-07
 
@@ -19,8 +26,6 @@
 - Fixed Time.parse with `--date` option on new posts and pages.
 - Bumped Jekyll to 1.5.
 
-## Past versions
-
 ### 3.0.0 RC6 - 2014-03-22
 
 - Added support for octopress-ink documentation system.

data/README.md

@@ -10,7 +10,7 @@ Octopress is an obsessively designed toolkit for writing and deploying Jekyll bl
 
 Add this line to your application's Gemfile:
 
-    gem 'octopress', '~> 3.0.0.rc.10'
+    gem 'octopress', '~> 3.0.0.rc.11'
 
 And then execute:
 
@@ -40,7 +40,7 @@ Run `octopress [command] --help` to learn more about any command and see its opt
 
 ### Deployment
 
-You can deploy your Octopress or Jeklly blog via git, rsync or Amazon S3. The deployment system ships with the [octopress-deploy][] gem which extends the Octopress CLI with the `deploy` command.
+You can deploy your Octopress or Jekyll blog via git, rsync or Amazon S3. The deployment system ships with the [octopress-deploy][] gem which extends the Octopress CLI with the `deploy` command.
 
 [octopress-deploy]: https://github.com/octopress/deploy
 

data/assets/docs/changelog.markdown

@@ -5,9 +5,16 @@ permalink: /changelog/
 
 ## Current released version
 
+### 3.0.0 RC11 - 2014-19-07
+
+- Replaced Hash extensions with Jekyll utility methods
+- Replaced String extension "titlecase" with Octopress utility method
+
+## Past versions
+
 ### 3.0.0 RC10 - 2014-05-07
 
-- Now using SafeYAML.load instead of YAML.safe_load
+- Now using SafeYAML.load instead of YAML.safe_load [#38](https://github.com/octopress/octopress/issues/38)
 
 ### 3.0.0 RC9 - 2014-05-07
 
@@ -22,8 +29,6 @@ permalink: /changelog/
 - Fixed Time.parse with `--date` option on new posts and pages.
 - Bumped Jekyll to 1.5.
 
-## Past versions
-
 ### 3.0.0 RC6 - 2014-03-22
 
 - Added support for octopress-ink documentation system.

data/assets/docs/index.markdown

@@ -12,7 +12,7 @@ Octopress is an obsessively designed toolkit for writing and deploying Jekyll bl
 
 Add this line to your application's Gemfile:
 
-    gem 'octopress', '~> 3.0.0.rc.10'
+    gem 'octopress', '~> 3.0.0.rc.11'
 
 And then execute:
 
@@ -42,7 +42,7 @@ Run `octopress [command] --help` to learn more about any command and see its opt
 
 ### Deployment
 
-You can deploy your Octopress or Jeklly blog via git, rsync or Amazon S3. The deployment system ships with the [octopress-deploy][] gem which extends the Octopress CLI with the `deploy` command.
+You can deploy your Octopress or Jekyll blog via git, rsync or Amazon S3. The deployment system ships with the [octopress-deploy][] gem which extends the Octopress CLI with the `deploy` command.
 
 [octopress-deploy]: https://github.com/octopress/deploy
 

data/lib/octopress.rb

@@ -1,8 +1,7 @@
 require 'mercenary'
 
 module Octopress
-  require 'octopress/ext/hash'
-  require 'octopress/ext/titlecase'
+  require 'octopress/utils'
   require 'octopress/configuration'
   require 'octopress/command'
   require 'octopress/version'

data/lib/octopress/configuration.rb

@@ -16,13 +16,13 @@ module Octopress
       user_config = {}
 
       if File.exist? file
-        user_config = SafeYAML.load(File.open(file).read) || {}
+        user_config = SafeYAML.load_file(file) || {}
       end
 
-      user_config = user_config.deep_merge(options['override'] || {})
-      user_config = (options['defaults'] || {}).deep_merge(user_config)
+      user_config = Jekyll::Utils.deep_merge_hashes(user_config, options['override'] || {})
+      user_config = Jekyll::Utils.deep_merge_hashes(options['defaults'] || {}, user_config)
 
-      @config = DEFAULTS.deep_merge(user_config)
+      @config = Jekyll::Utils.deep_merge_hashes(DEFAULTS, user_config)
     end
 
     def self.jekyll_config(options={})
@@ -32,7 +32,7 @@ module Octopress
 
       (options['config'] || ['_config.yml']).each do |file|
         if File.exist? file
-          configs = configs.deep_merge SafeYAML.load(File.open(file)) 
+          configs = Jekyll::Utils.deep_merge_hashes(configs, SafeYAML.load_file(file) || {})
         end
       end
 

data/lib/octopress/page.rb

@@ -106,7 +106,7 @@ module Octopress
     # Render Liquid vars in YAML front-matter.
     def parse_template(input)
 
-      @options['title'].titlecase! if @config['titlecase']
+      Octopress::Utils.titlecase!(@options['title']) 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.

data/lib/octopress/utils.rb

@@ -0,0 +1,42 @@
+module Octopress
+  module Utils
+
+    # Smart capitalization for titles
+    #
+    def self.titlecase(input)
+      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 = input.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! : smart_capitalize!(word)
+        word
+      end
+      # capitalize first and last words
+      smart_capitalize!(x.first)
+      smart_capitalize!(x.last)
+      # small words are capitalized after colon, period, exclamation mark, question mark
+      x.join(" ").gsub(/(:|\.|!|\?)\s?(\W*#{small_words.join("|")}\W*)\s/) { "#{$1} #{smart_capitalize($2)} " }
+    end
+
+    def self.titlecase!(input)
+      input.replace(titlecase(input))
+    end
+
+    def self.smart_capitalize(input)
+      target = input.dup
+      # ignore any leading crazy characters and capitalize the first real character
+      if target =~ /^['"\(\[']*([a-z])/
+        i = input.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 self.smart_capitalize!(input)
+      input.replace(smart_capitalize(input))
+    end
+  end
+end

data/lib/octopress/version.rb

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

data/octopress.gemspec

@@ -19,9 +19,9 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_runtime_dependency "mercenary", "~> 0.3.2"
-  spec.add_runtime_dependency "jekyll", "~> 2.0", ">= 2.0.0"
+  spec.add_runtime_dependency "jekyll", "~> 2.0"
 
-  #spec.add_development_dependency "octopress-ink"
+  spec.add_development_dependency "octopress-ink"
   spec.add_development_dependency "bundler", "~> 1.3"
   spec.add_development_dependency "pry-debugger"
   spec.add_development_dependency "rake"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: octopress
 version: !ruby/object:Gem::Version
-  version: 3.0.0.rc.10
+  version: 3.0.0.rc.11
 platform: ruby
 authors:
 - Brandon Mathis
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-08 00:00:00.000000000 Z
+date: 2014-05-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mercenary
@@ -32,9 +32,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.0'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 2.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -42,9 +39,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.0'
+- !ruby/object:Gem::Dependency
+  name: octopress-ink
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -119,11 +127,10 @@ files:
 - lib/octopress/configuration.rb
 - lib/octopress/docs.rb
 - lib/octopress/draft.rb
-- lib/octopress/ext/hash.rb
-- lib/octopress/ext/titlecase.rb
 - lib/octopress/page.rb
 - lib/octopress/post.rb
 - lib/octopress/scaffold.rb
+- lib/octopress/utils.rb
 - lib/octopress/version.rb
 - octopress.gemspec
 - scaffold/_octopress.yml

data/lib/octopress/ext/hash.rb

@@ -1,45 +0,0 @@
-class Hash
-  # Merges self with another hash, recursively.
-  #
-  # This code was lovingly stolen from some random gem:
-  # http://gemjack.com/gems/tartan-0.1.1/classes/Hash.html
-  #
-  # Thanks to whoever made it.
-  def deep_merge(hash)
-    target = dup
-    hash.keys.each do |key|
-      if hash[key].is_a? Hash and self[key].is_a? Hash
-        target[key] = target[key].deep_merge(hash[key])
-        next
-      end
-      target[key] = hash[key]
-    end
-
-    target
-  end
-
-  def to_symbol_keys
-    inject({}) do |memo, (k, v)|
-      if v.is_a? Hash
-        memo[k.to_sym] = v.to_symbol_keys
-      else
-        memo[k.to_sym] = v
-      end
-
-      memo
-    end
-  end
-
-  def to_string_keys
-    inject({}) do |memo, (k, v)|
-      if v.is_a? Hash
-        memo[k.to_s] = v.to_string_keys
-      else
-        memo[k.to_s] = v
-      end
-
-      memo
-    end
-  end
-end
-

data/lib/octopress/ext/titlecase.rb

@@ -1,37 +0,0 @@
-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