octopress 3.0.0.rc.28 → 3.0.0.rc.29

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 19962f7013c2826d4225761b535f04c51c304ce7
-  data.tar.gz: d4291418217bf31b93b8a5b2b344b5d21ff7e42f
+  metadata.gz: 6a1ddc17529ba0de8cc44c2028b351b8c3786b70
+  data.tar.gz: de86073fe8c3e25de3d6ba23772c028e76031bd5
 SHA512:
-  metadata.gz: 361196b074235495103e8f0422f4c73db8b132bf8a2242d9fa1774c69d589637ed3bdf79fa0baa3192242346ddf9a5336f31b617e7f67e00cb3162eb53891845
-  data.tar.gz: 2fbdc312f1b0d38462f736b1954e1b92ca1b0c22a1c394b3a3212ffad929f57e318597901d5a93dd9edfe1f6f8ea6dc76e629808721683d748e70cd32c450a1e
+  metadata.gz: 0cfa31c15e60fd0620d9c4ec45d20e9ce36b88c68865a927d1aa4ff0f47d29863454fbaa8f8f8984d77e0c806a1c4e75df606694c79d86b3ee014034f46842b9
+  data.tar.gz: bc4e05a79d74ee9a18782b4d4e708d294d23f0529f6f068a995c45bf240dec817c9df20f89877f7b57bc54c4a8ccd325694011738fea89be9609e3fa76058524

data/CHANGELOG.md

@@ -1,6 +1,10 @@
 # Octopress Changelog
 
-### 3.0.0 RC27 (2015-01-15)
+### 3.0.0 RC29 (2015-01-17)
+
+- Added `--lang` option for multi-language support.
+
+### 3.0.0 RC28 (2015-01-15)
 
 - Fix: `--template` option accepts a path, allowing shell auto-completion.
 - Added short option flags for most commands.

data/README.md

@@ -74,6 +74,7 @@ date: YYYY-MM-DDTHH:MM:SS-00:00
 |:---------------------|:----------------------------------------|
 | `--template PATH`    | Use a template from <path>              |
 | `--date DATE`        | The date for the post. Should be parseable by [Time#parse](http://ruby-doc.org/stdlib-2.1.0/libdoc/time/rdoc/Time.html#method-i-parse) |
+| `--lang LANGUAGE`    | Set post language (e.g. en, it) for multi-language sites. |
 | `--slug SLUG`        | Slug for the new post.                  |
 | `--dir DIR`          | Create post at _posts/DIR/.             |
 | `--force`            | Overwrite existing file.                |
@@ -105,6 +106,7 @@ After the page is created, Octopress will tell you how to configure this new col
 | `--template PATH`    | Use a template from <path>              |
 | `--title TITLE`      | The title of the new page               |
 | `--date DATE`        | The date for the page. Should be parseable by [Time#parse](http://ruby-doc.org/stdlib-2.1.0/libdoc/time/rdoc/Time.html#method-i-parse) |
+| `--lang LANGUAGE`    | Set page language (e.g. en, it) for multi-language sites. |
 | `--force`            | Overwrite existing file.                |
 
 Note: The default page template doesn't expect a date. If you want to add dates
@@ -124,6 +126,7 @@ $ octopress new draft "My Title"
 |:-------------------|:------------------------------------------|
 | `--template PATH`  | Use a template from <path>                |
 | `--date DATE`      | The date for the draft. Should be parseable by [Time#parse](http://ruby-doc.org/stdlib-2.1.0/libdoc/time/rdoc/Time.html#method-i-parse) (defaults to Time.now) |
+| `--lang LANGUAGE`  | Set draft language (e.g. en, it) for multi-language sites. |
 | `--slug SLUG`      | The slug for the new post.                |
 | `--force`          | Overwrite existing file.                  |
 

data/lib/octopress.rb

@@ -95,7 +95,7 @@ Octopress::Docs.add({
   version:     Octopress::VERSION,
   description: "A framework for writing Jekyll sites ",
   base_url:    "octopress",
-  path:        File.expand_path(File.join(File.dirname(__FILE__), "../")),
+  path:        File.expand_path(File.join(File.dirname(__FILE__), "..")),
   source_url:  "https://github.com/octopress/octopress",
   website:     "http://octopress.org",
 })

data/lib/octopress/commands/helpers.rb

@@ -3,8 +3,9 @@ module Octopress
     extend self
 
     def add_page_options(c)
-      c.option 'template', '-tm', '--template PATH', "New #{c.name.to_s} from a template."
       c.option 'date',     '-d', '--date DATE', "Use 'now' or a String that is parseable by Time#parse."
+      c.option 'template', '-tm', '--template PATH', "New #{c.name.to_s} from a template."
+      c.option 'lang',     '-l', '--lang LANGUAGE', "Set a #{c.name.to_s} language (e.g. en, it) for multi-language sites."
       c.option 'force',    '-f', '--force', 'Overwrite file if it already exists'
     end
 

data/lib/octopress/draft.rb

@@ -29,12 +29,13 @@ module Octopress
     # and options passed to the publish command
     #
     def publish
-      @options['date'] ||= read_post_date || Time.now.iso8601
-      @options['title'] = read_post_title
+      @options['date'] ||= read_post_yaml('date') || Time.now.iso8601
+      @options['title'] = read_post_yaml('title')
 
       post_options = {
         'title'   => @options['title'],
         'date'    => @options['date'],
+        'lang'    => read_post_yaml('lang'),
         'slug'    => title_slug,
         'content' => read_post_content,
         'dir'     => @options['dir'],
@@ -54,16 +55,5 @@ module Octopress
     def default_template
       'draft'
     end
-
-    # Draft template defaults
-    #
-    def default_content
-
-      if @options['date']
-        front_matter %w{layout title date}
-      else
-        front_matter %w{layout title}
-      end
-    end
   end
 end

data/lib/octopress/page.rb

@@ -16,13 +16,16 @@ module Octopress
       site.plugin_manager.conscientious_require
       @config = DEFAULT_OPTIONS.merge(site.config)
       @options = options
+      @options['lang'].downcase! if @options['lang']
       set_default_options
 
+      @front_matter = %w{layout title date lang}
+
       # Ensure title
       #
       @options['title'] ||= ''
 
-      # Ensure a quoted title
+      # Ensure a quoted title to avoid YAML parsing issues.
       #
       @options['title'] = "\"#{@options['title']}\""
 
@@ -135,10 +138,10 @@ module Octopress
         elsif @options['template']
           abort "No #{@options['type']} template found at #{file}"
         else
-          parse_template default_content
+          parse_template default_front_matter
         end
       else
-        parse_template default_content
+        parse_template default_front_matter
       end
     end
 
@@ -149,13 +152,18 @@ module Octopress
     # Render Liquid vars in YAML front-matter.
     def parse_template(input)
 
-      vars = @options.dup
-
       if @config['titlecase']
-        vars['title'].titlecase!
+        @options['title'].titlecase!
       end
 
+      vars = @options.dup
+
+      # Allow templates to use slug
+      #
       vars['slug'] = title_slug
+
+      # Allow templates to use date fragments
+      #
       date = Time.parse(vars['date'] || Time.now.iso8601)
       vars['year'] = date.year
       vars['month'] = date.strftime('%m')
@@ -170,9 +178,7 @@ module Octopress
       parsed = if input =~ /\A-{3}\s+(.+?)\s+-{3}(.+)?/m
         input = $1
         content = $2
-        if vars['date'] && !(input =~ /date:/)
-          input += "\ndate: #{vars['date']}"
-        end
+        input << default_front_matter(input)
       else
         content = ''
       end
@@ -181,6 +187,16 @@ module Octopress
       "---\n#{template.render(vars).strip}\n---\n#{content}"
     end
 
+    # Ensures front-matter is set with optional arguments
+    #
+    def default_front_matter(template='')
+      @front_matter.dup.map do |k|
+        if @options[k] && !(template =~ /#{k}:/)
+          "\n#{k}: #{@options[k]}"
+        end
+      end.join('')
+    end
+
     def date_slug
       @options['date'].split('T')[0]
     end
@@ -197,23 +213,5 @@ module Octopress
       value.gsub!(' ', '-')
       value
     end
-
-    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
-      if @options['date']
-        front_matter %w{layout title date}
-      else
-        front_matter %w{layout title}
-      end
-    end
   end
 end

data/lib/octopress/post.rb

@@ -13,6 +13,12 @@ module Octopress
       @options['extension'] ||= @config['post_ext']
       @options['template']  ||= @config['post_template']
       @options['dir']       ||= ''
+
+      # Language dir should always be added if language is set
+      #
+      if @options['lang']
+        @options['dir']       = File.join(@options['lang'], @options['dir'])
+      end
     end
 
     def path
@@ -26,15 +32,9 @@ module Octopress
       'post'
     end
     
-    # Post template defaults
-    #
-    def default_content
-      front_matter %w{layout title date}
-    end
-
     def unpublish
-      @options['date'] = read_post_date
-      @options['title'] = read_post_title
+      @options['date'] = read_post_yaml('date')
+      @options['title'] = read_post_yaml('title')
 
       post_options = {
         'title'   => @options['title'],
@@ -63,15 +63,8 @@ module Octopress
 
     # Get title from post file
     #
-    def read_post_title
-      match = read.match(/title:\s+(.+)?$/)
-      match[1] if match
-    end
-    
-    # Read date from post file
-    #
-    def read_post_date
-      match = read.match(/date:\s+(\d.+)$/)
+    def read_post_yaml(key)
+      match = read.match(/#{key}:\s*(.+)?$/)
       match[1] if match
     end
     

data/lib/octopress/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: octopress
 version: !ruby/object:Gem::Version
-  version: 3.0.0.rc.28
+  version: 3.0.0.rc.29
 platform: ruby
 authors:
 - Brandon Mathis
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-15 00:00:00.000000000 Z
+date: 2015-01-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mercenary