middleman 2.0.10 → 2.0.11.pre

Sign up to get free protection for your applications and to get access to all the features.
Files changed (7) hide show
  1. data/lib/middleman/base.rb +6 -2
  2. data/lib/middleman/core_extensions/features.rb +1 -1
  3. data/lib/middleman/features/minify_javascript.rb +1 -1
  4. data/lib/middleman/version.rb +1 -1
  5. data/middleman-x86-mingw32.gemspec +6 -11
  6. data/middleman.gemspec +3 -14
  7. metadata +91 -88
data/lib/middleman/base.rb CHANGED
@@ -124,12 +124,12 @@ module Middleman::Base
124
124
  module ClassMethods
125
125
  # Override Sinatra's set to accept a block
126
126
  # Specifically for the asset_host feature
127
- def set(option, value=self, &block)
127
+ def set(option, value = (not_set = true), ignore_setter = false, &block)
128
128
  if block_given?
129
129
  value = Proc.new { block }
130
130
  end
131
131
 
132
- super(option, value, &nil)
132
+ super(option, value, ignore_setter, &nil)
133
133
  end
134
134
 
135
135
  def before_processing(name=:unnamed, idx=-1, &block)
@@ -150,6 +150,10 @@ module Middleman::Base
150
150
  end
151
151
 
152
152
  module InstanceMethods
153
+ def forward
154
+ raise ::Sinatra::NotFound
155
+ end
156
+
153
157
  # Internal method to look for templates and evaluate them if found
154
158
  def process_request(options={})
155
159
  if !settings.views.include?(settings.root)
data/lib/middleman/core_extensions/features.rb CHANGED
@@ -20,7 +20,7 @@
20
20
  # activate MyExtension
21
21
  #
22
22
  # This will call the `registered` method in your extension and provide you
23
- # with the `app` parameter which is a Middleman::Server context. From here
23
+ # with the `app` parameter which is a Middleman::Base context. From here
24
24
  # you can choose to respond to requests for certain paths or simply attach
25
25
  # Rack middleware to the stack.
26
26
  #
data/lib/middleman/features/minify_javascript.rb CHANGED
@@ -19,7 +19,7 @@ module Middleman::Features::MinifyJavascript
19
19
  if env["PATH_INFO"].match(/\.html$/)
20
20
  compressor = ::Uglifier.new
21
21
 
22
- if response.is_a?(::Rack::File) or response.is_a?(::Sinatra::Helpers::StaticFile)
22
+ if response.is_a?(::Rack::File)# or response.is_a?(::Sinatra::Helpers::StaticFile)
23
23
  uncompressed_source = File.read(response.path)
24
24
  else
25
25
  uncompressed_source = response.join
data/lib/middleman/version.rb CHANGED
@@ -1,3 +1,3 @@
1
1
  module Middleman
2
- VERSION = "2.0.10"
2
+ VERSION = "2.0.11.pre"
3
3
  end
data/middleman-x86-mingw32.gemspec CHANGED
@@ -42,7 +42,7 @@ eos
42
42
  s.add_dependency("thor", ["~> 0.14.0"])
43
43
  s.add_dependency("tilt", ["~> 1.3.1"])
44
44
  s.add_dependency("maruku", ["~> 0.6.0"])
45
- s.add_dependency("sinatra", ["~> 1.2.6"])
45
+ s.add_dependency("sinatra", ["~> 1.3.0"])
46
46
  s.add_dependency("rack-test", ["~> 0.6.1"])
47
47
  s.add_dependency("uglifier", ["~> 1.0.0"])
48
48
  s.add_dependency("slim", ["~> 1.0.2"])
@@ -51,17 +51,12 @@ eos
51
51
  s.add_dependency("compass", ["~> 0.11.3"])
52
52
  s.add_dependency("coffee-script", ["~> 2.2.0"])
53
53
  s.add_dependency("sprockets", ["~> 2.0.0"])
54
- s.add_dependency("padrino-core", ["~> 0.10.2"])
55
- s.add_dependency("padrino-helpers", ["~> 0.10.2"])
54
+ s.add_dependency("padrino-core", ["~> 0.10.3"])
55
+ s.add_dependency("padrino-helpers", ["~> 0.10.3"])
56
56
 
57
- # case s.platform.to_s
58
- # when %r{mingw}
59
- s.add_dependency("eventmachine", ["1.0.0.beta.3"])
60
- s.add_dependency("win32-process", ["~> 0.6.5"])
61
- s.add_dependency("rb-fchange")
62
- # else
63
- # s.add_dependency("rb-fsevent", ["~> 0.4.2"])
64
- # end
57
+ s.add_dependency("eventmachine", ["1.0.0.beta.3"])
58
+ s.add_dependency("win32-process", ["~> 0.6.5"])
59
+ s.add_dependency("rb-fchange")
65
60
 
66
61
  s.add_dependency("guard", ["~> 0.6.2"])
67
62
  s.add_dependency("middleman-livereload", ["~> 0.2.0"])
data/middleman.gemspec CHANGED
@@ -42,7 +42,7 @@ eos
42
42
  s.add_dependency("thor", ["~> 0.14.0"])
43
43
  s.add_dependency("tilt", ["~> 1.3.1"])
44
44
  s.add_dependency("maruku", ["~> 0.6.0"])
45
- s.add_dependency("sinatra", ["~> 1.2.6"])
45
+ s.add_dependency("sinatra", ["~> 1.3.0"])
46
46
  # s.add_dependency("sinatra-synchrony", ["~> 0.2.1"])
47
47
  s.add_dependency("rack-test", ["~> 0.6.1"])
48
48
  s.add_dependency("uglifier", ["~> 1.0.0"])
@@ -52,24 +52,13 @@ eos
52
52
  s.add_dependency("compass", ["~> 0.11.3"])
53
53
  s.add_dependency("coffee-script", ["~> 2.2.0"])
54
54
  s.add_dependency("sprockets", ["~> 2.0.0"])
55
- s.add_dependency("padrino-core", ["~> 0.10.2"])
56
- s.add_dependency("padrino-helpers", ["~> 0.10.2"])
57
-
58
- # case s.platform.to_s
59
- # when %r{mingw}
60
- # s.add_dependency("eventmachine", ["1.0.0.beta.3"])
61
- # s.add_dependency("win32-process", ["~> 0.6.5"])
62
- # s.add_dependency("rb-fchange")
63
- # else
64
- # s.add_dependency("rb-fsevent", ["~> 0.4.2"])
65
- # s.add_dependency("therubyracer", ["~> 0.9.4"])
66
- # end
55
+ s.add_dependency("padrino-core", ["~> 0.10.3"])
56
+ s.add_dependency("padrino-helpers", ["~> 0.10.3"])
67
57
 
68
58
  s.add_dependency("guard", ["~> 0.6.2"])
69
59
  s.add_dependency("middleman-livereload", ["~> 0.2.0"])
70
60
 
71
61
  # Development and test
72
- # s.add_development_dependency("jquery-rails")
73
62
  s.add_development_dependency("coffee-filter", ["~> 0.1.1"])
74
63
  s.add_development_dependency("liquid", ["~> 2.2.0"])
75
64
  s.add_development_dependency("cucumber", ["~> 1.0.2"])
metadata CHANGED
@@ -1,13 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: middleman
3
3
  version: !ruby/object:Gem::Version
4
- hash: 27
5
- prerelease:
4
+ hash: 961915976
5
+ prerelease: 7
6
6
  segments:
7
7
  - 2
8
8
  - 0
9
- - 10
10
- version: 2.0.10
9
+ - 11
10
+ - pre
11
+ version: 2.0.11.pre
11
12
  platform: ruby
12
13
  authors:
13
14
  - Thomas Reynolds
@@ -15,10 +16,11 @@ autorequire:
15
16
  bindir: bin
16
17
  cert_chain: []
17
18
 
18
- date: 2011-09-27 00:00:00 -07:00
19
+ date: 2011-10-04 00:00:00 -07:00
19
20
  default_executable:
20
21
  dependencies:
21
22
  - !ruby/object:Gem::Dependency
23
+ prerelease: false
22
24
  requirement: &id001 !ruby/object:Gem::Requirement
23
25
  none: false
24
26
  requirements:
@@ -30,11 +32,11 @@ dependencies:
30
32
  - 3
31
33
  - 0
32
34
  version: 1.3.0
33
- version_requirements: *id001
34
- name: rack
35
- prerelease: false
36
35
  type: :runtime
36
+ name: rack
37
+ version_requirements: *id001
37
38
  - !ruby/object:Gem::Dependency
39
+ prerelease: false
38
40
  requirement: &id002 !ruby/object:Gem::Requirement
39
41
  none: false
40
42
  requirements:
@@ -46,11 +48,11 @@ dependencies:
46
48
  - 2
47
49
  - 11
48
50
  version: 1.2.11
49
- version_requirements: *id002
50
- name: thin
51
- prerelease: false
52
51
  type: :runtime
52
+ name: thin
53
+ version_requirements: *id002
53
54
  - !ruby/object:Gem::Dependency
55
+ prerelease: false
54
56
  requirement: &id003 !ruby/object:Gem::Requirement
55
57
  none: false
56
58
  requirements:
@@ -62,11 +64,11 @@ dependencies:
62
64
  - 14
63
65
  - 0
64
66
  version: 0.14.0
65
- version_requirements: *id003
66
- name: thor
67
- prerelease: false
68
67
  type: :runtime
68
+ name: thor
69
+ version_requirements: *id003
69
70
  - !ruby/object:Gem::Dependency
71
+ prerelease: false
70
72
  requirement: &id004 !ruby/object:Gem::Requirement
71
73
  none: false
72
74
  requirements:
@@ -78,11 +80,11 @@ dependencies:
78
80
  - 3
79
81
  - 1
80
82
  version: 1.3.1
81
- version_requirements: *id004
82
- name: tilt
83
- prerelease: false
84
83
  type: :runtime
84
+ name: tilt
85
+ version_requirements: *id004
85
86
  - !ruby/object:Gem::Dependency
87
+ prerelease: false
86
88
  requirement: &id005 !ruby/object:Gem::Requirement
87
89
  none: false
88
90
  requirements:
@@ -94,27 +96,27 @@ dependencies:
94
96
  - 6
95
97
  - 0
96
98
  version: 0.6.0
97
- version_requirements: *id005
98
- name: maruku
99
- prerelease: false
100
99
  type: :runtime
100
+ name: maruku
101
+ version_requirements: *id005
101
102
  - !ruby/object:Gem::Dependency
103
+ prerelease: false
102
104
  requirement: &id006 !ruby/object:Gem::Requirement
103
105
  none: false
104
106
  requirements:
105
107
  - - ~>
106
108
  - !ruby/object:Gem::Version
107
- hash: 19
109
+ hash: 27
108
110
  segments:
109
111
  - 1
110
- - 2
111
- - 6
112
- version: 1.2.6
113
- version_requirements: *id006
114
- name: sinatra
115
- prerelease: false
112
+ - 3
113
+ - 0
114
+ version: 1.3.0
116
115
  type: :runtime
116
+ name: sinatra
117
+ version_requirements: *id006
117
118
  - !ruby/object:Gem::Dependency
119
+ prerelease: false
118
120
  requirement: &id007 !ruby/object:Gem::Requirement
119
121
  none: false
120
122
  requirements:
@@ -126,11 +128,11 @@ dependencies:
126
128
  - 6
127
129
  - 1
128
130
  version: 0.6.1
129
- version_requirements: *id007
130
- name: rack-test
131
- prerelease: false
132
131
  type: :runtime
132
+ name: rack-test
133
+ version_requirements: *id007
133
134
  - !ruby/object:Gem::Dependency
135
+ prerelease: false
134
136
  requirement: &id008 !ruby/object:Gem::Requirement
135
137
  none: false
136
138
  requirements:
@@ -142,11 +144,11 @@ dependencies:
142
144
  - 0
143
145
  - 0
144
146
  version: 1.0.0
145
- version_requirements: *id008
146
- name: uglifier
147
- prerelease: false
148
147
  type: :runtime
148
+ name: uglifier
149
+ version_requirements: *id008
149
150
  - !ruby/object:Gem::Dependency
151
+ prerelease: false
150
152
  requirement: &id009 !ruby/object:Gem::Requirement
151
153
  none: false
152
154
  requirements:
@@ -158,11 +160,11 @@ dependencies:
158
160
  - 0
159
161
  - 2
160
162
  version: 1.0.2
161
- version_requirements: *id009
162
- name: slim
163
- prerelease: false
164
163
  type: :runtime
164
+ name: slim
165
+ version_requirements: *id009
165
166
  - !ruby/object:Gem::Dependency
167
+ prerelease: false
166
168
  requirement: &id010 !ruby/object:Gem::Requirement
167
169
  none: false
168
170
  requirements:
@@ -174,11 +176,11 @@ dependencies:
174
176
  - 1
175
177
  - 0
176
178
  version: 3.1.0
177
- version_requirements: *id010
178
- name: haml
179
- prerelease: false
180
179
  type: :runtime
180
+ name: haml
181
+ version_requirements: *id010
181
182
  - !ruby/object:Gem::Dependency
183
+ prerelease: false
182
184
  requirement: &id011 !ruby/object:Gem::Requirement
183
185
  none: false
184
186
  requirements:
@@ -190,11 +192,11 @@ dependencies:
190
192
  - 1
191
193
  - 7
192
194
  version: 3.1.7
193
- version_requirements: *id011
194
- name: sass
195
- prerelease: false
196
195
  type: :runtime
196
+ name: sass
197
+ version_requirements: *id011
197
198
  - !ruby/object:Gem::Dependency
199
+ prerelease: false
198
200
  requirement: &id012 !ruby/object:Gem::Requirement
199
201
  none: false
200
202
  requirements:
@@ -206,11 +208,11 @@ dependencies:
206
208
  - 11
207
209
  - 3
208
210
  version: 0.11.3
209
- version_requirements: *id012
210
- name: compass
211
- prerelease: false
212
211
  type: :runtime
212
+ name: compass
213
+ version_requirements: *id012
213
214
  - !ruby/object:Gem::Dependency
215
+ prerelease: false
214
216
  requirement: &id013 !ruby/object:Gem::Requirement
215
217
  none: false
216
218
  requirements:
@@ -222,11 +224,11 @@ dependencies:
222
224
  - 2
223
225
  - 0
224
226
  version: 2.2.0
225
- version_requirements: *id013
226
- name: coffee-script
227
- prerelease: false
228
227
  type: :runtime
228
+ name: coffee-script
229
+ version_requirements: *id013
229
230
  - !ruby/object:Gem::Dependency
231
+ prerelease: false
230
232
  requirement: &id014 !ruby/object:Gem::Requirement
231
233
  none: false
232
234
  requirements:
@@ -238,43 +240,43 @@ dependencies:
238
240
  - 0
239
241
  - 0
240
242
  version: 2.0.0
241
- version_requirements: *id014
242
- name: sprockets
243
- prerelease: false
244
243
  type: :runtime
244
+ name: sprockets
245
+ version_requirements: *id014
245
246
  - !ruby/object:Gem::Dependency
247
+ prerelease: false
246
248
  requirement: &id015 !ruby/object:Gem::Requirement
247
249
  none: false
248
250
  requirements:
249
251
  - - ~>
250
252
  - !ruby/object:Gem::Version
251
- hash: 51
253
+ hash: 49
252
254
  segments:
253
255
  - 0
254
256
  - 10
255
- - 2
256
- version: 0.10.2
257
- version_requirements: *id015
258
- name: padrino-core
259
- prerelease: false
257
+ - 3
258
+ version: 0.10.3
260
259
  type: :runtime
260
+ name: padrino-core
261
+ version_requirements: *id015
261
262
  - !ruby/object:Gem::Dependency
263
+ prerelease: false
262
264
  requirement: &id016 !ruby/object:Gem::Requirement
263
265
  none: false
264
266
  requirements:
265
267
  - - ~>
266
268
  - !ruby/object:Gem::Version
267
- hash: 51
269
+ hash: 49
268
270
  segments:
269
271
  - 0
270
272
  - 10
271
- - 2
272
- version: 0.10.2
273
- version_requirements: *id016
274
- name: padrino-helpers
275
- prerelease: false
273
+ - 3
274
+ version: 0.10.3
276
275
  type: :runtime
276
+ name: padrino-helpers
277
+ version_requirements: *id016
277
278
  - !ruby/object:Gem::Dependency
279
+ prerelease: false
278
280
  requirement: &id017 !ruby/object:Gem::Requirement
279
281
  none: false
280
282
  requirements:
@@ -286,11 +288,11 @@ dependencies:
286
288
  - 6
287
289
  - 2
288
290
  version: 0.6.2
289
- version_requirements: *id017
290
- name: guard
291
- prerelease: false
292
291
  type: :runtime
292
+ name: guard
293
+ version_requirements: *id017
293
294
  - !ruby/object:Gem::Dependency
295
+ prerelease: false
294
296
  requirement: &id018 !ruby/object:Gem::Requirement
295
297
  none: false
296
298
  requirements:
@@ -302,11 +304,11 @@ dependencies:
302
304
  - 2
303
305
  - 0
304
306
  version: 0.2.0
305
- version_requirements: *id018
306
- name: middleman-livereload
307
- prerelease: false
308
307
  type: :runtime
308
+ name: middleman-livereload
309
+ version_requirements: *id018
309
310
  - !ruby/object:Gem::Dependency
311
+ prerelease: false
310
312
  requirement: &id019 !ruby/object:Gem::Requirement
311
313
  none: false
312
314
  requirements:
@@ -318,11 +320,11 @@ dependencies:
318
320
  - 1
319
321
  - 1
320
322
  version: 0.1.1
321
- version_requirements: *id019
322
- name: coffee-filter
323
- prerelease: false
324
323
  type: :development
324
+ name: coffee-filter
325
+ version_requirements: *id019
325
326
  - !ruby/object:Gem::Dependency
327
+ prerelease: false
326
328
  requirement: &id020 !ruby/object:Gem::Requirement
327
329
  none: false
328
330
  requirements:
@@ -334,11 +336,11 @@ dependencies:
334
336
  - 2
335
337
  - 0
336
338
  version: 2.2.0
337
- version_requirements: *id020
338
- name: liquid
339
- prerelease: false
340
339
  type: :development
340
+ name: liquid
341
+ version_requirements: *id020
341
342
  - !ruby/object:Gem::Dependency
343
+ prerelease: false
342
344
  requirement: &id021 !ruby/object:Gem::Requirement
343
345
  none: false
344
346
  requirements:
@@ -350,11 +352,11 @@ dependencies:
350
352
  - 0
351
353
  - 2
352
354
  version: 1.0.2
353
- version_requirements: *id021
354
- name: cucumber
355
- prerelease: false
356
355
  type: :development
356
+ name: cucumber
357
+ version_requirements: *id021
357
358
  - !ruby/object:Gem::Dependency
359
+ prerelease: false
358
360
  requirement: &id022 !ruby/object:Gem::Requirement
359
361
  none: false
360
362
  requirements:
@@ -366,11 +368,11 @@ dependencies:
366
368
  - 8
367
369
  - 7
368
370
  version: 0.8.7
369
- version_requirements: *id022
370
- name: rake
371
- prerelease: false
372
371
  type: :development
372
+ name: rake
373
+ version_requirements: *id022
373
374
  - !ruby/object:Gem::Dependency
375
+ prerelease: false
374
376
  requirement: &id023 !ruby/object:Gem::Requirement
375
377
  none: false
376
378
  requirements:
@@ -382,10 +384,9 @@ dependencies:
382
384
  - 6
383
385
  - 0
384
386
  version: 2.6.0
385
- version_requirements: *id023
386
- name: rspec
387
- prerelease: false
388
387
  type: :development
388
+ name: rspec
389
+ version_requirements: *id023
389
390
  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.
390
391
  email:
391
392
  - me@tdreyno.com
@@ -712,12 +713,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
712
713
  required_rubygems_version: !ruby/object:Gem::Requirement
713
714
  none: false
714
715
  requirements:
715
- - - ">="
716
+ - - ">"
716
717
  - !ruby/object:Gem::Version
717
- hash: 3
718
+ hash: 25
718
719
  segments:
719
- - 0
720
- version: "0"
720
+ - 1
721
+ - 3
722
+ - 1
723
+ version: 1.3.1
721
724
  requirements: []
722
725
 
723
726
  rubyforge_project: