middleman 2.0.15 → 2.0.15.1

Sign up to get free protection for your applications and to get access to all the features.
Files changed (4) hide show
  1. data/lib/middleman/core_extensions/compass.rb +9 -0
  2. data/lib/middleman/version.rb +1 -1
  3. data/middleman-x86-mingw32.gemspec +2 -2
  4. metadata +181 -318
data/lib/middleman/core_extensions/compass.rb CHANGED
@@ -47,6 +47,15 @@ module Middleman::CoreExtensions::Compass
47
47
  File.join(app.http_prefix || "/", app.images_dir)
48
48
  end
49
49
 
50
+ # Correctly support HTTP paths with generated sprites
51
+ if config.respond_to? :http_generated_images_path
52
+ config.http_generated_images_path = if app.respond_to? :http_generated_images_path
53
+ app.http_generated_images_path
54
+ else
55
+ File.join(app.http_prefix || "/", app.images_dir)
56
+ end
57
+ end
58
+
50
59
  config.http_stylesheets_path = if app.respond_to? :http_css_path
51
60
  app.http_css_path
52
61
  else
data/lib/middleman/version.rb CHANGED
@@ -1,3 +1,3 @@
1
1
  module Middleman
2
- VERSION = "2.0.15"
2
+ VERSION = "2.0.15.1"
3
3
  end
data/middleman-x86-mingw32.gemspec CHANGED
@@ -47,8 +47,8 @@ eos
47
47
  s.add_dependency("uglifier", ["~> 1.0.0"])
48
48
  s.add_dependency("slim", ["~> 1.0.2"])
49
49
  s.add_dependency("haml", ["~> 3.1.0"])
50
- s.add_dependency("sass", ["~> 3.1.7"])
51
- s.add_dependency("compass", ["~> 0.11.3"])
50
+ s.add_dependency("sass", [">= 3.1.7"])
51
+ s.add_dependency("compass", ["~> 0.11"])
52
52
  s.add_dependency("coffee-script", ["~> 2.2.0"])
53
53
  s.add_dependency("sprockets", ["~> 2.0.3"])
54
54
  s.add_dependency("padrino-core", ["~> 0.10.5"])
metadata CHANGED
@@ -1,418 +1,294 @@
1
- --- !ruby/object:Gem::Specification
1
+ --- !ruby/object:Gem::Specification
2
2
  name: middleman
3
- version: !ruby/object:Gem::Version
4
- hash: 17
3
+ version: !ruby/object:Gem::Version
4
+ version: 2.0.15.1
5
5
  prerelease:
6
- segments:
7
- - 2
8
- - 0
9
- - 15
10
- version: 2.0.15
11
6
  platform: ruby
12
- authors:
7
+ authors:
13
8
  - Thomas Reynolds
14
9
  autorequire:
15
10
  bindir: bin
16
11
  cert_chain: []
17
-
18
- date: 2012-03-13 00:00:00 Z
19
- dependencies:
20
- - !ruby/object:Gem::Dependency
21
- type: :runtime
12
+ date: 2012-03-15 00:00:00.000000000Z
13
+ dependencies:
14
+ - !ruby/object:Gem::Dependency
22
15
  name: rack
23
- version_requirements: &id001 !ruby/object:Gem::Requirement
16
+ requirement: &70219842819700 !ruby/object:Gem::Requirement
24
17
  none: false
25
- requirements:
18
+ requirements:
26
19
  - - ~>
27
- - !ruby/object:Gem::Version
28
- hash: 17
29
- segments:
30
- - 1
31
- - 3
32
- - 5
20
+ - !ruby/object:Gem::Version
33
21
  version: 1.3.5
34
- prerelease: false
35
- requirement: *id001
36
- - !ruby/object:Gem::Dependency
37
22
  type: :runtime
23
+ prerelease: false
24
+ version_requirements: *70219842819700
25
+ - !ruby/object:Gem::Dependency
38
26
  name: thin
39
- version_requirements: &id002 !ruby/object:Gem::Requirement
27
+ requirement: &70219842818760 !ruby/object:Gem::Requirement
40
28
  none: false
41
- requirements:
29
+ requirements:
42
30
  - - ~>
43
- - !ruby/object:Gem::Version
44
- hash: 9
45
- segments:
46
- - 1
47
- - 2
48
- - 11
31
+ - !ruby/object:Gem::Version
49
32
  version: 1.2.11
50
- prerelease: false
51
- requirement: *id002
52
- - !ruby/object:Gem::Dependency
53
33
  type: :runtime
34
+ prerelease: false
35
+ version_requirements: *70219842818760
36
+ - !ruby/object:Gem::Dependency
54
37
  name: thor
55
- version_requirements: &id003 !ruby/object:Gem::Requirement
38
+ requirement: &70219842816840 !ruby/object:Gem::Requirement
56
39
  none: false
57
- requirements:
40
+ requirements:
58
41
  - - ~>
59
- - !ruby/object:Gem::Version
60
- hash: 39
61
- segments:
62
- - 0
63
- - 14
64
- - 0
42
+ - !ruby/object:Gem::Version
65
43
  version: 0.14.0
66
- prerelease: false
67
- requirement: *id003
68
- - !ruby/object:Gem::Dependency
69
44
  type: :runtime
45
+ prerelease: false
46
+ version_requirements: *70219842816840
47
+ - !ruby/object:Gem::Dependency
70
48
  name: tilt
71
- version_requirements: &id004 !ruby/object:Gem::Requirement
49
+ requirement: &70219842815660 !ruby/object:Gem::Requirement
72
50
  none: false
73
- requirements:
51
+ requirements:
74
52
  - - ~>
75
- - !ruby/object:Gem::Version
76
- hash: 25
77
- segments:
78
- - 1
79
- - 3
80
- - 1
53
+ - !ruby/object:Gem::Version
81
54
  version: 1.3.1
82
- prerelease: false
83
- requirement: *id004
84
- - !ruby/object:Gem::Dependency
85
55
  type: :runtime
56
+ prerelease: false
57
+ version_requirements: *70219842815660
58
+ - !ruby/object:Gem::Dependency
86
59
  name: maruku
87
- version_requirements: &id005 !ruby/object:Gem::Requirement
60
+ requirement: &70219842813740 !ruby/object:Gem::Requirement
88
61
  none: false
89
- requirements:
62
+ requirements:
90
63
  - - ~>
91
- - !ruby/object:Gem::Version
92
- hash: 7
93
- segments:
94
- - 0
95
- - 6
96
- - 0
64
+ - !ruby/object:Gem::Version
97
65
  version: 0.6.0
98
- prerelease: false
99
- requirement: *id005
100
- - !ruby/object:Gem::Dependency
101
66
  type: :runtime
67
+ prerelease: false
68
+ version_requirements: *70219842813740
69
+ - !ruby/object:Gem::Dependency
102
70
  name: sinatra
103
- version_requirements: &id006 !ruby/object:Gem::Requirement
71
+ requirement: &70219842808040 !ruby/object:Gem::Requirement
104
72
  none: false
105
- requirements:
73
+ requirements:
106
74
  - - ~>
107
- - !ruby/object:Gem::Version
108
- hash: 25
109
- segments:
110
- - 1
111
- - 3
112
- - 1
75
+ - !ruby/object:Gem::Version
113
76
  version: 1.3.1
114
- prerelease: false
115
- requirement: *id006
116
- - !ruby/object:Gem::Dependency
117
77
  type: :runtime
78
+ prerelease: false
79
+ version_requirements: *70219842808040
80
+ - !ruby/object:Gem::Dependency
118
81
  name: rack-test
119
- version_requirements: &id007 !ruby/object:Gem::Requirement
82
+ requirement: &70219842802760 !ruby/object:Gem::Requirement
120
83
  none: false
121
- requirements:
84
+ requirements:
122
85
  - - ~>
123
- - !ruby/object:Gem::Version
124
- hash: 5
125
- segments:
126
- - 0
127
- - 6
128
- - 1
86
+ - !ruby/object:Gem::Version
129
87
  version: 0.6.1
130
- prerelease: false
131
- requirement: *id007
132
- - !ruby/object:Gem::Dependency
133
88
  type: :runtime
89
+ prerelease: false
90
+ version_requirements: *70219842802760
91
+ - !ruby/object:Gem::Dependency
134
92
  name: uglifier
135
- version_requirements: &id008 !ruby/object:Gem::Requirement
93
+ requirement: &70219842770300 !ruby/object:Gem::Requirement
136
94
  none: false
137
- requirements:
95
+ requirements:
138
96
  - - ~>
139
- - !ruby/object:Gem::Version
140
- hash: 23
141
- segments:
142
- - 1
143
- - 0
144
- - 0
97
+ - !ruby/object:Gem::Version
145
98
  version: 1.0.0
146
- prerelease: false
147
- requirement: *id008
148
- - !ruby/object:Gem::Dependency
149
99
  type: :runtime
100
+ prerelease: false
101
+ version_requirements: *70219842770300
102
+ - !ruby/object:Gem::Dependency
150
103
  name: slim
151
- version_requirements: &id009 !ruby/object:Gem::Requirement
104
+ requirement: &70219842768680 !ruby/object:Gem::Requirement
152
105
  none: false
153
- requirements:
106
+ requirements:
154
107
  - - ~>
155
- - !ruby/object:Gem::Version
156
- hash: 19
157
- segments:
158
- - 1
159
- - 0
160
- - 2
108
+ - !ruby/object:Gem::Version
161
109
  version: 1.0.2
162
- prerelease: false
163
- requirement: *id009
164
- - !ruby/object:Gem::Dependency
165
110
  type: :runtime
111
+ prerelease: false
112
+ version_requirements: *70219842768680
113
+ - !ruby/object:Gem::Dependency
166
114
  name: haml
167
- version_requirements: &id010 !ruby/object:Gem::Requirement
115
+ requirement: &70219842767600 !ruby/object:Gem::Requirement
168
116
  none: false
169
- requirements:
117
+ requirements:
170
118
  - - ~>
171
- - !ruby/object:Gem::Version
172
- hash: 3
173
- segments:
174
- - 3
175
- - 1
176
- - 0
119
+ - !ruby/object:Gem::Version
177
120
  version: 3.1.0
178
- prerelease: false
179
- requirement: *id010
180
- - !ruby/object:Gem::Dependency
181
121
  type: :runtime
122
+ prerelease: false
123
+ version_requirements: *70219842767600
124
+ - !ruby/object:Gem::Dependency
182
125
  name: sass
183
- version_requirements: &id011 !ruby/object:Gem::Requirement
126
+ requirement: &70219842766800 !ruby/object:Gem::Requirement
184
127
  none: false
185
- requirements:
186
- - - ">="
187
- - !ruby/object:Gem::Version
188
- hash: 13
189
- segments:
190
- - 3
191
- - 1
192
- - 7
128
+ requirements:
129
+ - - ! '>='
130
+ - !ruby/object:Gem::Version
193
131
  version: 3.1.7
194
- prerelease: false
195
- requirement: *id011
196
- - !ruby/object:Gem::Dependency
197
132
  type: :runtime
133
+ prerelease: false
134
+ version_requirements: *70219842766800
135
+ - !ruby/object:Gem::Dependency
198
136
  name: compass
199
- version_requirements: &id012 !ruby/object:Gem::Requirement
137
+ requirement: &70219842763300 !ruby/object:Gem::Requirement
200
138
  none: false
201
- requirements:
139
+ requirements:
202
140
  - - ~>
203
- - !ruby/object:Gem::Version
204
- hash: 29
205
- segments:
206
- - 0
207
- - 11
208
- version: "0.11"
209
- prerelease: false
210
- requirement: *id012
211
- - !ruby/object:Gem::Dependency
141
+ - !ruby/object:Gem::Version
142
+ version: '0.11'
212
143
  type: :runtime
144
+ prerelease: false
145
+ version_requirements: *70219842763300
146
+ - !ruby/object:Gem::Dependency
213
147
  name: coffee-script
214
- version_requirements: &id013 !ruby/object:Gem::Requirement
148
+ requirement: &70219842761300 !ruby/object:Gem::Requirement
215
149
  none: false
216
- requirements:
150
+ requirements:
217
151
  - - ~>
218
- - !ruby/object:Gem::Version
219
- hash: 7
220
- segments:
221
- - 2
222
- - 2
223
- - 0
152
+ - !ruby/object:Gem::Version
224
153
  version: 2.2.0
225
- prerelease: false
226
- requirement: *id013
227
- - !ruby/object:Gem::Dependency
228
154
  type: :runtime
155
+ prerelease: false
156
+ version_requirements: *70219842761300
157
+ - !ruby/object:Gem::Dependency
229
158
  name: execjs
230
- version_requirements: &id014 !ruby/object:Gem::Requirement
159
+ requirement: &70219842759480 !ruby/object:Gem::Requirement
231
160
  none: false
232
- requirements:
161
+ requirements:
233
162
  - - ~>
234
- - !ruby/object:Gem::Version
235
- hash: 17
236
- segments:
237
- - 1
238
- - 2
239
- - 7
163
+ - !ruby/object:Gem::Version
240
164
  version: 1.2.7
241
- prerelease: false
242
- requirement: *id014
243
- - !ruby/object:Gem::Dependency
244
165
  type: :runtime
166
+ prerelease: false
167
+ version_requirements: *70219842759480
168
+ - !ruby/object:Gem::Dependency
245
169
  name: sprockets
246
- version_requirements: &id015 !ruby/object:Gem::Requirement
170
+ requirement: &70219842741000 !ruby/object:Gem::Requirement
247
171
  none: false
248
- requirements:
172
+ requirements:
249
173
  - - ~>
250
- - !ruby/object:Gem::Version
251
- hash: 9
252
- segments:
253
- - 2
254
- - 0
255
- - 3
174
+ - !ruby/object:Gem::Version
256
175
  version: 2.0.3
257
- prerelease: false
258
- requirement: *id015
259
- - !ruby/object:Gem::Dependency
260
176
  type: :runtime
177
+ prerelease: false
178
+ version_requirements: *70219842741000
179
+ - !ruby/object:Gem::Dependency
261
180
  name: padrino-core
262
- version_requirements: &id016 !ruby/object:Gem::Requirement
181
+ requirement: &70219842739100 !ruby/object:Gem::Requirement
263
182
  none: false
264
- requirements:
183
+ requirements:
265
184
  - - ~>
266
- - !ruby/object:Gem::Version
267
- hash: 61
268
- segments:
269
- - 0
270
- - 10
271
- - 5
185
+ - !ruby/object:Gem::Version
272
186
  version: 0.10.5
273
- prerelease: false
274
- requirement: *id016
275
- - !ruby/object:Gem::Dependency
276
187
  type: :runtime
188
+ prerelease: false
189
+ version_requirements: *70219842739100
190
+ - !ruby/object:Gem::Dependency
277
191
  name: padrino-helpers
278
- version_requirements: &id017 !ruby/object:Gem::Requirement
192
+ requirement: &70219842719840 !ruby/object:Gem::Requirement
279
193
  none: false
280
- requirements:
194
+ requirements:
281
195
  - - ~>
282
- - !ruby/object:Gem::Version
283
- hash: 61
284
- segments:
285
- - 0
286
- - 10
287
- - 5
196
+ - !ruby/object:Gem::Version
288
197
  version: 0.10.5
289
- prerelease: false
290
- requirement: *id017
291
- - !ruby/object:Gem::Dependency
292
198
  type: :runtime
199
+ prerelease: false
200
+ version_requirements: *70219842719840
201
+ - !ruby/object:Gem::Dependency
293
202
  name: guard
294
- version_requirements: &id018 !ruby/object:Gem::Requirement
203
+ requirement: &70219842717920 !ruby/object:Gem::Requirement
295
204
  none: false
296
- requirements:
205
+ requirements:
297
206
  - - ~>
298
- - !ruby/object:Gem::Version
299
- hash: 3
300
- segments:
301
- - 0
302
- - 6
303
- - 2
207
+ - !ruby/object:Gem::Version
304
208
  version: 0.6.2
305
- prerelease: false
306
- requirement: *id018
307
- - !ruby/object:Gem::Dependency
308
209
  type: :runtime
210
+ prerelease: false
211
+ version_requirements: *70219842717920
212
+ - !ruby/object:Gem::Dependency
309
213
  name: middleman-livereload
310
- version_requirements: &id019 !ruby/object:Gem::Requirement
214
+ requirement: &70219842713200 !ruby/object:Gem::Requirement
311
215
  none: false
312
- requirements:
216
+ requirements:
313
217
  - - ~>
314
- - !ruby/object:Gem::Version
315
- hash: 23
316
- segments:
317
- - 0
318
- - 2
319
- - 0
218
+ - !ruby/object:Gem::Version
320
219
  version: 0.2.0
220
+ type: :runtime
321
221
  prerelease: false
322
- requirement: *id019
323
- - !ruby/object:Gem::Dependency
324
- type: :development
222
+ version_requirements: *70219842713200
223
+ - !ruby/object:Gem::Dependency
325
224
  name: coffee-filter
326
- version_requirements: &id020 !ruby/object:Gem::Requirement
225
+ requirement: &70219842711980 !ruby/object:Gem::Requirement
327
226
  none: false
328
- requirements:
227
+ requirements:
329
228
  - - ~>
330
- - !ruby/object:Gem::Version
331
- hash: 25
332
- segments:
333
- - 0
334
- - 1
335
- - 1
229
+ - !ruby/object:Gem::Version
336
230
  version: 0.1.1
337
- prerelease: false
338
- requirement: *id020
339
- - !ruby/object:Gem::Dependency
340
231
  type: :development
232
+ prerelease: false
233
+ version_requirements: *70219842711980
234
+ - !ruby/object:Gem::Dependency
341
235
  name: liquid
342
- version_requirements: &id021 !ruby/object:Gem::Requirement
236
+ requirement: &70219842709500 !ruby/object:Gem::Requirement
343
237
  none: false
344
- requirements:
238
+ requirements:
345
239
  - - ~>
346
- - !ruby/object:Gem::Version
347
- hash: 7
348
- segments:
349
- - 2
350
- - 2
351
- - 0
240
+ - !ruby/object:Gem::Version
352
241
  version: 2.2.0
353
- prerelease: false
354
- requirement: *id021
355
- - !ruby/object:Gem::Dependency
356
242
  type: :development
243
+ prerelease: false
244
+ version_requirements: *70219842709500
245
+ - !ruby/object:Gem::Dependency
357
246
  name: cucumber
358
- version_requirements: &id022 !ruby/object:Gem::Requirement
247
+ requirement: &70219842689440 !ruby/object:Gem::Requirement
359
248
  none: false
360
- requirements:
249
+ requirements:
361
250
  - - ~>
362
- - !ruby/object:Gem::Version
363
- hash: 19
364
- segments:
365
- - 1
366
- - 0
367
- - 2
251
+ - !ruby/object:Gem::Version
368
252
  version: 1.0.2
369
- prerelease: false
370
- requirement: *id022
371
- - !ruby/object:Gem::Dependency
372
253
  type: :development
254
+ prerelease: false
255
+ version_requirements: *70219842689440
256
+ - !ruby/object:Gem::Dependency
373
257
  name: rake
374
- version_requirements: &id023 !ruby/object:Gem::Requirement
258
+ requirement: &70219842688140 !ruby/object:Gem::Requirement
375
259
  none: false
376
- requirements:
260
+ requirements:
377
261
  - - ~>
378
- - !ruby/object:Gem::Version
379
- hash: 63
380
- segments:
381
- - 0
382
- - 9
383
- - 2
262
+ - !ruby/object:Gem::Version
384
263
  version: 0.9.2
385
- prerelease: false
386
- requirement: *id023
387
- - !ruby/object:Gem::Dependency
388
264
  type: :development
265
+ prerelease: false
266
+ version_requirements: *70219842688140
267
+ - !ruby/object:Gem::Dependency
389
268
  name: rspec
390
- version_requirements: &id024 !ruby/object:Gem::Requirement
269
+ requirement: &70219842687000 !ruby/object:Gem::Requirement
391
270
  none: false
392
- requirements:
271
+ requirements:
393
272
  - - ~>
394
- - !ruby/object:Gem::Version
395
- hash: 23
396
- segments:
397
- - 2
398
- - 6
399
- - 0
273
+ - !ruby/object:Gem::Version
400
274
  version: 2.6.0
275
+ type: :development
401
276
  prerelease: false
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:
277
+ version_requirements: *70219842687000
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:
405
283
  - me@tdreyno.com
406
- executables:
284
+ executables:
407
285
  - middleman
408
286
  - mm-build
409
287
  - mm-init
410
288
  - mm-server
411
289
  extensions: []
412
-
413
290
  extra_rdoc_files: []
414
-
415
- files:
291
+ files:
416
292
  - .gemtest
417
293
  - .gitignore
418
294
  - .travis.yml
@@ -708,53 +584,40 @@ files:
708
584
  - middleman-x86-mingw32.gemspec
709
585
  - middleman.gemspec
710
586
  homepage: http://middlemanapp.com
711
- licenses:
587
+ licenses:
712
588
  - MIT
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
-
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"
728
593
  rdoc_options: []
729
-
730
- require_paths:
594
+ require_paths:
731
595
  - lib
732
- required_ruby_version: !ruby/object:Gem::Requirement
596
+ required_ruby_version: !ruby/object:Gem::Requirement
733
597
  none: false
734
- requirements:
735
- - - ">="
736
- - !ruby/object:Gem::Version
737
- hash: 3
738
- segments:
598
+ requirements:
599
+ - - ! '>='
600
+ - !ruby/object:Gem::Version
601
+ version: '0'
602
+ segments:
739
603
  - 0
740
- version: "0"
741
- required_rubygems_version: !ruby/object:Gem::Requirement
604
+ hash: 3700890820604793885
605
+ required_rubygems_version: !ruby/object:Gem::Requirement
742
606
  none: false
743
- requirements:
744
- - - ">="
745
- - !ruby/object:Gem::Version
746
- hash: 3
747
- segments:
607
+ requirements:
608
+ - - ! '>='
609
+ - !ruby/object:Gem::Version
610
+ version: '0'
611
+ segments:
748
612
  - 0
749
- version: "0"
613
+ hash: 3700890820604793885
750
614
  requirements: []
751
-
752
615
  rubyforge_project:
753
- rubygems_version: 1.8.18
616
+ rubygems_version: 1.8.10
754
617
  signing_key:
755
618
  specification_version: 3
756
619
  summary: Hand-crafted frontend development
757
- test_files:
620
+ test_files:
758
621
  - features/asset_host.feature
759
622
  - features/automatic_image_sizes.feature
760
623
  - features/builder.feature