middleman 0.99.0.pre → 0.99.1.pre

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 (38) hide show
  1. data/LICENSE +1 -1
  2. data/Rakefile +1 -1
  3. data/VERSION +1 -1
  4. data/bin/mm-build +1 -1
  5. data/bin/mm-init +1 -1
  6. data/bin/mm-server +3 -3
  7. data/features/step_definitions/asset_host_steps.rb +3 -3
  8. data/features/step_definitions/middleman_steps.rb +2 -3
  9. data/features/step_definitions/page_layout_steps.rb +6 -6
  10. data/lib/middleman.rb +1 -1
  11. data/lib/middleman/assets.rb +1 -1
  12. data/lib/middleman/builder.rb +7 -6
  13. data/lib/middleman/config.ru +1 -1
  14. data/lib/middleman/features.rb +7 -5
  15. data/lib/middleman/features/asset_host.rb +5 -5
  16. data/lib/middleman/features/automatic_image_sizes.rb +4 -4
  17. data/lib/middleman/features/automatic_image_sizes/fastimage.rb +214 -209
  18. data/lib/middleman/features/cache_buster.rb +7 -7
  19. data/lib/middleman/features/default_helpers.rb +2 -2
  20. data/lib/middleman/features/livereload.rb +3 -3
  21. data/lib/middleman/features/minify_css.rb +2 -2
  22. data/lib/middleman/features/minify_javascript.rb +1 -1
  23. data/lib/middleman/features/relative_assets.rb +3 -3
  24. data/lib/middleman/features/slickmap.rb +38 -68
  25. data/lib/middleman/features/slickmap/template.html.haml +27 -0
  26. data/lib/middleman/features/smush_pngs.rb +6 -6
  27. data/lib/middleman/features/ugly_haml.rb +2 -2
  28. data/lib/middleman/renderers/coffee.rb +1 -1
  29. data/lib/middleman/renderers/haml.rb +1 -1
  30. data/lib/middleman/renderers/sass.rb +5 -5
  31. data/lib/middleman/server.rb +168 -0
  32. data/lib/middleman/template/{init.rbt → config.rbt} +0 -0
  33. data/lib/middleman/templater+dynamic_renderer.rb +2 -2
  34. data/middleman.gemspec +9 -8
  35. data/spec/fixtures/sample/{init.rb → config.rb} +0 -0
  36. data/spec/helpers_spec.rb +1 -1
  37. metadata +11 -10
  38. data/lib/middleman/base.rb +0 -147
@@ -14,11 +14,11 @@ end
14
14
 
15
15
  class Templater::Actions::Template
16
16
  def render
17
- @@rack_test ||= Rack::Test::Session.new(Rack::MockSession.new(Middleman::Base))
17
+ @@rack_test ||= Rack::Test::Session.new(Rack::MockSession.new(Middleman::Server))
18
18
 
19
19
  @render_cache ||= begin
20
20
  # The default render just requests the page over Rack and writes the response
21
- request_path = destination.gsub(File.join(Dir.pwd, Middleman::Base.build_dir), "")
21
+ request_path = destination.gsub(File.join(Dir.pwd, Middleman::Server.build_dir), "")
22
22
  @@rack_test.get(request_path)
23
23
  @@rack_test.last_response.body
24
24
  end
@@ -5,7 +5,7 @@
5
5
 
6
6
  Gem::Specification.new do |s|
7
7
  s.name = %q{middleman}
8
- s.version = "0.99.0.pre"
8
+ s.version = "0.99.1.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"]
@@ -41,7 +41,6 @@ Gem::Specification.new do |s|
41
41
  "features/step_definitions/page_layout_steps.rb",
42
42
  "lib/middleman.rb",
43
43
  "lib/middleman/assets.rb",
44
- "lib/middleman/base.rb",
45
44
  "lib/middleman/builder.rb",
46
45
  "lib/middleman/config.ru",
47
46
  "lib/middleman/features.rb",
@@ -56,20 +55,22 @@ Gem::Specification.new do |s|
56
55
  "lib/middleman/features/minify_javascript/rack.rb",
57
56
  "lib/middleman/features/relative_assets.rb",
58
57
  "lib/middleman/features/slickmap.rb",
58
+ "lib/middleman/features/slickmap/template.html.haml",
59
59
  "lib/middleman/features/smush_pngs.rb",
60
60
  "lib/middleman/features/ugly_haml.rb",
61
61
  "lib/middleman/renderers.rb",
62
62
  "lib/middleman/renderers/coffee.rb",
63
63
  "lib/middleman/renderers/haml.rb",
64
64
  "lib/middleman/renderers/sass.rb",
65
- "lib/middleman/template/init.rbt",
65
+ "lib/middleman/server.rb",
66
+ "lib/middleman/template/config.rbt",
66
67
  "lib/middleman/template/views/index.html.haml",
67
68
  "lib/middleman/template/views/layout.haml",
68
69
  "lib/middleman/template/views/stylesheets/site.css.sass",
69
70
  "lib/middleman/templater+dynamic_renderer.rb",
70
71
  "middleman.gemspec",
71
72
  "spec/builder_spec.rb",
72
- "spec/fixtures/sample/init.rb",
73
+ "spec/fixtures/sample/config.rb",
73
74
  "spec/fixtures/sample/public/images/blank.gif",
74
75
  "spec/fixtures/sample/public/static.html",
75
76
  "spec/fixtures/sample/public/stylesheets/auto-css.css",
@@ -106,7 +107,7 @@ Gem::Specification.new do |s|
106
107
  s.summary = %q{A static site generator utilizing Haml, Sass and providing YUI compression and cache busting}
107
108
  s.test_files = [
108
109
  "spec/builder_spec.rb",
109
- "spec/fixtures/sample/init.rb",
110
+ "spec/fixtures/sample/config.rb",
110
111
  "spec/helpers_spec.rb",
111
112
  "spec/spec_helper.rb"
112
113
  ]
@@ -128,7 +129,7 @@ Gem::Specification.new do |s|
128
129
  s.add_runtime_dependency(%q<compass>, ["~> 0.10.0"])
129
130
  s.add_runtime_dependency(%q<json_pure>, ["~> 1.4.0"])
130
131
  s.add_runtime_dependency(%q<smusher>, ["~> 0.4.5"])
131
- s.add_runtime_dependency(%q<compass-slickmap>, ["~> 0.3.0"])
132
+ s.add_runtime_dependency(%q<compass-slickmap>, ["~> 0.4.0"])
132
133
  s.add_development_dependency(%q<rspec>, [">= 0"])
133
134
  s.add_development_dependency(%q<cucumber>, [">= 0"])
134
135
  s.add_development_dependency(%q<jeweler>, [">= 0"])
@@ -145,7 +146,7 @@ Gem::Specification.new do |s|
145
146
  s.add_dependency(%q<compass>, ["~> 0.10.0"])
146
147
  s.add_dependency(%q<json_pure>, ["~> 1.4.0"])
147
148
  s.add_dependency(%q<smusher>, ["~> 0.4.5"])
148
- s.add_dependency(%q<compass-slickmap>, ["~> 0.3.0"])
149
+ s.add_dependency(%q<compass-slickmap>, ["~> 0.4.0"])
149
150
  s.add_dependency(%q<rspec>, [">= 0"])
150
151
  s.add_dependency(%q<cucumber>, [">= 0"])
151
152
  s.add_dependency(%q<jeweler>, [">= 0"])
@@ -163,7 +164,7 @@ Gem::Specification.new do |s|
163
164
  s.add_dependency(%q<compass>, ["~> 0.10.0"])
164
165
  s.add_dependency(%q<json_pure>, ["~> 1.4.0"])
165
166
  s.add_dependency(%q<smusher>, ["~> 0.4.5"])
166
- s.add_dependency(%q<compass-slickmap>, ["~> 0.3.0"])
167
+ s.add_dependency(%q<compass-slickmap>, ["~> 0.4.0"])
167
168
  s.add_dependency(%q<rspec>, [">= 0"])
168
169
  s.add_dependency(%q<cucumber>, [">= 0"])
169
170
  s.add_dependency(%q<jeweler>, [">= 0"])
@@ -1,6 +1,6 @@
1
1
  require File.join(File.dirname(__FILE__), "spec_helper")
2
2
 
3
- base = ::Middleman::Base
3
+ base = ::Middleman::Server
4
4
 
5
5
  describe "page_classes helper" do
6
6
  it "should generate root paths correctly" do
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: 961916764
4
+ hash: 961916760
5
5
  prerelease: true
6
6
  segments:
7
7
  - 0
8
8
  - 99
9
- - 0
9
+ - 1
10
10
  - pre
11
- version: 0.99.0.pre
11
+ version: 0.99.1.pre
12
12
  platform: ruby
13
13
  authors:
14
14
  - Thomas Reynolds
@@ -216,12 +216,12 @@ dependencies:
216
216
  requirements:
217
217
  - - ~>
218
218
  - !ruby/object:Gem::Version
219
- hash: 19
219
+ hash: 15
220
220
  segments:
221
221
  - 0
222
- - 3
222
+ - 4
223
223
  - 0
224
- version: 0.3.0
224
+ version: 0.4.0
225
225
  type: :runtime
226
226
  version_requirements: *id013
227
227
  - !ruby/object:Gem::Dependency
@@ -302,7 +302,6 @@ files:
302
302
  - features/step_definitions/page_layout_steps.rb
303
303
  - lib/middleman.rb
304
304
  - lib/middleman/assets.rb
305
- - lib/middleman/base.rb
306
305
  - lib/middleman/builder.rb
307
306
  - lib/middleman/config.ru
308
307
  - lib/middleman/features.rb
@@ -317,20 +316,22 @@ files:
317
316
  - lib/middleman/features/minify_javascript/rack.rb
318
317
  - lib/middleman/features/relative_assets.rb
319
318
  - lib/middleman/features/slickmap.rb
319
+ - lib/middleman/features/slickmap/template.html.haml
320
320
  - lib/middleman/features/smush_pngs.rb
321
321
  - lib/middleman/features/ugly_haml.rb
322
322
  - lib/middleman/renderers.rb
323
323
  - lib/middleman/renderers/coffee.rb
324
324
  - lib/middleman/renderers/haml.rb
325
325
  - lib/middleman/renderers/sass.rb
326
- - lib/middleman/template/init.rbt
326
+ - lib/middleman/server.rb
327
+ - lib/middleman/template/config.rbt
327
328
  - lib/middleman/template/views/index.html.haml
328
329
  - lib/middleman/template/views/layout.haml
329
330
  - lib/middleman/template/views/stylesheets/site.css.sass
330
331
  - lib/middleman/templater+dynamic_renderer.rb
331
332
  - middleman.gemspec
332
333
  - spec/builder_spec.rb
333
- - spec/fixtures/sample/init.rb
334
+ - spec/fixtures/sample/config.rb
334
335
  - spec/fixtures/sample/public/images/blank.gif
335
336
  - spec/fixtures/sample/public/static.html
336
337
  - spec/fixtures/sample/public/stylesheets/auto-css.css
@@ -396,6 +397,6 @@ specification_version: 3
396
397
  summary: A static site generator utilizing Haml, Sass and providing YUI compression and cache busting
397
398
  test_files:
398
399
  - spec/builder_spec.rb
399
- - spec/fixtures/sample/init.rb
400
+ - spec/fixtures/sample/config.rb
400
401
  - spec/helpers_spec.rb
401
402
  - spec/spec_helper.rb
@@ -1,147 +0,0 @@
1
- # We're riding on Sinatra, so let's include it
2
- require "sinatra/base"
3
- require "sinatra/content_for"
4
-
5
- class Sinatra::Request
6
- attr_accessor :layout
7
- end
8
-
9
- module Middleman
10
- class Base < Sinatra::Base
11
- set :app_file, __FILE__
12
- set :root, ENV["MM_DIR"] || Dir.pwd
13
- set :reload, false
14
- set :sessions, false
15
- set :logging, false
16
- set :environment, ENV['MM_ENV'] || :development
17
- set :index_file, "index.html"
18
- set :js_dir, "javascripts"
19
- set :css_dir, "stylesheets"
20
- set :images_dir, "images"
21
- set :fonts_dir, "fonts"
22
- set :build_dir, "build"
23
- set :http_prefix, nil
24
-
25
- helpers Sinatra::ContentFor
26
-
27
- set :features, []
28
- def self.enable(*opts)
29
- set :features, (self.features << opts).flatten
30
- super
31
- end
32
-
33
- def self.disable(*opts)
34
- current = self.features
35
- current -= opts.flatten
36
- set :features, current
37
- super
38
- end
39
-
40
- def self.set(option, value=self, &block)
41
- if block_given?
42
- value = Proc.new { block }
43
- end
44
-
45
- super(option, value, &nil)
46
- end
47
-
48
- @@afters = []
49
- def self.after_feature_init(&block)
50
- @@afters << block
51
- end
52
-
53
- # Rack helper for adding mime-types during local preview
54
- def self.mime(ext, type)
55
- ext = ".#{ext}" unless ext.to_s[0] == ?.
56
- ::Rack::Mime::MIME_TYPES[ext.to_s] = type
57
- end
58
-
59
- @@layout = nil
60
- def self.page(url, options={}, &block)
61
- layout = @@layout
62
- layout = options[:layout] if !options[:layout].nil?
63
-
64
- get(url) do
65
- return yield if block_given?
66
- process_request(layout)
67
- end
68
- end
69
-
70
- def self.with_layout(layout, &block)
71
- @@layout = layout
72
- class_eval(&block) if block_given?
73
- ensure
74
- @@layout = nil
75
- end
76
-
77
- def self.enabled?(name)
78
- name = (name.to_s << "?").to_sym
79
- self.respond_to?(name) && self.send(name)
80
- end
81
-
82
- def enabled?(name)
83
- self.class.enabled?(name)
84
- end
85
-
86
- # This will match all requests not overridden in the project's init.rb
87
- not_found do
88
- process_request
89
- end
90
-
91
- private
92
- def process_request(layout = :layout)
93
- # Normalize the path and add index if we're looking at a directory
94
- path = request.path
95
- path << settings.index_file if path.match(%r{/$})
96
- path.gsub!(%r{^/}, '')
97
-
98
- template_path = locate_template_file(path)
99
- if template_path
100
- content_type mime_type(File.extname(path)), :charset => 'utf-8'
101
-
102
- renderer = Middleman::Renderers.get_method(template_path)
103
- if respond_to? renderer
104
- status 200
105
- return send(renderer, path.to_sym, { :layout => layout })
106
- end
107
- end
108
-
109
- status 404
110
- end
111
-
112
- def locate_template_file(path)
113
- template_path = File.join(settings.views, "#{path}.*")
114
- Dir.glob(template_path).first
115
- end
116
- end
117
- end
118
-
119
- require "middleman/assets"
120
- require "middleman/renderers"
121
- require "middleman/features"
122
-
123
- # The Rack App
124
- class Middleman::Base
125
- def self.new(*args, &block)
126
- # Check for and evaluate local configuration
127
- local_config = File.join(self.root, "init.rb")
128
- if File.exists? local_config
129
- puts "== Reading: Local config" if logging?
130
- Middleman::Base.class_eval File.read(local_config)
131
- set :app_file, File.expand_path(local_config)
132
- end
133
-
134
- # loop over enabled feature
135
- features.flatten.each do |feature_name|
136
- next unless send(:"#{feature_name}?")
137
- $stderr.puts "== Enabling: #{feature_name.to_s.capitalize}" if logging?
138
- Middleman::Features.run(feature_name, self)
139
- end
140
-
141
- use ::Rack::ConditionalGet if environment == :development
142
-
143
- @@afters.each { |block| class_eval(&block) }
144
-
145
- super
146
- end
147
- end