middleman 0.99.2.pre → 0.99.3.pre

Sign up to get free protection for your applications and to get access to all the features.
@@ -1,10 +1,10 @@
1
1
  = middleman
2
2
 
3
- The Middleman is ever-vigilant against tag-soup, unreadable CSS and repetition. He stands-watch over your Haml and Sass producing only the cleanest and efficient markup.
3
+ The Middleman is ever-vigilant against tag-soup, unreadable CSS and repetition. He stands-watch over your Haml, Sass, Less and CoffeeScript producing only the cleanest and efficient markup.
4
4
 
5
5
  == Getting Started
6
6
 
7
- Everything you need to know is on the wiki: http://wiki.github.com/tdreyno/middleman
7
+ Everything you need to know is on the wiki: http://github.com/tdreyno/middleman/wiki
8
8
 
9
9
  == Copyright
10
10
 
data/Rakefile CHANGED
@@ -16,6 +16,7 @@ begin
16
16
  gem.add_dependency("thin", "~>1.2.0")
17
17
  gem.add_dependency("shotgun", "~>0.8.0")
18
18
  gem.add_dependency("templater", "~>1.0.0")
19
+ gem.add_dependency("tilt", "~>1.1")
19
20
  gem.add_dependency("sinatra", "~>1.0")
20
21
  gem.add_dependency("padrino-core", "~>0.9.0")
21
22
  gem.add_dependency("padrino-helpers", "~>0.9.0")
data/VERSION CHANGED
@@ -1 +1 @@
1
- 0.99.2.pre
1
+ 0.99.3.pre
@@ -7,7 +7,6 @@ module Middleman
7
7
  autoload :Server, "middleman/server"
8
8
 
9
9
  module Renderers
10
- autoload :CoffeeScript, "middleman/renderers/coffee_script"
11
10
  autoload :Haml, "middleman/renderers/haml"
12
11
  autoload :Sass, "middleman/renderers/sass"
13
12
  end
@@ -61,7 +61,6 @@ module Middleman
61
61
  end
62
62
 
63
63
  # Activate custom renderers
64
- register Middleman::Renderers::CoffeeScript
65
64
  register Middleman::Renderers::Haml
66
65
  register Middleman::Renderers::Sass
67
66
 
@@ -5,11 +5,11 @@
5
5
 
6
6
  Gem::Specification.new do |s|
7
7
  s.name = %q{middleman}
8
- s.version = "0.99.2.pre"
8
+ s.version = "0.99.3.pre"
9
9
 
10
10
  s.required_rubygems_version = Gem::Requirement.new("> 1.3.1") if s.respond_to? :required_rubygems_version=
11
11
  s.authors = ["Thomas Reynolds"]
12
- s.date = %q{2010-09-06}
12
+ s.date = %q{2010-09-11}
13
13
  s.email = %q{tdreyno@gmail.com}
14
14
  s.executables = ["mm-init", "mm-build", "mm-server"]
15
15
  s.extra_rdoc_files = [
@@ -93,7 +93,6 @@ Gem::Specification.new do |s|
93
93
  "lib/middleman/features/slickmap/template.html.haml",
94
94
  "lib/middleman/features/smush_pngs.rb",
95
95
  "lib/middleman/features/ugly_haml.rb",
96
- "lib/middleman/renderers/coffee_script.rb",
97
96
  "lib/middleman/renderers/haml.rb",
98
97
  "lib/middleman/renderers/sass.rb",
99
98
  "lib/middleman/server.rb",
@@ -120,6 +119,7 @@ Gem::Specification.new do |s|
120
119
  s.add_runtime_dependency(%q<thin>, ["~> 1.2.0"])
121
120
  s.add_runtime_dependency(%q<shotgun>, ["~> 0.8.0"])
122
121
  s.add_runtime_dependency(%q<templater>, ["~> 1.0.0"])
122
+ s.add_runtime_dependency(%q<tilt>, ["~> 1.1"])
123
123
  s.add_runtime_dependency(%q<sinatra>, ["~> 1.0"])
124
124
  s.add_runtime_dependency(%q<padrino-core>, ["~> 0.9.0"])
125
125
  s.add_runtime_dependency(%q<padrino-helpers>, ["~> 0.9.0"])
@@ -137,6 +137,7 @@ Gem::Specification.new do |s|
137
137
  s.add_dependency(%q<thin>, ["~> 1.2.0"])
138
138
  s.add_dependency(%q<shotgun>, ["~> 0.8.0"])
139
139
  s.add_dependency(%q<templater>, ["~> 1.0.0"])
140
+ s.add_dependency(%q<tilt>, ["~> 1.1"])
140
141
  s.add_dependency(%q<sinatra>, ["~> 1.0"])
141
142
  s.add_dependency(%q<padrino-core>, ["~> 0.9.0"])
142
143
  s.add_dependency(%q<padrino-helpers>, ["~> 0.9.0"])
@@ -155,6 +156,7 @@ Gem::Specification.new do |s|
155
156
  s.add_dependency(%q<thin>, ["~> 1.2.0"])
156
157
  s.add_dependency(%q<shotgun>, ["~> 0.8.0"])
157
158
  s.add_dependency(%q<templater>, ["~> 1.0.0"])
159
+ s.add_dependency(%q<tilt>, ["~> 1.1"])
158
160
  s.add_dependency(%q<sinatra>, ["~> 1.0"])
159
161
  s.add_dependency(%q<padrino-core>, ["~> 0.9.0"])
160
162
  s.add_dependency(%q<padrino-helpers>, ["~> 0.9.0"])
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: middleman
3
3
  version: !ruby/object:Gem::Version
4
- hash: 961916756
4
+ hash: 961916752
5
5
  prerelease: true
6
6
  segments:
7
7
  - 0
8
8
  - 99
9
- - 2
9
+ - 3
10
10
  - pre
11
- version: 0.99.2.pre
11
+ version: 0.99.3.pre
12
12
  platform: ruby
13
13
  authors:
14
14
  - Thomas Reynolds
@@ -16,7 +16,7 @@ autorequire:
16
16
  bindir: bin
17
17
  cert_chain: []
18
18
 
19
- date: 2010-09-06 00:00:00 -07:00
19
+ date: 2010-09-11 00:00:00 -07:00
20
20
  default_executable:
21
21
  dependencies:
22
22
  - !ruby/object:Gem::Dependency
@@ -83,9 +83,24 @@ dependencies:
83
83
  type: :runtime
84
84
  version_requirements: *id004
85
85
  - !ruby/object:Gem::Dependency
86
- name: sinatra
86
+ name: tilt
87
87
  prerelease: false
88
88
  requirement: &id005 !ruby/object:Gem::Requirement
89
+ none: false
90
+ requirements:
91
+ - - ~>
92
+ - !ruby/object:Gem::Version
93
+ hash: 13
94
+ segments:
95
+ - 1
96
+ - 1
97
+ version: "1.1"
98
+ type: :runtime
99
+ version_requirements: *id005
100
+ - !ruby/object:Gem::Dependency
101
+ name: sinatra
102
+ prerelease: false
103
+ requirement: &id006 !ruby/object:Gem::Requirement
89
104
  none: false
90
105
  requirements:
91
106
  - - ~>
@@ -96,11 +111,11 @@ dependencies:
96
111
  - 0
97
112
  version: "1.0"
98
113
  type: :runtime
99
- version_requirements: *id005
114
+ version_requirements: *id006
100
115
  - !ruby/object:Gem::Dependency
101
116
  name: padrino-core
102
117
  prerelease: false
103
- requirement: &id006 !ruby/object:Gem::Requirement
118
+ requirement: &id007 !ruby/object:Gem::Requirement
104
119
  none: false
105
120
  requirements:
106
121
  - - ~>
@@ -112,11 +127,11 @@ dependencies:
112
127
  - 0
113
128
  version: 0.9.0
114
129
  type: :runtime
115
- version_requirements: *id006
130
+ version_requirements: *id007
116
131
  - !ruby/object:Gem::Dependency
117
132
  name: padrino-helpers
118
133
  prerelease: false
119
- requirement: &id007 !ruby/object:Gem::Requirement
134
+ requirement: &id008 !ruby/object:Gem::Requirement
120
135
  none: false
121
136
  requirements:
122
137
  - - ~>
@@ -128,11 +143,11 @@ dependencies:
128
143
  - 0
129
144
  version: 0.9.0
130
145
  type: :runtime
131
- version_requirements: *id007
146
+ version_requirements: *id008
132
147
  - !ruby/object:Gem::Dependency
133
148
  name: rack-test
134
149
  prerelease: false
135
- requirement: &id008 !ruby/object:Gem::Requirement
150
+ requirement: &id009 !ruby/object:Gem::Requirement
136
151
  none: false
137
152
  requirements:
138
153
  - - ~>
@@ -144,11 +159,11 @@ dependencies:
144
159
  - 0
145
160
  version: 0.5.0
146
161
  type: :runtime
147
- version_requirements: *id008
162
+ version_requirements: *id009
148
163
  - !ruby/object:Gem::Dependency
149
164
  name: yui-compressor
150
165
  prerelease: false
151
- requirement: &id009 !ruby/object:Gem::Requirement
166
+ requirement: &id010 !ruby/object:Gem::Requirement
152
167
  none: false
153
168
  requirements:
154
169
  - - ~>
@@ -160,11 +175,11 @@ dependencies:
160
175
  - 0
161
176
  version: 0.9.0
162
177
  type: :runtime
163
- version_requirements: *id009
178
+ version_requirements: *id010
164
179
  - !ruby/object:Gem::Dependency
165
180
  name: haml
166
181
  prerelease: false
167
- requirement: &id010 !ruby/object:Gem::Requirement
182
+ requirement: &id011 !ruby/object:Gem::Requirement
168
183
  none: false
169
184
  requirements:
170
185
  - - ~>
@@ -175,11 +190,11 @@ dependencies:
175
190
  - 0
176
191
  version: "3.0"
177
192
  type: :runtime
178
- version_requirements: *id010
193
+ version_requirements: *id011
179
194
  - !ruby/object:Gem::Dependency
180
195
  name: compass
181
196
  prerelease: false
182
- requirement: &id011 !ruby/object:Gem::Requirement
197
+ requirement: &id012 !ruby/object:Gem::Requirement
183
198
  none: false
184
199
  requirements:
185
200
  - - ~>
@@ -191,11 +206,11 @@ dependencies:
191
206
  - 0
192
207
  version: 0.10.0
193
208
  type: :runtime
194
- version_requirements: *id011
209
+ version_requirements: *id012
195
210
  - !ruby/object:Gem::Dependency
196
211
  name: json_pure
197
212
  prerelease: false
198
- requirement: &id012 !ruby/object:Gem::Requirement
213
+ requirement: &id013 !ruby/object:Gem::Requirement
199
214
  none: false
200
215
  requirements:
201
216
  - - ~>
@@ -207,11 +222,11 @@ dependencies:
207
222
  - 0
208
223
  version: 1.4.0
209
224
  type: :runtime
210
- version_requirements: *id012
225
+ version_requirements: *id013
211
226
  - !ruby/object:Gem::Dependency
212
227
  name: smusher
213
228
  prerelease: false
214
- requirement: &id013 !ruby/object:Gem::Requirement
229
+ requirement: &id014 !ruby/object:Gem::Requirement
215
230
  none: false
216
231
  requirements:
217
232
  - - ~>
@@ -223,11 +238,11 @@ dependencies:
223
238
  - 5
224
239
  version: 0.4.5
225
240
  type: :runtime
226
- version_requirements: *id013
241
+ version_requirements: *id014
227
242
  - !ruby/object:Gem::Dependency
228
243
  name: compass-slickmap
229
244
  prerelease: false
230
- requirement: &id014 !ruby/object:Gem::Requirement
245
+ requirement: &id015 !ruby/object:Gem::Requirement
231
246
  none: false
232
247
  requirements:
233
248
  - - ~>
@@ -239,11 +254,11 @@ dependencies:
239
254
  - 0
240
255
  version: 0.4.0
241
256
  type: :runtime
242
- version_requirements: *id014
257
+ version_requirements: *id015
243
258
  - !ruby/object:Gem::Dependency
244
259
  name: cucumber
245
260
  prerelease: false
246
- requirement: &id015 !ruby/object:Gem::Requirement
261
+ requirement: &id016 !ruby/object:Gem::Requirement
247
262
  none: false
248
263
  requirements:
249
264
  - - ">="
@@ -253,11 +268,11 @@ dependencies:
253
268
  - 0
254
269
  version: "0"
255
270
  type: :development
256
- version_requirements: *id015
271
+ version_requirements: *id016
257
272
  - !ruby/object:Gem::Dependency
258
273
  name: jeweler
259
274
  prerelease: false
260
- requirement: &id016 !ruby/object:Gem::Requirement
275
+ requirement: &id017 !ruby/object:Gem::Requirement
261
276
  none: false
262
277
  requirements:
263
278
  - - ">="
@@ -267,7 +282,7 @@ dependencies:
267
282
  - 0
268
283
  version: "0"
269
284
  type: :development
270
- version_requirements: *id016
285
+ version_requirements: *id017
271
286
  description:
272
287
  email: tdreyno@gmail.com
273
288
  executables:
@@ -356,7 +371,6 @@ files:
356
371
  - lib/middleman/features/slickmap/template.html.haml
357
372
  - lib/middleman/features/smush_pngs.rb
358
373
  - lib/middleman/features/ugly_haml.rb
359
- - lib/middleman/renderers/coffee_script.rb
360
374
  - lib/middleman/renderers/haml.rb
361
375
  - lib/middleman/renderers/sass.rb
362
376
  - lib/middleman/server.rb
@@ -1,31 +0,0 @@
1
- module Middleman
2
- module Renderers
3
- module CoffeeScript
4
- class << self
5
- def registered(app)
6
- Tilt.register 'coffee', Tilt::CoffeeTemplate
7
- end
8
- alias :included :registered
9
- end
10
- end
11
- end
12
- end
13
-
14
- unless defined? Tilt::CoffeeTemplate
15
- # CoffeeScript info:
16
- # http://jashkenas.github.com/coffee-script/
17
- class Tilt::CoffeeTemplate < Tilt::Template
18
- def initialize_engine
19
- return if defined? ::CoffeeScript
20
- require_template_library 'coffee-script'
21
- end
22
-
23
- def prepare
24
- @output = nil
25
- end
26
-
27
- def evaluate(scope, locals, &block)
28
- @output ||= ::CoffeeScript::compile(data, options)
29
- end
30
- end
31
- end