middleman-more 3.0.0.beta.2 → 3.0.0.beta.3

Sign up to get free protection for your applications and to get access to all the features.
Files changed (33) hide show
  1. data/features/asset_hash.feature +24 -24
  2. data/features/ignore_already_minified.feature +39 -4
  3. data/features/markdown.feature +3 -12
  4. data/features/markdown_redcarpet.feature +37 -0
  5. data/features/minify_css.feature +72 -10
  6. data/features/minify_javascript.feature +108 -10
  7. data/features/slim.feature +15 -1
  8. data/fixtures/markdown-app/config.rb +0 -9
  9. data/lib/middleman-more.rb +1 -74
  10. data/lib/middleman-more/core_extensions/compass.rb +49 -48
  11. data/lib/middleman-more/core_extensions/sprockets.rb +10 -2
  12. data/lib/middleman-more/extensions/asset_hash.rb +9 -23
  13. data/lib/middleman-more/extensions/cache_buster.rb +51 -53
  14. data/lib/middleman-more/extensions/gzip.rb +14 -0
  15. data/lib/middleman-more/extensions/minify_css.rb +60 -70
  16. data/lib/middleman-more/extensions/minify_javascript.rb +70 -77
  17. data/lib/middleman-more/extensions/relative_assets.rb +47 -47
  18. data/lib/middleman-more/register_extensions.rb +82 -0
  19. data/lib/middleman-more/renderers/coffee_script.rb +22 -0
  20. data/lib/middleman-more/renderers/haml.rb +24 -19
  21. data/lib/middleman-more/renderers/liquid.rb +28 -23
  22. data/lib/middleman-more/renderers/markdown.rb +50 -42
  23. data/lib/middleman-more/renderers/sass.rb +70 -63
  24. data/lib/middleman-more/renderers/slim.rb +27 -19
  25. data/middleman-more.gemspec +6 -7
  26. metadata +34 -43
  27. data/fixtures/already-minified-app/config.rb +0 -2
  28. data/fixtures/already-minified-app/source/javascripts/test.min.js +0 -10
  29. data/fixtures/already-minified-app/source/stylesheets/test.min.css +0 -10
  30. data/fixtures/minify-css-app/config.rb +0 -0
  31. data/fixtures/passthrough-app/config.rb +0 -17
  32. data/fixtures/slim-app/config.rb +0 -1
  33. data/fixtures/slim-app/source/slim.html.slim +0 -7
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: middleman-more
3
3
  version: !ruby/object:Gem::Version
4
- version: 3.0.0.beta.2
4
+ version: 3.0.0.beta.3
5
5
  prerelease: 6
6
6
  platform: ruby
7
7
  authors:
@@ -10,22 +10,22 @@ authors:
10
10
  autorequire:
11
11
  bindir: bin
12
12
  cert_chain: []
13
- date: 2012-04-22 00:00:00.000000000Z
13
+ date: 2012-05-21 00:00:00.000000000Z
14
14
  dependencies:
15
15
  - !ruby/object:Gem::Dependency
16
16
  name: middleman-core
17
- requirement: &70144569655900 !ruby/object:Gem::Requirement
17
+ requirement: &70152818222660 !ruby/object:Gem::Requirement
18
18
  none: false
19
19
  requirements:
20
20
  - - =
21
21
  - !ruby/object:Gem::Version
22
- version: 3.0.0.beta.2
22
+ version: 3.0.0.beta.3
23
23
  type: :runtime
24
24
  prerelease: false
25
- version_requirements: *70144569655900
25
+ version_requirements: *70152818222660
26
26
  - !ruby/object:Gem::Dependency
27
27
  name: uglifier
28
- requirement: &70144569646960 !ruby/object:Gem::Requirement
28
+ requirement: &70152818219560 !ruby/object:Gem::Requirement
29
29
  none: false
30
30
  requirements:
31
31
  - - ~>
@@ -33,21 +33,21 @@ dependencies:
33
33
  version: 1.2.0
34
34
  type: :runtime
35
35
  prerelease: false
36
- version_requirements: *70144569646960
36
+ version_requirements: *70152818219560
37
37
  - !ruby/object:Gem::Dependency
38
38
  name: haml
39
- requirement: &70144569644220 !ruby/object:Gem::Requirement
39
+ requirement: &70152818213340 !ruby/object:Gem::Requirement
40
40
  none: false
41
41
  requirements:
42
- - - ~>
42
+ - - ! '>='
43
43
  - !ruby/object:Gem::Version
44
44
  version: 3.1.0
45
45
  type: :runtime
46
46
  prerelease: false
47
- version_requirements: *70144569644220
47
+ version_requirements: *70152818213340
48
48
  - !ruby/object:Gem::Dependency
49
49
  name: sass
50
- requirement: &70144569643020 !ruby/object:Gem::Requirement
50
+ requirement: &70152818210180 !ruby/object:Gem::Requirement
51
51
  none: false
52
52
  requirements:
53
53
  - - ! '>='
@@ -55,21 +55,21 @@ dependencies:
55
55
  version: 3.1.7
56
56
  type: :runtime
57
57
  prerelease: false
58
- version_requirements: *70144569643020
58
+ version_requirements: *70152818210180
59
59
  - !ruby/object:Gem::Dependency
60
60
  name: compass
61
- requirement: &70144569640920 !ruby/object:Gem::Requirement
61
+ requirement: &70152818207700 !ruby/object:Gem::Requirement
62
62
  none: false
63
63
  requirements:
64
- - - ~>
64
+ - - ! '>='
65
65
  - !ruby/object:Gem::Version
66
66
  version: 0.12.1
67
67
  type: :runtime
68
68
  prerelease: false
69
- version_requirements: *70144569640920
69
+ version_requirements: *70152818207700
70
70
  - !ruby/object:Gem::Dependency
71
71
  name: coffee-script
72
- requirement: &70144569636620 !ruby/object:Gem::Requirement
72
+ requirement: &70152818206260 !ruby/object:Gem::Requirement
73
73
  none: false
74
74
  requirements:
75
75
  - - ~>
@@ -77,21 +77,21 @@ dependencies:
77
77
  version: 2.2.0
78
78
  type: :runtime
79
79
  prerelease: false
80
- version_requirements: *70144569636620
80
+ version_requirements: *70152818206260
81
81
  - !ruby/object:Gem::Dependency
82
82
  name: execjs
83
- requirement: &70144569635320 !ruby/object:Gem::Requirement
83
+ requirement: &70152818191380 !ruby/object:Gem::Requirement
84
84
  none: false
85
85
  requirements:
86
86
  - - ~>
87
87
  - !ruby/object:Gem::Version
88
- version: '1.2'
88
+ version: 1.3.2
89
89
  type: :runtime
90
90
  prerelease: false
91
- version_requirements: *70144569635320
91
+ version_requirements: *70152818191380
92
92
  - !ruby/object:Gem::Dependency
93
93
  name: sprockets
94
- requirement: &70144569633740 !ruby/object:Gem::Requirement
94
+ requirement: &70152818190120 !ruby/object:Gem::Requirement
95
95
  none: false
96
96
  requirements:
97
97
  - - ~>
@@ -99,10 +99,10 @@ dependencies:
99
99
  version: '2.1'
100
100
  type: :runtime
101
101
  prerelease: false
102
- version_requirements: *70144569633740
102
+ version_requirements: *70152818190120
103
103
  - !ruby/object:Gem::Dependency
104
104
  name: sprockets-sass
105
- requirement: &70144569623820 !ruby/object:Gem::Requirement
105
+ requirement: &70152818186700 !ruby/object:Gem::Requirement
106
106
  none: false
107
107
  requirements:
108
108
  - - ~>
@@ -110,18 +110,18 @@ dependencies:
110
110
  version: 0.8.0
111
111
  type: :runtime
112
112
  prerelease: false
113
- version_requirements: *70144569623820
113
+ version_requirements: *70152818186700
114
114
  - !ruby/object:Gem::Dependency
115
- name: redcarpet
116
- requirement: &70144569622180 !ruby/object:Gem::Requirement
115
+ name: maruku
116
+ requirement: &70152818184020 !ruby/object:Gem::Requirement
117
117
  none: false
118
118
  requirements:
119
119
  - - ~>
120
120
  - !ruby/object:Gem::Version
121
- version: 2.1.0
121
+ version: 0.6.0
122
122
  type: :runtime
123
123
  prerelease: false
124
- version_requirements: *70144569622180
124
+ version_requirements: *70152818184020
125
125
  description: A static site generator. Provides dozens of templating languages (Haml,
126
126
  Sass, Compass, Slim, CoffeeScript, and more). Makes minification, compression, cache
127
127
  busting, Yaml data (and more) an easy part of your development cycle.
@@ -145,6 +145,7 @@ files:
145
145
  - features/ignore_already_minified.feature
146
146
  - features/liquid.feature
147
147
  - features/markdown.feature
148
+ - features/markdown_redcarpet.feature
148
149
  - features/minify_css.feature
149
150
  - features/minify_javascript.feature
150
151
  - features/relative_assets.feature
@@ -154,9 +155,6 @@ files:
154
155
  - features/sprockets.feature
155
156
  - features/sprockets_gems.feature
156
157
  - features/support/env.rb
157
- - fixtures/already-minified-app/config.rb
158
- - fixtures/already-minified-app/source/javascripts/test.min.js
159
- - fixtures/already-minified-app/source/stylesheets/test.min.css
160
158
  - fixtures/asset-hash-app/config.rb
161
159
  - fixtures/asset-hash-app/source/images/100px.gif
162
160
  - fixtures/asset-hash-app/source/images/100px.jpg
@@ -225,7 +223,6 @@ files:
225
223
  - fixtures/markdown-app/source/strikethrough.html.markdown
226
224
  - fixtures/markdown-app/source/superscript.html.markdown
227
225
  - fixtures/markdown-app/source/tables.html.markdown
228
- - fixtures/minify-css-app/config.rb
229
226
  - fixtures/minify-css-app/source/inline-css.html.haml
230
227
  - fixtures/minify-css-app/source/more-css/site.css
231
228
  - fixtures/minify-css-app/source/stylesheets/site.css.sass
@@ -235,7 +232,6 @@ files:
235
232
  - fixtures/minify-js-app/source/javascripts/coffee_test.js.coffee
236
233
  - fixtures/minify-js-app/source/javascripts/js_test.js
237
234
  - fixtures/minify-js-app/source/more-js/other.js
238
- - fixtures/passthrough-app/config.rb
239
235
  - fixtures/passthrough-app/source/.htaccess
240
236
  - fixtures/passthrough-app/source/inline-coffeescript.html.haml
241
237
  - fixtures/passthrough-app/source/inline-css.html.haml
@@ -262,8 +258,6 @@ files:
262
258
  - fixtures/scss-app/config.rb
263
259
  - fixtures/scss-app/source/stylesheets/layout.css.sass
264
260
  - fixtures/scss-app/source/stylesheets/site_scss.css.scss
265
- - fixtures/slim-app/config.rb
266
- - fixtures/slim-app/source/slim.html.slim
267
261
  - fixtures/sprockets-app/config.rb
268
262
  - fixtures/sprockets-app/source/library/css/bootstrap_include.css.scss
269
263
  - fixtures/sprockets-app/source/library/css/plain.css
@@ -295,6 +289,8 @@ files:
295
289
  - lib/middleman-more/extensions/minify_css/rainpress.rb
296
290
  - lib/middleman-more/extensions/minify_javascript.rb
297
291
  - lib/middleman-more/extensions/relative_assets.rb
292
+ - lib/middleman-more/register_extensions.rb
293
+ - lib/middleman-more/renderers/coffee_script.rb
298
294
  - lib/middleman-more/renderers/haml.rb
299
295
  - lib/middleman-more/renderers/liquid.rb
300
296
  - lib/middleman-more/renderers/markdown.rb
@@ -316,7 +312,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
316
312
  version: '0'
317
313
  segments:
318
314
  - 0
319
- hash: 2031035666304926986
315
+ hash: 2577255282603066770
320
316
  required_rubygems_version: !ruby/object:Gem::Requirement
321
317
  none: false
322
318
  requirements:
@@ -341,6 +337,7 @@ test_files:
341
337
  - features/ignore_already_minified.feature
342
338
  - features/liquid.feature
343
339
  - features/markdown.feature
340
+ - features/markdown_redcarpet.feature
344
341
  - features/minify_css.feature
345
342
  - features/minify_javascript.feature
346
343
  - features/relative_assets.feature
@@ -350,9 +347,6 @@ test_files:
350
347
  - features/sprockets.feature
351
348
  - features/sprockets_gems.feature
352
349
  - features/support/env.rb
353
- - fixtures/already-minified-app/config.rb
354
- - fixtures/already-minified-app/source/javascripts/test.min.js
355
- - fixtures/already-minified-app/source/stylesheets/test.min.css
356
350
  - fixtures/asset-hash-app/config.rb
357
351
  - fixtures/asset-hash-app/source/images/100px.gif
358
352
  - fixtures/asset-hash-app/source/images/100px.jpg
@@ -421,7 +415,6 @@ test_files:
421
415
  - fixtures/markdown-app/source/strikethrough.html.markdown
422
416
  - fixtures/markdown-app/source/superscript.html.markdown
423
417
  - fixtures/markdown-app/source/tables.html.markdown
424
- - fixtures/minify-css-app/config.rb
425
418
  - fixtures/minify-css-app/source/inline-css.html.haml
426
419
  - fixtures/minify-css-app/source/more-css/site.css
427
420
  - fixtures/minify-css-app/source/stylesheets/site.css.sass
@@ -431,7 +424,6 @@ test_files:
431
424
  - fixtures/minify-js-app/source/javascripts/coffee_test.js.coffee
432
425
  - fixtures/minify-js-app/source/javascripts/js_test.js
433
426
  - fixtures/minify-js-app/source/more-js/other.js
434
- - fixtures/passthrough-app/config.rb
435
427
  - fixtures/passthrough-app/source/.htaccess
436
428
  - fixtures/passthrough-app/source/inline-coffeescript.html.haml
437
429
  - fixtures/passthrough-app/source/inline-css.html.haml
@@ -458,8 +450,6 @@ test_files:
458
450
  - fixtures/scss-app/config.rb
459
451
  - fixtures/scss-app/source/stylesheets/layout.css.sass
460
452
  - fixtures/scss-app/source/stylesheets/site_scss.css.scss
461
- - fixtures/slim-app/config.rb
462
- - fixtures/slim-app/source/slim.html.slim
463
453
  - fixtures/sprockets-app/config.rb
464
454
  - fixtures/sprockets-app/source/library/css/bootstrap_include.css.scss
465
455
  - fixtures/sprockets-app/source/library/css/plain.css
@@ -481,3 +471,4 @@ test_files:
481
471
  - fixtures/sprockets-app2/source/stylesheets/sprockets_base1.css.scss
482
472
  - fixtures/sprockets-app2/source/stylesheets/sprockets_base2.css.scss
483
473
  - fixtures/sprockets-app2/source/stylesheets/sprockets_sub.css.scss
474
+ has_rdoc:
@@ -1,2 +0,0 @@
1
- activate :minify_javascript
2
- activate :minify_css
@@ -1,10 +0,0 @@
1
- var numbers = [ 1,
2
- 2,
3
- 3,
4
- 4,
5
- 5,
6
- 6,
7
- 7,
8
- 8,
9
- 9,
10
- 10 ];
@@ -1,10 +0,0 @@
1
- body { one: 1;
2
- two: 2;
3
- three: 3;
4
- four: 4;
5
- five: 5;
6
- six: 6;
7
- seven: 7;
8
- eight: 8;
9
- nine: 9;
10
- ten: 10; }
File without changes
@@ -1,17 +0,0 @@
1
- module ::PassThrough
2
- def self.compress(data)
3
- data
4
- end
5
- end
6
-
7
- activate :minify_javascript
8
- activate :minify_css
9
-
10
- set :js_compressor, ::PassThrough
11
- set :css_compressor, ::PassThrough
12
-
13
- with_layout false do
14
- page "/inline-css.html"
15
- page "/inline-js.html"
16
- page "/inline-coffeescript.html"
17
- end
@@ -1 +0,0 @@
1
- require "slim"
@@ -1,7 +0,0 @@
1
- doctype 5
2
- html lang='en'
3
- head
4
- meta charset="utf-8"
5
-
6
- body
7
- h1 Welcome to Slim