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

Sign up to get free protection for your applications and to get access to all the features.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: b592fc093e97e386a697674ed6afc49123a36229
4
- data.tar.gz: c4e319f97c9ec7c9ca1868268d5bc1f51b125d08
3
+ metadata.gz: 05007844a106947e1ddb0425f249f86be68707dc
4
+ data.tar.gz: 05708e4e2f628ef6e7b6842a1ac7113a174de0cc
5
5
  SHA512:
6
- metadata.gz: 6f83d00d87e5b87ab1628b9216d6407a02a8e2419c28c8b20bc6abece9fd5421c94d48227b1250c05970cb9855cd8691bbaca7b1b234c750e1982736a2c8ad77
7
- data.tar.gz: 03cc61c13df8e7b37debefd536598ff4434c5c346a5e4c737c2c75553b37b6c6d976736e9a2a483be38c0ed56d998b300fa06e88f34a1fdeb3dae85cd7b1076c
6
+ metadata.gz: 56b947fa037f555093bfd33bbfa23df1926fbb314a15459a8af0595d40255439899859de87eb44c4eacc6c7290ca6297486b8a2dd1d18fb9649f12ae0186a753
7
+ data.tar.gz: 7e68ee662d4aed859ec99f06d36eb0e2a653a034336fa2fc293857cbd76333a36f810949eed9106d1d0acbe28d4d3b784319004af1ad5085a252221dd262ccd5
data/CHANGELOG.md CHANGED
@@ -1,5 +1,9 @@
1
1
  # Changelog
2
2
 
3
+ ### 3.0.0 RC34 (2015-02-21)
4
+
5
+ - Added `multilingual?` method so plugins can easily check if a site is configured with Octopress Multilingual.
6
+
3
7
  ### 3.0.0 RC33 (2015-02-14)
4
8
 
5
9
  - Removed `--lang` option from CLI. This adds unnecessary complexity which can be addressed with templates.
data/lib/octopress.rb CHANGED
@@ -2,6 +2,8 @@ require 'mercenary'
2
2
  require 'titlecase'
3
3
 
4
4
  module Octopress
5
+ extend self
6
+
5
7
  require 'octopress/command'
6
8
  require 'octopress/version'
7
9
  require 'octopress/utils'
@@ -26,7 +28,7 @@ module Octopress
26
28
  octopress-multilingual
27
29
  ]
28
30
 
29
- def self.logger
31
+ def logger
30
32
  @logger ||= Mercenary::Command.logger
31
33
  @logger.level = Logger::DEBUG
32
34
  @logger
@@ -34,7 +36,7 @@ module Octopress
34
36
 
35
37
  # Cache Jekyll's site configuration
36
38
  #
37
- def self.configuration(options={})
39
+ def configuration(options={})
38
40
  if site?
39
41
  @site.config
40
42
  else
@@ -42,19 +44,25 @@ module Octopress
42
44
  end
43
45
  end
44
46
 
45
- def self.site?
47
+ def site?
46
48
  !@site.nil?
47
49
  end
48
50
 
51
+ # Is this site set up with the multilingual plugin?
52
+ #
53
+ def multilingual?
54
+ defined?(Octopress::Multilingual) && !Octopress.site.config['lang'].nil?
55
+ end
56
+
49
57
  # Cache Jekyll's site
50
58
  #
51
- def self.site(options={})
59
+ def site(options={})
52
60
  @site ||= read_site(options)
53
61
  end
54
62
 
55
63
  # Quietly read from Jekyll's site
56
64
  #
57
- def self.read_site(options={})
65
+ def read_site(options={})
58
66
  Jekyll.logger.log_level = :error
59
67
  s = Jekyll::Site.new(Jekyll.configuration(options))
60
68
  Jekyll::PluginManager.require_from_bundler
@@ -65,7 +73,7 @@ module Octopress
65
73
 
66
74
  # Allow site to be set
67
75
  #
68
- def self.site=(site)
76
+ def site=(site)
69
77
  @site = alias_site_title(site)
70
78
  end
71
79
 
@@ -73,16 +81,16 @@ module Octopress
73
81
  # This ensures we can all use site.name to be
74
82
  # compatible with Jekyll's scaffold convention
75
83
  #
76
- def self.alias_site_title(site)
84
+ def alias_site_title(site)
77
85
  site.config['name'] ||= site.config['title']
78
86
  site
79
87
  end
80
88
 
81
- def self.gem_dir(dir='')
89
+ def gem_dir(dir='')
82
90
  File.expand_path(File.join(File.dirname(__FILE__), '..', dir))
83
91
  end
84
92
 
85
- def self.require_blessed_gems
93
+ def require_blessed_gems
86
94
  BLESSED_GEMS.each do |gem|
87
95
  begin
88
96
  require gem
@@ -1,3 +1,3 @@
1
1
  module Octopress
2
- VERSION = "3.0.0.rc.33"
2
+ VERSION = "3.0.0.rc.34"
3
3
  end
data/site/Gemfile CHANGED
@@ -8,6 +8,8 @@ group :jekyll_plugins do
8
8
  gem "octopress-deploy"#, path: "../../deploy"
9
9
  gem "octopress-linkblog"#, path: "../../linkblog"
10
10
  gem "octopress-feeds"#, path: "../../feeds"
11
+ gem "octopress-paginate"#, path: "../../paginate"
12
+ gem "octopress-multilingual"#, path: "../../multilingual"
11
13
  gem "octopress-asset-pipeline"#, path: "../../asset-pipeline"
12
14
  gem "octopress-minify-html"#, path: "../../minify-html"
13
15
  gem "octopress-date-format"#, path: "../../date-format"
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: octopress
3
3
  version: !ruby/object:Gem::Version
4
- version: 3.0.0.rc.33
4
+ version: 3.0.0.rc.34
5
5
  platform: ruby
6
6
  authors:
7
7
  - Brandon Mathis
@@ -9,7 +9,7 @@ authors:
9
9
  autorequire:
10
10
  bindir: bin
11
11
  cert_chain: []
12
- date: 2015-02-14 00:00:00.000000000 Z
12
+ date: 2015-02-22 00:00:00.000000000 Z
13
13
  dependencies:
14
14
  - !ruby/object:Gem::Dependency
15
15
  name: mercenary