middleman 1.2.8 → 2.0.0.beta2

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.
Files changed (89) hide show
  1. data/.gitignore +1 -0
  2. data/CHANGELOG +7 -0
  3. data/README.rdoc +1 -1
  4. data/bin/mm-server +15 -39
  5. data/features/coffee-script.feature +6 -1
  6. data/features/minify_javascript.feature +14 -6
  7. data/features/slim.feature +7 -0
  8. data/features/step_definitions/builder_steps.rb +1 -23
  9. data/features/step_definitions/env.rb +7 -1
  10. data/features/step_definitions/generator_steps.rb +1 -1
  11. data/features/step_definitions/middleman_steps.rb +5 -0
  12. data/fixtures/test-app/config.rb +2 -0
  13. data/fixtures/test-app/{views → source}/_partial.haml +0 -0
  14. data/fixtures/test-app/{views → source}/asset_host.html.haml +0 -0
  15. data/fixtures/test-app/{views → source}/auto-css.html.haml +0 -0
  16. data/fixtures/test-app/{views → source}/auto-image-sizes.html.haml +0 -0
  17. data/fixtures/test-app/{views → source}/cache-buster.html.haml +0 -0
  18. data/fixtures/test-app/{views → source}/custom-layout-dir/index.html.haml +0 -0
  19. data/fixtures/test-app/{views → source}/custom-layout.html.haml +0 -0
  20. data/fixtures/test-app/source/front-matter.html.erb +7 -0
  21. data/fixtures/test-app/{public → source}/images/blank.gif +0 -0
  22. data/fixtures/test-app/{views → source}/index.html.haml +0 -0
  23. data/fixtures/test-app/source/inline-coffeescript.html.haml +3 -0
  24. data/fixtures/test-app/{views → source}/inline-css.html.haml +0 -0
  25. data/fixtures/test-app/{views → source}/inline-js.html.haml +1 -1
  26. data/fixtures/test-app/{views → source}/javascripts/coffee_test.js.coffee +0 -0
  27. data/fixtures/test-app/source/javascripts/jquery.plugin.with.dots.js +1 -0
  28. data/fixtures/test-app/{views → source}/layout.haml +0 -0
  29. data/fixtures/test-app/{views → source}/layouts/custom.haml +0 -0
  30. data/fixtures/test-app/{views → source}/padrino_test.html.haml +0 -0
  31. data/fixtures/test-app/{views → source}/page-classes.html.haml +0 -0
  32. data/fixtures/test-app/{views → source}/services/index.html.haml +0 -0
  33. data/fixtures/test-app/source/slim.html.slim +7 -0
  34. data/fixtures/test-app/{public → source}/static.html +0 -0
  35. data/fixtures/test-app/{views → source}/stylesheets/asset_host.css.sass +0 -0
  36. data/fixtures/test-app/{public → source}/stylesheets/auto-css.css +0 -0
  37. data/fixtures/test-app/{views → source}/stylesheets/relative_assets.css.sass +0 -0
  38. data/fixtures/test-app/{views → source}/stylesheets/site.css.sass +0 -0
  39. data/fixtures/test-app/{views → source}/stylesheets/site_scss.css.scss +0 -0
  40. data/fixtures/test-app/{public → source}/stylesheets/static.css +0 -0
  41. data/fixtures/test-app/{public → source}/stylesheets/sub1/auto-css.css +0 -0
  42. data/fixtures/test-app/{public → source}/stylesheets/sub1/sub2/auto-css.css +0 -0
  43. data/fixtures/test-app/{views → source}/tiny_src.html.haml +0 -0
  44. data/lib/middleman.rb +1 -0
  45. data/lib/middleman/builder.rb +15 -22
  46. data/lib/middleman/features.rb +7 -1
  47. data/lib/middleman/features/automatic_image_sizes.rb +1 -1
  48. data/lib/middleman/features/blog.rb +118 -0
  49. data/lib/middleman/features/cache_buster.rb +2 -2
  50. data/lib/middleman/features/data.rb +19 -6
  51. data/lib/middleman/features/default_helpers.rb +1 -1
  52. data/lib/middleman/features/front_matter.rb +69 -0
  53. data/lib/middleman/features/live_reload.rb +8 -3
  54. data/lib/middleman/features/minify_javascript/rack.rb +27 -6
  55. data/lib/middleman/renderers/haml.rb +1 -0
  56. data/lib/middleman/renderers/sass.rb +5 -4
  57. data/lib/middleman/renderers/slim.rb +12 -0
  58. data/lib/middleman/server.rb +30 -11
  59. data/lib/middleman/templates/default.rb +4 -4
  60. data/lib/middleman/templates/default/{views → source}/index.html.haml +0 -0
  61. data/lib/middleman/templates/default/{views → source}/layout.haml +0 -0
  62. data/lib/middleman/templates/default/source/stylesheets/site.css.sass +34 -0
  63. data/lib/middleman/templates/html5.rb +2 -2
  64. data/lib/middleman/templates/html5/{public → source}/404.html +0 -0
  65. data/lib/middleman/templates/html5/{public → source}/apple-touch-icon.png +0 -0
  66. data/lib/middleman/templates/html5/{public → source}/crossdomain.xml +0 -0
  67. data/lib/middleman/templates/html5/{public → source}/css/handheld.css +0 -0
  68. data/lib/middleman/templates/html5/{public → source}/css/style.css +0 -0
  69. data/lib/middleman/templates/html5/{public → source}/favicon.ico +0 -0
  70. data/lib/middleman/templates/html5/{public → source}/humans.txt +0 -0
  71. data/lib/middleman/templates/html5/{public → source}/images/.gitignore +0 -0
  72. data/lib/middleman/templates/html5/{public → source}/index.html +0 -0
  73. data/lib/middleman/templates/html5/{public → source}/js/libs/dd_belatedpng.js +0 -0
  74. data/lib/middleman/templates/html5/{public → source}/js/libs/jquery-1.5.0.js +0 -0
  75. data/lib/middleman/templates/html5/{public → source}/js/libs/jquery-1.5.0.min.js +0 -0
  76. data/lib/middleman/templates/html5/{public → source}/js/libs/modernizr-1.6.min.js +0 -0
  77. data/lib/middleman/templates/html5/{public → source}/js/mylibs/.gitignore +0 -0
  78. data/lib/middleman/templates/html5/{public → source}/js/plugins.js +0 -0
  79. data/lib/middleman/templates/html5/{public → source}/js/script.js +0 -0
  80. data/lib/middleman/templates/html5/{public → source}/robots.txt +0 -0
  81. data/lib/middleman/templates/xhtml.rb +4 -4
  82. data/lib/middleman/templates/xhtml/{views → source}/index.html.haml +0 -0
  83. data/lib/middleman/templates/xhtml/{views → source}/layout.haml +0 -0
  84. data/lib/middleman/templates/xhtml/source/stylesheets/site.css.sass +34 -0
  85. data/lib/middleman/version.rb +1 -1
  86. data/middleman.gemspec +7 -7
  87. metadata +149 -113
  88. data/lib/middleman/templates/default/views/stylesheets/site.css.sass +0 -27
  89. data/lib/middleman/templates/xhtml/views/stylesheets/site.css.sass +0 -27
@@ -6,10 +6,10 @@ class Middleman::Templates::Default < Middleman::Templates::Base
6
6
  def build_scaffold
7
7
  template "config.tt", File.join(location, "config.rb")
8
8
  template "config.ru", File.join(location, "config.ru")
9
- directory "views", File.join(location, "views")
10
- empty_directory File.join(location, "public", options[:css_dir])
11
- empty_directory File.join(location, "public", options[:js_dir])
12
- empty_directory File.join(location, "public", options[:images_dir])
9
+ directory "source", File.join(location, "source")
10
+ empty_directory File.join(location, "source", options[:css_dir])
11
+ empty_directory File.join(location, "source", options[:js_dir])
12
+ empty_directory File.join(location, "source", options[:images_dir])
13
13
  end
14
14
  end
15
15
 
@@ -0,0 +1,34 @@
1
+ @import "compass"
2
+ @import "susy"
3
+
4
+ $link-color: #0388a6
5
+ $link-hover-color: #009ce0
6
+ $link-focus-color: false
7
+ $link-active-color: false
8
+ $link-visited-color: false
9
+
10
+ $font-color: #2a2a2a
11
+ $font-family: 'Helvetica Neue', sans-serif
12
+ $base-font-size: 12px
13
+ $base-line-height: 18px
14
+
15
+ $total-cols: 12
16
+ $col-width: 4em
17
+ $gutter-width: 1em
18
+ $side-gutter-width: $gutter-width
19
+
20
+ +global-reset
21
+
22
+ +establish-baseline
23
+
24
+ body
25
+ font-family: $font-family
26
+ color: $font-color
27
+
28
+ a
29
+ +link-colors($link-color, $link-hover-color, $link-focus-color, $link-active-color, $link-visited-color)
30
+
31
+ #main
32
+ padding: 50px
33
+ +container
34
+ +susy-grid-background
@@ -5,8 +5,8 @@ class Middleman::Templates::Html5 < Middleman::Templates::Base
5
5
 
6
6
  def build_scaffold
7
7
  template "config.tt", File.join(location, "config.rb")
8
- directory "public", File.join(location, "public")
9
- empty_directory File.join(location, "views")
8
+ directory "source", File.join(location, "source")
9
+ empty_directory File.join(location, "source")
10
10
  end
11
11
  end
12
12
 
@@ -6,10 +6,10 @@ class Middleman::Templates::Xhtml < Middleman::Templates::Base
6
6
  def build_scaffold
7
7
  template "config.tt", File.join(location, "config.rb")
8
8
  template "config.ru", File.join(location, "config.ru")
9
- directory "views", File.join(location, "views")
10
- empty_directory File.join(location, "public", options[:css_dir])
11
- empty_directory File.join(location, "public", options[:js_dir])
12
- empty_directory File.join(location, "public", options[:images_dir])
9
+ directory "source", File.join(location, "source")
10
+ empty_directory File.join(location, "source", options[:css_dir])
11
+ empty_directory File.join(location, "source", options[:js_dir])
12
+ empty_directory File.join(location, "source", options[:images_dir])
13
13
  end
14
14
  end
15
15
 
@@ -0,0 +1,34 @@
1
+ @import "compass"
2
+ @import "susy"
3
+
4
+ $link-color: #0388a6
5
+ $link-hover-color: #009ce0
6
+ $link-focus-color: false
7
+ $link-active-color: false
8
+ $link-visited-color: false
9
+
10
+ $font-color: #2a2a2a
11
+ $font-family: 'Helvetica Neue', sans-serif
12
+ $base-font-size: 12px
13
+ $base-line-height: 18px
14
+
15
+ $total-cols: 12
16
+ $col-width: 4em
17
+ $gutter-width: 1em
18
+ $side-gutter-width: $gutter-width
19
+
20
+ +global-reset
21
+
22
+ +establish-baseline
23
+
24
+ body
25
+ font-family: $font-family
26
+ color: $font-color
27
+
28
+ a
29
+ +link-colors($link-color, $link-hover-color, $link-focus-color, $link-active-color, $link-visited-color)
30
+
31
+ #main
32
+ padding: 50px
33
+ +container
34
+ +susy-grid-background
@@ -1,3 +1,3 @@
1
1
  module Middleman
2
- VERSION = "1.2.8"
2
+ VERSION = "2.0.0.beta2"
3
3
  end
data/middleman.gemspec CHANGED
@@ -18,23 +18,23 @@ Gem::Specification.new do |s|
18
18
  s.executables = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
19
19
  s.require_paths = ["lib"]
20
20
 
21
- s.add_runtime_dependency("rack", ["~> 1.0"])
22
- s.add_runtime_dependency("thin", ["~> 1.2.0"]) unless defined?(JRUBY_VERSION)
23
- s.add_runtime_dependency("kirk", ["~> 0.1.8"]) if defined?(JRUBY_VERSION)
24
- s.add_runtime_dependency("shotgun", ["~> 0.8.0"])
21
+ s.add_runtime_dependency("rack", ["~> 1.1"])
25
22
  s.add_runtime_dependency("thor", ["~> 0.14.0"])
26
- s.add_runtime_dependency("tilt", ["~> 1.3.0"])
23
+ s.add_runtime_dependency("tilt", ["~> 1.3.1"])
24
+ s.add_runtime_dependency("rdiscount", ["~> 1.6.8"])
27
25
  s.add_runtime_dependency("sinatra", ["~> 1.2.0"])
28
26
  s.add_runtime_dependency("padrino-core", ["~> 0.9.23"])
29
27
  s.add_runtime_dependency("padrino-helpers", ["~> 0.9.23"])
30
28
  s.add_runtime_dependency("rack-test", ["~> 0.5.0"])
31
29
  s.add_runtime_dependency("uglifier", ["~> 0.5.0"])
30
+ s.add_runtime_dependency("slim", ["~> 0.9.4"])
32
31
  s.add_runtime_dependency("haml", ["~> 3.1.0"])
32
+ s.add_runtime_dependency("coffee-filter", ["~> 0.1.0"])
33
33
  s.add_runtime_dependency("sass", ["~> 3.1.0"])
34
- s.add_runtime_dependency("compass", ["0.11.2"])
34
+ s.add_runtime_dependency("compass", ["~> 0.11.1"])
35
+ s.add_runtime_dependency("compass-susy-plugin", ["~> 0.9.0"])
35
36
  s.add_runtime_dependency("coffee-script", ["~> 2.2.0"])
36
37
  s.add_runtime_dependency("httparty", ["~> 0.7.0"])
37
- # s.add_runtime_dependency("fssm", ["~> 0.2.0"])
38
38
  s.add_development_dependency("cucumber", ["~> 0.10.0"])
39
39
  s.add_development_dependency("rspec", [">= 0"])
40
40
  s.add_development_dependency("rocco", [">= 0"]) unless defined?(JRUBY_VERSION)
metadata CHANGED
@@ -1,8 +1,8 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: middleman
3
3
  version: !ruby/object:Gem::Version
4
- prerelease:
5
- version: 1.2.8
4
+ prerelease: 6
5
+ version: 2.0.0.beta2
6
6
  platform: ruby
7
7
  authors:
8
8
  - Thomas Reynolds
@@ -20,66 +20,66 @@ dependencies:
20
20
  requirements:
21
21
  - - ~>
22
22
  - !ruby/object:Gem::Version
23
- version: "1.0"
23
+ version: "1.1"
24
24
  type: :runtime
25
25
  version_requirements: *id001
26
26
  - !ruby/object:Gem::Dependency
27
- name: thin
27
+ name: thor
28
28
  prerelease: false
29
29
  requirement: &id002 !ruby/object:Gem::Requirement
30
30
  none: false
31
31
  requirements:
32
32
  - - ~>
33
33
  - !ruby/object:Gem::Version
34
- version: 1.2.0
34
+ version: 0.14.0
35
35
  type: :runtime
36
36
  version_requirements: *id002
37
37
  - !ruby/object:Gem::Dependency
38
- name: shotgun
38
+ name: tilt
39
39
  prerelease: false
40
40
  requirement: &id003 !ruby/object:Gem::Requirement
41
41
  none: false
42
42
  requirements:
43
43
  - - ~>
44
44
  - !ruby/object:Gem::Version
45
- version: 0.8.0
45
+ version: 1.3.1
46
46
  type: :runtime
47
47
  version_requirements: *id003
48
48
  - !ruby/object:Gem::Dependency
49
- name: thor
49
+ name: rdiscount
50
50
  prerelease: false
51
51
  requirement: &id004 !ruby/object:Gem::Requirement
52
52
  none: false
53
53
  requirements:
54
54
  - - ~>
55
55
  - !ruby/object:Gem::Version
56
- version: 0.14.0
56
+ version: 1.6.8
57
57
  type: :runtime
58
58
  version_requirements: *id004
59
59
  - !ruby/object:Gem::Dependency
60
- name: tilt
60
+ name: sinatra
61
61
  prerelease: false
62
62
  requirement: &id005 !ruby/object:Gem::Requirement
63
63
  none: false
64
64
  requirements:
65
65
  - - ~>
66
66
  - !ruby/object:Gem::Version
67
- version: 1.3.0
67
+ version: 1.2.0
68
68
  type: :runtime
69
69
  version_requirements: *id005
70
70
  - !ruby/object:Gem::Dependency
71
- name: sinatra
71
+ name: padrino-core
72
72
  prerelease: false
73
73
  requirement: &id006 !ruby/object:Gem::Requirement
74
74
  none: false
75
75
  requirements:
76
76
  - - ~>
77
77
  - !ruby/object:Gem::Version
78
- version: 1.2.0
78
+ version: 0.9.23
79
79
  type: :runtime
80
80
  version_requirements: *id006
81
81
  - !ruby/object:Gem::Dependency
82
- name: padrino-core
82
+ name: padrino-helpers
83
83
  prerelease: false
84
84
  requirement: &id007 !ruby/object:Gem::Requirement
85
85
  none: false
@@ -90,18 +90,18 @@ dependencies:
90
90
  type: :runtime
91
91
  version_requirements: *id007
92
92
  - !ruby/object:Gem::Dependency
93
- name: padrino-helpers
93
+ name: rack-test
94
94
  prerelease: false
95
95
  requirement: &id008 !ruby/object:Gem::Requirement
96
96
  none: false
97
97
  requirements:
98
98
  - - ~>
99
99
  - !ruby/object:Gem::Version
100
- version: 0.9.23
100
+ version: 0.5.0
101
101
  type: :runtime
102
102
  version_requirements: *id008
103
103
  - !ruby/object:Gem::Dependency
104
- name: rack-test
104
+ name: uglifier
105
105
  prerelease: false
106
106
  requirement: &id009 !ruby/object:Gem::Requirement
107
107
  none: false
@@ -112,14 +112,14 @@ dependencies:
112
112
  type: :runtime
113
113
  version_requirements: *id009
114
114
  - !ruby/object:Gem::Dependency
115
- name: uglifier
115
+ name: slim
116
116
  prerelease: false
117
117
  requirement: &id010 !ruby/object:Gem::Requirement
118
118
  none: false
119
119
  requirements:
120
120
  - - ~>
121
121
  - !ruby/object:Gem::Version
122
- version: 0.5.0
122
+ version: 0.9.4
123
123
  type: :runtime
124
124
  version_requirements: *id010
125
125
  - !ruby/object:Gem::Dependency
@@ -134,82 +134,104 @@ dependencies:
134
134
  type: :runtime
135
135
  version_requirements: *id011
136
136
  - !ruby/object:Gem::Dependency
137
- name: sass
137
+ name: coffee-filter
138
138
  prerelease: false
139
139
  requirement: &id012 !ruby/object:Gem::Requirement
140
140
  none: false
141
141
  requirements:
142
142
  - - ~>
143
143
  - !ruby/object:Gem::Version
144
- version: 3.1.0
144
+ version: 0.1.0
145
145
  type: :runtime
146
146
  version_requirements: *id012
147
147
  - !ruby/object:Gem::Dependency
148
- name: compass
148
+ name: sass
149
149
  prerelease: false
150
150
  requirement: &id013 !ruby/object:Gem::Requirement
151
151
  none: false
152
152
  requirements:
153
- - - "="
153
+ - - ~>
154
154
  - !ruby/object:Gem::Version
155
- version: 0.11.2
155
+ version: 3.1.0
156
156
  type: :runtime
157
157
  version_requirements: *id013
158
158
  - !ruby/object:Gem::Dependency
159
- name: coffee-script
159
+ name: compass
160
160
  prerelease: false
161
161
  requirement: &id014 !ruby/object:Gem::Requirement
162
162
  none: false
163
163
  requirements:
164
164
  - - ~>
165
165
  - !ruby/object:Gem::Version
166
- version: 2.2.0
166
+ version: 0.11.1
167
167
  type: :runtime
168
168
  version_requirements: *id014
169
169
  - !ruby/object:Gem::Dependency
170
- name: httparty
170
+ name: compass-susy-plugin
171
171
  prerelease: false
172
172
  requirement: &id015 !ruby/object:Gem::Requirement
173
173
  none: false
174
174
  requirements:
175
175
  - - ~>
176
176
  - !ruby/object:Gem::Version
177
- version: 0.7.0
177
+ version: 0.9.0
178
178
  type: :runtime
179
179
  version_requirements: *id015
180
180
  - !ruby/object:Gem::Dependency
181
- name: cucumber
181
+ name: coffee-script
182
182
  prerelease: false
183
183
  requirement: &id016 !ruby/object:Gem::Requirement
184
+ none: false
185
+ requirements:
186
+ - - ~>
187
+ - !ruby/object:Gem::Version
188
+ version: 2.2.0
189
+ type: :runtime
190
+ version_requirements: *id016
191
+ - !ruby/object:Gem::Dependency
192
+ name: httparty
193
+ prerelease: false
194
+ requirement: &id017 !ruby/object:Gem::Requirement
195
+ none: false
196
+ requirements:
197
+ - - ~>
198
+ - !ruby/object:Gem::Version
199
+ version: 0.7.0
200
+ type: :runtime
201
+ version_requirements: *id017
202
+ - !ruby/object:Gem::Dependency
203
+ name: cucumber
204
+ prerelease: false
205
+ requirement: &id018 !ruby/object:Gem::Requirement
184
206
  none: false
185
207
  requirements:
186
208
  - - ~>
187
209
  - !ruby/object:Gem::Version
188
210
  version: 0.10.0
189
211
  type: :development
190
- version_requirements: *id016
212
+ version_requirements: *id018
191
213
  - !ruby/object:Gem::Dependency
192
214
  name: rspec
193
215
  prerelease: false
194
- requirement: &id017 !ruby/object:Gem::Requirement
216
+ requirement: &id019 !ruby/object:Gem::Requirement
195
217
  none: false
196
218
  requirements:
197
219
  - - ">="
198
220
  - !ruby/object:Gem::Version
199
221
  version: "0"
200
222
  type: :development
201
- version_requirements: *id017
223
+ version_requirements: *id019
202
224
  - !ruby/object:Gem::Dependency
203
225
  name: rocco
204
226
  prerelease: false
205
- requirement: &id018 !ruby/object:Gem::Requirement
227
+ requirement: &id020 !ruby/object:Gem::Requirement
206
228
  none: false
207
229
  requirements:
208
230
  - - ">="
209
231
  - !ruby/object:Gem::Version
210
232
  version: "0"
211
233
  type: :development
212
- version_requirements: *id018
234
+ version_requirements: *id020
213
235
  description:
214
236
  email:
215
237
  - tdreyno@gmail.com
@@ -226,6 +248,7 @@ files:
226
248
  - .gemtest
227
249
  - .gitignore
228
250
  - .gitmodules
251
+ - CHANGELOG
229
252
  - Gemfile
230
253
  - LICENSE
231
254
  - README.rdoc
@@ -243,6 +266,7 @@ files:
243
266
  - features/padrino_helpers.feature
244
267
  - features/page_alias_and_layouts.feature
245
268
  - features/scss-support.feature
269
+ - features/slim.feature
246
270
  - features/step_definitions/asset_host_steps.rb
247
271
  - features/step_definitions/builder_steps.rb
248
272
  - features/step_definitions/env.rb
@@ -255,33 +279,37 @@ files:
255
279
  - features/y_cache_buster.feature
256
280
  - features/z_relative_assets.feature
257
281
  - fixtures/test-app/config.rb
258
- - fixtures/test-app/public/images/blank.gif
259
- - fixtures/test-app/public/static.html
260
- - fixtures/test-app/public/stylesheets/auto-css.css
261
- - fixtures/test-app/public/stylesheets/static.css
262
- - fixtures/test-app/public/stylesheets/sub1/auto-css.css
263
- - fixtures/test-app/public/stylesheets/sub1/sub2/auto-css.css
264
- - fixtures/test-app/views/_partial.haml
265
- - fixtures/test-app/views/asset_host.html.haml
266
- - fixtures/test-app/views/auto-css.html.haml
267
- - fixtures/test-app/views/auto-image-sizes.html.haml
268
- - fixtures/test-app/views/cache-buster.html.haml
269
- - fixtures/test-app/views/custom-layout-dir/index.html.haml
270
- - fixtures/test-app/views/custom-layout.html.haml
271
- - fixtures/test-app/views/index.html.haml
272
- - fixtures/test-app/views/inline-css.html.haml
273
- - fixtures/test-app/views/inline-js.html.haml
274
- - fixtures/test-app/views/javascripts/coffee_test.js.coffee
275
- - fixtures/test-app/views/layout.haml
276
- - fixtures/test-app/views/layouts/custom.haml
277
- - fixtures/test-app/views/padrino_test.html.haml
278
- - fixtures/test-app/views/page-classes.html.haml
279
- - fixtures/test-app/views/services/index.html.haml
280
- - fixtures/test-app/views/stylesheets/asset_host.css.sass
281
- - fixtures/test-app/views/stylesheets/relative_assets.css.sass
282
- - fixtures/test-app/views/stylesheets/site.css.sass
283
- - fixtures/test-app/views/stylesheets/site_scss.css.scss
284
- - fixtures/test-app/views/tiny_src.html.haml
282
+ - fixtures/test-app/source/_partial.haml
283
+ - fixtures/test-app/source/asset_host.html.haml
284
+ - fixtures/test-app/source/auto-css.html.haml
285
+ - fixtures/test-app/source/auto-image-sizes.html.haml
286
+ - fixtures/test-app/source/cache-buster.html.haml
287
+ - fixtures/test-app/source/custom-layout-dir/index.html.haml
288
+ - fixtures/test-app/source/custom-layout.html.haml
289
+ - fixtures/test-app/source/front-matter.html.erb
290
+ - fixtures/test-app/source/images/blank.gif
291
+ - fixtures/test-app/source/index.html.haml
292
+ - fixtures/test-app/source/inline-coffeescript.html.haml
293
+ - fixtures/test-app/source/inline-css.html.haml
294
+ - fixtures/test-app/source/inline-js.html.haml
295
+ - fixtures/test-app/source/javascripts/coffee_test.js.coffee
296
+ - fixtures/test-app/source/javascripts/jquery.plugin.with.dots.js
297
+ - fixtures/test-app/source/layout.haml
298
+ - fixtures/test-app/source/layouts/custom.haml
299
+ - fixtures/test-app/source/padrino_test.html.haml
300
+ - fixtures/test-app/source/page-classes.html.haml
301
+ - fixtures/test-app/source/services/index.html.haml
302
+ - fixtures/test-app/source/slim.html.slim
303
+ - fixtures/test-app/source/static.html
304
+ - fixtures/test-app/source/stylesheets/asset_host.css.sass
305
+ - fixtures/test-app/source/stylesheets/auto-css.css
306
+ - fixtures/test-app/source/stylesheets/relative_assets.css.sass
307
+ - fixtures/test-app/source/stylesheets/site.css.sass
308
+ - fixtures/test-app/source/stylesheets/site_scss.css.scss
309
+ - fixtures/test-app/source/stylesheets/static.css
310
+ - fixtures/test-app/source/stylesheets/sub1/auto-css.css
311
+ - fixtures/test-app/source/stylesheets/sub1/sub2/auto-css.css
312
+ - fixtures/test-app/source/tiny_src.html.haml
285
313
  - lib/middleman.rb
286
314
  - lib/middleman/assets.rb
287
315
  - lib/middleman/builder.rb
@@ -290,10 +318,12 @@ files:
290
318
  - lib/middleman/features/asset_host.rb
291
319
  - lib/middleman/features/automatic_image_sizes.rb
292
320
  - lib/middleman/features/automatic_image_sizes/fastimage.rb
321
+ - lib/middleman/features/blog.rb
293
322
  - lib/middleman/features/cache_buster.rb
294
323
  - lib/middleman/features/code_ray.rb
295
324
  - lib/middleman/features/data.rb
296
325
  - lib/middleman/features/default_helpers.rb
326
+ - lib/middleman/features/front_matter.rb
297
327
  - lib/middleman/features/live_reload.rb
298
328
  - lib/middleman/features/lorem.rb
299
329
  - lib/middleman/features/minify_css.rb
@@ -305,42 +335,43 @@ files:
305
335
  - lib/middleman/features/ugly_haml.rb
306
336
  - lib/middleman/renderers/haml.rb
307
337
  - lib/middleman/renderers/sass.rb
338
+ - lib/middleman/renderers/slim.rb
308
339
  - lib/middleman/server.rb
309
340
  - lib/middleman/templates.rb
310
341
  - lib/middleman/templates/compass.rb
311
342
  - lib/middleman/templates/default.rb
312
343
  - lib/middleman/templates/default/config.ru
313
344
  - lib/middleman/templates/default/config.tt
314
- - lib/middleman/templates/default/views/index.html.haml
315
- - lib/middleman/templates/default/views/layout.haml
316
- - lib/middleman/templates/default/views/stylesheets/site.css.sass
345
+ - lib/middleman/templates/default/source/index.html.haml
346
+ - lib/middleman/templates/default/source/layout.haml
347
+ - lib/middleman/templates/default/source/stylesheets/site.css.sass
317
348
  - lib/middleman/templates/html5.rb
318
349
  - lib/middleman/templates/html5/config.ru
319
350
  - lib/middleman/templates/html5/config.tt
320
- - lib/middleman/templates/html5/public/404.html
321
- - lib/middleman/templates/html5/public/apple-touch-icon.png
322
- - lib/middleman/templates/html5/public/crossdomain.xml
323
- - lib/middleman/templates/html5/public/css/handheld.css
324
- - lib/middleman/templates/html5/public/css/style.css
325
- - lib/middleman/templates/html5/public/favicon.ico
326
- - lib/middleman/templates/html5/public/humans.txt
327
- - lib/middleman/templates/html5/public/images/.gitignore
328
- - lib/middleman/templates/html5/public/index.html
329
- - lib/middleman/templates/html5/public/js/libs/dd_belatedpng.js
330
- - lib/middleman/templates/html5/public/js/libs/jquery-1.5.0.js
331
- - lib/middleman/templates/html5/public/js/libs/jquery-1.5.0.min.js
332
- - lib/middleman/templates/html5/public/js/libs/modernizr-1.6.min.js
333
- - lib/middleman/templates/html5/public/js/mylibs/.gitignore
334
- - lib/middleman/templates/html5/public/js/plugins.js
335
- - lib/middleman/templates/html5/public/js/script.js
336
- - lib/middleman/templates/html5/public/robots.txt
351
+ - lib/middleman/templates/html5/source/404.html
352
+ - lib/middleman/templates/html5/source/apple-touch-icon.png
353
+ - lib/middleman/templates/html5/source/crossdomain.xml
354
+ - lib/middleman/templates/html5/source/css/handheld.css
355
+ - lib/middleman/templates/html5/source/css/style.css
356
+ - lib/middleman/templates/html5/source/favicon.ico
357
+ - lib/middleman/templates/html5/source/humans.txt
358
+ - lib/middleman/templates/html5/source/images/.gitignore
359
+ - lib/middleman/templates/html5/source/index.html
360
+ - lib/middleman/templates/html5/source/js/libs/dd_belatedpng.js
361
+ - lib/middleman/templates/html5/source/js/libs/jquery-1.5.0.js
362
+ - lib/middleman/templates/html5/source/js/libs/jquery-1.5.0.min.js
363
+ - lib/middleman/templates/html5/source/js/libs/modernizr-1.6.min.js
364
+ - lib/middleman/templates/html5/source/js/mylibs/.gitignore
365
+ - lib/middleman/templates/html5/source/js/plugins.js
366
+ - lib/middleman/templates/html5/source/js/script.js
367
+ - lib/middleman/templates/html5/source/robots.txt
337
368
  - lib/middleman/templates/local.rb
338
369
  - lib/middleman/templates/xhtml.rb
339
370
  - lib/middleman/templates/xhtml/config.ru
340
371
  - lib/middleman/templates/xhtml/config.tt
341
- - lib/middleman/templates/xhtml/views/index.html.haml
342
- - lib/middleman/templates/xhtml/views/layout.haml
343
- - lib/middleman/templates/xhtml/views/stylesheets/site.css.sass
372
+ - lib/middleman/templates/xhtml/source/index.html.haml
373
+ - lib/middleman/templates/xhtml/source/layout.haml
374
+ - lib/middleman/templates/xhtml/source/stylesheets/site.css.sass
344
375
  - lib/middleman/version.rb
345
376
  - middleman.gemspec
346
377
  homepage: http://wiki.github.com/tdreyno/middleman
@@ -360,9 +391,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
360
391
  required_rubygems_version: !ruby/object:Gem::Requirement
361
392
  none: false
362
393
  requirements:
363
- - - ">="
394
+ - - ">"
364
395
  - !ruby/object:Gem::Version
365
- version: "0"
396
+ version: 1.3.1
366
397
  requirements: []
367
398
 
368
399
  rubyforge_project: middleman
@@ -381,6 +412,7 @@ test_files:
381
412
  - features/padrino_helpers.feature
382
413
  - features/page_alias_and_layouts.feature
383
414
  - features/scss-support.feature
415
+ - features/slim.feature
384
416
  - features/step_definitions/asset_host_steps.rb
385
417
  - features/step_definitions/builder_steps.rb
386
418
  - features/step_definitions/env.rb
@@ -393,30 +425,34 @@ test_files:
393
425
  - features/y_cache_buster.feature
394
426
  - features/z_relative_assets.feature
395
427
  - fixtures/test-app/config.rb
396
- - fixtures/test-app/public/images/blank.gif
397
- - fixtures/test-app/public/static.html
398
- - fixtures/test-app/public/stylesheets/auto-css.css
399
- - fixtures/test-app/public/stylesheets/static.css
400
- - fixtures/test-app/public/stylesheets/sub1/auto-css.css
401
- - fixtures/test-app/public/stylesheets/sub1/sub2/auto-css.css
402
- - fixtures/test-app/views/_partial.haml
403
- - fixtures/test-app/views/asset_host.html.haml
404
- - fixtures/test-app/views/auto-css.html.haml
405
- - fixtures/test-app/views/auto-image-sizes.html.haml
406
- - fixtures/test-app/views/cache-buster.html.haml
407
- - fixtures/test-app/views/custom-layout-dir/index.html.haml
408
- - fixtures/test-app/views/custom-layout.html.haml
409
- - fixtures/test-app/views/index.html.haml
410
- - fixtures/test-app/views/inline-css.html.haml
411
- - fixtures/test-app/views/inline-js.html.haml
412
- - fixtures/test-app/views/javascripts/coffee_test.js.coffee
413
- - fixtures/test-app/views/layout.haml
414
- - fixtures/test-app/views/layouts/custom.haml
415
- - fixtures/test-app/views/padrino_test.html.haml
416
- - fixtures/test-app/views/page-classes.html.haml
417
- - fixtures/test-app/views/services/index.html.haml
418
- - fixtures/test-app/views/stylesheets/asset_host.css.sass
419
- - fixtures/test-app/views/stylesheets/relative_assets.css.sass
420
- - fixtures/test-app/views/stylesheets/site.css.sass
421
- - fixtures/test-app/views/stylesheets/site_scss.css.scss
422
- - fixtures/test-app/views/tiny_src.html.haml
428
+ - fixtures/test-app/source/_partial.haml
429
+ - fixtures/test-app/source/asset_host.html.haml
430
+ - fixtures/test-app/source/auto-css.html.haml
431
+ - fixtures/test-app/source/auto-image-sizes.html.haml
432
+ - fixtures/test-app/source/cache-buster.html.haml
433
+ - fixtures/test-app/source/custom-layout-dir/index.html.haml
434
+ - fixtures/test-app/source/custom-layout.html.haml
435
+ - fixtures/test-app/source/front-matter.html.erb
436
+ - fixtures/test-app/source/images/blank.gif
437
+ - fixtures/test-app/source/index.html.haml
438
+ - fixtures/test-app/source/inline-coffeescript.html.haml
439
+ - fixtures/test-app/source/inline-css.html.haml
440
+ - fixtures/test-app/source/inline-js.html.haml
441
+ - fixtures/test-app/source/javascripts/coffee_test.js.coffee
442
+ - fixtures/test-app/source/javascripts/jquery.plugin.with.dots.js
443
+ - fixtures/test-app/source/layout.haml
444
+ - fixtures/test-app/source/layouts/custom.haml
445
+ - fixtures/test-app/source/padrino_test.html.haml
446
+ - fixtures/test-app/source/page-classes.html.haml
447
+ - fixtures/test-app/source/services/index.html.haml
448
+ - fixtures/test-app/source/slim.html.slim
449
+ - fixtures/test-app/source/static.html
450
+ - fixtures/test-app/source/stylesheets/asset_host.css.sass
451
+ - fixtures/test-app/source/stylesheets/auto-css.css
452
+ - fixtures/test-app/source/stylesheets/relative_assets.css.sass
453
+ - fixtures/test-app/source/stylesheets/site.css.sass
454
+ - fixtures/test-app/source/stylesheets/site_scss.css.scss
455
+ - fixtures/test-app/source/stylesheets/static.css
456
+ - fixtures/test-app/source/stylesheets/sub1/auto-css.css
457
+ - fixtures/test-app/source/stylesheets/sub1/sub2/auto-css.css
458
+ - fixtures/test-app/source/tiny_src.html.haml