octopress-ink 1.0.0.rc.21 → 1.0.0.rc.22

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (7) hide show
  1. checksums.yaml +4 -4
  2. data/CHANGELOG.md +4 -0
  3. data/lib/octopress-ink/configuration.rb +9 -8
  4. data/lib/octopress-ink/plugin_asset_pipeline.rb +3 -3
  5. data/lib/octopress-ink/plugins.rb +4 -4
  6. data/lib/octopress-ink/version.rb +1 -1
  7. metadata +2 -2
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 9f537a9fba193fcd94d397c8ba99b25c8e7d1b02
4
- data.tar.gz: c17b345185bf16c0b37b9778afbb6886de3bb4f4
3
+ metadata.gz: 647bcbdbcf354195f3990d5a63ad12b63b52b9cd
4
+ data.tar.gz: 86d6463658166fc12f5ef709144d0b247911a5d2
5
5
  SHA512:
6
- metadata.gz: c469002b6db39ef5315845dc649cbd6bb77e5d38ca63e050d44d1ee7d952e831450bc3bbc63e8f66e7031ca045a19ea0b1d42ba7e1f5acbe781dbcaadf409f40
7
- data.tar.gz: 9e3910263a34f3f44a49a2cf340f66266a4fef28cadc982c61b721fd1301d4f9e8e875c1f55d40868fd41a3f347873e77b57e1f48983c1360bd68a9306f2ec95
6
+ metadata.gz: 7280f35abb690a97429b47c58a4b62fad146b2cd8a2de8a8903003cf7fcf424c433e6f26f0f9f05ee64f692ade152d6be887f28b22d891105d80152923baba09
7
+ data.tar.gz: d12f8f562636a17c2ee61c52bbd74b870a2d2f0c43595bedc941a67aee624a8c0c2161f47f89c070705bbcb7a71de03cc7eccc26be2503dac18d76dcedec23ba
data/CHANGELOG.md CHANGED
@@ -1,5 +1,9 @@
1
1
  # Changelog
2
2
 
3
+ ### 1.0.0 RC22 - 2015-01-01
4
+
5
+ - Moved Asset pipeline configuration under `asset_pipline` key in _config.yml
6
+
3
7
  ### 1.0.0 RC21 - 2014-12-13
4
8
 
5
9
  - Documentation fixes
data/lib/octopress-ink/configuration.rb CHANGED
@@ -1,20 +1,21 @@
1
1
  # encoding: UTF-8
2
- require 'yaml'
3
2
 
4
3
  module Octopress
5
4
  module Ink
6
5
  DEFAULT_OPTIONS = {
7
- 'combine_css' => true,
8
- 'compress_css' => true,
9
- 'combine_js' => true,
10
- 'compress_js' => true,
11
- 'uglifier' => {},
12
- 'disable' => [],
6
+ 'asset_pipeline' => {
7
+ 'combine_css' => true,
8
+ 'compress_css' => true,
9
+ 'combine_js' => true,
10
+ 'compress_js' => true,
11
+ 'uglifier' => {},
12
+ },
13
+
13
14
  'date_format' => 'ordinal',
14
15
  }
15
16
 
16
17
  def self.configuration(options={})
17
- @config ||= DEFAULT_OPTIONS.merge(Octopress.configuration(options))
18
+ @config ||= Jekyll::Utils.deep_merge_hashes(DEFAULT_OPTIONS, Octopress.configuration(options))
18
19
  end
19
20
 
20
21
  end
data/lib/octopress-ink/plugin_asset_pipeline.rb CHANGED
@@ -7,7 +7,7 @@ module Octopress
7
7
  def self.compile_css(content)
8
8
  configs = sass_converter.sass_configs
9
9
  configs[:syntax] = :scss
10
- configs[:style] ||= :compressed if Ink.configuration['compress_css']
10
+ configs[:style] ||= :compressed if Ink.configuration['asset_pipeline']['compress_css']
11
11
 
12
12
  Sass.compile(content, configs)
13
13
  end
@@ -158,8 +158,8 @@ module Octopress
158
158
  @combined_javascripts = nil
159
159
  js = combine_javascripts
160
160
  unless js == ''
161
- if Ink.configuration['compress_js']
162
- settings = Jekyll::Utils.symbolize_hash_keys(Ink.configuration['uglifier'])
161
+ if Ink.configuration['asset_pipeline']['compress_js']
162
+ settings = Jekyll::Utils.symbolize_hash_keys(Ink.configuration['asset_pipeline']['uglifier'])
163
163
  js = Uglifier.new(settings).compile(js)
164
164
  end
165
165
  write_files(js, combined_javascript_path)
data/lib/octopress-ink/plugins.rb CHANGED
@@ -117,7 +117,7 @@ module Octopress
117
117
  # Copy/Generate Stylesheets
118
118
  #
119
119
  def self.add_stylesheets
120
- if Ink.configuration['combine_css']
120
+ if Ink.configuration['asset_pipeline']['combine_css']
121
121
  PluginAssetPipeline.write_combined_stylesheet
122
122
  else
123
123
  add_assets(%w{css sass})
@@ -127,7 +127,7 @@ module Octopress
127
127
  # Copy/Generate Javascripts
128
128
  #
129
129
  def self.add_javascripts
130
- if Ink.configuration['combine_js']
130
+ if Ink.configuration['asset_pipeline']['combine_js']
131
131
  PluginAssetPipeline.write_combined_javascript
132
132
  else
133
133
  add_assets(%w{js coffee})
@@ -135,7 +135,7 @@ module Octopress
135
135
  end
136
136
 
137
137
  def self.css_tags
138
- if Ink.configuration['combine_css']
138
+ if Ink.configuration['asset_pipeline']['combine_css']
139
139
  PluginAssetPipeline.combined_stylesheet_tag
140
140
  else
141
141
  @css_tags.join('')
@@ -143,7 +143,7 @@ module Octopress
143
143
  end
144
144
 
145
145
  def self.js_tags
146
- if Ink.configuration['combine_js']
146
+ if Ink.configuration['asset_pipeline']['combine_js']
147
147
  PluginAssetPipeline.combined_javascript_tag
148
148
  else
149
149
  @js_tags.join('')
data/lib/octopress-ink/version.rb CHANGED
@@ -1,5 +1,5 @@
1
1
  module Octopress
2
2
  module Ink
3
- VERSION = "1.0.0.rc.21"
3
+ VERSION = "1.0.0.rc.22"
4
4
  end
5
5
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: octopress-ink
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.0.0.rc.21
4
+ version: 1.0.0.rc.22
5
5
  platform: ruby
6
6
  authors:
7
7
  - Brandon Mathis
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2014-12-19 00:00:00.000000000 Z
11
+ date: 2015-01-02 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: jekyll