middleman 0.14.0 → 0.14.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
data/Rakefile CHANGED
@@ -21,6 +21,8 @@ begin
21
21
  gem.add_dependency("sprockets")
22
22
  gem.add_dependency("sinatra", ">=1.0")
23
23
  gem.add_dependency("sinatra-content-for")
24
+ gem.add_dependency("less")
25
+ gem.add_dependency("builder")
24
26
  gem.add_dependency("rack-test")
25
27
  gem.add_dependency("yui-compressor")
26
28
  gem.add_dependency("haml", ">=3.0")
@@ -51,4 +53,4 @@ end
51
53
 
52
54
  task :spec => :check_dependencies
53
55
 
54
- task :default => [:cucumber, :spec]
56
+ task :default => [:cucumber, :spec]
data/VERSION CHANGED
@@ -1 +1 @@
1
- 0.14.0
1
+ 0.14.1
@@ -11,10 +11,15 @@ module Middleman
11
11
  autoload :MinifyCSS, "middleman/rack/minify_css"
12
12
  end
13
13
 
14
+ module Renderers
15
+ autoload :ERb, "middleman/renderers/erb"
16
+ autoload :Builder, "middleman/renderers/builder"
17
+ autoload :Less, "middleman/renderers/less"
18
+ end
19
+
14
20
  autoload :Base, "middleman/base"
15
- autoload :ERb, "middleman/erb"
16
- autoload :Haml, "middleman/haml"
17
- autoload :Sass, "middleman/sass"
21
+ autoload :Haml, "middleman/renderers/haml"
22
+ autoload :Sass, "middleman/renderers/sass"
18
23
  autoload :Helpers, "middleman/helpers"
19
24
 
20
- end
25
+ end
@@ -126,10 +126,11 @@ module Middleman
126
126
  end
127
127
  end
128
128
 
129
- require "middleman/erb"
130
- # Haml is required & includes helpers
131
- require "middleman/haml"
132
- require "middleman/sass"
129
+ require "middleman/renderers/erb"
130
+ require "middleman/renderers/haml"
131
+ require "middleman/renderers/sass"
132
+ require "middleman/renderers/less"
133
+ require "middleman/renderers/builder"
133
134
 
134
135
  class Middleman::Base
135
136
  helpers Middleman::Helpers
@@ -184,4 +185,4 @@ class Middleman::Base
184
185
 
185
186
  super
186
187
  end
187
- end
188
+ end
@@ -0,0 +1,23 @@
1
+ require "builder"
2
+
3
+ module Middleman
4
+ module Renderers
5
+ module Builder
6
+ def self.included(base)
7
+ base.supported_formats << "builder"
8
+ end
9
+
10
+ def render_path(path, layout)
11
+ if template_exists?(path, :builder)
12
+ builder(path.to_sym, :layout => layout)
13
+ else
14
+ super
15
+ end
16
+ end
17
+ end
18
+ end
19
+ end
20
+
21
+ class Middleman::Base
22
+ include Middleman::Renderers::Builder
23
+ end
@@ -1,8 +1,8 @@
1
1
  require "erb"
2
2
 
3
3
  module Middleman
4
- module ERb
5
- module Renderer
4
+ module Renderers
5
+ module ERb
6
6
  def self.included(base)
7
7
  base.supported_formats << "erb"
8
8
  end
@@ -20,5 +20,5 @@ module Middleman
20
20
  end
21
21
 
22
22
  class Middleman::Base
23
- include Middleman::ERb::Renderer
24
- end
23
+ include Middleman::Renderers::ERb
24
+ end
@@ -0,0 +1,23 @@
1
+ require "less"
2
+
3
+ module Middleman
4
+ module Renderers
5
+ module Less
6
+ def self.included(base)
7
+ base.supported_formats << "less"
8
+ end
9
+
10
+ def render_path(path, layout)
11
+ if template_exists?(path, :less)
12
+ less(path.to_sym)
13
+ else
14
+ super
15
+ end
16
+ end
17
+ end
18
+ end
19
+ end
20
+
21
+ class Middleman::Base
22
+ include Middleman::Renderers::Less
23
+ end
@@ -5,11 +5,11 @@
5
5
 
6
6
  Gem::Specification.new do |s|
7
7
  s.name = %q{middleman}
8
- s.version = "0.14.0"
8
+ s.version = "0.14.1"
9
9
 
10
10
  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
11
11
  s.authors = ["Thomas Reynolds"]
12
- s.date = %q{2010-08-03}
12
+ s.date = %q{2010-08-06}
13
13
  s.email = %q{tdreyno@gmail.com}
14
14
  s.executables = ["mm-init", "mm-build", "mm-server"]
15
15
  s.extra_rdoc_files = [
@@ -43,7 +43,6 @@ Gem::Specification.new do |s|
43
43
  "lib/middleman/base.rb",
44
44
  "lib/middleman/builder.rb",
45
45
  "lib/middleman/config.ru",
46
- "lib/middleman/erb.rb",
47
46
  "lib/middleman/fastimage.rb",
48
47
  "lib/middleman/features/asset_host.rb",
49
48
  "lib/middleman/features/automatic_image_sizes.rb",
@@ -53,12 +52,15 @@ Gem::Specification.new do |s|
53
52
  "lib/middleman/features/relative_assets.rb",
54
53
  "lib/middleman/features/slickmap.rb",
55
54
  "lib/middleman/features/smush_pngs.rb",
56
- "lib/middleman/haml.rb",
57
55
  "lib/middleman/helpers.rb",
58
56
  "lib/middleman/rack/minify_css.rb",
59
57
  "lib/middleman/rack/minify_javascript.rb",
60
58
  "lib/middleman/rack/sprockets.rb",
61
- "lib/middleman/sass.rb",
59
+ "lib/middleman/renderers/builder.rb",
60
+ "lib/middleman/renderers/erb.rb",
61
+ "lib/middleman/renderers/haml.rb",
62
+ "lib/middleman/renderers/less.rb",
63
+ "lib/middleman/renderers/sass.rb",
62
64
  "lib/middleman/template/init.rbt",
63
65
  "lib/middleman/template/views/index.html.haml",
64
66
  "lib/middleman/template/views/layout.haml",
@@ -99,20 +101,20 @@ Gem::Specification.new do |s|
99
101
  s.rdoc_options = ["--charset=UTF-8"]
100
102
  s.require_paths = ["lib"]
101
103
  s.rubyforge_project = %q{middleman}
102
- s.rubygems_version = %q{1.3.7}
104
+ s.rubygems_version = %q{1.3.6}
103
105
  s.summary = %q{A static site generator utilizing Haml, Sass and providing YUI compression and cache busting}
104
106
  s.test_files = [
105
- "spec/builder_spec.rb",
106
- "spec/fixtures/sample/init.rb",
107
+ "spec/spec_helper.rb",
108
+ "spec/builder_spec.rb",
107
109
  "spec/helpers_spec.rb",
108
- "spec/spec_helper.rb"
110
+ "spec/fixtures/sample/init.rb"
109
111
  ]
110
112
 
111
113
  if s.respond_to? :specification_version then
112
114
  current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
113
115
  s.specification_version = 3
114
116
 
115
- if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
117
+ if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
116
118
  s.add_runtime_dependency(%q<rack>, [">= 0"])
117
119
  s.add_runtime_dependency(%q<thin>, [">= 0"])
118
120
  s.add_runtime_dependency(%q<shotgun>, [">= 0.8"])
@@ -120,6 +122,8 @@ Gem::Specification.new do |s|
120
122
  s.add_runtime_dependency(%q<sprockets>, [">= 0"])
121
123
  s.add_runtime_dependency(%q<sinatra>, [">= 1.0"])
122
124
  s.add_runtime_dependency(%q<sinatra-content-for>, [">= 0"])
125
+ s.add_runtime_dependency(%q<less>, [">= 0"])
126
+ s.add_runtime_dependency(%q<builder>, [">= 0"])
123
127
  s.add_runtime_dependency(%q<rack-test>, [">= 0"])
124
128
  s.add_runtime_dependency(%q<yui-compressor>, [">= 0"])
125
129
  s.add_runtime_dependency(%q<haml>, [">= 3.0"])
@@ -139,6 +143,8 @@ Gem::Specification.new do |s|
139
143
  s.add_dependency(%q<sprockets>, [">= 0"])
140
144
  s.add_dependency(%q<sinatra>, [">= 1.0"])
141
145
  s.add_dependency(%q<sinatra-content-for>, [">= 0"])
146
+ s.add_dependency(%q<less>, [">= 0"])
147
+ s.add_dependency(%q<builder>, [">= 0"])
142
148
  s.add_dependency(%q<rack-test>, [">= 0"])
143
149
  s.add_dependency(%q<yui-compressor>, [">= 0"])
144
150
  s.add_dependency(%q<haml>, [">= 3.0"])
@@ -159,6 +165,8 @@ Gem::Specification.new do |s|
159
165
  s.add_dependency(%q<sprockets>, [">= 0"])
160
166
  s.add_dependency(%q<sinatra>, [">= 1.0"])
161
167
  s.add_dependency(%q<sinatra-content-for>, [">= 0"])
168
+ s.add_dependency(%q<less>, [">= 0"])
169
+ s.add_dependency(%q<builder>, [">= 0"])
162
170
  s.add_dependency(%q<rack-test>, [">= 0"])
163
171
  s.add_dependency(%q<yui-compressor>, [">= 0"])
164
172
  s.add_dependency(%q<haml>, [">= 3.0"])
metadata CHANGED
@@ -1,13 +1,12 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: middleman
3
3
  version: !ruby/object:Gem::Version
4
- hash: 39
5
4
  prerelease: false
6
5
  segments:
7
6
  - 0
8
7
  - 14
9
- - 0
10
- version: 0.14.0
8
+ - 1
9
+ version: 0.14.1
11
10
  platform: ruby
12
11
  authors:
13
12
  - Thomas Reynolds
@@ -15,18 +14,16 @@ autorequire:
15
14
  bindir: bin
16
15
  cert_chain: []
17
16
 
18
- date: 2010-08-03 00:00:00 -07:00
17
+ date: 2010-08-06 00:00:00 -07:00
19
18
  default_executable:
20
19
  dependencies:
21
20
  - !ruby/object:Gem::Dependency
22
21
  name: rack
23
22
  prerelease: false
24
23
  requirement: &id001 !ruby/object:Gem::Requirement
25
- none: false
26
24
  requirements:
27
25
  - - ">="
28
26
  - !ruby/object:Gem::Version
29
- hash: 3
30
27
  segments:
31
28
  - 0
32
29
  version: "0"
@@ -36,11 +33,9 @@ dependencies:
36
33
  name: thin
37
34
  prerelease: false
38
35
  requirement: &id002 !ruby/object:Gem::Requirement
39
- none: false
40
36
  requirements:
41
37
  - - ">="
42
38
  - !ruby/object:Gem::Version
43
- hash: 3
44
39
  segments:
45
40
  - 0
46
41
  version: "0"
@@ -50,11 +45,9 @@ dependencies:
50
45
  name: shotgun
51
46
  prerelease: false
52
47
  requirement: &id003 !ruby/object:Gem::Requirement
53
- none: false
54
48
  requirements:
55
49
  - - ">="
56
50
  - !ruby/object:Gem::Version
57
- hash: 27
58
51
  segments:
59
52
  - 0
60
53
  - 8
@@ -65,11 +58,9 @@ dependencies:
65
58
  name: templater
66
59
  prerelease: false
67
60
  requirement: &id004 !ruby/object:Gem::Requirement
68
- none: false
69
61
  requirements:
70
62
  - - ">="
71
63
  - !ruby/object:Gem::Version
72
- hash: 3
73
64
  segments:
74
65
  - 0
75
66
  version: "0"
@@ -79,11 +70,9 @@ dependencies:
79
70
  name: sprockets
80
71
  prerelease: false
81
72
  requirement: &id005 !ruby/object:Gem::Requirement
82
- none: false
83
73
  requirements:
84
74
  - - ">="
85
75
  - !ruby/object:Gem::Version
86
- hash: 3
87
76
  segments:
88
77
  - 0
89
78
  version: "0"
@@ -93,11 +82,9 @@ dependencies:
93
82
  name: sinatra
94
83
  prerelease: false
95
84
  requirement: &id006 !ruby/object:Gem::Requirement
96
- none: false
97
85
  requirements:
98
86
  - - ">="
99
87
  - !ruby/object:Gem::Version
100
- hash: 15
101
88
  segments:
102
89
  - 1
103
90
  - 0
@@ -108,172 +95,172 @@ dependencies:
108
95
  name: sinatra-content-for
109
96
  prerelease: false
110
97
  requirement: &id007 !ruby/object:Gem::Requirement
111
- none: false
112
98
  requirements:
113
99
  - - ">="
114
100
  - !ruby/object:Gem::Version
115
- hash: 3
116
101
  segments:
117
102
  - 0
118
103
  version: "0"
119
104
  type: :runtime
120
105
  version_requirements: *id007
121
106
  - !ruby/object:Gem::Dependency
122
- name: rack-test
107
+ name: less
123
108
  prerelease: false
124
109
  requirement: &id008 !ruby/object:Gem::Requirement
125
- none: false
126
110
  requirements:
127
111
  - - ">="
128
112
  - !ruby/object:Gem::Version
129
- hash: 3
130
113
  segments:
131
114
  - 0
132
115
  version: "0"
133
116
  type: :runtime
134
117
  version_requirements: *id008
135
118
  - !ruby/object:Gem::Dependency
136
- name: yui-compressor
119
+ name: builder
137
120
  prerelease: false
138
121
  requirement: &id009 !ruby/object:Gem::Requirement
139
- none: false
140
122
  requirements:
141
123
  - - ">="
142
124
  - !ruby/object:Gem::Version
143
- hash: 3
144
125
  segments:
145
126
  - 0
146
127
  version: "0"
147
128
  type: :runtime
148
129
  version_requirements: *id009
149
130
  - !ruby/object:Gem::Dependency
150
- name: haml
131
+ name: rack-test
151
132
  prerelease: false
152
133
  requirement: &id010 !ruby/object:Gem::Requirement
153
- none: false
154
134
  requirements:
155
135
  - - ">="
156
136
  - !ruby/object:Gem::Version
157
- hash: 7
158
137
  segments:
159
- - 3
160
138
  - 0
161
- version: "3.0"
139
+ version: "0"
162
140
  type: :runtime
163
141
  version_requirements: *id010
164
142
  - !ruby/object:Gem::Dependency
165
- name: compass
143
+ name: yui-compressor
166
144
  prerelease: false
167
145
  requirement: &id011 !ruby/object:Gem::Requirement
168
- none: false
169
146
  requirements:
170
147
  - - ">="
171
148
  - !ruby/object:Gem::Version
172
- hash: 31
173
149
  segments:
174
150
  - 0
175
- - 10
176
- version: "0.10"
151
+ version: "0"
177
152
  type: :runtime
178
153
  version_requirements: *id011
179
154
  - !ruby/object:Gem::Dependency
180
- name: fancy-buttons
155
+ name: haml
181
156
  prerelease: false
182
157
  requirement: &id012 !ruby/object:Gem::Requirement
183
- none: false
184
158
  requirements:
185
159
  - - ">="
186
160
  - !ruby/object:Gem::Version
187
- hash: 3
188
161
  segments:
162
+ - 3
189
163
  - 0
190
- version: "0"
164
+ version: "3.0"
191
165
  type: :runtime
192
166
  version_requirements: *id012
193
167
  - !ruby/object:Gem::Dependency
194
- name: json_pure
168
+ name: compass
195
169
  prerelease: false
196
170
  requirement: &id013 !ruby/object:Gem::Requirement
197
- none: false
198
171
  requirements:
199
172
  - - ">="
200
173
  - !ruby/object:Gem::Version
201
- hash: 3
202
174
  segments:
203
175
  - 0
204
- version: "0"
176
+ - 10
177
+ version: "0.10"
205
178
  type: :runtime
206
179
  version_requirements: *id013
207
180
  - !ruby/object:Gem::Dependency
208
- name: smusher
181
+ name: fancy-buttons
209
182
  prerelease: false
210
183
  requirement: &id014 !ruby/object:Gem::Requirement
211
- none: false
212
184
  requirements:
213
185
  - - ">="
214
186
  - !ruby/object:Gem::Version
215
- hash: 3
216
187
  segments:
217
188
  - 0
218
189
  version: "0"
219
190
  type: :runtime
220
191
  version_requirements: *id014
221
192
  - !ruby/object:Gem::Dependency
222
- name: compass-slickmap
193
+ name: json_pure
223
194
  prerelease: false
224
195
  requirement: &id015 !ruby/object:Gem::Requirement
225
- none: false
226
196
  requirements:
227
197
  - - ">="
228
198
  - !ruby/object:Gem::Version
229
- hash: 3
230
199
  segments:
231
200
  - 0
232
201
  version: "0"
233
202
  type: :runtime
234
203
  version_requirements: *id015
235
204
  - !ruby/object:Gem::Dependency
236
- name: rspec
205
+ name: smusher
237
206
  prerelease: false
238
207
  requirement: &id016 !ruby/object:Gem::Requirement
239
- none: false
240
208
  requirements:
241
209
  - - ">="
242
210
  - !ruby/object:Gem::Version
243
- hash: 3
244
211
  segments:
245
212
  - 0
246
213
  version: "0"
247
- type: :development
214
+ type: :runtime
248
215
  version_requirements: *id016
249
216
  - !ruby/object:Gem::Dependency
250
- name: cucumber
217
+ name: compass-slickmap
251
218
  prerelease: false
252
219
  requirement: &id017 !ruby/object:Gem::Requirement
253
- none: false
254
220
  requirements:
255
221
  - - ">="
256
222
  - !ruby/object:Gem::Version
257
- hash: 3
258
223
  segments:
259
224
  - 0
260
225
  version: "0"
261
- type: :development
226
+ type: :runtime
262
227
  version_requirements: *id017
263
228
  - !ruby/object:Gem::Dependency
264
- name: jeweler
229
+ name: rspec
265
230
  prerelease: false
266
231
  requirement: &id018 !ruby/object:Gem::Requirement
267
- none: false
268
232
  requirements:
269
233
  - - ">="
270
234
  - !ruby/object:Gem::Version
271
- hash: 3
272
235
  segments:
273
236
  - 0
274
237
  version: "0"
275
238
  type: :development
276
239
  version_requirements: *id018
240
+ - !ruby/object:Gem::Dependency
241
+ name: cucumber
242
+ prerelease: false
243
+ requirement: &id019 !ruby/object:Gem::Requirement
244
+ requirements:
245
+ - - ">="
246
+ - !ruby/object:Gem::Version
247
+ segments:
248
+ - 0
249
+ version: "0"
250
+ type: :development
251
+ version_requirements: *id019
252
+ - !ruby/object:Gem::Dependency
253
+ name: jeweler
254
+ prerelease: false
255
+ requirement: &id020 !ruby/object:Gem::Requirement
256
+ requirements:
257
+ - - ">="
258
+ - !ruby/object:Gem::Version
259
+ segments:
260
+ - 0
261
+ version: "0"
262
+ type: :development
263
+ version_requirements: *id020
277
264
  description:
278
265
  email: tdreyno@gmail.com
279
266
  executables:
@@ -312,7 +299,6 @@ files:
312
299
  - lib/middleman/base.rb
313
300
  - lib/middleman/builder.rb
314
301
  - lib/middleman/config.ru
315
- - lib/middleman/erb.rb
316
302
  - lib/middleman/fastimage.rb
317
303
  - lib/middleman/features/asset_host.rb
318
304
  - lib/middleman/features/automatic_image_sizes.rb
@@ -322,12 +308,15 @@ files:
322
308
  - lib/middleman/features/relative_assets.rb
323
309
  - lib/middleman/features/slickmap.rb
324
310
  - lib/middleman/features/smush_pngs.rb
325
- - lib/middleman/haml.rb
326
311
  - lib/middleman/helpers.rb
327
312
  - lib/middleman/rack/minify_css.rb
328
313
  - lib/middleman/rack/minify_javascript.rb
329
314
  - lib/middleman/rack/sprockets.rb
330
- - lib/middleman/sass.rb
315
+ - lib/middleman/renderers/builder.rb
316
+ - lib/middleman/renderers/erb.rb
317
+ - lib/middleman/renderers/haml.rb
318
+ - lib/middleman/renderers/less.rb
319
+ - lib/middleman/renderers/sass.rb
331
320
  - lib/middleman/template/init.rbt
332
321
  - lib/middleman/template/views/index.html.haml
333
322
  - lib/middleman/template/views/layout.haml
@@ -373,32 +362,28 @@ rdoc_options:
373
362
  require_paths:
374
363
  - lib
375
364
  required_ruby_version: !ruby/object:Gem::Requirement
376
- none: false
377
365
  requirements:
378
366
  - - ">="
379
367
  - !ruby/object:Gem::Version
380
- hash: 3
381
368
  segments:
382
369
  - 0
383
370
  version: "0"
384
371
  required_rubygems_version: !ruby/object:Gem::Requirement
385
- none: false
386
372
  requirements:
387
373
  - - ">="
388
374
  - !ruby/object:Gem::Version
389
- hash: 3
390
375
  segments:
391
376
  - 0
392
377
  version: "0"
393
378
  requirements: []
394
379
 
395
380
  rubyforge_project: middleman
396
- rubygems_version: 1.3.7
381
+ rubygems_version: 1.3.6
397
382
  signing_key:
398
383
  specification_version: 3
399
384
  summary: A static site generator utilizing Haml, Sass and providing YUI compression and cache busting
400
385
  test_files:
386
+ - spec/spec_helper.rb
401
387
  - spec/builder_spec.rb
402
- - spec/fixtures/sample/init.rb
403
388
  - spec/helpers_spec.rb
404
- - spec/spec_helper.rb
389
+ - spec/fixtures/sample/init.rb