octopress-ink 1.0.0.rc.27 → 1.0.0.rc.28
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/CHANGELOG.md +5 -1
- data/lib/octopress-ink/commands/new.rb +0 -1
- data/lib/octopress-ink/plugin.rb +14 -5
- data/lib/octopress-ink/plugin_asset_pipeline.rb +23 -15
- data/lib/octopress-ink/version.rb +1 -1
- metadata +2 -2
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA1:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: cb5a0fff7675e6e4fb71daeb25bdc9182ba46733
|
4
|
+
data.tar.gz: 7f7b16f0b24ed3950c4a443d78f9014d68d26814
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: b42fa1b59613766cc22f41186cad54981c8dd261273e53e1bc69400b08c5a0d59ef9772ecfe71ae06ce64dbc91271525d3cacb54d72457015d97565ca88db4a2
|
7
|
+
data.tar.gz: 19dd65c91260292c6a6912ef3a633eb3b687100f9f26b4a58b15d761b66e8d468c93ba3c8ace4da7723e9924ac74fef24cfb9ee99427fc022c36655734117ca3
|
data/CHANGELOG.md
CHANGED
@@ -1,6 +1,10 @@
|
|
1
1
|
# Changelog
|
2
2
|
|
3
|
-
### 1.0.0
|
3
|
+
### 1.0.0 RC27 - 2015-01-14
|
4
|
+
|
5
|
+
- Minified javascripts (whatever.min.js) are not re-compressed and are added first in the builds
|
6
|
+
|
7
|
+
### 1.0.0 RC27 - 2015-01-12
|
4
8
|
|
5
9
|
- Fixed: Invisible "dot" files are now ignored as plugin assets. [#32](https://github.com/octopress/ink/issues/32)
|
6
10
|
|
@@ -261,7 +261,6 @@ gemspec path: '../'
|
|
261
261
|
gemspec: gemspec,
|
262
262
|
gemspec_path: gemspec_path,
|
263
263
|
spec_var: gemspec.scan(/(\w+)\.name/).flatten[0],
|
264
|
-
version: gemspec.scan(/version.+=\s+(.+)$/).flatten[0],
|
265
264
|
name: gemspec.scan(/name.+['"](.+)['"]/).flatten[0],
|
266
265
|
version: version,
|
267
266
|
require_version: require_version,
|
data/lib/octopress-ink/plugin.rb
CHANGED
@@ -31,6 +31,7 @@ module Octopress
|
|
31
31
|
@includes = []
|
32
32
|
@css = []
|
33
33
|
@js = []
|
34
|
+
@no_compress_js = []
|
34
35
|
@coffee = []
|
35
36
|
@images = []
|
36
37
|
@sass = []
|
@@ -113,6 +114,10 @@ module Octopress
|
|
113
114
|
js.clone.concat coffee
|
114
115
|
end
|
115
116
|
|
117
|
+
def no_compress_js
|
118
|
+
@no_compress_js.reject(&:disabled?).compact
|
119
|
+
end
|
120
|
+
|
116
121
|
# Plugin configuration
|
117
122
|
#
|
118
123
|
# returns: Hash of merged user and default config.yml files
|
@@ -181,6 +186,7 @@ module Octopress
|
|
181
186
|
'sass' => @sass,
|
182
187
|
'css' => @css,
|
183
188
|
'js' => @js,
|
189
|
+
'minjs' => @no_compress_js,
|
184
190
|
'coffee' => @coffee,
|
185
191
|
'images' => @images,
|
186
192
|
'fonts' => @fonts,
|
@@ -286,6 +292,7 @@ module Octopress
|
|
286
292
|
|
287
293
|
if asset_types['javascripts']
|
288
294
|
asset_types['js'] = true
|
295
|
+
asset_types['minjs'] = true
|
289
296
|
asset_types['coffee'] = true
|
290
297
|
asset_types.delete('javascripts')
|
291
298
|
end
|
@@ -347,7 +354,9 @@ module Octopress
|
|
347
354
|
|
348
355
|
def add_javascripts
|
349
356
|
find_assets(@javascripts_dir).each do |asset|
|
350
|
-
if
|
357
|
+
if asset =~ /\.min\.js$/
|
358
|
+
@no_compress_js << Assets::Javascript.new(self, @javascripts_dir, asset)
|
359
|
+
elsif asset =~ /\.js$/
|
351
360
|
@js << Assets::Javascript.new(self, @javascripts_dir, asset)
|
352
361
|
elsif File.extname(asset) =~ /\.coffee$/
|
353
362
|
@coffee << Assets::Coffeescript.new(self, @javascripts_dir, asset)
|
@@ -384,11 +393,11 @@ module Octopress
|
|
384
393
|
end
|
385
394
|
|
386
395
|
def css
|
387
|
-
@css.reject
|
396
|
+
@css.reject(&:disabled?).compact
|
388
397
|
end
|
389
398
|
|
390
399
|
def sass
|
391
|
-
@sass.reject
|
400
|
+
@sass.reject(&:disabled?).compact
|
392
401
|
end
|
393
402
|
|
394
403
|
def sass_without_partials
|
@@ -396,11 +405,11 @@ module Octopress
|
|
396
405
|
end
|
397
406
|
|
398
407
|
def js
|
399
|
-
@js.reject
|
408
|
+
@js.reject(&:disabled?).compact
|
400
409
|
end
|
401
410
|
|
402
411
|
def coffee
|
403
|
-
@coffee.reject
|
412
|
+
@coffee.reject(&:disabled?).compact
|
404
413
|
end
|
405
414
|
|
406
415
|
def configuration; {}; end
|
@@ -101,7 +101,7 @@ module Octopress
|
|
101
101
|
def self.stylesheet_fingerprint(media)
|
102
102
|
@stylesheet_fingerprint ||= {}
|
103
103
|
@stylesheet_fingerprint[media] ||=
|
104
|
-
fingerprint(stylesheets[media].clone.map
|
104
|
+
fingerprint(stylesheets[media].clone.map(&:path))
|
105
105
|
end
|
106
106
|
|
107
107
|
# Get all plugins stylesheets
|
@@ -127,27 +127,35 @@ module Octopress
|
|
127
127
|
|
128
128
|
def self.javascripts
|
129
129
|
@javascripts ||=
|
130
|
-
Plugins.plugins.clone.map
|
130
|
+
Plugins.plugins.clone.map(&:javascripts).flatten
|
131
|
+
end
|
132
|
+
|
133
|
+
def self.no_compress_js
|
134
|
+
@no_compress_js ||= Plugins.plugins.clone.map(&:no_compress_js).flatten
|
131
135
|
end
|
132
136
|
|
133
137
|
def self.javascript_fingerprint
|
134
138
|
@javascript_fingerprint ||=
|
135
|
-
fingerprint(javascripts.clone.map
|
139
|
+
fingerprint(javascripts.clone.concat(no_compress_js).map(&:path))
|
136
140
|
end
|
137
141
|
|
138
142
|
def self.combine_javascripts
|
139
|
-
|
140
|
-
|
141
|
-
|
142
|
-
|
143
|
-
|
144
|
-
|
145
|
-
|
146
|
-
|
147
|
-
|
143
|
+
@combined_javascripts ||= combine_js(javascripts)
|
144
|
+
end
|
145
|
+
|
146
|
+
def self.combine_no_compress_javascripts
|
147
|
+
@combined_no_compress_javascripts ||= combine_js(no_compress_js)
|
148
|
+
end
|
149
|
+
|
150
|
+
def self.combine_js(files)
|
151
|
+
js = ''
|
152
|
+
files.each do |file|
|
153
|
+
unless js =~ /#{file.plugin.name}/
|
154
|
+
js << "/* #{file.plugin.type.capitalize}: #{file.plugin.name} */\n"
|
148
155
|
end
|
149
|
-
|
156
|
+
js << (file.ext.match(/.coffee/) ? file.compile : file.content)
|
150
157
|
end
|
158
|
+
(js == '' ? false : js)
|
151
159
|
end
|
152
160
|
|
153
161
|
def self.combined_javascript_path
|
@@ -156,12 +164,12 @@ module Octopress
|
|
156
164
|
|
157
165
|
def self.write_combined_javascript
|
158
166
|
@combined_javascripts = nil
|
159
|
-
js = combine_javascripts
|
160
|
-
unless js == ''
|
167
|
+
if js = combine_javascripts
|
161
168
|
if Ink.configuration['asset_pipeline']['compress_js']
|
162
169
|
settings = Jekyll::Utils.symbolize_hash_keys(Ink.configuration['asset_pipeline']['uglifier'])
|
163
170
|
js = Uglifier.new(settings).compile(js)
|
164
171
|
end
|
172
|
+
js = combine_no_compress_javascripts << js
|
165
173
|
write_files(js, combined_javascript_path)
|
166
174
|
end
|
167
175
|
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.
|
4
|
+
version: 1.0.0.rc.28
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Brandon Mathis
|
8
8
|
autorequire:
|
9
9
|
bindir: bin
|
10
10
|
cert_chain: []
|
11
|
-
date: 2015-01-
|
11
|
+
date: 2015-01-15 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: jekyll
|