middleman 0.11.4 → 0.11.5
Sign up to get free protection for your applications and to get access to all the features.
- data/Gemfile +8 -3
- data/Rakefile +41 -43
- data/VERSION +1 -1
- data/bin/mm-init +1 -1
- data/bin/mm-server +1 -0
- data/lib/middleman.rb +1 -1
- data/lib/middleman/base.rb +0 -3
- data/lib/middleman/features/cache_buster.rb +13 -7
- data/middleman.gemspec +1 -40
- data/spec/cache_buster_off_spec.rb +11 -12
- data/spec/cache_buster_on_spec.rb +9 -10
- data/spec/spec_helper.rb +2 -3
- metadata +1 -131
data/Gemfile
CHANGED
@@ -1,19 +1,24 @@
|
|
1
1
|
source "http://gemcutter.org"
|
2
2
|
bin_path "vendor/bin"
|
3
|
-
disable_rubygems
|
3
|
+
# disable_rubygems
|
4
|
+
# disable_system_gems
|
4
5
|
|
5
|
-
gem "thin"
|
6
6
|
gem "shotgun"
|
7
7
|
gem "templater"
|
8
8
|
gem "sprockets"
|
9
9
|
gem "sinatra"
|
10
10
|
gem "sinatra-content-for"
|
11
|
-
gem "rack-test"
|
11
|
+
gem "rack-test"
|
12
12
|
gem "yui-compressor"
|
13
13
|
gem "haml"
|
14
14
|
gem "compass"
|
15
15
|
gem "smusher"
|
16
|
+
gem "compass-slickmap"
|
17
|
+
gem "maruku"
|
18
|
+
gem "markaby"
|
16
19
|
|
20
|
+
gem "jeweler"
|
17
21
|
gem "rspec"
|
22
|
+
gem "rdoc"
|
18
23
|
gem "sdoc"
|
19
24
|
gem "cucumber"
|
data/Rakefile
CHANGED
@@ -1,4 +1,3 @@
|
|
1
|
-
require 'rubygems'
|
2
1
|
require 'lib/middleman'
|
3
2
|
require 'rake'
|
4
3
|
require 'cucumber/rake/task'
|
@@ -14,19 +13,20 @@ begin
|
|
14
13
|
gem.rubyforge_project = "middleman"
|
15
14
|
gem.executables = %w(mm-init mm-build mm-server)
|
16
15
|
gem.add_dependency("thin")
|
17
|
-
gem.add_dependency("shotgun")
|
18
|
-
gem.add_dependency("templater")
|
19
|
-
gem.add_dependency("sprockets")
|
20
|
-
gem.add_dependency("sinatra")
|
21
|
-
gem.add_dependency("sinatra-content-for")
|
22
|
-
gem.add_dependency("rack-test")
|
23
|
-
gem.add_dependency("yui-compressor")
|
24
|
-
gem.add_dependency("smusher")
|
25
|
-
gem.add_dependency("haml", ">=2.1.0")
|
26
|
-
gem.add_dependency("compass")
|
27
|
-
gem.add_development_dependency("
|
28
|
-
gem.add_development_dependency("
|
29
|
-
gem.add_development_dependency("
|
16
|
+
# gem.add_dependency("shotgun")
|
17
|
+
# gem.add_dependency("templater")
|
18
|
+
# gem.add_dependency("sprockets")
|
19
|
+
# gem.add_dependency("sinatra")
|
20
|
+
# gem.add_dependency("sinatra-content-for")
|
21
|
+
# gem.add_dependency("rack-test")
|
22
|
+
# gem.add_dependency("yui-compressor")
|
23
|
+
# gem.add_dependency("smusher")
|
24
|
+
# gem.add_dependency("haml", ">=2.1.0")
|
25
|
+
# gem.add_dependency("compass")
|
26
|
+
# gem.add_development_dependency("rdoc")
|
27
|
+
# gem.add_development_dependency("rspec")
|
28
|
+
# gem.add_development_dependency("sdoc")
|
29
|
+
# gem.add_development_dependency("cucumber")
|
30
30
|
|
31
31
|
# Ignore vendored files
|
32
32
|
gem.files = gem.files.exclude("vendor/*")
|
@@ -53,37 +53,35 @@ task :spec => :check_dependencies
|
|
53
53
|
|
54
54
|
task :default => :spec
|
55
55
|
|
56
|
-
|
57
|
-
|
58
|
-
require 'sdoc'
|
56
|
+
require 'rake/rdoctask'
|
57
|
+
require 'sdoc'
|
59
58
|
|
60
|
-
|
61
|
-
|
62
|
-
|
63
|
-
|
64
|
-
|
65
|
-
end
|
66
|
-
|
67
|
-
# rdoc.template = 'direct'
|
68
|
-
|
69
|
-
rdoc.rdoc_dir = 'rdoc'
|
70
|
-
rdoc.title = "middleman #{version}"
|
71
|
-
rdoc.rdoc_files.include('README*')
|
72
|
-
rdoc.rdoc_files.include('lib/**/*.rb')
|
73
|
-
rdoc.rdoc_files.exclude('lib/middleman/features/sprockets+ruby19.rb')
|
74
|
-
rdoc.rdoc_files.exclude('lib/middleman/templater+dynamic_renderer.rb')
|
59
|
+
Rake::RDocTask.new do |rdoc|
|
60
|
+
if File.exist?('VERSION')
|
61
|
+
version = File.read('VERSION')
|
62
|
+
else
|
63
|
+
version = ""
|
75
64
|
end
|
76
65
|
|
77
|
-
|
78
|
-
|
79
|
-
|
80
|
-
|
81
|
-
|
82
|
-
|
83
|
-
|
84
|
-
|
85
|
-
|
86
|
-
|
87
|
-
|
66
|
+
# rdoc.template = 'direct'
|
67
|
+
|
68
|
+
rdoc.rdoc_dir = 'rdoc'
|
69
|
+
rdoc.title = "middleman #{version}"
|
70
|
+
rdoc.rdoc_files.include('README*')
|
71
|
+
rdoc.rdoc_files.include('lib/**/*.rb')
|
72
|
+
rdoc.rdoc_files.exclude('lib/middleman/features/sprockets+ruby19.rb')
|
73
|
+
rdoc.rdoc_files.exclude('lib/middleman/templater+dynamic_renderer.rb')
|
74
|
+
end
|
75
|
+
|
76
|
+
desc "Build and publish documentation using GitHub Pages."
|
77
|
+
task :pages do
|
78
|
+
if !`git status`.include?('nothing to commit')
|
79
|
+
abort "dirty index - not publishing!"
|
88
80
|
end
|
81
|
+
|
82
|
+
Rake::Task[:rerdoc].invoke
|
83
|
+
`git checkout gh-pages`
|
84
|
+
`ls -1 | grep -v rdoc | xargs rm -rf; mv rdoc/* .; rm -rf rdoc`
|
85
|
+
`git commit -a -m "update docs"; git push origin gh-pages`
|
86
|
+
`git checkout master`
|
89
87
|
end
|
data/VERSION
CHANGED
@@ -1 +1 @@
|
|
1
|
-
0.11.
|
1
|
+
0.11.5
|
data/bin/mm-init
CHANGED
data/bin/mm-server
CHANGED
data/lib/middleman.rb
CHANGED
@@ -2,5 +2,5 @@ libdir = File.dirname(__FILE__)
|
|
2
2
|
$LOAD_PATH.unshift(libdir) unless $LOAD_PATH.include?(libdir)
|
3
3
|
|
4
4
|
# Bundler
|
5
|
-
require File.join(File.dirname(libdir), "vendor", "gems", "environment") if ENV["RUN_CODE_RUN"]
|
5
|
+
require File.join(File.dirname(libdir), "vendor", "gems", "environment")# if ENV["RUN_CODE_RUN"]
|
6
6
|
require 'middleman/base'
|
data/lib/middleman/base.rb
CHANGED
@@ -1,14 +1,18 @@
|
|
1
1
|
class Middleman::Base
|
2
2
|
after_feature_init do
|
3
3
|
::Compass.configuration do |config|
|
4
|
-
|
5
|
-
|
6
|
-
|
7
|
-
|
8
|
-
File.
|
9
|
-
|
10
|
-
|
4
|
+
if self.respond_to?(:cache_buster?) && self.cache_buster?
|
5
|
+
config.asset_cache_buster do |path, real_path|
|
6
|
+
real_path = real_path.path if real_path.is_a? File
|
7
|
+
real_path = real_path.gsub(File.join(self.root, self.build_dir), self.public)
|
8
|
+
if File.readable?(real_path)
|
9
|
+
File.mtime(real_path).strftime("%s")
|
10
|
+
else
|
11
|
+
$stderr.puts "WARNING: '#{File.basename(path)}' was not found (or cannot be read) in #{File.dirname(real_path)}"
|
12
|
+
end
|
11
13
|
end
|
14
|
+
else
|
15
|
+
config.asset_cache_buster { false }
|
12
16
|
end
|
13
17
|
end
|
14
18
|
|
@@ -21,6 +25,8 @@ class << Middleman::Base
|
|
21
25
|
def asset_url(path, prefix="", request=nil)
|
22
26
|
http_path = pre_cache_buster_asset_url(path, prefix, request)
|
23
27
|
|
28
|
+
return http_path unless self.respond_to?(:cache_buster?) && self.cache_buster?
|
29
|
+
|
24
30
|
if http_path.include?("://") || !%w(.css .png .jpg .js .gif).include?(File.extname(http_path))
|
25
31
|
http_path
|
26
32
|
else
|
data/middleman.gemspec
CHANGED
@@ -5,7 +5,7 @@
|
|
5
5
|
|
6
6
|
Gem::Specification.new do |s|
|
7
7
|
s.name = %q{middleman}
|
8
|
-
s.version = "0.11.
|
8
|
+
s.version = "0.11.5"
|
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"]
|
@@ -116,50 +116,11 @@ Gem::Specification.new do |s|
|
|
116
116
|
|
117
117
|
if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
|
118
118
|
s.add_runtime_dependency(%q<thin>, [">= 0"])
|
119
|
-
s.add_runtime_dependency(%q<shotgun>, [">= 0"])
|
120
|
-
s.add_runtime_dependency(%q<templater>, [">= 0"])
|
121
|
-
s.add_runtime_dependency(%q<sprockets>, [">= 0"])
|
122
|
-
s.add_runtime_dependency(%q<sinatra>, [">= 0"])
|
123
|
-
s.add_runtime_dependency(%q<sinatra-content-for>, [">= 0"])
|
124
|
-
s.add_runtime_dependency(%q<rack-test>, [">= 0"])
|
125
|
-
s.add_runtime_dependency(%q<yui-compressor>, [">= 0"])
|
126
|
-
s.add_runtime_dependency(%q<smusher>, [">= 0"])
|
127
|
-
s.add_runtime_dependency(%q<haml>, [">= 2.1.0"])
|
128
|
-
s.add_runtime_dependency(%q<compass>, [">= 0"])
|
129
|
-
s.add_development_dependency(%q<rspec>, [">= 0"])
|
130
|
-
s.add_development_dependency(%q<sdoc>, [">= 0"])
|
131
|
-
s.add_development_dependency(%q<cucumber>, [">= 0"])
|
132
119
|
else
|
133
120
|
s.add_dependency(%q<thin>, [">= 0"])
|
134
|
-
s.add_dependency(%q<shotgun>, [">= 0"])
|
135
|
-
s.add_dependency(%q<templater>, [">= 0"])
|
136
|
-
s.add_dependency(%q<sprockets>, [">= 0"])
|
137
|
-
s.add_dependency(%q<sinatra>, [">= 0"])
|
138
|
-
s.add_dependency(%q<sinatra-content-for>, [">= 0"])
|
139
|
-
s.add_dependency(%q<rack-test>, [">= 0"])
|
140
|
-
s.add_dependency(%q<yui-compressor>, [">= 0"])
|
141
|
-
s.add_dependency(%q<smusher>, [">= 0"])
|
142
|
-
s.add_dependency(%q<haml>, [">= 2.1.0"])
|
143
|
-
s.add_dependency(%q<compass>, [">= 0"])
|
144
|
-
s.add_dependency(%q<rspec>, [">= 0"])
|
145
|
-
s.add_dependency(%q<sdoc>, [">= 0"])
|
146
|
-
s.add_dependency(%q<cucumber>, [">= 0"])
|
147
121
|
end
|
148
122
|
else
|
149
123
|
s.add_dependency(%q<thin>, [">= 0"])
|
150
|
-
s.add_dependency(%q<shotgun>, [">= 0"])
|
151
|
-
s.add_dependency(%q<templater>, [">= 0"])
|
152
|
-
s.add_dependency(%q<sprockets>, [">= 0"])
|
153
|
-
s.add_dependency(%q<sinatra>, [">= 0"])
|
154
|
-
s.add_dependency(%q<sinatra-content-for>, [">= 0"])
|
155
|
-
s.add_dependency(%q<rack-test>, [">= 0"])
|
156
|
-
s.add_dependency(%q<yui-compressor>, [">= 0"])
|
157
|
-
s.add_dependency(%q<smusher>, [">= 0"])
|
158
|
-
s.add_dependency(%q<haml>, [">= 2.1.0"])
|
159
|
-
s.add_dependency(%q<compass>, [">= 0"])
|
160
|
-
s.add_dependency(%q<rspec>, [">= 0"])
|
161
|
-
s.add_dependency(%q<sdoc>, [">= 0"])
|
162
|
-
s.add_dependency(%q<cucumber>, [">= 0"])
|
163
124
|
end
|
164
125
|
end
|
165
126
|
|
@@ -1,21 +1,20 @@
|
|
1
1
|
require File.join(File.dirname(__FILE__), "spec_helper")
|
2
|
-
|
2
|
+
|
3
3
|
describe "Cache Buster Feature in CSS" do
|
4
|
-
before
|
5
|
-
|
6
|
-
|
7
|
-
|
4
|
+
before do
|
5
|
+
base = ::Middleman::Base
|
6
|
+
base.set :root, File.join(File.dirname(__FILE__), "fixtures", "sample")
|
7
|
+
base.disable :cache_buster
|
8
|
+
@browser = Rack::Test::Session.new(Rack::MockSession.new(base.new))
|
8
9
|
end
|
9
|
-
|
10
|
+
|
10
11
|
it "should not append query string in CSS if off" do
|
11
|
-
browser
|
12
|
-
browser.
|
13
|
-
browser.last_response.body.should_not include("?")
|
12
|
+
@browser.get("/stylesheets/relative_assets.css")
|
13
|
+
@browser.last_response.body.count("?").should == 0
|
14
14
|
end
|
15
15
|
|
16
16
|
it "should not append query string in HTML if off" do
|
17
|
-
browser
|
18
|
-
browser.
|
19
|
-
browser.last_response.body.count("?").should == 0
|
17
|
+
@browser.get("/cache-buster.html")
|
18
|
+
@browser.last_response.body.count("?").should == 0
|
20
19
|
end
|
21
20
|
end
|
@@ -1,21 +1,20 @@
|
|
1
1
|
require File.join(File.dirname(__FILE__), "spec_helper")
|
2
2
|
|
3
3
|
describe "Cache Buster Feature in CSS" do
|
4
|
-
before
|
5
|
-
|
6
|
-
|
7
|
-
|
4
|
+
before do
|
5
|
+
base = ::Middleman::Base
|
6
|
+
base.set :root, File.join(File.dirname(__FILE__), "fixtures", "sample")
|
7
|
+
base.enable :cache_buster
|
8
|
+
@browser = Rack::Test::Session.new(Rack::MockSession.new(base.new))
|
8
9
|
end
|
9
10
|
|
10
11
|
it "should append query string in CSS if on" do
|
11
|
-
browser
|
12
|
-
browser.
|
13
|
-
browser.last_response.body.should include("?")
|
12
|
+
@browser.get("/stylesheets/relative_assets.css")
|
13
|
+
@browser.last_response.body.should include("?")
|
14
14
|
end
|
15
15
|
|
16
16
|
it "should not append query string in HTML if on IN DEVELOPMENT" do
|
17
|
-
browser
|
18
|
-
browser.
|
19
|
-
browser.last_response.body.count("?").should == 0
|
17
|
+
@browser.get("/cache-buster.html")
|
18
|
+
@browser.last_response.body.count("?").should == 0
|
20
19
|
end
|
21
20
|
end
|
data/spec/spec_helper.rb
CHANGED
@@ -1,9 +1,8 @@
|
|
1
|
-
require 'rubygems'
|
1
|
+
#require 'rubygems'
|
2
|
+
require File.join(File.dirname(File.dirname(__FILE__)), 'lib', 'middleman')
|
2
3
|
require 'spec'
|
3
4
|
require 'rack/test'
|
4
5
|
|
5
|
-
require File.join(File.dirname(File.dirname(__FILE__)), 'lib', 'middleman')
|
6
|
-
|
7
6
|
Spec::Runner.configure do |config|
|
8
7
|
|
9
8
|
end
|
metadata
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: middleman
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 0.11.
|
4
|
+
version: 0.11.5
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Thomas Reynolds
|
@@ -22,136 +22,6 @@ dependencies:
|
|
22
22
|
- !ruby/object:Gem::Version
|
23
23
|
version: "0"
|
24
24
|
version:
|
25
|
-
- !ruby/object:Gem::Dependency
|
26
|
-
name: shotgun
|
27
|
-
type: :runtime
|
28
|
-
version_requirement:
|
29
|
-
version_requirements: !ruby/object:Gem::Requirement
|
30
|
-
requirements:
|
31
|
-
- - ">="
|
32
|
-
- !ruby/object:Gem::Version
|
33
|
-
version: "0"
|
34
|
-
version:
|
35
|
-
- !ruby/object:Gem::Dependency
|
36
|
-
name: templater
|
37
|
-
type: :runtime
|
38
|
-
version_requirement:
|
39
|
-
version_requirements: !ruby/object:Gem::Requirement
|
40
|
-
requirements:
|
41
|
-
- - ">="
|
42
|
-
- !ruby/object:Gem::Version
|
43
|
-
version: "0"
|
44
|
-
version:
|
45
|
-
- !ruby/object:Gem::Dependency
|
46
|
-
name: sprockets
|
47
|
-
type: :runtime
|
48
|
-
version_requirement:
|
49
|
-
version_requirements: !ruby/object:Gem::Requirement
|
50
|
-
requirements:
|
51
|
-
- - ">="
|
52
|
-
- !ruby/object:Gem::Version
|
53
|
-
version: "0"
|
54
|
-
version:
|
55
|
-
- !ruby/object:Gem::Dependency
|
56
|
-
name: sinatra
|
57
|
-
type: :runtime
|
58
|
-
version_requirement:
|
59
|
-
version_requirements: !ruby/object:Gem::Requirement
|
60
|
-
requirements:
|
61
|
-
- - ">="
|
62
|
-
- !ruby/object:Gem::Version
|
63
|
-
version: "0"
|
64
|
-
version:
|
65
|
-
- !ruby/object:Gem::Dependency
|
66
|
-
name: sinatra-content-for
|
67
|
-
type: :runtime
|
68
|
-
version_requirement:
|
69
|
-
version_requirements: !ruby/object:Gem::Requirement
|
70
|
-
requirements:
|
71
|
-
- - ">="
|
72
|
-
- !ruby/object:Gem::Version
|
73
|
-
version: "0"
|
74
|
-
version:
|
75
|
-
- !ruby/object:Gem::Dependency
|
76
|
-
name: rack-test
|
77
|
-
type: :runtime
|
78
|
-
version_requirement:
|
79
|
-
version_requirements: !ruby/object:Gem::Requirement
|
80
|
-
requirements:
|
81
|
-
- - ">="
|
82
|
-
- !ruby/object:Gem::Version
|
83
|
-
version: "0"
|
84
|
-
version:
|
85
|
-
- !ruby/object:Gem::Dependency
|
86
|
-
name: yui-compressor
|
87
|
-
type: :runtime
|
88
|
-
version_requirement:
|
89
|
-
version_requirements: !ruby/object:Gem::Requirement
|
90
|
-
requirements:
|
91
|
-
- - ">="
|
92
|
-
- !ruby/object:Gem::Version
|
93
|
-
version: "0"
|
94
|
-
version:
|
95
|
-
- !ruby/object:Gem::Dependency
|
96
|
-
name: smusher
|
97
|
-
type: :runtime
|
98
|
-
version_requirement:
|
99
|
-
version_requirements: !ruby/object:Gem::Requirement
|
100
|
-
requirements:
|
101
|
-
- - ">="
|
102
|
-
- !ruby/object:Gem::Version
|
103
|
-
version: "0"
|
104
|
-
version:
|
105
|
-
- !ruby/object:Gem::Dependency
|
106
|
-
name: haml
|
107
|
-
type: :runtime
|
108
|
-
version_requirement:
|
109
|
-
version_requirements: !ruby/object:Gem::Requirement
|
110
|
-
requirements:
|
111
|
-
- - ">="
|
112
|
-
- !ruby/object:Gem::Version
|
113
|
-
version: 2.1.0
|
114
|
-
version:
|
115
|
-
- !ruby/object:Gem::Dependency
|
116
|
-
name: compass
|
117
|
-
type: :runtime
|
118
|
-
version_requirement:
|
119
|
-
version_requirements: !ruby/object:Gem::Requirement
|
120
|
-
requirements:
|
121
|
-
- - ">="
|
122
|
-
- !ruby/object:Gem::Version
|
123
|
-
version: "0"
|
124
|
-
version:
|
125
|
-
- !ruby/object:Gem::Dependency
|
126
|
-
name: rspec
|
127
|
-
type: :development
|
128
|
-
version_requirement:
|
129
|
-
version_requirements: !ruby/object:Gem::Requirement
|
130
|
-
requirements:
|
131
|
-
- - ">="
|
132
|
-
- !ruby/object:Gem::Version
|
133
|
-
version: "0"
|
134
|
-
version:
|
135
|
-
- !ruby/object:Gem::Dependency
|
136
|
-
name: sdoc
|
137
|
-
type: :development
|
138
|
-
version_requirement:
|
139
|
-
version_requirements: !ruby/object:Gem::Requirement
|
140
|
-
requirements:
|
141
|
-
- - ">="
|
142
|
-
- !ruby/object:Gem::Version
|
143
|
-
version: "0"
|
144
|
-
version:
|
145
|
-
- !ruby/object:Gem::Dependency
|
146
|
-
name: cucumber
|
147
|
-
type: :development
|
148
|
-
version_requirement:
|
149
|
-
version_requirements: !ruby/object:Gem::Requirement
|
150
|
-
requirements:
|
151
|
-
- - ">="
|
152
|
-
- !ruby/object:Gem::Version
|
153
|
-
version: "0"
|
154
|
-
version:
|
155
25
|
description:
|
156
26
|
email: tdreyno@gmail.com
|
157
27
|
executables:
|