octopress 3.0.0.rc.33 → 3.0.0.rc.34

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b592fc093e97e386a697674ed6afc49123a36229
-  data.tar.gz: c4e319f97c9ec7c9ca1868268d5bc1f51b125d08
+  metadata.gz: 05007844a106947e1ddb0425f249f86be68707dc
+  data.tar.gz: 05708e4e2f628ef6e7b6842a1ac7113a174de0cc
 SHA512:
-  metadata.gz: 6f83d00d87e5b87ab1628b9216d6407a02a8e2419c28c8b20bc6abece9fd5421c94d48227b1250c05970cb9855cd8691bbaca7b1b234c750e1982736a2c8ad77
-  data.tar.gz: 03cc61c13df8e7b37debefd536598ff4434c5c346a5e4c737c2c75553b37b6c6d976736e9a2a483be38c0ed56d998b300fa06e88f34a1fdeb3dae85cd7b1076c
+  metadata.gz: 56b947fa037f555093bfd33bbfa23df1926fbb314a15459a8af0595d40255439899859de87eb44c4eacc6c7290ca6297486b8a2dd1d18fb9649f12ae0186a753
+  data.tar.gz: 7e68ee662d4aed859ec99f06d36eb0e2a653a034336fa2fc293857cbd76333a36f810949eed9106d1d0acbe28d4d3b784319004af1ad5085a252221dd262ccd5

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+### 3.0.0 RC34 (2015-02-21)
+
+- Added `multilingual?` method so plugins can easily check if a site is configured with Octopress Multilingual.
+
 ### 3.0.0 RC33 (2015-02-14)
 
 - Removed `--lang` option from CLI. This adds unnecessary complexity which can be addressed with templates.

data/lib/octopress.rb

@@ -2,6 +2,8 @@ require 'mercenary'
 require 'titlecase'
 
 module Octopress
+  extend self
+
   require 'octopress/command'
   require 'octopress/version'
   require 'octopress/utils'
@@ -26,7 +28,7 @@ module Octopress
     octopress-multilingual
   ]
 
-  def self.logger
+  def logger
     @logger ||= Mercenary::Command.logger
     @logger.level = Logger::DEBUG
     @logger
@@ -34,7 +36,7 @@ module Octopress
 
   # Cache Jekyll's site configuration
   #
-  def self.configuration(options={})
+  def configuration(options={})
     if site?
       @site.config
     else
@@ -42,19 +44,25 @@ module Octopress
     end
   end
 
-  def self.site?
+  def site?
     !@site.nil?
   end
 
+  # Is this site set up with the multilingual plugin?
+  #
+  def multilingual?
+    defined?(Octopress::Multilingual) && !Octopress.site.config['lang'].nil?
+  end
+
   # Cache Jekyll's site
   #
-  def self.site(options={})
+  def site(options={})
     @site ||= read_site(options)
   end
 
   # Quietly read from Jekyll's site
   #
-  def self.read_site(options={})
+  def read_site(options={})
     Jekyll.logger.log_level = :error
     s = Jekyll::Site.new(Jekyll.configuration(options))
     Jekyll::PluginManager.require_from_bundler
@@ -65,7 +73,7 @@ module Octopress
 
   # Allow site to be set
   #
-  def self.site=(site)
+  def site=(site)
     @site = alias_site_title(site)
   end
 
@@ -73,16 +81,16 @@ module Octopress
   # This ensures we can all use site.name to be
   # compatible with Jekyll's scaffold convention
   #
-  def self.alias_site_title(site)
+  def alias_site_title(site)
     site.config['name'] ||= site.config['title']
     site
   end
 
-  def self.gem_dir(dir='')
+  def gem_dir(dir='')
     File.expand_path(File.join(File.dirname(__FILE__), '..', dir))
   end
 
-  def self.require_blessed_gems
+  def require_blessed_gems
     BLESSED_GEMS.each do |gem|
       begin
         require gem

data/lib/octopress/version.rb

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

data/site/Gemfile

@@ -8,6 +8,8 @@ group :jekyll_plugins do
   gem "octopress-deploy"#, path: "../../deploy"
   gem "octopress-linkblog"#, path: "../../linkblog"
   gem "octopress-feeds"#, path: "../../feeds"
+  gem "octopress-paginate"#, path: "../../paginate"
+  gem "octopress-multilingual"#, path: "../../multilingual"
   gem "octopress-asset-pipeline"#, path: "../../asset-pipeline"
   gem "octopress-minify-html"#, path: "../../minify-html"
   gem "octopress-date-format"#, path: "../../date-format"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: octopress
 version: !ruby/object:Gem::Version
-  version: 3.0.0.rc.33
+  version: 3.0.0.rc.34
 platform: ruby
 authors:
 - Brandon Mathis
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-14 00:00:00.000000000 Z
+date: 2015-02-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mercenary