middleman 2.0.14.pre → 2.0.14.pre2
Sign up to get free protection for your applications and to get access to all the features.
- data/.travis.yml +2 -0
- data/CHANGELOG +8 -0
- data/features/sprockets.feature +13 -3
- data/features/sprockets_gems.feature +7 -2
- data/fixtures/sprockets-app/config.rb +2 -2
- data/fixtures/sprockets-app/source/library/css/plain.css +3 -0
- data/fixtures/sprockets-app/source/library/{stylesheets → css}/sprockets_base1.css.scss +0 -0
- data/fixtures/sprockets-app/source/library/{stylesheets → css}/sprockets_base2.css.scss +0 -0
- data/fixtures/sprockets-app/source/library/{stylesheets → css}/sprockets_sub.css.scss +0 -0
- data/fixtures/sprockets-app/source/library/{javascripts → js}/jquery_include.js +0 -0
- data/fixtures/sprockets-app/source/library/js/plain.js +3 -0
- data/fixtures/sprockets-app/source/library/{javascripts → js}/sprockets_base.js +0 -0
- data/fixtures/sprockets-app/source/library/{javascripts → js}/sprockets_sub.js +0 -0
- data/fixtures/sprockets-app/source/library/stylesheets/bootstrap_include.css.scss +1 -0
- data/lib/middleman.rb +3 -2
- data/lib/middleman/cli.rb +1 -1
- data/lib/middleman/core_extensions/front_matter.rb +3 -0
- data/lib/middleman/core_extensions/rendering.rb +1 -0
- data/lib/middleman/core_extensions/sprockets.rb +26 -8
- data/lib/middleman/features/minify_css.rb +2 -3
- data/lib/middleman/features/minify_css/cssmin.rb +55 -0
- data/lib/middleman/renderers/erb.rb +34 -0
- data/lib/middleman/version.rb +1 -1
- data/middleman-x86-mingw32.gemspec +3 -2
- data/middleman.gemspec +2 -1
- metadata +120 -97
data/.travis.yml
CHANGED
data/CHANGELOG
CHANGED
data/features/sprockets.feature
CHANGED
@@ -7,9 +7,14 @@ Feature: Sprockets
|
|
7
7
|
|
8
8
|
Scenario: Sprockets JS require with custom :js_dir
|
9
9
|
Given the Server is running at "sprockets-app"
|
10
|
-
When I go to "/library/
|
10
|
+
When I go to "/library/js/sprockets_base.js"
|
11
11
|
Then I should see "sprockets_sub_function"
|
12
12
|
|
13
|
+
Scenario: Plain JS require with custom :js_dir
|
14
|
+
Given the Server is running at "sprockets-app"
|
15
|
+
When I go to "/library/css/plain.css"
|
16
|
+
Then I should see "helloWorld"
|
17
|
+
|
13
18
|
Scenario: Sprockets JS should have access to yaml data
|
14
19
|
Given the Server is running at "test-app"
|
15
20
|
When I go to "/javascripts/multiple_engines.js"
|
@@ -32,10 +37,15 @@ Feature: Sprockets
|
|
32
37
|
|
33
38
|
Scenario: Sprockets CSS require with custom :css_dir //require
|
34
39
|
Given the Server is running at "sprockets-app"
|
35
|
-
When I go to "/library/
|
40
|
+
When I go to "/library/css/sprockets_base1.css"
|
36
41
|
Then I should see "hello"
|
37
42
|
|
43
|
+
Scenario: Plain CSS require with custom :css_dir
|
44
|
+
Given the Server is running at "sprockets-app"
|
45
|
+
When I go to "/library/css/plain.css"
|
46
|
+
Then I should see "helloWorld"
|
47
|
+
|
38
48
|
Scenario: Sprockets CSS require with custom :css_dir @import
|
39
49
|
Given the Server is running at "sprockets-app"
|
40
|
-
When I go to "/library/
|
50
|
+
When I go to "/library/css/sprockets_base2.css"
|
41
51
|
Then I should see "hello"
|
@@ -1,5 +1,10 @@
|
|
1
1
|
Feature: Sprockets Gems
|
2
2
|
Scenario: Sprockets can pull jQuery from gem
|
3
3
|
Given the Server is running at "sprockets-app"
|
4
|
-
When I go to "/library/
|
5
|
-
Then I should see "var jQuery ="
|
4
|
+
When I go to "/library/js/jquery_include.js"
|
5
|
+
Then I should see "var jQuery ="
|
6
|
+
|
7
|
+
# Scenario: Sprockets can pull CSS from gem
|
8
|
+
# Given the Server is running at "sprockets-app"
|
9
|
+
# When I go to "/library/css/bootstrap_include.css"
|
10
|
+
# Then I should see "Bootstrap"
|
@@ -1,2 +1,2 @@
|
|
1
|
-
set :js_dir, "library/
|
2
|
-
set :css_dir, "library/
|
1
|
+
set :js_dir, "library/js"
|
2
|
+
set :css_dir, "library/css"
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
@@ -0,0 +1 @@
|
|
1
|
+
//= require "bootstrap.scss"
|
data/lib/middleman.rb
CHANGED
@@ -48,7 +48,7 @@
|
|
48
48
|
#
|
49
49
|
# [Visit the website]: http://middlemanapp.com
|
50
50
|
# [Read the wiki]: https://github.com/tdreyno/middleman/wiki
|
51
|
-
# [Email the users group]:
|
51
|
+
# [Email the users group]: https://convore.com/middleman/
|
52
52
|
# [Submit bug reports]: https://github.com/tdreyno/middleman/issues
|
53
53
|
|
54
54
|
# Setup our load paths
|
@@ -73,6 +73,7 @@ module Middleman
|
|
73
73
|
autoload :Sass, "middleman/renderers/sass"
|
74
74
|
autoload :Slim, "middleman/renderers/slim"
|
75
75
|
autoload :Markdown, "middleman/renderers/markdown"
|
76
|
+
autoload :ERb, "middleman/renderers/erb"
|
76
77
|
autoload :CoffeeScript, "middleman/renderers/coffee_script"
|
77
78
|
autoload :Liquid, "middleman/renderers/liquid"
|
78
79
|
end
|
@@ -199,4 +200,4 @@ module Middleman
|
|
199
200
|
end
|
200
201
|
|
201
202
|
require "middleman/version"
|
202
|
-
Middleman.load_extensions_in_path
|
203
|
+
Middleman.load_extensions_in_path
|
data/lib/middleman/cli.rb
CHANGED
@@ -12,7 +12,7 @@ module Middleman
|
|
12
12
|
help_check if options[:help]
|
13
13
|
end
|
14
14
|
|
15
|
-
desc "init NAME", "Create new Middleman project directory NAME"
|
15
|
+
desc "init NAME [options]", "Create new Middleman project directory NAME"
|
16
16
|
available_templates = Middleman::Templates.registered_names.join(", ")
|
17
17
|
method_option "template", :aliases => "-T", :default => "default", :desc => "Optionally use a pre-defined project template: #{available_templates}"
|
18
18
|
method_option "css_dir", :default => "stylesheets", :desc => 'The path to the css files'
|
@@ -101,6 +101,9 @@ module Middleman::CoreExtensions::FrontMatter
|
|
101
101
|
class ERBTemplate < ::Tilt::ERBTemplate
|
102
102
|
include Middleman::CoreExtensions::FrontMatter::YamlAware
|
103
103
|
end
|
104
|
+
class ErubisTemplate < ::Tilt::ErubisTemplate
|
105
|
+
include Middleman::CoreExtensions::FrontMatter::YamlAware
|
106
|
+
end
|
104
107
|
|
105
108
|
class LiquidTemplate < ::Tilt::LiquidTemplate
|
106
109
|
include Middleman::CoreExtensions::FrontMatter::YamlAware
|
@@ -11,6 +11,7 @@ module Middleman::CoreExtensions::Rendering
|
|
11
11
|
app.register Middleman::Renderers::Haml
|
12
12
|
app.register Middleman::Renderers::Sass
|
13
13
|
app.register Middleman::Renderers::Markdown
|
14
|
+
app.register Middleman::Renderers::ERb
|
14
15
|
app.register Middleman::Renderers::CoffeeScript
|
15
16
|
app.register Middleman::Renderers::Liquid
|
16
17
|
end
|
@@ -6,6 +6,7 @@ module Middleman::CoreExtensions::Sprockets
|
|
6
6
|
class << self
|
7
7
|
def registered(app)
|
8
8
|
app.set :js_compressor, false
|
9
|
+
app.set :css_compressor, false
|
9
10
|
|
10
11
|
# Cut off every extension after .js (which sprockets eats up)
|
11
12
|
app.build_reroute do |destination, request_path|
|
@@ -22,11 +23,18 @@ module Middleman::CoreExtensions::Sprockets
|
|
22
23
|
app.after_configuration do
|
23
24
|
js_env = Middleman::CoreExtensions::Sprockets::JavascriptEnvironment.new(app)
|
24
25
|
|
25
|
-
|
26
|
+
vendor_dir = File.join("vendor", "assets", "javascripts")
|
26
27
|
gems_with_js = ::Middleman.rubygems_latest_specs.select do |spec|
|
27
|
-
::Middleman.spec_has_file?(spec,
|
28
|
+
::Middleman.spec_has_file?(spec, vendor_dir)
|
28
29
|
end.each do |spec|
|
29
|
-
js_env.append_path File.join(spec.full_gem_path,
|
30
|
+
js_env.append_path File.join(spec.full_gem_path, vendor_dir)
|
31
|
+
end
|
32
|
+
|
33
|
+
app_dir = File.join("app", "assets", "javascripts")
|
34
|
+
gems_with_js = ::Middleman.rubygems_latest_specs.select do |spec|
|
35
|
+
::Middleman.spec_has_file?(spec, app_dir)
|
36
|
+
end.each do |spec|
|
37
|
+
js_env.append_path File.join(spec.full_gem_path, app_dir)
|
30
38
|
end
|
31
39
|
|
32
40
|
# add paths to js_env (vendor/assets/javascripts)
|
@@ -37,11 +45,19 @@ module Middleman::CoreExtensions::Sprockets
|
|
37
45
|
|
38
46
|
app.after_compass_config do
|
39
47
|
css_env = Middleman::CoreExtensions::Sprockets::StylesheetEnvironment.new(app)
|
40
|
-
|
48
|
+
|
49
|
+
vendor_dir = File.join("vendor", "assets", "stylesheets")
|
41
50
|
gems_with_css = ::Middleman.rubygems_latest_specs.select do |spec|
|
42
|
-
::Middleman.spec_has_file?(spec,
|
51
|
+
::Middleman.spec_has_file?(spec, vendor_dir)
|
43
52
|
end.each do |spec|
|
44
|
-
css_env.append_path File.join(spec.full_gem_path,
|
53
|
+
css_env.append_path File.join(spec.full_gem_path, vendor_dir)
|
54
|
+
end
|
55
|
+
|
56
|
+
app_dir = File.join("app", "assets", "stylesheets")
|
57
|
+
gems_with_css = ::Middleman.rubygems_latest_specs.select do |spec|
|
58
|
+
::Middleman.spec_has_file?(spec, app_dir)
|
59
|
+
end.each do |spec|
|
60
|
+
css_env.append_path File.join(spec.full_gem_path, app_dir)
|
45
61
|
end
|
46
62
|
|
47
63
|
app.map "/#{app.css_dir}" do
|
@@ -78,7 +94,7 @@ module Middleman::CoreExtensions::Sprockets
|
|
78
94
|
super
|
79
95
|
|
80
96
|
# Disable css
|
81
|
-
unregister_processor "text/css", ::Sprockets::DirectiveProcessor
|
97
|
+
# unregister_processor "text/css", ::Sprockets::DirectiveProcessor
|
82
98
|
|
83
99
|
self.js_compressor = app.settings.js_compressor
|
84
100
|
|
@@ -97,7 +113,9 @@ module Middleman::CoreExtensions::Sprockets
|
|
97
113
|
super
|
98
114
|
|
99
115
|
# Disable js
|
100
|
-
unregister_processor "application/javascript", ::Sprockets::DirectiveProcessor
|
116
|
+
# unregister_processor "application/javascript", ::Sprockets::DirectiveProcessor
|
117
|
+
|
118
|
+
self.css_compressor = app.settings.css_compressor
|
101
119
|
|
102
120
|
# configure search paths
|
103
121
|
append_path app.css_dir
|
@@ -1,9 +1,8 @@
|
|
1
1
|
module Middleman::Features::MinifyCss
|
2
2
|
class << self
|
3
3
|
def registered(app)
|
4
|
-
|
5
|
-
|
6
|
-
end
|
4
|
+
require "middleman/features/minify_css/cssmin"
|
5
|
+
app.set :css_compressor, ::CSSMin
|
7
6
|
end
|
8
7
|
alias :included :registered
|
9
8
|
end
|
@@ -0,0 +1,55 @@
|
|
1
|
+
#--
|
2
|
+
# Copyright (c) 2008 Ryan Grove <ryan@wonko.com>
|
3
|
+
# All rights reserved.
|
4
|
+
#
|
5
|
+
# Redistribution and use in source and binary forms, with or without
|
6
|
+
# modification, are permitted provided that the following conditions are met:
|
7
|
+
#
|
8
|
+
# * Redistributions of source code must retain the above copyright notice,
|
9
|
+
# this list of conditions and the following disclaimer.
|
10
|
+
# * Redistributions in binary form must reproduce the above copyright notice,
|
11
|
+
# this list of conditions and the following disclaimer in the documentation
|
12
|
+
# and/or other materials provided with the distribution.
|
13
|
+
# * Neither the name of this project nor the names of its contributors may be
|
14
|
+
# used to endorse or promote products derived from this software without
|
15
|
+
# specific prior written permission.
|
16
|
+
#
|
17
|
+
# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
|
18
|
+
# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
|
19
|
+
# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
|
20
|
+
# DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE
|
21
|
+
# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
|
22
|
+
# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
|
23
|
+
# SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
|
24
|
+
# CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
|
25
|
+
# OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
|
26
|
+
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
27
|
+
#++
|
28
|
+
|
29
|
+
module CSSMin
|
30
|
+
def self.compress(input)
|
31
|
+
css = input.is_a?(IO) ? input.read : input.dup.to_s
|
32
|
+
css.gsub!(/\/\*[\s\S]*?\*\//, '')
|
33
|
+
css.gsub!(/\s+/, ' ')
|
34
|
+
css.gsub!(/"\\"\}\\""/, '___BMH___')
|
35
|
+
css.gsub!(/(?:^|\})[^\{:]+\s+:+[^\{]*\{/) do |match|
|
36
|
+
match.gsub(':', '___PSEUDOCLASSCOLON___')
|
37
|
+
end
|
38
|
+
css.gsub!(/\s+([!\{\};:>+\(\)\],])/, '\1')
|
39
|
+
css.gsub!('___PSEUDOCLASSCOLON___', ':')
|
40
|
+
css.gsub!(/([!\{\}:;>+\(\[,])\s+/, '\1')
|
41
|
+
css.gsub!(/([^;\}])\}/, '\1;}')
|
42
|
+
css.gsub!(/([\s:])([+-]?0)(?:%|em|ex|px|in|cm|mm|pt|pc)/i, '\1\2')
|
43
|
+
css.gsub!(/:(?:0 )+0;/, ':0;')
|
44
|
+
css.gsub!('background-position:0;', 'background-position:0 0;')
|
45
|
+
css.gsub!(/(:|\s)0+\.(\d+)/, '\1.\2')
|
46
|
+
css.gsub!(/rgb\s*\(\s*([0-9,\s]+)\s*\)/) do |match|
|
47
|
+
'#' << $1.scan(/\d+/).map{|n| n.to_i.to_s(16).rjust(2, '0') }.join
|
48
|
+
end
|
49
|
+
css.gsub!(/([^"'=\s])\s*#([0-9a-f])\2([0-9a-f])\3([0-9a-f])\4/i, '\1 #\2\3\4')
|
50
|
+
css.gsub!(/[^\}]+\{;\}\n/, '')
|
51
|
+
css.gsub!('___BMH___', '"\"}\""')
|
52
|
+
css.gsub!(/;;+/, ';')
|
53
|
+
css.strip
|
54
|
+
end
|
55
|
+
end
|
@@ -0,0 +1,34 @@
|
|
1
|
+
require "tilt"
|
2
|
+
|
3
|
+
module Middleman::Renderers::ERb
|
4
|
+
class << self
|
5
|
+
def registered(app)
|
6
|
+
app.extend ClassMethods
|
7
|
+
|
8
|
+
app.set :erb_engine, :erb
|
9
|
+
|
10
|
+
if !app.respond_to? :erb_engine_prefix
|
11
|
+
app.set :erb_engine_prefix, ::Tilt
|
12
|
+
end
|
13
|
+
|
14
|
+
app.after_configuration do
|
15
|
+
engine = app.settings.erb_engine
|
16
|
+
|
17
|
+
if engine.is_a? Symbol
|
18
|
+
engine = app.tilt_template_from_symbol(engine)
|
19
|
+
end
|
20
|
+
|
21
|
+
::Tilt.prefer(engine)
|
22
|
+
end
|
23
|
+
end
|
24
|
+
alias :included :registered
|
25
|
+
end
|
26
|
+
|
27
|
+
module ClassMethods
|
28
|
+
def tilt_template_from_symbol(engine)
|
29
|
+
engine = engine.to_s
|
30
|
+
engine = engine == "erb" ? "ERB" : engine.camelize
|
31
|
+
settings.erb_engine_prefix.const_get("#{engine}Template")
|
32
|
+
end
|
33
|
+
end
|
34
|
+
end
|
data/lib/middleman/version.rb
CHANGED
@@ -55,11 +55,11 @@ eos
|
|
55
55
|
s.add_dependency("padrino-core", ["~> 0.10.5"])
|
56
56
|
s.add_dependency("padrino-helpers", ["~> 0.10.5"])
|
57
57
|
|
58
|
-
s.add_dependency("eventmachine", ["1.0.0.beta.
|
58
|
+
s.add_dependency("eventmachine", ["1.0.0.beta.4.1"])
|
59
59
|
s.add_dependency("win32-process", ["~> 0.6.5"])
|
60
60
|
s.add_dependency("rb-fchange")
|
61
61
|
|
62
|
-
s.add_dependency("guard", ["~> 0.
|
62
|
+
s.add_dependency("guard", ["~> 0.8.8"])
|
63
63
|
s.add_dependency("middleman-livereload", ["~> 0.2.0"])
|
64
64
|
|
65
65
|
# Development and test
|
@@ -70,5 +70,6 @@ eos
|
|
70
70
|
s.add_development_dependency("rake", ["~> 0.9.2"])
|
71
71
|
s.add_development_dependency("rspec", ["~> 2.6.0"])
|
72
72
|
s.add_development_dependency("jquery-rails")
|
73
|
+
s.add_development_dependency("bootstrap-rails")
|
73
74
|
end
|
74
75
|
|
data/middleman.gemspec
CHANGED
@@ -57,7 +57,7 @@ eos
|
|
57
57
|
s.add_dependency("padrino-core", ["~> 0.10.5"])
|
58
58
|
s.add_dependency("padrino-helpers", ["~> 0.10.5"])
|
59
59
|
|
60
|
-
s.add_dependency("guard", ["~> 0.
|
60
|
+
s.add_dependency("guard", ["~> 0.8.8"])
|
61
61
|
s.add_dependency("middleman-livereload", ["~> 0.2.0"])
|
62
62
|
|
63
63
|
# Development and test
|
@@ -67,5 +67,6 @@ eos
|
|
67
67
|
s.add_development_dependency("rake", ["~> 0.9.2"])
|
68
68
|
s.add_development_dependency("rspec", ["~> 2.6.0"])
|
69
69
|
s.add_development_dependency("jquery-rails")
|
70
|
+
s.add_development_dependency("bootstrap-rails")
|
70
71
|
end
|
71
72
|
|
metadata
CHANGED
@@ -1,14 +1,15 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: middleman
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
hash:
|
4
|
+
hash: 1923831965
|
5
5
|
prerelease: 7
|
6
6
|
segments:
|
7
7
|
- 2
|
8
8
|
- 0
|
9
9
|
- 14
|
10
10
|
- pre
|
11
|
-
|
11
|
+
- 2
|
12
|
+
version: 2.0.14.pre2
|
12
13
|
platform: ruby
|
13
14
|
authors:
|
14
15
|
- Thomas Reynolds
|
@@ -16,11 +17,10 @@ autorequire:
|
|
16
17
|
bindir: bin
|
17
18
|
cert_chain: []
|
18
19
|
|
19
|
-
date: 2011-
|
20
|
+
date: 2011-11-03 00:00:00 -07:00
|
20
21
|
default_executable:
|
21
22
|
dependencies:
|
22
23
|
- !ruby/object:Gem::Dependency
|
23
|
-
prerelease: false
|
24
24
|
requirement: &id001 !ruby/object:Gem::Requirement
|
25
25
|
none: false
|
26
26
|
requirements:
|
@@ -32,11 +32,11 @@ dependencies:
|
|
32
32
|
- 3
|
33
33
|
- 5
|
34
34
|
version: 1.3.5
|
35
|
-
type: :runtime
|
36
|
-
name: rack
|
37
35
|
version_requirements: *id001
|
38
|
-
|
36
|
+
name: rack
|
39
37
|
prerelease: false
|
38
|
+
type: :runtime
|
39
|
+
- !ruby/object:Gem::Dependency
|
40
40
|
requirement: &id002 !ruby/object:Gem::Requirement
|
41
41
|
none: false
|
42
42
|
requirements:
|
@@ -48,11 +48,11 @@ dependencies:
|
|
48
48
|
- 2
|
49
49
|
- 11
|
50
50
|
version: 1.2.11
|
51
|
-
type: :runtime
|
52
|
-
name: thin
|
53
51
|
version_requirements: *id002
|
54
|
-
|
52
|
+
name: thin
|
55
53
|
prerelease: false
|
54
|
+
type: :runtime
|
55
|
+
- !ruby/object:Gem::Dependency
|
56
56
|
requirement: &id003 !ruby/object:Gem::Requirement
|
57
57
|
none: false
|
58
58
|
requirements:
|
@@ -64,11 +64,11 @@ dependencies:
|
|
64
64
|
- 14
|
65
65
|
- 0
|
66
66
|
version: 0.14.0
|
67
|
-
type: :runtime
|
68
|
-
name: thor
|
69
67
|
version_requirements: *id003
|
70
|
-
|
68
|
+
name: thor
|
71
69
|
prerelease: false
|
70
|
+
type: :runtime
|
71
|
+
- !ruby/object:Gem::Dependency
|
72
72
|
requirement: &id004 !ruby/object:Gem::Requirement
|
73
73
|
none: false
|
74
74
|
requirements:
|
@@ -80,11 +80,11 @@ dependencies:
|
|
80
80
|
- 3
|
81
81
|
- 1
|
82
82
|
version: 1.3.1
|
83
|
-
type: :runtime
|
84
|
-
name: tilt
|
85
83
|
version_requirements: *id004
|
86
|
-
|
84
|
+
name: tilt
|
87
85
|
prerelease: false
|
86
|
+
type: :runtime
|
87
|
+
- !ruby/object:Gem::Dependency
|
88
88
|
requirement: &id005 !ruby/object:Gem::Requirement
|
89
89
|
none: false
|
90
90
|
requirements:
|
@@ -96,11 +96,11 @@ dependencies:
|
|
96
96
|
- 6
|
97
97
|
- 0
|
98
98
|
version: 0.6.0
|
99
|
-
type: :runtime
|
100
|
-
name: maruku
|
101
99
|
version_requirements: *id005
|
102
|
-
|
100
|
+
name: maruku
|
103
101
|
prerelease: false
|
102
|
+
type: :runtime
|
103
|
+
- !ruby/object:Gem::Dependency
|
104
104
|
requirement: &id006 !ruby/object:Gem::Requirement
|
105
105
|
none: false
|
106
106
|
requirements:
|
@@ -112,11 +112,11 @@ dependencies:
|
|
112
112
|
- 3
|
113
113
|
- 1
|
114
114
|
version: 1.3.1
|
115
|
-
type: :runtime
|
116
|
-
name: sinatra
|
117
115
|
version_requirements: *id006
|
118
|
-
|
116
|
+
name: sinatra
|
119
117
|
prerelease: false
|
118
|
+
type: :runtime
|
119
|
+
- !ruby/object:Gem::Dependency
|
120
120
|
requirement: &id007 !ruby/object:Gem::Requirement
|
121
121
|
none: false
|
122
122
|
requirements:
|
@@ -128,11 +128,11 @@ dependencies:
|
|
128
128
|
- 6
|
129
129
|
- 1
|
130
130
|
version: 0.6.1
|
131
|
-
type: :runtime
|
132
|
-
name: rack-test
|
133
131
|
version_requirements: *id007
|
134
|
-
|
132
|
+
name: rack-test
|
135
133
|
prerelease: false
|
134
|
+
type: :runtime
|
135
|
+
- !ruby/object:Gem::Dependency
|
136
136
|
requirement: &id008 !ruby/object:Gem::Requirement
|
137
137
|
none: false
|
138
138
|
requirements:
|
@@ -144,11 +144,11 @@ dependencies:
|
|
144
144
|
- 0
|
145
145
|
- 0
|
146
146
|
version: 1.0.0
|
147
|
-
type: :runtime
|
148
|
-
name: uglifier
|
149
147
|
version_requirements: *id008
|
150
|
-
|
148
|
+
name: uglifier
|
151
149
|
prerelease: false
|
150
|
+
type: :runtime
|
151
|
+
- !ruby/object:Gem::Dependency
|
152
152
|
requirement: &id009 !ruby/object:Gem::Requirement
|
153
153
|
none: false
|
154
154
|
requirements:
|
@@ -160,11 +160,11 @@ dependencies:
|
|
160
160
|
- 0
|
161
161
|
- 2
|
162
162
|
version: 1.0.2
|
163
|
-
type: :runtime
|
164
|
-
name: slim
|
165
163
|
version_requirements: *id009
|
166
|
-
|
164
|
+
name: slim
|
167
165
|
prerelease: false
|
166
|
+
type: :runtime
|
167
|
+
- !ruby/object:Gem::Dependency
|
168
168
|
requirement: &id010 !ruby/object:Gem::Requirement
|
169
169
|
none: false
|
170
170
|
requirements:
|
@@ -176,11 +176,11 @@ dependencies:
|
|
176
176
|
- 1
|
177
177
|
- 0
|
178
178
|
version: 3.1.0
|
179
|
-
type: :runtime
|
180
|
-
name: haml
|
181
179
|
version_requirements: *id010
|
182
|
-
|
180
|
+
name: haml
|
183
181
|
prerelease: false
|
182
|
+
type: :runtime
|
183
|
+
- !ruby/object:Gem::Dependency
|
184
184
|
requirement: &id011 !ruby/object:Gem::Requirement
|
185
185
|
none: false
|
186
186
|
requirements:
|
@@ -192,11 +192,11 @@ dependencies:
|
|
192
192
|
- 1
|
193
193
|
- 7
|
194
194
|
version: 3.1.7
|
195
|
-
type: :runtime
|
196
|
-
name: sass
|
197
195
|
version_requirements: *id011
|
198
|
-
|
196
|
+
name: sass
|
199
197
|
prerelease: false
|
198
|
+
type: :runtime
|
199
|
+
- !ruby/object:Gem::Dependency
|
200
200
|
requirement: &id012 !ruby/object:Gem::Requirement
|
201
201
|
none: false
|
202
202
|
requirements:
|
@@ -208,11 +208,11 @@ dependencies:
|
|
208
208
|
- 11
|
209
209
|
- 3
|
210
210
|
version: 0.11.3
|
211
|
-
type: :runtime
|
212
|
-
name: compass
|
213
211
|
version_requirements: *id012
|
214
|
-
|
212
|
+
name: compass
|
215
213
|
prerelease: false
|
214
|
+
type: :runtime
|
215
|
+
- !ruby/object:Gem::Dependency
|
216
216
|
requirement: &id013 !ruby/object:Gem::Requirement
|
217
217
|
none: false
|
218
218
|
requirements:
|
@@ -224,11 +224,11 @@ dependencies:
|
|
224
224
|
- 2
|
225
225
|
- 0
|
226
226
|
version: 2.2.0
|
227
|
-
type: :runtime
|
228
|
-
name: coffee-script
|
229
227
|
version_requirements: *id013
|
230
|
-
|
228
|
+
name: coffee-script
|
231
229
|
prerelease: false
|
230
|
+
type: :runtime
|
231
|
+
- !ruby/object:Gem::Dependency
|
232
232
|
requirement: &id014 !ruby/object:Gem::Requirement
|
233
233
|
none: false
|
234
234
|
requirements:
|
@@ -240,11 +240,11 @@ dependencies:
|
|
240
240
|
- 2
|
241
241
|
- 7
|
242
242
|
version: 1.2.7
|
243
|
-
type: :runtime
|
244
|
-
name: execjs
|
245
243
|
version_requirements: *id014
|
246
|
-
|
244
|
+
name: execjs
|
247
245
|
prerelease: false
|
246
|
+
type: :runtime
|
247
|
+
- !ruby/object:Gem::Dependency
|
248
248
|
requirement: &id015 !ruby/object:Gem::Requirement
|
249
249
|
none: false
|
250
250
|
requirements:
|
@@ -256,11 +256,11 @@ dependencies:
|
|
256
256
|
- 0
|
257
257
|
- 3
|
258
258
|
version: 2.0.3
|
259
|
-
type: :runtime
|
260
|
-
name: sprockets
|
261
259
|
version_requirements: *id015
|
262
|
-
|
260
|
+
name: sprockets
|
263
261
|
prerelease: false
|
262
|
+
type: :runtime
|
263
|
+
- !ruby/object:Gem::Dependency
|
264
264
|
requirement: &id016 !ruby/object:Gem::Requirement
|
265
265
|
none: false
|
266
266
|
requirements:
|
@@ -272,11 +272,11 @@ dependencies:
|
|
272
272
|
- 3
|
273
273
|
- 0
|
274
274
|
version: 0.3.0
|
275
|
-
type: :runtime
|
276
|
-
name: sprockets-sass
|
277
275
|
version_requirements: *id016
|
278
|
-
|
276
|
+
name: sprockets-sass
|
279
277
|
prerelease: false
|
278
|
+
type: :runtime
|
279
|
+
- !ruby/object:Gem::Dependency
|
280
280
|
requirement: &id017 !ruby/object:Gem::Requirement
|
281
281
|
none: false
|
282
282
|
requirements:
|
@@ -288,11 +288,11 @@ dependencies:
|
|
288
288
|
- 10
|
289
289
|
- 5
|
290
290
|
version: 0.10.5
|
291
|
-
type: :runtime
|
292
|
-
name: padrino-core
|
293
291
|
version_requirements: *id017
|
294
|
-
|
292
|
+
name: padrino-core
|
295
293
|
prerelease: false
|
294
|
+
type: :runtime
|
295
|
+
- !ruby/object:Gem::Dependency
|
296
296
|
requirement: &id018 !ruby/object:Gem::Requirement
|
297
297
|
none: false
|
298
298
|
requirements:
|
@@ -304,27 +304,27 @@ dependencies:
|
|
304
304
|
- 10
|
305
305
|
- 5
|
306
306
|
version: 0.10.5
|
307
|
-
type: :runtime
|
308
|
-
name: padrino-helpers
|
309
307
|
version_requirements: *id018
|
310
|
-
|
308
|
+
name: padrino-helpers
|
311
309
|
prerelease: false
|
310
|
+
type: :runtime
|
311
|
+
- !ruby/object:Gem::Dependency
|
312
312
|
requirement: &id019 !ruby/object:Gem::Requirement
|
313
313
|
none: false
|
314
314
|
requirements:
|
315
315
|
- - ~>
|
316
316
|
- !ruby/object:Gem::Version
|
317
|
-
hash:
|
317
|
+
hash: 47
|
318
318
|
segments:
|
319
319
|
- 0
|
320
|
-
-
|
321
|
-
-
|
322
|
-
version: 0.
|
323
|
-
type: :runtime
|
324
|
-
name: guard
|
320
|
+
- 8
|
321
|
+
- 8
|
322
|
+
version: 0.8.8
|
325
323
|
version_requirements: *id019
|
326
|
-
|
324
|
+
name: guard
|
327
325
|
prerelease: false
|
326
|
+
type: :runtime
|
327
|
+
- !ruby/object:Gem::Dependency
|
328
328
|
requirement: &id020 !ruby/object:Gem::Requirement
|
329
329
|
none: false
|
330
330
|
requirements:
|
@@ -336,11 +336,11 @@ dependencies:
|
|
336
336
|
- 2
|
337
337
|
- 0
|
338
338
|
version: 0.2.0
|
339
|
-
type: :runtime
|
340
|
-
name: middleman-livereload
|
341
339
|
version_requirements: *id020
|
342
|
-
|
340
|
+
name: middleman-livereload
|
343
341
|
prerelease: false
|
342
|
+
type: :runtime
|
343
|
+
- !ruby/object:Gem::Dependency
|
344
344
|
requirement: &id021 !ruby/object:Gem::Requirement
|
345
345
|
none: false
|
346
346
|
requirements:
|
@@ -352,11 +352,11 @@ dependencies:
|
|
352
352
|
- 1
|
353
353
|
- 1
|
354
354
|
version: 0.1.1
|
355
|
-
type: :development
|
356
|
-
name: coffee-filter
|
357
355
|
version_requirements: *id021
|
358
|
-
|
356
|
+
name: coffee-filter
|
359
357
|
prerelease: false
|
358
|
+
type: :development
|
359
|
+
- !ruby/object:Gem::Dependency
|
360
360
|
requirement: &id022 !ruby/object:Gem::Requirement
|
361
361
|
none: false
|
362
362
|
requirements:
|
@@ -368,11 +368,11 @@ dependencies:
|
|
368
368
|
- 2
|
369
369
|
- 0
|
370
370
|
version: 2.2.0
|
371
|
-
type: :development
|
372
|
-
name: liquid
|
373
371
|
version_requirements: *id022
|
374
|
-
|
372
|
+
name: liquid
|
375
373
|
prerelease: false
|
374
|
+
type: :development
|
375
|
+
- !ruby/object:Gem::Dependency
|
376
376
|
requirement: &id023 !ruby/object:Gem::Requirement
|
377
377
|
none: false
|
378
378
|
requirements:
|
@@ -384,11 +384,11 @@ dependencies:
|
|
384
384
|
- 0
|
385
385
|
- 2
|
386
386
|
version: 1.0.2
|
387
|
-
type: :development
|
388
|
-
name: cucumber
|
389
387
|
version_requirements: *id023
|
390
|
-
|
388
|
+
name: cucumber
|
391
389
|
prerelease: false
|
390
|
+
type: :development
|
391
|
+
- !ruby/object:Gem::Dependency
|
392
392
|
requirement: &id024 !ruby/object:Gem::Requirement
|
393
393
|
none: false
|
394
394
|
requirements:
|
@@ -400,11 +400,11 @@ dependencies:
|
|
400
400
|
- 9
|
401
401
|
- 2
|
402
402
|
version: 0.9.2
|
403
|
-
type: :development
|
404
|
-
name: rake
|
405
403
|
version_requirements: *id024
|
406
|
-
|
404
|
+
name: rake
|
407
405
|
prerelease: false
|
406
|
+
type: :development
|
407
|
+
- !ruby/object:Gem::Dependency
|
408
408
|
requirement: &id025 !ruby/object:Gem::Requirement
|
409
409
|
none: false
|
410
410
|
requirements:
|
@@ -416,11 +416,11 @@ dependencies:
|
|
416
416
|
- 6
|
417
417
|
- 0
|
418
418
|
version: 2.6.0
|
419
|
-
type: :development
|
420
|
-
name: rspec
|
421
419
|
version_requirements: *id025
|
422
|
-
|
420
|
+
name: rspec
|
423
421
|
prerelease: false
|
422
|
+
type: :development
|
423
|
+
- !ruby/object:Gem::Dependency
|
424
424
|
requirement: &id026 !ruby/object:Gem::Requirement
|
425
425
|
none: false
|
426
426
|
requirements:
|
@@ -430,9 +430,24 @@ dependencies:
|
|
430
430
|
segments:
|
431
431
|
- 0
|
432
432
|
version: "0"
|
433
|
-
type: :development
|
434
|
-
name: jquery-rails
|
435
433
|
version_requirements: *id026
|
434
|
+
name: jquery-rails
|
435
|
+
prerelease: false
|
436
|
+
type: :development
|
437
|
+
- !ruby/object:Gem::Dependency
|
438
|
+
requirement: &id027 !ruby/object:Gem::Requirement
|
439
|
+
none: false
|
440
|
+
requirements:
|
441
|
+
- - ">="
|
442
|
+
- !ruby/object:Gem::Version
|
443
|
+
hash: 3
|
444
|
+
segments:
|
445
|
+
- 0
|
446
|
+
version: "0"
|
447
|
+
version_requirements: *id027
|
448
|
+
name: bootstrap-rails
|
449
|
+
prerelease: false
|
450
|
+
type: :development
|
436
451
|
description: A static site generator based on Sinatra. Providing dozens of templating languages (Haml, Sass, Compass, Slim, CoffeeScript, and more). Makes minification, compression, cache busting, Yaml data (and more) an easy part of your development cycle.
|
437
452
|
email:
|
438
453
|
- me@tdreyno.com
|
@@ -526,12 +541,15 @@ files:
|
|
526
541
|
- fixtures/relative-app/source/images/blank.gif
|
527
542
|
- fixtures/relative-app/source/stylesheets/relative_assets.css.sass
|
528
543
|
- fixtures/sprockets-app/config.rb
|
529
|
-
- fixtures/sprockets-app/source/library/
|
530
|
-
- fixtures/sprockets-app/source/library/
|
531
|
-
- fixtures/sprockets-app/source/library/
|
532
|
-
- fixtures/sprockets-app/source/library/
|
533
|
-
- fixtures/sprockets-app/source/library/
|
534
|
-
- fixtures/sprockets-app/source/library/
|
544
|
+
- fixtures/sprockets-app/source/library/css/plain.css
|
545
|
+
- fixtures/sprockets-app/source/library/css/sprockets_base1.css.scss
|
546
|
+
- fixtures/sprockets-app/source/library/css/sprockets_base2.css.scss
|
547
|
+
- fixtures/sprockets-app/source/library/css/sprockets_sub.css.scss
|
548
|
+
- fixtures/sprockets-app/source/library/js/jquery_include.js
|
549
|
+
- fixtures/sprockets-app/source/library/js/plain.js
|
550
|
+
- fixtures/sprockets-app/source/library/js/sprockets_base.js
|
551
|
+
- fixtures/sprockets-app/source/library/js/sprockets_sub.js
|
552
|
+
- fixtures/sprockets-app/source/library/stylesheets/bootstrap_include.css.scss
|
535
553
|
- fixtures/test-app/config.rb
|
536
554
|
- fixtures/test-app/data/test.yml
|
537
555
|
- fixtures/test-app/data/test2.json
|
@@ -629,10 +647,12 @@ files:
|
|
629
647
|
- lib/middleman/features/directory_indexes.rb
|
630
648
|
- lib/middleman/features/lorem.rb
|
631
649
|
- lib/middleman/features/minify_css.rb
|
650
|
+
- lib/middleman/features/minify_css/cssmin.rb
|
632
651
|
- lib/middleman/features/minify_javascript.rb
|
633
652
|
- lib/middleman/features/relative_assets.rb
|
634
653
|
- lib/middleman/guard.rb
|
635
654
|
- lib/middleman/renderers/coffee_script.rb
|
655
|
+
- lib/middleman/renderers/erb.rb
|
636
656
|
- lib/middleman/renderers/haml.rb
|
637
657
|
- lib/middleman/renderers/liquid.rb
|
638
658
|
- lib/middleman/renderers/markdown.rb
|
@@ -865,12 +885,15 @@ test_files:
|
|
865
885
|
- fixtures/relative-app/source/images/blank.gif
|
866
886
|
- fixtures/relative-app/source/stylesheets/relative_assets.css.sass
|
867
887
|
- fixtures/sprockets-app/config.rb
|
868
|
-
- fixtures/sprockets-app/source/library/
|
869
|
-
- fixtures/sprockets-app/source/library/
|
870
|
-
- fixtures/sprockets-app/source/library/
|
871
|
-
- fixtures/sprockets-app/source/library/
|
872
|
-
- fixtures/sprockets-app/source/library/
|
873
|
-
- fixtures/sprockets-app/source/library/
|
888
|
+
- fixtures/sprockets-app/source/library/css/plain.css
|
889
|
+
- fixtures/sprockets-app/source/library/css/sprockets_base1.css.scss
|
890
|
+
- fixtures/sprockets-app/source/library/css/sprockets_base2.css.scss
|
891
|
+
- fixtures/sprockets-app/source/library/css/sprockets_sub.css.scss
|
892
|
+
- fixtures/sprockets-app/source/library/js/jquery_include.js
|
893
|
+
- fixtures/sprockets-app/source/library/js/plain.js
|
894
|
+
- fixtures/sprockets-app/source/library/js/sprockets_base.js
|
895
|
+
- fixtures/sprockets-app/source/library/js/sprockets_sub.js
|
896
|
+
- fixtures/sprockets-app/source/library/stylesheets/bootstrap_include.css.scss
|
874
897
|
- fixtures/test-app/config.rb
|
875
898
|
- fixtures/test-app/data/test.yml
|
876
899
|
- fixtures/test-app/data/test2.json
|