middleman 2.0.15.2 → 2.0.15.3

Sign up to get free protection for your applications and to get access to all the features.
Files changed (5) hide show
  1. data/features/builder.feature +1 -1
  2. data/features/coffee-script.feature +2 -2
  3. data/lib/middleman/features/relative_assets.rb +2 -1
  4. data/lib/middleman/version.rb +1 -1
  5. metadata +319 -182
data/features/builder.feature CHANGED
@@ -4,7 +4,7 @@ Feature: Builder
4
4
  Scenario: Checking built folder for content
5
5
  Given a built app at "test-app"
6
6
  Then "index.html" should exist at "test-app" and include "Comment in layout"
7
- Then "javascripts/coffee_test.js" should exist at "test-app" and include "Array.prototype.slice"
7
+ Then "javascripts/coffee_test.js" should exist at "test-app" and include ".slice"
8
8
  Then "index.html" should exist at "test-app" and include "<h1>Welcome</h1>"
9
9
  Then "static.html" should exist at "test-app" and include "Static, no code!"
10
10
  Then "services/index.html" should exist at "test-app" and include "Services"
data/features/coffee-script.feature CHANGED
@@ -4,12 +4,12 @@ Feature: Support coffee-script
4
4
  Scenario: Rendering coffee script
5
5
  Given the Server is running at "test-app"
6
6
  When I go to "/javascripts/coffee_test.js"
7
- Then I should see "Array.prototype.slice"
7
+ Then I should see ".slice"
8
8
 
9
9
  Scenario: Rendering coffee-script with :coffeescript haml-filter
10
10
  Given the Server is running at "test-app"
11
11
  When I go to "/inline-coffeescript.html"
12
- Then I should see "Array.prototype.slice"
12
+ Then I should see ".slice"
13
13
 
14
14
  Scenario: Rendering broken coffee
15
15
  Given the Server is running at "test-app"
data/lib/middleman/features/relative_assets.rb CHANGED
@@ -16,7 +16,8 @@ module Middleman::Features::RelativeAssets
16
16
  elsif path[0,1] == "/"
17
17
  path
18
18
  else
19
- path = File.join(prefix, path) if prefix.length > 0
19
+ path = app.before_asset_handler(:relative_assets, path, prefix, request).sub(%r{^/}, '')
20
+ # path = File.join(prefix, path) if prefix.length > 0
20
21
  request_path = request.path_info.dup
21
22
  request_path << app.index_file if path.match(%r{/$})
22
23
  request_path.gsub!(%r{^/}, '')
data/lib/middleman/version.rb CHANGED
@@ -1,3 +1,3 @@
1
1
  module Middleman
2
- VERSION = "2.0.15.2"
2
+ VERSION = "2.0.15.3"
3
3
  end
metadata CHANGED
@@ -1,294 +1,418 @@
1
- --- !ruby/object:Gem::Specification
1
+ --- !ruby/object:Gem::Specification
2
2
  name: middleman
3
- version: !ruby/object:Gem::Version
4
- version: 2.0.15.2
3
+ version: !ruby/object:Gem::Version
4
+ hash: 85
5
5
  prerelease:
6
+ segments:
7
+ - 2
8
+ - 0
9
+ - 15
10
+ - 3
11
+ version: 2.0.15.3
6
12
  platform: ruby
7
- authors:
13
+ authors:
8
14
  - Thomas Reynolds
9
15
  autorequire:
10
16
  bindir: bin
11
17
  cert_chain: []
12
- date: 2012-04-05 00:00:00.000000000Z
13
- dependencies:
14
- - !ruby/object:Gem::Dependency
18
+
19
+ date: 2012-04-11 00:00:00 Z
20
+ dependencies:
21
+ - !ruby/object:Gem::Dependency
22
+ type: :runtime
15
23
  name: rack
16
- requirement: &70097574960620 !ruby/object:Gem::Requirement
24
+ version_requirements: &id001 !ruby/object:Gem::Requirement
17
25
  none: false
18
- requirements:
26
+ requirements:
19
27
  - - ~>
20
- - !ruby/object:Gem::Version
28
+ - !ruby/object:Gem::Version
29
+ hash: 17
30
+ segments:
31
+ - 1
32
+ - 3
33
+ - 5
21
34
  version: 1.3.5
22
- type: :runtime
23
35
  prerelease: false
24
- version_requirements: *70097574960620
25
- - !ruby/object:Gem::Dependency
36
+ requirement: *id001
37
+ - !ruby/object:Gem::Dependency
38
+ type: :runtime
26
39
  name: thin
27
- requirement: &70097574959720 !ruby/object:Gem::Requirement
40
+ version_requirements: &id002 !ruby/object:Gem::Requirement
28
41
  none: false
29
- requirements:
42
+ requirements:
30
43
  - - ~>
31
- - !ruby/object:Gem::Version
44
+ - !ruby/object:Gem::Version
45
+ hash: 9
46
+ segments:
47
+ - 1
48
+ - 2
49
+ - 11
32
50
  version: 1.2.11
33
- type: :runtime
34
51
  prerelease: false
35
- version_requirements: *70097574959720
36
- - !ruby/object:Gem::Dependency
52
+ requirement: *id002
53
+ - !ruby/object:Gem::Dependency
54
+ type: :runtime
37
55
  name: thor
38
- requirement: &70097574958200 !ruby/object:Gem::Requirement
56
+ version_requirements: &id003 !ruby/object:Gem::Requirement
39
57
  none: false
40
- requirements:
58
+ requirements:
41
59
  - - ~>
42
- - !ruby/object:Gem::Version
60
+ - !ruby/object:Gem::Version
61
+ hash: 39
62
+ segments:
63
+ - 0
64
+ - 14
65
+ - 0
43
66
  version: 0.14.0
44
- type: :runtime
45
67
  prerelease: false
46
- version_requirements: *70097574958200
47
- - !ruby/object:Gem::Dependency
68
+ requirement: *id003
69
+ - !ruby/object:Gem::Dependency
70
+ type: :runtime
48
71
  name: tilt
49
- requirement: &70097574956580 !ruby/object:Gem::Requirement
72
+ version_requirements: &id004 !ruby/object:Gem::Requirement
50
73
  none: false
51
- requirements:
74
+ requirements:
52
75
  - - ~>
53
- - !ruby/object:Gem::Version
76
+ - !ruby/object:Gem::Version
77
+ hash: 25
78
+ segments:
79
+ - 1
80
+ - 3
81
+ - 1
54
82
  version: 1.3.1
55
- type: :runtime
56
83
  prerelease: false
57
- version_requirements: *70097574956580
58
- - !ruby/object:Gem::Dependency
84
+ requirement: *id004
85
+ - !ruby/object:Gem::Dependency
86
+ type: :runtime
59
87
  name: maruku
60
- requirement: &70097574955440 !ruby/object:Gem::Requirement
88
+ version_requirements: &id005 !ruby/object:Gem::Requirement
61
89
  none: false
62
- requirements:
90
+ requirements:
63
91
  - - ~>
64
- - !ruby/object:Gem::Version
92
+ - !ruby/object:Gem::Version
93
+ hash: 7
94
+ segments:
95
+ - 0
96
+ - 6
97
+ - 0
65
98
  version: 0.6.0
66
- type: :runtime
67
99
  prerelease: false
68
- version_requirements: *70097574955440
69
- - !ruby/object:Gem::Dependency
100
+ requirement: *id005
101
+ - !ruby/object:Gem::Dependency
102
+ type: :runtime
70
103
  name: sinatra
71
- requirement: &70097574950460 !ruby/object:Gem::Requirement
104
+ version_requirements: &id006 !ruby/object:Gem::Requirement
72
105
  none: false
73
- requirements:
106
+ requirements:
74
107
  - - ~>
75
- - !ruby/object:Gem::Version
108
+ - !ruby/object:Gem::Version
109
+ hash: 25
110
+ segments:
111
+ - 1
112
+ - 3
113
+ - 1
76
114
  version: 1.3.1
77
- type: :runtime
78
115
  prerelease: false
79
- version_requirements: *70097574950460
80
- - !ruby/object:Gem::Dependency
116
+ requirement: *id006
117
+ - !ruby/object:Gem::Dependency
118
+ type: :runtime
81
119
  name: rack-test
82
- requirement: &70097574949260 !ruby/object:Gem::Requirement
120
+ version_requirements: &id007 !ruby/object:Gem::Requirement
83
121
  none: false
84
- requirements:
122
+ requirements:
85
123
  - - ~>
86
- - !ruby/object:Gem::Version
124
+ - !ruby/object:Gem::Version
125
+ hash: 5
126
+ segments:
127
+ - 0
128
+ - 6
129
+ - 1
87
130
  version: 0.6.1
88
- type: :runtime
89
131
  prerelease: false
90
- version_requirements: *70097574949260
91
- - !ruby/object:Gem::Dependency
132
+ requirement: *id007
133
+ - !ruby/object:Gem::Dependency
134
+ type: :runtime
92
135
  name: uglifier
93
- requirement: &70097574947860 !ruby/object:Gem::Requirement
136
+ version_requirements: &id008 !ruby/object:Gem::Requirement
94
137
  none: false
95
- requirements:
138
+ requirements:
96
139
  - - ~>
97
- - !ruby/object:Gem::Version
98
- version: '1.2'
99
- type: :runtime
140
+ - !ruby/object:Gem::Version
141
+ hash: 11
142
+ segments:
143
+ - 1
144
+ - 2
145
+ version: "1.2"
100
146
  prerelease: false
101
- version_requirements: *70097574947860
102
- - !ruby/object:Gem::Dependency
147
+ requirement: *id008
148
+ - !ruby/object:Gem::Dependency
149
+ type: :runtime
103
150
  name: slim
104
- requirement: &70097574946140 !ruby/object:Gem::Requirement
151
+ version_requirements: &id009 !ruby/object:Gem::Requirement
105
152
  none: false
106
- requirements:
153
+ requirements:
107
154
  - - ~>
108
- - !ruby/object:Gem::Version
155
+ - !ruby/object:Gem::Version
156
+ hash: 19
157
+ segments:
158
+ - 1
159
+ - 0
160
+ - 2
109
161
  version: 1.0.2
110
- type: :runtime
111
162
  prerelease: false
112
- version_requirements: *70097574946140
113
- - !ruby/object:Gem::Dependency
163
+ requirement: *id009
164
+ - !ruby/object:Gem::Dependency
165
+ type: :runtime
114
166
  name: haml
115
- requirement: &70097574944980 !ruby/object:Gem::Requirement
167
+ version_requirements: &id010 !ruby/object:Gem::Requirement
116
168
  none: false
117
- requirements:
169
+ requirements:
118
170
  - - ~>
119
- - !ruby/object:Gem::Version
171
+ - !ruby/object:Gem::Version
172
+ hash: 3
173
+ segments:
174
+ - 3
175
+ - 1
176
+ - 0
120
177
  version: 3.1.0
121
- type: :runtime
122
178
  prerelease: false
123
- version_requirements: *70097574944980
124
- - !ruby/object:Gem::Dependency
179
+ requirement: *id010
180
+ - !ruby/object:Gem::Dependency
181
+ type: :runtime
125
182
  name: sass
126
- requirement: &70097574942960 !ruby/object:Gem::Requirement
183
+ version_requirements: &id011 !ruby/object:Gem::Requirement
127
184
  none: false
128
- requirements:
129
- - - ! '>='
130
- - !ruby/object:Gem::Version
185
+ requirements:
186
+ - - ">="
187
+ - !ruby/object:Gem::Version
188
+ hash: 13
189
+ segments:
190
+ - 3
191
+ - 1
192
+ - 7
131
193
  version: 3.1.7
132
- type: :runtime
133
194
  prerelease: false
134
- version_requirements: *70097574942960
135
- - !ruby/object:Gem::Dependency
195
+ requirement: *id011
196
+ - !ruby/object:Gem::Dependency
197
+ type: :runtime
136
198
  name: compass
137
- requirement: &70097574941240 !ruby/object:Gem::Requirement
199
+ version_requirements: &id012 !ruby/object:Gem::Requirement
138
200
  none: false
139
- requirements:
201
+ requirements:
140
202
  - - ~>
141
- - !ruby/object:Gem::Version
142
- version: '0.11'
143
- type: :runtime
203
+ - !ruby/object:Gem::Version
204
+ hash: 29
205
+ segments:
206
+ - 0
207
+ - 11
208
+ version: "0.11"
144
209
  prerelease: false
145
- version_requirements: *70097574941240
146
- - !ruby/object:Gem::Dependency
210
+ requirement: *id012
211
+ - !ruby/object:Gem::Dependency
212
+ type: :runtime
147
213
  name: coffee-script
148
- requirement: &70097574940120 !ruby/object:Gem::Requirement
214
+ version_requirements: &id013 !ruby/object:Gem::Requirement
149
215
  none: false
150
- requirements:
216
+ requirements:
151
217
  - - ~>
152
- - !ruby/object:Gem::Version
218
+ - !ruby/object:Gem::Version
219
+ hash: 7
220
+ segments:
221
+ - 2
222
+ - 2
223
+ - 0
153
224
  version: 2.2.0
154
- type: :runtime
155
225
  prerelease: false
156
- version_requirements: *70097574940120
157
- - !ruby/object:Gem::Dependency
226
+ requirement: *id013
227
+ - !ruby/object:Gem::Dependency
228
+ type: :runtime
158
229
  name: execjs
159
- requirement: &70097574938980 !ruby/object:Gem::Requirement
230
+ version_requirements: &id014 !ruby/object:Gem::Requirement
160
231
  none: false
161
- requirements:
232
+ requirements:
162
233
  - - ~>
163
- - !ruby/object:Gem::Version
234
+ - !ruby/object:Gem::Version
235
+ hash: 17
236
+ segments:
237
+ - 1
238
+ - 2
239
+ - 7
164
240
  version: 1.2.7
165
- type: :runtime
166
241
  prerelease: false
167
- version_requirements: *70097574938980
168
- - !ruby/object:Gem::Dependency
242
+ requirement: *id014
243
+ - !ruby/object:Gem::Dependency
244
+ type: :runtime
169
245
  name: sprockets
170
- requirement: &70097574937500 !ruby/object:Gem::Requirement
246
+ version_requirements: &id015 !ruby/object:Gem::Requirement
171
247
  none: false
172
- requirements:
248
+ requirements:
173
249
  - - ~>
174
- - !ruby/object:Gem::Version
250
+ - !ruby/object:Gem::Version
251
+ hash: 9
252
+ segments:
253
+ - 2
254
+ - 0
255
+ - 3
175
256
  version: 2.0.3
176
- type: :runtime
177
257
  prerelease: false
178
- version_requirements: *70097574937500
179
- - !ruby/object:Gem::Dependency
258
+ requirement: *id015
259
+ - !ruby/object:Gem::Dependency
260
+ type: :runtime
180
261
  name: padrino-core
181
- requirement: &70097574936440 !ruby/object:Gem::Requirement
262
+ version_requirements: &id016 !ruby/object:Gem::Requirement
182
263
  none: false
183
- requirements:
264
+ requirements:
184
265
  - - ~>
185
- - !ruby/object:Gem::Version
266
+ - !ruby/object:Gem::Version
267
+ hash: 61
268
+ segments:
269
+ - 0
270
+ - 10
271
+ - 5
186
272
  version: 0.10.5
187
- type: :runtime
188
273
  prerelease: false
189
- version_requirements: *70097574936440
190
- - !ruby/object:Gem::Dependency
274
+ requirement: *id016
275
+ - !ruby/object:Gem::Dependency
276
+ type: :runtime
191
277
  name: padrino-helpers
192
- requirement: &70097574935620 !ruby/object:Gem::Requirement
278
+ version_requirements: &id017 !ruby/object:Gem::Requirement
193
279
  none: false
194
- requirements:
280
+ requirements:
195
281
  - - ~>
196
- - !ruby/object:Gem::Version
282
+ - !ruby/object:Gem::Version
283
+ hash: 61
284
+ segments:
285
+ - 0
286
+ - 10
287
+ - 5
197
288
  version: 0.10.5
198
- type: :runtime
199
289
  prerelease: false
200
- version_requirements: *70097574935620
201
- - !ruby/object:Gem::Dependency
290
+ requirement: *id017
291
+ - !ruby/object:Gem::Dependency
292
+ type: :runtime
202
293
  name: guard
203
- requirement: &70097574933960 !ruby/object:Gem::Requirement
294
+ version_requirements: &id018 !ruby/object:Gem::Requirement
204
295
  none: false
205
- requirements:
296
+ requirements:
206
297
  - - ~>
207
- - !ruby/object:Gem::Version
298
+ - !ruby/object:Gem::Version
299
+ hash: 3
300
+ segments:
301
+ - 0
302
+ - 6
303
+ - 2
208
304
  version: 0.6.2
209
- type: :runtime
210
305
  prerelease: false
211
- version_requirements: *70097574933960
212
- - !ruby/object:Gem::Dependency
306
+ requirement: *id018
307
+ - !ruby/object:Gem::Dependency
308
+ type: :runtime
213
309
  name: middleman-livereload
214
- requirement: &70097574932140 !ruby/object:Gem::Requirement
310
+ version_requirements: &id019 !ruby/object:Gem::Requirement
215
311
  none: false
216
- requirements:
312
+ requirements:
217
313
  - - ~>
218
- - !ruby/object:Gem::Version
314
+ - !ruby/object:Gem::Version
315
+ hash: 23
316
+ segments:
317
+ - 0
318
+ - 2
319
+ - 0
219
320
  version: 0.2.0
220
- type: :runtime
221
321
  prerelease: false
222
- version_requirements: *70097574932140
223
- - !ruby/object:Gem::Dependency
322
+ requirement: *id019
323
+ - !ruby/object:Gem::Dependency
324
+ type: :development
224
325
  name: coffee-filter
225
- requirement: &70097574930660 !ruby/object:Gem::Requirement
326
+ version_requirements: &id020 !ruby/object:Gem::Requirement
226
327
  none: false
227
- requirements:
328
+ requirements:
228
329
  - - ~>
229
- - !ruby/object:Gem::Version
330
+ - !ruby/object:Gem::Version
331
+ hash: 25
332
+ segments:
333
+ - 0
334
+ - 1
335
+ - 1
230
336
  version: 0.1.1
231
- type: :development
232
337
  prerelease: false
233
- version_requirements: *70097574930660
234
- - !ruby/object:Gem::Dependency
338
+ requirement: *id020
339
+ - !ruby/object:Gem::Dependency
340
+ type: :development
235
341
  name: liquid
236
- requirement: &70097574929040 !ruby/object:Gem::Requirement
342
+ version_requirements: &id021 !ruby/object:Gem::Requirement
237
343
  none: false
238
- requirements:
344
+ requirements:
239
345
  - - ~>
240
- - !ruby/object:Gem::Version
346
+ - !ruby/object:Gem::Version
347
+ hash: 7
348
+ segments:
349
+ - 2
350
+ - 2
351
+ - 0
241
352
  version: 2.2.0
242
- type: :development
243
353
  prerelease: false
244
- version_requirements: *70097574929040
245
- - !ruby/object:Gem::Dependency
354
+ requirement: *id021
355
+ - !ruby/object:Gem::Dependency
356
+ type: :development
246
357
  name: cucumber
247
- requirement: &70097574927980 !ruby/object:Gem::Requirement
358
+ version_requirements: &id022 !ruby/object:Gem::Requirement
248
359
  none: false
249
- requirements:
360
+ requirements:
250
361
  - - ~>
251
- - !ruby/object:Gem::Version
362
+ - !ruby/object:Gem::Version
363
+ hash: 19
364
+ segments:
365
+ - 1
366
+ - 0
367
+ - 2
252
368
  version: 1.0.2
253
- type: :development
254
369
  prerelease: false
255
- version_requirements: *70097574927980
256
- - !ruby/object:Gem::Dependency
370
+ requirement: *id022
371
+ - !ruby/object:Gem::Dependency
372
+ type: :development
257
373
  name: rake
258
- requirement: &70097574927120 !ruby/object:Gem::Requirement
374
+ version_requirements: &id023 !ruby/object:Gem::Requirement
259
375
  none: false
260
- requirements:
376
+ requirements:
261
377
  - - ~>
262
- - !ruby/object:Gem::Version
378
+ - !ruby/object:Gem::Version
379
+ hash: 63
380
+ segments:
381
+ - 0
382
+ - 9
383
+ - 2
263
384
  version: 0.9.2
264
- type: :development
265
385
  prerelease: false
266
- version_requirements: *70097574927120
267
- - !ruby/object:Gem::Dependency
386
+ requirement: *id023
387
+ - !ruby/object:Gem::Dependency
388
+ type: :development
268
389
  name: rspec
269
- requirement: &70097574925620 !ruby/object:Gem::Requirement
390
+ version_requirements: &id024 !ruby/object:Gem::Requirement
270
391
  none: false
271
- requirements:
392
+ requirements:
272
393
  - - ~>
273
- - !ruby/object:Gem::Version
394
+ - !ruby/object:Gem::Version
395
+ hash: 23
396
+ segments:
397
+ - 2
398
+ - 6
399
+ - 0
274
400
  version: 2.6.0
275
- type: :development
276
401
  prerelease: false
277
- version_requirements: *70097574925620
278
- description: A static site generator based on Sinatra. Providing dozens of templating
279
- languages (Haml, Sass, Compass, Slim, CoffeeScript, and more). Makes minification,
280
- compression, cache busting, Yaml data (and more) an easy part of your development
281
- cycle.
282
- email:
402
+ requirement: *id024
403
+ description: A static site generator based on Sinatra. Providing dozens of templating languages (Haml, Sass, Compass, Slim, CoffeeScript, and more). Makes minification, compression, cache busting, Yaml data (and more) an easy part of your development cycle.
404
+ email:
283
405
  - me@tdreyno.com
284
- executables:
406
+ executables:
285
407
  - middleman
286
408
  - mm-build
287
409
  - mm-init
288
410
  - mm-server
289
411
  extensions: []
412
+
290
413
  extra_rdoc_files: []
291
- files:
414
+
415
+ files:
292
416
  - .gemtest
293
417
  - .gitignore
294
418
  - .travis.yml
@@ -584,40 +708,53 @@ files:
584
708
  - middleman-x86-mingw32.gemspec
585
709
  - middleman.gemspec
586
710
  homepage: http://middlemanapp.com
587
- licenses:
711
+ licenses:
588
712
  - MIT
589
- post_install_message: ! "********************************************************************************\n\n
590
- \ Welcome to Middleman 2.0\n \n In addition to many new features, some backwards-incompatible\n
591
- \ changes have been made to the structure of Middleman sites.\n \n Before running
592
- you old, v1.x project on Middleman 2.0,\n review the Migration guide:\n \n http://middlemanapp.com/guides/migrating\n\n********************************************************************************\n"
713
+ post_install_message: |
714
+ ********************************************************************************
715
+
716
+ Welcome to Middleman 2.0
717
+
718
+ In addition to many new features, some backwards-incompatible
719
+ changes have been made to the structure of Middleman sites.
720
+
721
+ Before running you old, v1.x project on Middleman 2.0,
722
+ review the Migration guide:
723
+
724
+ http://middlemanapp.com/guides/migrating
725
+
726
+ ********************************************************************************
727
+
593
728
  rdoc_options: []
594
- require_paths:
729
+
730
+ require_paths:
595
731
  - lib
596
- required_ruby_version: !ruby/object:Gem::Requirement
732
+ required_ruby_version: !ruby/object:Gem::Requirement
597
733
  none: false
598
- requirements:
599
- - - ! '>='
600
- - !ruby/object:Gem::Version
601
- version: '0'
602
- segments:
734
+ requirements:
735
+ - - ">="
736
+ - !ruby/object:Gem::Version
737
+ hash: 3
738
+ segments:
603
739
  - 0
604
- hash: -130629978203306322
605
- required_rubygems_version: !ruby/object:Gem::Requirement
740
+ version: "0"
741
+ required_rubygems_version: !ruby/object:Gem::Requirement
606
742
  none: false
607
- requirements:
608
- - - ! '>='
609
- - !ruby/object:Gem::Version
610
- version: '0'
611
- segments:
743
+ requirements:
744
+ - - ">="
745
+ - !ruby/object:Gem::Version
746
+ hash: 3
747
+ segments:
612
748
  - 0
613
- hash: -130629978203306322
749
+ version: "0"
614
750
  requirements: []
751
+
615
752
  rubyforge_project:
616
- rubygems_version: 1.8.10
753
+ rubygems_version: 1.8.18
617
754
  signing_key:
618
755
  specification_version: 3
619
756
  summary: Hand-crafted frontend development
620
- test_files:
757
+ test_files:
621
758
  - features/asset_host.feature
622
759
  - features/automatic_image_sizes.feature
623
760
  - features/builder.feature