diff --git a/lib/middleman.rb b/lib/middleman.rb
old mode 100755
new mode 100644
diff --git a/lib/middleman/builder.rb b/lib/middleman/builder.rb
old mode 100644
new mode 100755
diff --git a/lib/middleman/config.ru b/lib/middleman/config.ru
old mode 100755
new mode 100644
diff --git a/lib/middleman/fastimage.rb b/lib/middleman/fastimage.rb
old mode 100755
new mode 100644
diff --git a/lib/middleman/features/automatic_image_sizes.rb b/lib/middleman/features/automatic_image_sizes.rb
old mode 100755
new mode 100644
diff --git a/lib/middleman/features/cache_buster.rb b/lib/middleman/features/cache_buster.rb
old mode 100755
new mode 100644
diff --git a/lib/middleman/features/growl.rb b/lib/middleman/features/growl.rb
old mode 100755
new mode 100644
diff --git a/lib/middleman/features/maruku.rb b/lib/middleman/features/maruku.rb
old mode 100755
new mode 100644
diff --git a/lib/middleman/features/minify_javascript.rb b/lib/middleman/features/minify_javascript.rb
old mode 100755
new mode 100644
diff --git a/lib/middleman/features/relative_assets.rb b/lib/middleman/features/relative_assets.rb
old mode 100755
new mode 100644
diff --git a/lib/middleman/features/slickmap.rb b/lib/middleman/features/slickmap.rb
old mode 100755
new mode 100644
diff --git a/lib/middleman/haml.rb b/lib/middleman/haml.rb
old mode 100755
new mode 100644
diff --git a/lib/middleman/helpers.rb b/lib/middleman/helpers.rb
old mode 100755
new mode 100644
index abf986ff..d672dd9f
--- a/lib/middleman/helpers.rb
+++ b/lib/middleman/helpers.rb
@@ -10,11 +10,12 @@ module Middleman
haml name.to_sym, options.merge(:layout => false)
end
- def auto_stylesheet_link_tag
+ def auto_stylesheet_link_tag(separator="/")
path = request.path_info.dup
path << self.class.index_file if path.match(%r{/$})
path = path.gsub(%r{^/}, '')
path = path.gsub(File.extname(path), '')
+ path = path.gsub("/", separator)
css_file = File.join(self.class.public, self.class.css_dir, "#{path}.css")
sass_file = File.join(self.class.views, self.class.css_dir, "#{path}.css.sass")
diff --git a/lib/middleman/rack/sprockets+ruby19.rb b/lib/middleman/rack/sprockets+ruby19.rb
old mode 100755
new mode 100644
diff --git a/lib/middleman/template/views/layout.haml b/lib/middleman/template/views/layout.haml
old mode 100644
new mode 100755
diff --git a/lib/middleman/template/views/stylesheets/site.css.sass b/lib/middleman/template/views/stylesheets/site.css.sass
old mode 100644
new mode 100755
diff --git a/lib/middleman/vendor/bin/compass b/lib/middleman/vendor/bin/compass
index 326af1f9..002bb4fa 100755
--- a/lib/middleman/vendor/bin/compass
+++ b/lib/middleman/vendor/bin/compass
@@ -1,3 +1,3 @@
-#!/System/Library/Frameworks/Ruby.framework/Versions/1.8/usr/bin/ruby
-require File.join(File.dirname(__FILE__), "../gems/environment")
-load File.join(File.dirname(__FILE__), "../gems/gems/compass-0.10.0.pre2/bin/compass")
\ No newline at end of file
+#!/Users/tdreyno/homebrew/Cellar/ruby/1.9.1-p243/bin/ruby
+require File.expand_path(File.join(File.dirname(__FILE__), "../gems/environment"))
+load File.expand_path(File.join(File.dirname(__FILE__), "../gems/gems/compass-0.10.0.pre2/bin/compass"))
\ No newline at end of file
diff --git a/lib/middleman/vendor/bin/css2sass b/lib/middleman/vendor/bin/css2sass
index f313d777..59340af0 100755
--- a/lib/middleman/vendor/bin/css2sass
+++ b/lib/middleman/vendor/bin/css2sass
@@ -1,3 +1,3 @@
-#!/System/Library/Frameworks/Ruby.framework/Versions/1.8/usr/bin/ruby
-require File.join(File.dirname(__FILE__), "../gems/environment")
-load File.join(File.dirname(__FILE__), "../gems/gems/haml-2.2.15/bin/css2sass")
\ No newline at end of file
+#!/Users/tdreyno/homebrew/Cellar/ruby/1.9.1-p243/bin/ruby
+require File.expand_path(File.join(File.dirname(__FILE__), "../gems/environment"))
+load File.expand_path(File.join(File.dirname(__FILE__), "../gems/gems/haml-2.2.16/bin/css2sass"))
\ No newline at end of file
diff --git a/lib/middleman/vendor/bin/edit_json.rb b/lib/middleman/vendor/bin/edit_json.rb
index 69acc5d1..e28fb2c5 100755
--- a/lib/middleman/vendor/bin/edit_json.rb
+++ b/lib/middleman/vendor/bin/edit_json.rb
@@ -1,3 +1,3 @@
-#!/System/Library/Frameworks/Ruby.framework/Versions/1.8/usr/bin/ruby
-require File.join(File.dirname(__FILE__), "../gems/environment")
-load File.join(File.dirname(__FILE__), "../gems/gems/json-1.2.0/bin/edit_json.rb")
\ No newline at end of file
+#!/Users/tdreyno/homebrew/Cellar/ruby/1.9.1-p243/bin/ruby
+require File.expand_path(File.join(File.dirname(__FILE__), "../gems/environment"))
+load File.expand_path(File.join(File.dirname(__FILE__), "../gems/gems/json_pure-1.2.0/bin/edit_json.rb"))
\ No newline at end of file
diff --git a/lib/middleman/vendor/bin/haml b/lib/middleman/vendor/bin/haml
index 8e7ea094..503b85c5 100755
--- a/lib/middleman/vendor/bin/haml
+++ b/lib/middleman/vendor/bin/haml
@@ -1,3 +1,3 @@
-#!/System/Library/Frameworks/Ruby.framework/Versions/1.8/usr/bin/ruby
-require File.join(File.dirname(__FILE__), "../gems/environment")
-load File.join(File.dirname(__FILE__), "../gems/gems/haml-2.2.15/bin/haml")
\ No newline at end of file
+#!/Users/tdreyno/homebrew/Cellar/ruby/1.9.1-p243/bin/ruby
+require File.expand_path(File.join(File.dirname(__FILE__), "../gems/environment"))
+load File.expand_path(File.join(File.dirname(__FILE__), "../gems/gems/haml-2.2.16/bin/haml"))
\ No newline at end of file
diff --git a/lib/middleman/vendor/bin/html2haml b/lib/middleman/vendor/bin/html2haml
index 71aae8d9..2f48a865 100755
--- a/lib/middleman/vendor/bin/html2haml
+++ b/lib/middleman/vendor/bin/html2haml
@@ -1,3 +1,3 @@
-#!/System/Library/Frameworks/Ruby.framework/Versions/1.8/usr/bin/ruby
-require File.join(File.dirname(__FILE__), "../gems/environment")
-load File.join(File.dirname(__FILE__), "../gems/gems/haml-2.2.15/bin/html2haml")
\ No newline at end of file
+#!/Users/tdreyno/homebrew/Cellar/ruby/1.9.1-p243/bin/ruby
+require File.expand_path(File.join(File.dirname(__FILE__), "../gems/environment"))
+load File.expand_path(File.join(File.dirname(__FILE__), "../gems/gems/haml-2.2.16/bin/html2haml"))
\ No newline at end of file
diff --git a/lib/middleman/vendor/bin/htmldiff b/lib/middleman/vendor/bin/htmldiff
index c2f78731..eb611123 100755
--- a/lib/middleman/vendor/bin/htmldiff
+++ b/lib/middleman/vendor/bin/htmldiff
@@ -1,3 +1,3 @@
-#!/System/Library/Frameworks/Ruby.framework/Versions/1.8/usr/bin/ruby
-require File.join(File.dirname(__FILE__), "../gems/environment")
-load File.join(File.dirname(__FILE__), "../gems/gems/diff-lcs-1.1.2/bin/htmldiff")
\ No newline at end of file
+#!/Users/tdreyno/homebrew/Cellar/ruby/1.9.1-p243/bin/ruby
+require File.expand_path(File.join(File.dirname(__FILE__), "../gems/environment"))
+load File.expand_path(File.join(File.dirname(__FILE__), "../gems/gems/diff-lcs-1.1.2/bin/htmldiff"))
\ No newline at end of file
diff --git a/lib/middleman/vendor/bin/launchy b/lib/middleman/vendor/bin/launchy
index ebc55a95..f2ef7636 100755
--- a/lib/middleman/vendor/bin/launchy
+++ b/lib/middleman/vendor/bin/launchy
@@ -1,3 +1,3 @@
-#!/System/Library/Frameworks/Ruby.framework/Versions/1.8/usr/bin/ruby
-require File.join(File.dirname(__FILE__), "../gems/environment")
-load File.join(File.dirname(__FILE__), "../gems/gems/launchy-0.3.3/bin/launchy")
\ No newline at end of file
+#!/Users/tdreyno/homebrew/Cellar/ruby/1.9.1-p243/bin/ruby
+require File.expand_path(File.join(File.dirname(__FILE__), "../gems/environment"))
+load File.expand_path(File.join(File.dirname(__FILE__), "../gems/gems/launchy-0.3.5/bin/launchy"))
\ No newline at end of file
diff --git a/lib/middleman/vendor/bin/ldiff b/lib/middleman/vendor/bin/ldiff
index 1ab75e7e..86c72ad1 100755
--- a/lib/middleman/vendor/bin/ldiff
+++ b/lib/middleman/vendor/bin/ldiff
@@ -1,3 +1,3 @@
-#!/System/Library/Frameworks/Ruby.framework/Versions/1.8/usr/bin/ruby
-require File.join(File.dirname(__FILE__), "../gems/environment")
-load File.join(File.dirname(__FILE__), "../gems/gems/diff-lcs-1.1.2/bin/ldiff")
\ No newline at end of file
+#!/Users/tdreyno/homebrew/Cellar/ruby/1.9.1-p243/bin/ruby
+require File.expand_path(File.join(File.dirname(__FILE__), "../gems/environment"))
+load File.expand_path(File.join(File.dirname(__FILE__), "../gems/gems/diff-lcs-1.1.2/bin/ldiff"))
\ No newline at end of file
diff --git a/lib/middleman/vendor/bin/prettify_json.rb b/lib/middleman/vendor/bin/prettify_json.rb
index a2fbce0e..964f4480 100755
--- a/lib/middleman/vendor/bin/prettify_json.rb
+++ b/lib/middleman/vendor/bin/prettify_json.rb
@@ -1,3 +1,3 @@
-#!/System/Library/Frameworks/Ruby.framework/Versions/1.8/usr/bin/ruby
-require File.join(File.dirname(__FILE__), "../gems/environment")
-load File.join(File.dirname(__FILE__), "../gems/gems/json-1.2.0/bin/prettify_json.rb")
\ No newline at end of file
+#!/Users/tdreyno/homebrew/Cellar/ruby/1.9.1-p243/bin/ruby
+require File.expand_path(File.join(File.dirname(__FILE__), "../gems/environment"))
+load File.expand_path(File.join(File.dirname(__FILE__), "../gems/gems/json_pure-1.2.0/bin/prettify_json.rb"))
\ No newline at end of file
diff --git a/lib/middleman/vendor/bin/rackup b/lib/middleman/vendor/bin/rackup
index 04f66249..9f5d2668 100755
--- a/lib/middleman/vendor/bin/rackup
+++ b/lib/middleman/vendor/bin/rackup
@@ -1,3 +1,3 @@
-#!/System/Library/Frameworks/Ruby.framework/Versions/1.8/usr/bin/ruby
-require File.join(File.dirname(__FILE__), "../gems/environment")
-load File.join(File.dirname(__FILE__), "../gems/gems/rack-1.0.1/bin/rackup")
\ No newline at end of file
+#!/Users/tdreyno/homebrew/Cellar/ruby/1.9.1-p243/bin/ruby
+require File.expand_path(File.join(File.dirname(__FILE__), "../gems/environment"))
+load File.expand_path(File.join(File.dirname(__FILE__), "../gems/gems/rack-1.0.1/bin/rackup"))
\ No newline at end of file
diff --git a/lib/middleman/vendor/bin/rake b/lib/middleman/vendor/bin/rake
index 8a94b7cc..ab1f1e0e 100755
--- a/lib/middleman/vendor/bin/rake
+++ b/lib/middleman/vendor/bin/rake
@@ -1,3 +1,3 @@
-#!/System/Library/Frameworks/Ruby.framework/Versions/1.8/usr/bin/ruby
-require File.join(File.dirname(__FILE__), "../gems/environment")
-load File.join(File.dirname(__FILE__), "../gems/gems/rake-0.8.7/bin/rake")
\ No newline at end of file
+#!/Users/tdreyno/homebrew/Cellar/ruby/1.9.1-p243/bin/ruby
+require File.expand_path(File.join(File.dirname(__FILE__), "../gems/environment"))
+load File.expand_path(File.join(File.dirname(__FILE__), "../gems/gems/rake-0.8.7/bin/rake"))
\ No newline at end of file
diff --git a/lib/middleman/vendor/bin/sass b/lib/middleman/vendor/bin/sass
index 95f5c39a..87fa858e 100755
--- a/lib/middleman/vendor/bin/sass
+++ b/lib/middleman/vendor/bin/sass
@@ -1,3 +1,3 @@
-#!/System/Library/Frameworks/Ruby.framework/Versions/1.8/usr/bin/ruby
-require File.join(File.dirname(__FILE__), "../gems/environment")
-load File.join(File.dirname(__FILE__), "../gems/gems/haml-2.2.15/bin/sass")
\ No newline at end of file
+#!/Users/tdreyno/homebrew/Cellar/ruby/1.9.1-p243/bin/ruby
+require File.expand_path(File.join(File.dirname(__FILE__), "../gems/environment"))
+load File.expand_path(File.join(File.dirname(__FILE__), "../gems/gems/haml-2.2.16/bin/sass"))
\ No newline at end of file
diff --git a/lib/middleman/vendor/bin/shotgun b/lib/middleman/vendor/bin/shotgun
index 7d3cc578..ee9e217f 100755
--- a/lib/middleman/vendor/bin/shotgun
+++ b/lib/middleman/vendor/bin/shotgun
@@ -1,3 +1,3 @@
-#!/System/Library/Frameworks/Ruby.framework/Versions/1.8/usr/bin/ruby
-require File.join(File.dirname(__FILE__), "../gems/environment")
-load File.join(File.dirname(__FILE__), "../gems/gems/shotgun-0.4/bin/shotgun")
\ No newline at end of file
+#!/Users/tdreyno/homebrew/Cellar/ruby/1.9.1-p243/bin/ruby
+require File.expand_path(File.join(File.dirname(__FILE__), "../gems/environment"))
+load File.expand_path(File.join(File.dirname(__FILE__), "../gems/gems/shotgun-0.4/bin/shotgun"))
\ No newline at end of file
diff --git a/lib/middleman/vendor/bin/smusher b/lib/middleman/vendor/bin/smusher
index d1f2dfc4..ee7ddef7 100755
--- a/lib/middleman/vendor/bin/smusher
+++ b/lib/middleman/vendor/bin/smusher
@@ -1,3 +1,3 @@
-#!/System/Library/Frameworks/Ruby.framework/Versions/1.8/usr/bin/ruby
-require File.join(File.dirname(__FILE__), "../gems/environment")
-load File.join(File.dirname(__FILE__), "../gems/gems/smusher-0.4.2/bin/smusher")
\ No newline at end of file
+#!/Users/tdreyno/homebrew/Cellar/ruby/1.9.1-p243/bin/ruby
+require File.expand_path(File.join(File.dirname(__FILE__), "../gems/environment"))
+load File.expand_path(File.join(File.dirname(__FILE__), "../gems/gems/smusher-0.4.2/bin/smusher"))
\ No newline at end of file
diff --git a/lib/middleman/vendor/bin/sprocketize b/lib/middleman/vendor/bin/sprocketize
index f4f4dab0..807b5b72 100755
--- a/lib/middleman/vendor/bin/sprocketize
+++ b/lib/middleman/vendor/bin/sprocketize
@@ -1,3 +1,3 @@
-#!/System/Library/Frameworks/Ruby.framework/Versions/1.8/usr/bin/ruby
-require File.join(File.dirname(__FILE__), "../gems/environment")
-load File.join(File.dirname(__FILE__), "../gems/gems/sprockets-1.0.2/bin/sprocketize")
\ No newline at end of file
+#!/Users/tdreyno/homebrew/Cellar/ruby/1.9.1-p243/bin/ruby
+require File.expand_path(File.join(File.dirname(__FILE__), "../gems/environment"))
+load File.expand_path(File.join(File.dirname(__FILE__), "../gems/gems/sprockets-1.0.2/bin/sprocketize"))
\ No newline at end of file
diff --git a/lib/middleman/vendor/gems/cache/configuration-1.1.0.gem b/lib/middleman/vendor/gems/cache/configuration-1.1.0.gem
old mode 100755
new mode 100644
diff --git a/lib/middleman/vendor/gems/cache/diff-lcs-1.1.2.gem b/lib/middleman/vendor/gems/cache/diff-lcs-1.1.2.gem
old mode 100755
new mode 100644
diff --git a/lib/middleman/vendor/gems/cache/extlib-0.9.13.gem b/lib/middleman/vendor/gems/cache/extlib-0.9.13.gem
deleted file mode 100755
index 3ef00baa..00000000
Binary files a/lib/middleman/vendor/gems/cache/extlib-0.9.13.gem and /dev/null differ
diff --git a/lib/middleman/vendor/gems/cache/fancy-buttons-0.3.6.gem b/lib/middleman/vendor/gems/cache/fancy-buttons-0.3.6.gem
deleted file mode 100644
index 433de1ca..00000000
Binary files a/lib/middleman/vendor/gems/cache/fancy-buttons-0.3.6.gem and /dev/null differ
diff --git a/lib/middleman/vendor/gems/cache/fancy-buttons-0.3.7.gem b/lib/middleman/vendor/gems/cache/fancy-buttons-0.3.7.gem
new file mode 100644
index 00000000..9d34b591
Binary files /dev/null and b/lib/middleman/vendor/gems/cache/fancy-buttons-0.3.7.gem differ
diff --git a/lib/middleman/vendor/gems/cache/haml-2.2.15.gem b/lib/middleman/vendor/gems/cache/haml-2.2.15.gem
deleted file mode 100644
index ee236b0c..00000000
Binary files a/lib/middleman/vendor/gems/cache/haml-2.2.15.gem and /dev/null differ
diff --git a/lib/middleman/vendor/gems/cache/haml-2.2.16.gem b/lib/middleman/vendor/gems/cache/haml-2.2.16.gem
new file mode 100644
index 00000000..3b4dfc2b
Binary files /dev/null and b/lib/middleman/vendor/gems/cache/haml-2.2.16.gem differ
diff --git a/lib/middleman/vendor/gems/cache/highline-1.5.1.gem b/lib/middleman/vendor/gems/cache/highline-1.5.1.gem
old mode 100755
new mode 100644
diff --git a/lib/middleman/vendor/gems/cache/launchy-0.3.3.gem b/lib/middleman/vendor/gems/cache/launchy-0.3.3.gem
deleted file mode 100755
index b915520e..00000000
Binary files a/lib/middleman/vendor/gems/cache/launchy-0.3.3.gem and /dev/null differ
diff --git a/lib/middleman/vendor/gems/cache/launchy-0.3.5.gem b/lib/middleman/vendor/gems/cache/launchy-0.3.5.gem
new file mode 100644
index 00000000..1c4752d7
Binary files /dev/null and b/lib/middleman/vendor/gems/cache/launchy-0.3.5.gem differ
diff --git a/lib/middleman/vendor/gems/cache/rack-1.0.1.gem b/lib/middleman/vendor/gems/cache/rack-1.0.1.gem
old mode 100755
new mode 100644
diff --git a/lib/middleman/vendor/gems/cache/rake-0.8.7.gem b/lib/middleman/vendor/gems/cache/rake-0.8.7.gem
old mode 100755
new mode 100644
diff --git a/lib/middleman/vendor/gems/cache/shotgun-0.4.gem b/lib/middleman/vendor/gems/cache/shotgun-0.4.gem
old mode 100755
new mode 100644
diff --git a/lib/middleman/vendor/gems/cache/sinatra-0.9.4.gem b/lib/middleman/vendor/gems/cache/sinatra-0.9.4.gem
old mode 100755
new mode 100644
diff --git a/lib/middleman/vendor/gems/cache/sprockets-1.0.2.gem b/lib/middleman/vendor/gems/cache/sprockets-1.0.2.gem
old mode 100755
new mode 100644
diff --git a/lib/middleman/vendor/gems/cache/templater-1.0.0.gem b/lib/middleman/vendor/gems/cache/templater-1.0.0.gem
old mode 100755
new mode 100644
diff --git a/lib/middleman/vendor/gems/environment.rb b/lib/middleman/vendor/gems/environment.rb
index 41b60d24..a4705bbe 100644
--- a/lib/middleman/vendor/gems/environment.rb
+++ b/lib/middleman/vendor/gems/environment.rb
@@ -6,106 +6,106 @@ module Bundler
ENV["PATH"] = "#{dir}/../bin:#{ENV["PATH"]}"
ENV["RUBYOPT"] = "-r#{file} #{ENV["RUBYOPT"]}"
- $LOAD_PATH.unshift File.expand_path("#{dir}/gems/configuration-1.1.0/bin")
- $LOAD_PATH.unshift File.expand_path("#{dir}/gems/configuration-1.1.0/lib")
- $LOAD_PATH.unshift File.expand_path("#{dir}/gems/json_pure-1.2.0/bin")
- $LOAD_PATH.unshift File.expand_path("#{dir}/gems/json_pure-1.2.0/lib")
- $LOAD_PATH.unshift File.expand_path("#{dir}/gems/extlib-0.9.14/bin")
- $LOAD_PATH.unshift File.expand_path("#{dir}/gems/extlib-0.9.14/lib")
+ $LOAD_PATH.unshift File.expand_path("#{dir}/gems/highline-1.5.1/bin")
+ $LOAD_PATH.unshift File.expand_path("#{dir}/gems/highline-1.5.1/lib")
+ $LOAD_PATH.unshift File.expand_path("#{dir}/gems/diff-lcs-1.1.2/bin")
+ $LOAD_PATH.unshift File.expand_path("#{dir}/gems/diff-lcs-1.1.2/lib")
+ $LOAD_PATH.unshift File.expand_path("#{dir}/gems/templater-1.0.0/bin")
+ $LOAD_PATH.unshift File.expand_path("#{dir}/gems/templater-1.0.0/lib")
$LOAD_PATH.unshift File.expand_path("#{dir}/gems/json-1.2.0/bin")
$LOAD_PATH.unshift File.expand_path("#{dir}/gems/json-1.2.0/ext/json/ext")
$LOAD_PATH.unshift File.expand_path("#{dir}/gems/json-1.2.0/ext")
$LOAD_PATH.unshift File.expand_path("#{dir}/gems/json-1.2.0/lib")
- $LOAD_PATH.unshift File.expand_path("#{dir}/gems/yui-compressor-0.9.1/bin")
- $LOAD_PATH.unshift File.expand_path("#{dir}/gems/yui-compressor-0.9.1/lib")
+ $LOAD_PATH.unshift File.expand_path("#{dir}/gems/json_pure-1.2.0/bin")
+ $LOAD_PATH.unshift File.expand_path("#{dir}/gems/json_pure-1.2.0/lib")
+ $LOAD_PATH.unshift File.expand_path("#{dir}/gems/extlib-0.9.14/bin")
+ $LOAD_PATH.unshift File.expand_path("#{dir}/gems/extlib-0.9.14/lib")
+ $LOAD_PATH.unshift File.expand_path("#{dir}/gems/httpclient-2.1.5.2/bin")
+ $LOAD_PATH.unshift File.expand_path("#{dir}/gems/httpclient-2.1.5.2/lib")
+ $LOAD_PATH.unshift File.expand_path("#{dir}/gems/rake-0.8.7/bin")
+ $LOAD_PATH.unshift File.expand_path("#{dir}/gems/rake-0.8.7/lib")
+ $LOAD_PATH.unshift File.expand_path("#{dir}/gems/sprockets-1.0.2/bin")
+ $LOAD_PATH.unshift File.expand_path("#{dir}/gems/sprockets-1.0.2/lib")
$LOAD_PATH.unshift File.expand_path("#{dir}/gems/rack-1.0.1/bin")
$LOAD_PATH.unshift File.expand_path("#{dir}/gems/rack-1.0.1/lib")
$LOAD_PATH.unshift File.expand_path("#{dir}/gems/rack-test-0.5.3/bin")
$LOAD_PATH.unshift File.expand_path("#{dir}/gems/rack-test-0.5.3/lib")
- $LOAD_PATH.unshift File.expand_path("#{dir}/gems/sinatra-0.9.4/bin")
- $LOAD_PATH.unshift File.expand_path("#{dir}/gems/sinatra-0.9.4/lib")
- $LOAD_PATH.unshift File.expand_path("#{dir}/gems/rake-0.8.7/bin")
- $LOAD_PATH.unshift File.expand_path("#{dir}/gems/rake-0.8.7/lib")
- $LOAD_PATH.unshift File.expand_path("#{dir}/gems/launchy-0.3.3/bin")
- $LOAD_PATH.unshift File.expand_path("#{dir}/gems/launchy-0.3.3/lib")
+ $LOAD_PATH.unshift File.expand_path("#{dir}/gems/configuration-1.1.0/bin")
+ $LOAD_PATH.unshift File.expand_path("#{dir}/gems/configuration-1.1.0/lib")
+ $LOAD_PATH.unshift File.expand_path("#{dir}/gems/launchy-0.3.5/bin")
+ $LOAD_PATH.unshift File.expand_path("#{dir}/gems/launchy-0.3.5/lib")
$LOAD_PATH.unshift File.expand_path("#{dir}/gems/shotgun-0.4/bin")
$LOAD_PATH.unshift File.expand_path("#{dir}/gems/shotgun-0.4/lib")
- $LOAD_PATH.unshift File.expand_path("#{dir}/gems/haml-2.2.15/bin")
- $LOAD_PATH.unshift File.expand_path("#{dir}/gems/haml-2.2.15/lib")
- $LOAD_PATH.unshift File.expand_path("#{dir}/gems/sprockets-1.0.2/bin")
- $LOAD_PATH.unshift File.expand_path("#{dir}/gems/sprockets-1.0.2/lib")
- $LOAD_PATH.unshift File.expand_path("#{dir}/gems/diff-lcs-1.1.2/bin")
- $LOAD_PATH.unshift File.expand_path("#{dir}/gems/diff-lcs-1.1.2/lib")
- $LOAD_PATH.unshift File.expand_path("#{dir}/gems/highline-1.5.1/bin")
- $LOAD_PATH.unshift File.expand_path("#{dir}/gems/highline-1.5.1/lib")
- $LOAD_PATH.unshift File.expand_path("#{dir}/gems/templater-1.0.0/bin")
- $LOAD_PATH.unshift File.expand_path("#{dir}/gems/templater-1.0.0/lib")
- $LOAD_PATH.unshift File.expand_path("#{dir}/gems/httpclient-2.1.5.2/bin")
- $LOAD_PATH.unshift File.expand_path("#{dir}/gems/httpclient-2.1.5.2/lib")
+ $LOAD_PATH.unshift File.expand_path("#{dir}/gems/sinatra-0.9.4/bin")
+ $LOAD_PATH.unshift File.expand_path("#{dir}/gems/sinatra-0.9.4/lib")
+ $LOAD_PATH.unshift File.expand_path("#{dir}/gems/haml-2.2.16/bin")
+ $LOAD_PATH.unshift File.expand_path("#{dir}/gems/haml-2.2.16/lib")
+ $LOAD_PATH.unshift File.expand_path("#{dir}/gems/sinatra-content-for-0.2/bin")
+ $LOAD_PATH.unshift File.expand_path("#{dir}/gems/sinatra-content-for-0.2/lib")
+ $LOAD_PATH.unshift File.expand_path("#{dir}/gems/yui-compressor-0.9.1/bin")
+ $LOAD_PATH.unshift File.expand_path("#{dir}/gems/yui-compressor-0.9.1/lib")
+ $LOAD_PATH.unshift File.expand_path("#{dir}/gems/smusher-0.4.2/bin")
+ $LOAD_PATH.unshift File.expand_path("#{dir}/gems/smusher-0.4.2/lib")
$LOAD_PATH.unshift File.expand_path("#{dir}/gems/compass-0.10.0.pre2/bin")
$LOAD_PATH.unshift File.expand_path("#{dir}/gems/compass-0.10.0.pre2/lib")
$LOAD_PATH.unshift File.expand_path("#{dir}/gems/compass-slickmap-0.2.3/bin")
$LOAD_PATH.unshift File.expand_path("#{dir}/gems/compass-slickmap-0.2.3/lib")
$LOAD_PATH.unshift File.expand_path("#{dir}/gems/compass-colors-0.3.1/bin")
$LOAD_PATH.unshift File.expand_path("#{dir}/gems/compass-colors-0.3.1/lib")
- $LOAD_PATH.unshift File.expand_path("#{dir}/gems/smusher-0.4.2/bin")
- $LOAD_PATH.unshift File.expand_path("#{dir}/gems/smusher-0.4.2/lib")
- $LOAD_PATH.unshift File.expand_path("#{dir}/gems/sinatra-content-for-0.2/bin")
- $LOAD_PATH.unshift File.expand_path("#{dir}/gems/sinatra-content-for-0.2/lib")
- $LOAD_PATH.unshift File.expand_path("#{dir}/gems/fancy-buttons-0.3.6/bin")
- $LOAD_PATH.unshift File.expand_path("#{dir}/gems/fancy-buttons-0.3.6/lib")
+ $LOAD_PATH.unshift File.expand_path("#{dir}/gems/fancy-buttons-0.3.7/bin")
+ $LOAD_PATH.unshift File.expand_path("#{dir}/gems/fancy-buttons-0.3.7/lib")
@gemfile = "#{dir}/../../../../Gemfile"
require "rubygems"
@bundled_specs = {}
- @bundled_specs["configuration"] = eval(File.read("#{dir}/specifications/configuration-1.1.0.gemspec"))
- @bundled_specs["configuration"].loaded_from = "#{dir}/specifications/configuration-1.1.0.gemspec"
+ @bundled_specs["highline"] = eval(File.read("#{dir}/specifications/highline-1.5.1.gemspec"))
+ @bundled_specs["highline"].loaded_from = "#{dir}/specifications/highline-1.5.1.gemspec"
+ @bundled_specs["diff-lcs"] = eval(File.read("#{dir}/specifications/diff-lcs-1.1.2.gemspec"))
+ @bundled_specs["diff-lcs"].loaded_from = "#{dir}/specifications/diff-lcs-1.1.2.gemspec"
+ @bundled_specs["templater"] = eval(File.read("#{dir}/specifications/templater-1.0.0.gemspec"))
+ @bundled_specs["templater"].loaded_from = "#{dir}/specifications/templater-1.0.0.gemspec"
+ @bundled_specs["json"] = eval(File.read("#{dir}/specifications/json-1.2.0.gemspec"))
+ @bundled_specs["json"].loaded_from = "#{dir}/specifications/json-1.2.0.gemspec"
@bundled_specs["json_pure"] = eval(File.read("#{dir}/specifications/json_pure-1.2.0.gemspec"))
@bundled_specs["json_pure"].loaded_from = "#{dir}/specifications/json_pure-1.2.0.gemspec"
@bundled_specs["extlib"] = eval(File.read("#{dir}/specifications/extlib-0.9.14.gemspec"))
@bundled_specs["extlib"].loaded_from = "#{dir}/specifications/extlib-0.9.14.gemspec"
- @bundled_specs["json"] = eval(File.read("#{dir}/specifications/json-1.2.0.gemspec"))
- @bundled_specs["json"].loaded_from = "#{dir}/specifications/json-1.2.0.gemspec"
- @bundled_specs["yui-compressor"] = eval(File.read("#{dir}/specifications/yui-compressor-0.9.1.gemspec"))
- @bundled_specs["yui-compressor"].loaded_from = "#{dir}/specifications/yui-compressor-0.9.1.gemspec"
+ @bundled_specs["httpclient"] = eval(File.read("#{dir}/specifications/httpclient-2.1.5.2.gemspec"))
+ @bundled_specs["httpclient"].loaded_from = "#{dir}/specifications/httpclient-2.1.5.2.gemspec"
+ @bundled_specs["rake"] = eval(File.read("#{dir}/specifications/rake-0.8.7.gemspec"))
+ @bundled_specs["rake"].loaded_from = "#{dir}/specifications/rake-0.8.7.gemspec"
+ @bundled_specs["sprockets"] = eval(File.read("#{dir}/specifications/sprockets-1.0.2.gemspec"))
+ @bundled_specs["sprockets"].loaded_from = "#{dir}/specifications/sprockets-1.0.2.gemspec"
@bundled_specs["rack"] = eval(File.read("#{dir}/specifications/rack-1.0.1.gemspec"))
@bundled_specs["rack"].loaded_from = "#{dir}/specifications/rack-1.0.1.gemspec"
@bundled_specs["rack-test"] = eval(File.read("#{dir}/specifications/rack-test-0.5.3.gemspec"))
@bundled_specs["rack-test"].loaded_from = "#{dir}/specifications/rack-test-0.5.3.gemspec"
- @bundled_specs["sinatra"] = eval(File.read("#{dir}/specifications/sinatra-0.9.4.gemspec"))
- @bundled_specs["sinatra"].loaded_from = "#{dir}/specifications/sinatra-0.9.4.gemspec"
- @bundled_specs["rake"] = eval(File.read("#{dir}/specifications/rake-0.8.7.gemspec"))
- @bundled_specs["rake"].loaded_from = "#{dir}/specifications/rake-0.8.7.gemspec"
- @bundled_specs["launchy"] = eval(File.read("#{dir}/specifications/launchy-0.3.3.gemspec"))
- @bundled_specs["launchy"].loaded_from = "#{dir}/specifications/launchy-0.3.3.gemspec"
+ @bundled_specs["configuration"] = eval(File.read("#{dir}/specifications/configuration-1.1.0.gemspec"))
+ @bundled_specs["configuration"].loaded_from = "#{dir}/specifications/configuration-1.1.0.gemspec"
+ @bundled_specs["launchy"] = eval(File.read("#{dir}/specifications/launchy-0.3.5.gemspec"))
+ @bundled_specs["launchy"].loaded_from = "#{dir}/specifications/launchy-0.3.5.gemspec"
@bundled_specs["shotgun"] = eval(File.read("#{dir}/specifications/shotgun-0.4.gemspec"))
@bundled_specs["shotgun"].loaded_from = "#{dir}/specifications/shotgun-0.4.gemspec"
- @bundled_specs["haml"] = eval(File.read("#{dir}/specifications/haml-2.2.15.gemspec"))
- @bundled_specs["haml"].loaded_from = "#{dir}/specifications/haml-2.2.15.gemspec"
- @bundled_specs["sprockets"] = eval(File.read("#{dir}/specifications/sprockets-1.0.2.gemspec"))
- @bundled_specs["sprockets"].loaded_from = "#{dir}/specifications/sprockets-1.0.2.gemspec"
- @bundled_specs["diff-lcs"] = eval(File.read("#{dir}/specifications/diff-lcs-1.1.2.gemspec"))
- @bundled_specs["diff-lcs"].loaded_from = "#{dir}/specifications/diff-lcs-1.1.2.gemspec"
- @bundled_specs["highline"] = eval(File.read("#{dir}/specifications/highline-1.5.1.gemspec"))
- @bundled_specs["highline"].loaded_from = "#{dir}/specifications/highline-1.5.1.gemspec"
- @bundled_specs["templater"] = eval(File.read("#{dir}/specifications/templater-1.0.0.gemspec"))
- @bundled_specs["templater"].loaded_from = "#{dir}/specifications/templater-1.0.0.gemspec"
- @bundled_specs["httpclient"] = eval(File.read("#{dir}/specifications/httpclient-2.1.5.2.gemspec"))
- @bundled_specs["httpclient"].loaded_from = "#{dir}/specifications/httpclient-2.1.5.2.gemspec"
+ @bundled_specs["sinatra"] = eval(File.read("#{dir}/specifications/sinatra-0.9.4.gemspec"))
+ @bundled_specs["sinatra"].loaded_from = "#{dir}/specifications/sinatra-0.9.4.gemspec"
+ @bundled_specs["haml"] = eval(File.read("#{dir}/specifications/haml-2.2.16.gemspec"))
+ @bundled_specs["haml"].loaded_from = "#{dir}/specifications/haml-2.2.16.gemspec"
+ @bundled_specs["sinatra-content-for"] = eval(File.read("#{dir}/specifications/sinatra-content-for-0.2.gemspec"))
+ @bundled_specs["sinatra-content-for"].loaded_from = "#{dir}/specifications/sinatra-content-for-0.2.gemspec"
+ @bundled_specs["yui-compressor"] = eval(File.read("#{dir}/specifications/yui-compressor-0.9.1.gemspec"))
+ @bundled_specs["yui-compressor"].loaded_from = "#{dir}/specifications/yui-compressor-0.9.1.gemspec"
+ @bundled_specs["smusher"] = eval(File.read("#{dir}/specifications/smusher-0.4.2.gemspec"))
+ @bundled_specs["smusher"].loaded_from = "#{dir}/specifications/smusher-0.4.2.gemspec"
@bundled_specs["compass"] = eval(File.read("#{dir}/specifications/compass-0.10.0.pre2.gemspec"))
@bundled_specs["compass"].loaded_from = "#{dir}/specifications/compass-0.10.0.pre2.gemspec"
@bundled_specs["compass-slickmap"] = eval(File.read("#{dir}/specifications/compass-slickmap-0.2.3.gemspec"))
@bundled_specs["compass-slickmap"].loaded_from = "#{dir}/specifications/compass-slickmap-0.2.3.gemspec"
@bundled_specs["compass-colors"] = eval(File.read("#{dir}/specifications/compass-colors-0.3.1.gemspec"))
@bundled_specs["compass-colors"].loaded_from = "#{dir}/specifications/compass-colors-0.3.1.gemspec"
- @bundled_specs["smusher"] = eval(File.read("#{dir}/specifications/smusher-0.4.2.gemspec"))
- @bundled_specs["smusher"].loaded_from = "#{dir}/specifications/smusher-0.4.2.gemspec"
- @bundled_specs["sinatra-content-for"] = eval(File.read("#{dir}/specifications/sinatra-content-for-0.2.gemspec"))
- @bundled_specs["sinatra-content-for"].loaded_from = "#{dir}/specifications/sinatra-content-for-0.2.gemspec"
- @bundled_specs["fancy-buttons"] = eval(File.read("#{dir}/specifications/fancy-buttons-0.3.6.gemspec"))
- @bundled_specs["fancy-buttons"].loaded_from = "#{dir}/specifications/fancy-buttons-0.3.6.gemspec"
+ @bundled_specs["fancy-buttons"] = eval(File.read("#{dir}/specifications/fancy-buttons-0.3.7.gemspec"))
+ @bundled_specs["fancy-buttons"].loaded_from = "#{dir}/specifications/fancy-buttons-0.3.7.gemspec"
def self.add_specs_to_loaded_specs
Gem.loaded_specs.merge! @bundled_specs
diff --git a/lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/examples/css3/extensions/fancy-fonts/templates/project/Vtks Revolt.ttf b/lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/examples/css3/extensions/fancy-fonts/templates/project/Vtks Revolt.ttf
old mode 100644
new mode 100755
diff --git a/lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/examples/css3/extensions/fancy-fonts/templates/project/angelina.ttf b/lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/examples/css3/extensions/fancy-fonts/templates/project/angelina.ttf
old mode 100644
new mode 100755
diff --git a/lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/lib/compass/frameworks/blueprint/templates/buttons/buttons/cross.png b/lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/lib/compass/frameworks/blueprint/templates/buttons/buttons/cross.png
old mode 100644
new mode 100755
diff --git a/lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/lib/compass/frameworks/blueprint/templates/buttons/buttons/key.png b/lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/lib/compass/frameworks/blueprint/templates/buttons/buttons/key.png
old mode 100644
new mode 100755
diff --git a/lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/lib/compass/frameworks/blueprint/templates/buttons/buttons/tick.png b/lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/lib/compass/frameworks/blueprint/templates/buttons/buttons/tick.png
old mode 100644
new mode 100755
diff --git a/lib/middleman/vendor/gems/gems/compass-slickmap-0.2.3/lib/slickmap.rb b/lib/middleman/vendor/gems/gems/compass-slickmap-0.2.3/lib/slickmap.rb
old mode 100644
new mode 100755
diff --git a/lib/middleman/vendor/gems/gems/compass-slickmap-0.2.3/lib/slickmap/compass_plugin.rb b/lib/middleman/vendor/gems/gems/compass-slickmap-0.2.3/lib/slickmap/compass_plugin.rb
old mode 100644
new mode 100755
diff --git a/lib/middleman/vendor/gems/gems/compass-slickmap-0.2.3/templates/project/manifest.rb b/lib/middleman/vendor/gems/gems/compass-slickmap-0.2.3/templates/project/manifest.rb
old mode 100644
new mode 100755
diff --git a/lib/middleman/vendor/gems/gems/compass-slickmap-0.2.3/templates/project/sitemap.sass b/lib/middleman/vendor/gems/gems/compass-slickmap-0.2.3/templates/project/sitemap.sass
old mode 100644
new mode 100755
diff --git a/lib/middleman/vendor/gems/gems/configuration-1.1.0/README b/lib/middleman/vendor/gems/gems/configuration-1.1.0/README
old mode 100755
new mode 100644
diff --git a/lib/middleman/vendor/gems/gems/configuration-1.1.0/README.erb b/lib/middleman/vendor/gems/gems/configuration-1.1.0/README.erb
old mode 100755
new mode 100644
diff --git a/lib/middleman/vendor/gems/gems/configuration-1.1.0/Rakefile b/lib/middleman/vendor/gems/gems/configuration-1.1.0/Rakefile
old mode 100755
new mode 100644
diff --git a/lib/middleman/vendor/gems/gems/diff-lcs-1.1.2/Install b/lib/middleman/vendor/gems/gems/diff-lcs-1.1.2/Install
old mode 100755
new mode 100644
diff --git a/lib/middleman/vendor/gems/gems/diff-lcs-1.1.2/README b/lib/middleman/vendor/gems/gems/diff-lcs-1.1.2/README
old mode 100755
new mode 100644
diff --git a/lib/middleman/vendor/gems/gems/extlib-0.9.14/Rakefile b/lib/middleman/vendor/gems/gems/extlib-0.9.14/Rakefile
old mode 100755
new mode 100644
diff --git a/lib/middleman/vendor/gems/gems/extlib-0.9.14/lib/extlib/logger.rb b/lib/middleman/vendor/gems/gems/extlib-0.9.14/lib/extlib/logger.rb
old mode 100755
new mode 100644
diff --git a/lib/middleman/vendor/gems/gems/fancy-buttons-0.3.6/README.markdown b/lib/middleman/vendor/gems/gems/fancy-buttons-0.3.7/README.markdown
similarity index 90%
rename from lib/middleman/vendor/gems/gems/fancy-buttons-0.3.6/README.markdown
rename to lib/middleman/vendor/gems/gems/fancy-buttons-0.3.7/README.markdown
index 225a6758..f572a44f 100644
--- a/lib/middleman/vendor/gems/gems/fancy-buttons-0.3.6/README.markdown
+++ b/lib/middleman/vendor/gems/gems/fancy-buttons-0.3.7/README.markdown
@@ -11,16 +11,13 @@ Without CSS gradient support:
## Install
Install the plugin:
-
+ sudo gem install compass --pre
sudo gem install fancy-buttons
-If you don't have compass colors 0.3.1
-
- sudo gem install compass-colors
To create a new project based on fancy-buttons:
- compass -r compass-colors -r fancy-buttons -f fancy-buttons your_project_name
+ compass -r compass-colors -r fancy-buttons -f fancy-buttons project_directory
To add fancy-buttons to an existing compass project:
@@ -29,7 +26,7 @@ To add fancy-buttons to an existing compass project:
require 'fancy-buttons'
# Then run the following command:
- compass -i -f fancy-buttons
+ compass -r fancy-buttons -f fancy-buttons project_directory
# Project Goals:
diff --git a/lib/middleman/vendor/gems/gems/fancy-buttons-0.3.6/Rakefile b/lib/middleman/vendor/gems/gems/fancy-buttons-0.3.7/Rakefile
similarity index 100%
rename from lib/middleman/vendor/gems/gems/fancy-buttons-0.3.6/Rakefile
rename to lib/middleman/vendor/gems/gems/fancy-buttons-0.3.7/Rakefile
diff --git a/lib/middleman/vendor/gems/gems/fancy-buttons-0.3.6/fancy-buttons.gemspec b/lib/middleman/vendor/gems/gems/fancy-buttons-0.3.7/fancy-buttons.gemspec
similarity index 97%
rename from lib/middleman/vendor/gems/gems/fancy-buttons-0.3.6/fancy-buttons.gemspec
rename to lib/middleman/vendor/gems/gems/fancy-buttons-0.3.7/fancy-buttons.gemspec
index 691a0c3c..c78d7bfd 100644
--- a/lib/middleman/vendor/gems/gems/fancy-buttons-0.3.6/fancy-buttons.gemspec
+++ b/lib/middleman/vendor/gems/gems/fancy-buttons-0.3.7/fancy-buttons.gemspec
@@ -5,11 +5,11 @@
Gem::Specification.new do |s|
s.name = %q{fancy-buttons}
- s.version = "0.3.6"
+ s.version = "0.3.7"
s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
s.authors = ["Brandon Mathis"]
- s.date = %q{2009-12-11}
+ s.date = %q{2009-12-15}
s.description = %q{Make fancy buttons with the Compass stylesheet authoring framework.}
s.email = %q{brandon@imathis.com}
s.extra_rdoc_files = [
diff --git a/lib/middleman/vendor/gems/gems/fancy-buttons-0.3.6/lib/fancy-buttons.rb b/lib/middleman/vendor/gems/gems/fancy-buttons-0.3.7/lib/fancy-buttons.rb
similarity index 100%
rename from lib/middleman/vendor/gems/gems/fancy-buttons-0.3.6/lib/fancy-buttons.rb
rename to lib/middleman/vendor/gems/gems/fancy-buttons-0.3.7/lib/fancy-buttons.rb
diff --git a/lib/middleman/vendor/gems/gems/fancy-buttons-0.3.6/lib/sass/_fancy_buttons.sass b/lib/middleman/vendor/gems/gems/fancy-buttons-0.3.7/lib/sass/_fancy_buttons.sass
similarity index 92%
rename from lib/middleman/vendor/gems/gems/fancy-buttons-0.3.6/lib/sass/_fancy_buttons.sass
rename to lib/middleman/vendor/gems/gems/fancy-buttons-0.3.7/lib/sass/_fancy_buttons.sass
index 4dbbf184..b21629bb 100644
--- a/lib/middleman/vendor/gems/gems/fancy-buttons-0.3.6/lib/sass/_fancy_buttons.sass
+++ b/lib/middleman/vendor/gems/gems/fancy-buttons-0.3.7/lib/sass/_fancy_buttons.sass
@@ -20,6 +20,8 @@
// Style the button's colors, picking the most appropriate color set for the base color.
=fancy-button-colors(!color = !fb_color, !hover = 0, !active = 0)
+fb-color(!color, "default")
+ &.disabled:active, &.disabled:hover, &[disabled]:active, &[disabled]:hover
+ +fb-color(!color, "default")
&:hover, &:focus
@if !hover == 0
+fb-color(darken(!color, 3), "hover", !color)
@@ -95,6 +97,15 @@
text-shadow= lighten(!color, 15) !text_shadow_settings
color= !fb_dark_text
+=fancy-button-text-colors(!color, !hover, !active)
+ color= !color
+ &:hover, &:focus
+ color= !hover
+ &:active
+ color= !active
+ &.disabled:active, &.disabled:hover, &[disabled]:active, &[disabled]:hover
+ color= !color
+
// Apply this mixin to a nested element to style an arrow
=fancy-arrow(!font_size)
font-size= !font_size + 4px
@@ -131,7 +142,7 @@
&:active
padding= !v_padding_active !h_padding_active
border-width= !border_width + 1px
- &.disabled:active
+ &.disabled:active, &[disabled]
padding= !v_padding !h_padding
border-width= !border_width
@@ -152,8 +163,10 @@
padding: 0
&:focus
outline: none
+ &.disabled, &[disabled]
+ +disable-button
=disable-button(!opacity = .7)
+opacity(!opacity)
- &:hover
+ &:hover, &:focus
cursor: default
\ No newline at end of file
diff --git a/lib/middleman/vendor/gems/gems/fancy-buttons-0.3.6/lib/sass/_fancy_gradient.sass b/lib/middleman/vendor/gems/gems/fancy-buttons-0.3.7/lib/sass/_fancy_gradient.sass
similarity index 100%
rename from lib/middleman/vendor/gems/gems/fancy-buttons-0.3.6/lib/sass/_fancy_gradient.sass
rename to lib/middleman/vendor/gems/gems/fancy-buttons-0.3.7/lib/sass/_fancy_gradient.sass
diff --git a/lib/middleman/vendor/gems/gems/fancy-buttons-0.3.6/lib/templates/project/button_bg.png b/lib/middleman/vendor/gems/gems/fancy-buttons-0.3.7/lib/templates/project/button_bg.png
similarity index 100%
rename from lib/middleman/vendor/gems/gems/fancy-buttons-0.3.6/lib/templates/project/button_bg.png
rename to lib/middleman/vendor/gems/gems/fancy-buttons-0.3.7/lib/templates/project/button_bg.png
diff --git a/lib/middleman/vendor/gems/gems/fancy-buttons-0.3.6/lib/templates/project/buttons.sass b/lib/middleman/vendor/gems/gems/fancy-buttons-0.3.7/lib/templates/project/buttons.sass
similarity index 100%
rename from lib/middleman/vendor/gems/gems/fancy-buttons-0.3.6/lib/templates/project/buttons.sass
rename to lib/middleman/vendor/gems/gems/fancy-buttons-0.3.7/lib/templates/project/buttons.sass
diff --git a/lib/middleman/vendor/gems/gems/fancy-buttons-0.3.6/lib/templates/project/index.html b/lib/middleman/vendor/gems/gems/fancy-buttons-0.3.7/lib/templates/project/index.html
similarity index 87%
rename from lib/middleman/vendor/gems/gems/fancy-buttons-0.3.6/lib/templates/project/index.html
rename to lib/middleman/vendor/gems/gems/fancy-buttons-0.3.7/lib/templates/project/index.html
index 7c454536..0ba7523c 100644
--- a/lib/middleman/vendor/gems/gems/fancy-buttons-0.3.6/lib/templates/project/index.html
+++ b/lib/middleman/vendor/gems/gems/fancy-buttons-0.3.7/lib/templates/project/index.html
@@ -21,6 +21,11 @@
+ Disabled Buttons
+
+
+
+
Custom Radial Gradient
diff --git a/lib/middleman/vendor/gems/gems/fancy-buttons-0.3.6/lib/templates/project/manifest.rb b/lib/middleman/vendor/gems/gems/fancy-buttons-0.3.7/lib/templates/project/manifest.rb
similarity index 100%
rename from lib/middleman/vendor/gems/gems/fancy-buttons-0.3.6/lib/templates/project/manifest.rb
rename to lib/middleman/vendor/gems/gems/fancy-buttons-0.3.7/lib/templates/project/manifest.rb
diff --git a/lib/middleman/vendor/gems/gems/haml-2.2.15/VERSION b/lib/middleman/vendor/gems/gems/haml-2.2.15/VERSION
deleted file mode 100644
index 5bd8c543..00000000
--- a/lib/middleman/vendor/gems/gems/haml-2.2.15/VERSION
+++ /dev/null
@@ -1 +0,0 @@
-2.2.15
diff --git a/lib/middleman/vendor/gems/gems/haml-2.2.15/.yardopts b/lib/middleman/vendor/gems/gems/haml-2.2.16/.yardopts
similarity index 100%
rename from lib/middleman/vendor/gems/gems/haml-2.2.15/.yardopts
rename to lib/middleman/vendor/gems/gems/haml-2.2.16/.yardopts
diff --git a/lib/middleman/vendor/gems/gems/haml-2.2.15/CONTRIBUTING b/lib/middleman/vendor/gems/gems/haml-2.2.16/CONTRIBUTING
similarity index 100%
rename from lib/middleman/vendor/gems/gems/haml-2.2.15/CONTRIBUTING
rename to lib/middleman/vendor/gems/gems/haml-2.2.16/CONTRIBUTING
diff --git a/lib/middleman/vendor/gems/gems/haml-2.2.15/MIT-LICENSE b/lib/middleman/vendor/gems/gems/haml-2.2.16/MIT-LICENSE
similarity index 100%
rename from lib/middleman/vendor/gems/gems/haml-2.2.15/MIT-LICENSE
rename to lib/middleman/vendor/gems/gems/haml-2.2.16/MIT-LICENSE
diff --git a/lib/middleman/vendor/gems/gems/haml-2.2.15/README.md b/lib/middleman/vendor/gems/gems/haml-2.2.16/README.md
similarity index 100%
rename from lib/middleman/vendor/gems/gems/haml-2.2.15/README.md
rename to lib/middleman/vendor/gems/gems/haml-2.2.16/README.md
diff --git a/lib/middleman/vendor/gems/gems/haml-2.2.15/REVISION b/lib/middleman/vendor/gems/gems/haml-2.2.16/REVISION
similarity index 100%
rename from lib/middleman/vendor/gems/gems/haml-2.2.15/REVISION
rename to lib/middleman/vendor/gems/gems/haml-2.2.16/REVISION
diff --git a/lib/middleman/vendor/gems/gems/haml-2.2.15/Rakefile b/lib/middleman/vendor/gems/gems/haml-2.2.16/Rakefile
similarity index 100%
rename from lib/middleman/vendor/gems/gems/haml-2.2.15/Rakefile
rename to lib/middleman/vendor/gems/gems/haml-2.2.16/Rakefile
diff --git a/lib/middleman/vendor/gems/gems/haml-2.2.16/VERSION b/lib/middleman/vendor/gems/gems/haml-2.2.16/VERSION
new file mode 100644
index 00000000..ed1fc352
--- /dev/null
+++ b/lib/middleman/vendor/gems/gems/haml-2.2.16/VERSION
@@ -0,0 +1 @@
+2.2.16
diff --git a/lib/middleman/vendor/gems/gems/haml-2.2.15/VERSION_NAME b/lib/middleman/vendor/gems/gems/haml-2.2.16/VERSION_NAME
similarity index 100%
rename from lib/middleman/vendor/gems/gems/haml-2.2.15/VERSION_NAME
rename to lib/middleman/vendor/gems/gems/haml-2.2.16/VERSION_NAME
diff --git a/lib/middleman/vendor/gems/gems/haml-2.2.15/bin/css2sass b/lib/middleman/vendor/gems/gems/haml-2.2.16/bin/css2sass
similarity index 100%
rename from lib/middleman/vendor/gems/gems/haml-2.2.15/bin/css2sass
rename to lib/middleman/vendor/gems/gems/haml-2.2.16/bin/css2sass
diff --git a/lib/middleman/vendor/gems/gems/haml-2.2.15/bin/haml b/lib/middleman/vendor/gems/gems/haml-2.2.16/bin/haml
similarity index 100%
rename from lib/middleman/vendor/gems/gems/haml-2.2.15/bin/haml
rename to lib/middleman/vendor/gems/gems/haml-2.2.16/bin/haml
diff --git a/lib/middleman/vendor/gems/gems/haml-2.2.15/bin/html2haml b/lib/middleman/vendor/gems/gems/haml-2.2.16/bin/html2haml
similarity index 100%
rename from lib/middleman/vendor/gems/gems/haml-2.2.15/bin/html2haml
rename to lib/middleman/vendor/gems/gems/haml-2.2.16/bin/html2haml
diff --git a/lib/middleman/vendor/gems/gems/haml-2.2.15/bin/sass b/lib/middleman/vendor/gems/gems/haml-2.2.16/bin/sass
similarity index 100%
rename from lib/middleman/vendor/gems/gems/haml-2.2.15/bin/sass
rename to lib/middleman/vendor/gems/gems/haml-2.2.16/bin/sass
diff --git a/lib/middleman/vendor/gems/gems/haml-2.2.15/extra/haml-mode.el b/lib/middleman/vendor/gems/gems/haml-2.2.16/extra/haml-mode.el
similarity index 100%
rename from lib/middleman/vendor/gems/gems/haml-2.2.15/extra/haml-mode.el
rename to lib/middleman/vendor/gems/gems/haml-2.2.16/extra/haml-mode.el
diff --git a/lib/middleman/vendor/gems/gems/haml-2.2.15/extra/sass-mode.el b/lib/middleman/vendor/gems/gems/haml-2.2.16/extra/sass-mode.el
similarity index 100%
rename from lib/middleman/vendor/gems/gems/haml-2.2.15/extra/sass-mode.el
rename to lib/middleman/vendor/gems/gems/haml-2.2.16/extra/sass-mode.el
diff --git a/lib/middleman/vendor/gems/gems/haml-2.2.15/extra/update_watch.rb b/lib/middleman/vendor/gems/gems/haml-2.2.16/extra/update_watch.rb
similarity index 100%
rename from lib/middleman/vendor/gems/gems/haml-2.2.15/extra/update_watch.rb
rename to lib/middleman/vendor/gems/gems/haml-2.2.16/extra/update_watch.rb
diff --git a/lib/middleman/vendor/gems/gems/haml-2.2.15/init.rb b/lib/middleman/vendor/gems/gems/haml-2.2.16/init.rb
similarity index 100%
rename from lib/middleman/vendor/gems/gems/haml-2.2.15/init.rb
rename to lib/middleman/vendor/gems/gems/haml-2.2.16/init.rb
diff --git a/lib/middleman/vendor/gems/gems/haml-2.2.15/lib/haml.rb b/lib/middleman/vendor/gems/gems/haml-2.2.16/lib/haml.rb
similarity index 100%
rename from lib/middleman/vendor/gems/gems/haml-2.2.15/lib/haml.rb
rename to lib/middleman/vendor/gems/gems/haml-2.2.16/lib/haml.rb
diff --git a/lib/middleman/vendor/gems/gems/haml-2.2.15/lib/haml/buffer.rb b/lib/middleman/vendor/gems/gems/haml-2.2.16/lib/haml/buffer.rb
similarity index 96%
rename from lib/middleman/vendor/gems/gems/haml-2.2.15/lib/haml/buffer.rb
rename to lib/middleman/vendor/gems/gems/haml-2.2.16/lib/haml/buffer.rb
index 12e6cd4e..e5c3c741 100644
--- a/lib/middleman/vendor/gems/gems/haml-2.2.15/lib/haml/buffer.rb
+++ b/lib/middleman/vendor/gems/gems/haml-2.2.16/lib/haml/buffer.rb
@@ -15,7 +15,7 @@ module Haml
# The options hash passed in from {Haml::Engine}.
#
- # @return [Hash]
+ # @return [{String => Object}]
# @see Haml::Engine#options_for_buffer
attr_accessor :options
@@ -85,7 +85,7 @@ module Haml
end
# @param upper [Buffer] The parent buffer
- # @param options [Hash] An options hash.
+ # @param options [{Symbol => Object}] An options hash.
# See {Haml::Engine#options\_for\_buffer}
def initialize(upper = nil, options = {})
@active = true
@@ -240,9 +240,9 @@ RUBY
#
# Destructively modifies both `to` and `from`.
#
- # @param to [Hash] The attribute hash to merge into
- # @param from [Hash] The attribute hash to merge from
- # @return [Hash] `to`, after being merged
+ # @param to [{String => String}] The attribute hash to merge into
+ # @param from [{String => String}] The attribute hash to merge from
+ # @return [{String => String}] `to`, after being merged
def self.merge_attrs(to, from)
if to['id'] && from['id']
to['id'] << '_' << from.delete('id').to_s
diff --git a/lib/middleman/vendor/gems/gems/haml-2.2.15/lib/haml/engine.rb b/lib/middleman/vendor/gems/gems/haml-2.2.16/lib/haml/engine.rb
similarity index 97%
rename from lib/middleman/vendor/gems/gems/haml-2.2.15/lib/haml/engine.rb
rename to lib/middleman/vendor/gems/gems/haml-2.2.16/lib/haml/engine.rb
index 475d93a7..eef3a823 100644
--- a/lib/middleman/vendor/gems/gems/haml-2.2.15/lib/haml/engine.rb
+++ b/lib/middleman/vendor/gems/gems/haml-2.2.16/lib/haml/engine.rb
@@ -20,7 +20,7 @@ module Haml
# The options hash.
# See {file:HAML_REFERENCE.md#haml_options the Haml options documentation}.
#
- # @return [Hash]
+ # @return [{Symbol => Object}]
attr_accessor :options
# The indentation used in the Haml document,
@@ -66,7 +66,7 @@ module Haml
# Precompiles the Haml template.
#
# @param template [String] The Haml template
- # @param options [Hash] An options hash;
+ # @param options [{Symbol => Object}] An options hash;
# see {file:HAML_REFERENCE.md#haml_options the Haml options documentation}
# @raise [Haml::Error] if there's a Haml syntax error in the template
def initialize(template, options = {})
@@ -154,7 +154,7 @@ module Haml
# they won't work.
#
# @param scope [Binding, Proc, Object] The context in which the template is evaluated
- # @param locals [Hash] Local variables that will be made available
+ # @param locals [{Symbol => Object}] Local variables that will be made available
# to the template
# @param block [#to_proc] A block that can be yielded to within the template
# @return [String] The rendered template
@@ -275,7 +275,7 @@ module Haml
#
# See {file:HAML_REFERENCE.md#haml_options the Haml options documentation}.
#
- # @return [Hash] The options hash
+ # @return [{Symbol => Object}] The options hash
def options_for_buffer
{
:autoclose => @options[:autoclose],
diff --git a/lib/middleman/vendor/gems/gems/haml-2.2.15/lib/haml/error.rb b/lib/middleman/vendor/gems/gems/haml-2.2.16/lib/haml/error.rb
similarity index 100%
rename from lib/middleman/vendor/gems/gems/haml-2.2.15/lib/haml/error.rb
rename to lib/middleman/vendor/gems/gems/haml-2.2.16/lib/haml/error.rb
diff --git a/lib/middleman/vendor/gems/gems/haml-2.2.15/lib/haml/exec.rb b/lib/middleman/vendor/gems/gems/haml-2.2.16/lib/haml/exec.rb
similarity index 100%
rename from lib/middleman/vendor/gems/gems/haml-2.2.15/lib/haml/exec.rb
rename to lib/middleman/vendor/gems/gems/haml-2.2.16/lib/haml/exec.rb
diff --git a/lib/middleman/vendor/gems/gems/haml-2.2.15/lib/haml/filters.rb b/lib/middleman/vendor/gems/gems/haml-2.2.16/lib/haml/filters.rb
similarity index 99%
rename from lib/middleman/vendor/gems/gems/haml-2.2.15/lib/haml/filters.rb
rename to lib/middleman/vendor/gems/gems/haml-2.2.16/lib/haml/filters.rb
index 06945b40..df79557d 100644
--- a/lib/middleman/vendor/gems/gems/haml-2.2.15/lib/haml/filters.rb
+++ b/lib/middleman/vendor/gems/gems/haml-2.2.16/lib/haml/filters.rb
@@ -4,7 +4,7 @@ module Haml
#
# @see Haml::Filters::Base
module Filters
- # @return [Hash] a hash of filter names to classes
+ # @return [{String => Haml::Filters::Base}] a hash of filter names to classes
def self.defined
@defined ||= {}
end
diff --git a/lib/middleman/vendor/gems/gems/haml-2.2.15/lib/haml/helpers.rb b/lib/middleman/vendor/gems/gems/haml-2.2.16/lib/haml/helpers.rb
similarity index 99%
rename from lib/middleman/vendor/gems/gems/haml-2.2.15/lib/haml/helpers.rb
rename to lib/middleman/vendor/gems/gems/haml-2.2.16/lib/haml/helpers.rb
index 11305fc0..b1bb9918 100644
--- a/lib/middleman/vendor/gems/gems/haml-2.2.15/lib/haml/helpers.rb
+++ b/lib/middleman/vendor/gems/gems/haml-2.2.16/lib/haml/helpers.rb
@@ -198,7 +198,7 @@ MESSAGE
#
#
# @param lang [String] The value of `xml:lang` and `lang`
- # @return [Hash<#to_s, String>] The attribute hash
+ # @return [{#to_s => String}] The attribute hash
def html_attrs(lang = 'en-US')
{:xmlns => "http://www.w3.org/1999/xhtml", 'xml:lang' => lang, :lang => lang}
end
diff --git a/lib/middleman/vendor/gems/gems/haml-2.2.15/lib/haml/helpers/action_view_extensions.rb b/lib/middleman/vendor/gems/gems/haml-2.2.16/lib/haml/helpers/action_view_extensions.rb
similarity index 100%
rename from lib/middleman/vendor/gems/gems/haml-2.2.15/lib/haml/helpers/action_view_extensions.rb
rename to lib/middleman/vendor/gems/gems/haml-2.2.16/lib/haml/helpers/action_view_extensions.rb
diff --git a/lib/middleman/vendor/gems/gems/haml-2.2.15/lib/haml/helpers/action_view_mods.rb b/lib/middleman/vendor/gems/gems/haml-2.2.16/lib/haml/helpers/action_view_mods.rb
similarity index 100%
rename from lib/middleman/vendor/gems/gems/haml-2.2.15/lib/haml/helpers/action_view_mods.rb
rename to lib/middleman/vendor/gems/gems/haml-2.2.16/lib/haml/helpers/action_view_mods.rb
diff --git a/lib/middleman/vendor/gems/gems/haml-2.2.15/lib/haml/helpers/xss_mods.rb b/lib/middleman/vendor/gems/gems/haml-2.2.16/lib/haml/helpers/xss_mods.rb
similarity index 100%
rename from lib/middleman/vendor/gems/gems/haml-2.2.15/lib/haml/helpers/xss_mods.rb
rename to lib/middleman/vendor/gems/gems/haml-2.2.16/lib/haml/helpers/xss_mods.rb
diff --git a/lib/middleman/vendor/gems/gems/haml-2.2.15/lib/haml/html.rb b/lib/middleman/vendor/gems/gems/haml-2.2.16/lib/haml/html.rb
similarity index 100%
rename from lib/middleman/vendor/gems/gems/haml-2.2.15/lib/haml/html.rb
rename to lib/middleman/vendor/gems/gems/haml-2.2.16/lib/haml/html.rb
diff --git a/lib/middleman/vendor/gems/gems/haml-2.2.15/lib/haml/precompiler.rb b/lib/middleman/vendor/gems/gems/haml-2.2.16/lib/haml/precompiler.rb
similarity index 100%
rename from lib/middleman/vendor/gems/gems/haml-2.2.15/lib/haml/precompiler.rb
rename to lib/middleman/vendor/gems/gems/haml-2.2.16/lib/haml/precompiler.rb
diff --git a/lib/middleman/vendor/gems/gems/haml-2.2.15/lib/haml/shared.rb b/lib/middleman/vendor/gems/gems/haml-2.2.16/lib/haml/shared.rb
similarity index 100%
rename from lib/middleman/vendor/gems/gems/haml-2.2.15/lib/haml/shared.rb
rename to lib/middleman/vendor/gems/gems/haml-2.2.16/lib/haml/shared.rb
diff --git a/lib/middleman/vendor/gems/gems/haml-2.2.15/lib/haml/template.rb b/lib/middleman/vendor/gems/gems/haml-2.2.16/lib/haml/template.rb
similarity index 95%
rename from lib/middleman/vendor/gems/gems/haml-2.2.15/lib/haml/template.rb
rename to lib/middleman/vendor/gems/gems/haml-2.2.16/lib/haml/template.rb
index 7f1eb9b8..1aa26a46 100644
--- a/lib/middleman/vendor/gems/gems/haml-2.2.15/lib/haml/template.rb
+++ b/lib/middleman/vendor/gems/gems/haml-2.2.16/lib/haml/template.rb
@@ -9,7 +9,7 @@ module Haml
# The options hash for Haml when used within Rails.
# See {file:HAML_REFERENCE.md#haml_options the Haml options documentation}.
#
- # @return [Hash]
+ # @return [{Symbol => Object}]
attr_accessor :options
# Enables integration with the Rails 2.2.5+ XSS protection,
@@ -46,7 +46,7 @@ end
# Decide how we want to load Haml into Rails.
# Patching was necessary for versions <= 2.0.1,
# but we can make it a normal handler for higher versions.
-if defined?(ActionView::TemplateHandler)
+if defined?(ActionView::TemplateHandler) || defined?(ActionView::Template::Handler)
require 'haml/template/plugin'
else
require 'haml/template/patch'
diff --git a/lib/middleman/vendor/gems/gems/haml-2.2.15/lib/haml/template/patch.rb b/lib/middleman/vendor/gems/gems/haml-2.2.16/lib/haml/template/patch.rb
similarity index 100%
rename from lib/middleman/vendor/gems/gems/haml-2.2.15/lib/haml/template/patch.rb
rename to lib/middleman/vendor/gems/gems/haml-2.2.16/lib/haml/template/patch.rb
diff --git a/lib/middleman/vendor/gems/gems/haml-2.2.15/lib/haml/template/plugin.rb b/lib/middleman/vendor/gems/gems/haml-2.2.16/lib/haml/template/plugin.rb
similarity index 87%
rename from lib/middleman/vendor/gems/gems/haml-2.2.15/lib/haml/template/plugin.rb
rename to lib/middleman/vendor/gems/gems/haml-2.2.16/lib/haml/template/plugin.rb
index 22a69681..a270a38c 100644
--- a/lib/middleman/vendor/gems/gems/haml-2.2.15/lib/haml/template/plugin.rb
+++ b/lib/middleman/vendor/gems/gems/haml-2.2.16/lib/haml/template/plugin.rb
@@ -2,8 +2,11 @@
# using the > 2.0.1 template handler API.
module Haml
- class Plugin < ActionView::TemplateHandler
- include ActionView::TemplateHandlers::Compilable if defined?(ActionView::TemplateHandlers::Compilable)
+ class Plugin < Haml::Util.av_template_class(:Handler)
+ if defined?(ActionView::TemplateHandlers::Compilable) ||
+ defined?(ActionView::Template::Handlers::Compilable)
+ include Haml::Util.av_template_class(:Handlers)::Compilable
+ end
def compile(template)
options = Haml::Template.options.dup
@@ -38,7 +41,8 @@ end.register_template_handler(:haml, Haml::Plugin)
# In Rails 2.0.2, ActionView::TemplateError took arguments
# that we can't fill in from the Haml::Plugin context.
# Thus, we've got to monkeypatch ActionView::Base to catch the error.
-if ActionView::TemplateError.instance_method(:initialize).arity == 5
+if defined?(ActionView::TemplateError) &&
+ ActionView::TemplateError.instance_method(:initialize).arity == 5
class ActionView::Base
def compile_template(handler, template, file_name, local_assigns)
render_symbol = assign_method_name(handler, template, file_name)
diff --git a/lib/middleman/vendor/gems/gems/haml-2.2.15/lib/haml/util.rb b/lib/middleman/vendor/gems/gems/haml-2.2.16/lib/haml/util.rb
similarity index 93%
rename from lib/middleman/vendor/gems/gems/haml-2.2.15/lib/haml/util.rb
rename to lib/middleman/vendor/gems/gems/haml-2.2.16/lib/haml/util.rb
index aa8c6998..4cf37213 100644
--- a/lib/middleman/vendor/gems/gems/haml-2.2.15/lib/haml/util.rb
+++ b/lib/middleman/vendor/gems/gems/haml-2.2.16/lib/haml/util.rb
@@ -146,6 +146,19 @@ module Haml
return nil
end
+ # Returns an ActionView::Template* class.
+ # In pre-3.0 versions of Rails, most of these classes
+ # were of the form `ActionView::TemplateFoo`,
+ # while afterwards they were of the form `ActionView;:Template::Foo`.
+ #
+ # @param name [#to_s] The name of the class to get.
+ # For example, `:Error` will return `ActionView::TemplateError`
+ # or `ActionView::Template::Error`.
+ def av_template_class(name)
+ return ActionView.const_get("Template#{name}") if ActionView.const_defined?("Template#{name}")
+ return ActionView::Template.const_get(name.to_s)
+ end
+
## Rails XSS Safety
# Whether or not ActionView's XSS protection is available and enabled,
diff --git a/lib/middleman/vendor/gems/gems/haml-2.2.15/lib/haml/version.rb b/lib/middleman/vendor/gems/gems/haml-2.2.16/lib/haml/version.rb
similarity index 97%
rename from lib/middleman/vendor/gems/gems/haml-2.2.15/lib/haml/version.rb
rename to lib/middleman/vendor/gems/gems/haml-2.2.16/lib/haml/version.rb
index eba3cbf6..de0b0017 100644
--- a/lib/middleman/vendor/gems/gems/haml-2.2.15/lib/haml/version.rb
+++ b/lib/middleman/vendor/gems/gems/haml-2.2.16/lib/haml/version.rb
@@ -23,7 +23,7 @@ module Haml
# :major => 2, :minor => 1, :teeny => 0
# }
#
- # @return [Hash] The version hash
+ # @return [{Symbol => String/Fixnum}] The version hash
def version
return @@version if defined?(@@version)
diff --git a/lib/middleman/vendor/gems/gems/haml-2.2.15/lib/sass.rb b/lib/middleman/vendor/gems/gems/haml-2.2.16/lib/sass.rb
similarity index 100%
rename from lib/middleman/vendor/gems/gems/haml-2.2.15/lib/sass.rb
rename to lib/middleman/vendor/gems/gems/haml-2.2.16/lib/sass.rb
diff --git a/lib/middleman/vendor/gems/gems/haml-2.2.15/lib/sass/css.rb b/lib/middleman/vendor/gems/gems/haml-2.2.16/lib/sass/css.rb
similarity index 99%
rename from lib/middleman/vendor/gems/gems/haml-2.2.15/lib/sass/css.rb
rename to lib/middleman/vendor/gems/gems/haml-2.2.16/lib/sass/css.rb
index 1ecb502e..43929848 100644
--- a/lib/middleman/vendor/gems/gems/haml-2.2.15/lib/sass/css.rb
+++ b/lib/middleman/vendor/gems/gems/haml-2.2.16/lib/sass/css.rb
@@ -8,7 +8,7 @@ module Sass
# Converts a node to Sass code that will generate it.
#
# @param tabs [Fixnum] The amount of tabulation to use for the Sass code
- # @param opts [Hash] An options hash (see {Sass::CSS#initialize})
+ # @param opts [{Symbol => Object}] An options hash (see {Sass::CSS#initialize})
# @return [String] The Sass code corresponding to the node
def to_sass(tabs = 0, opts = {})
result = ''
diff --git a/lib/middleman/vendor/gems/gems/haml-2.2.15/lib/sass/engine.rb b/lib/middleman/vendor/gems/gems/haml-2.2.16/lib/sass/engine.rb
similarity index 99%
rename from lib/middleman/vendor/gems/gems/haml-2.2.15/lib/sass/engine.rb
rename to lib/middleman/vendor/gems/gems/haml-2.2.16/lib/sass/engine.rb
index ae3b0ecb..f8af351a 100644
--- a/lib/middleman/vendor/gems/gems/haml-2.2.15/lib/sass/engine.rb
+++ b/lib/middleman/vendor/gems/gems/haml-2.2.16/lib/sass/engine.rb
@@ -126,7 +126,7 @@ module Sass
}.freeze
# @param template [String] The Sass template.
- # @param options [Hash] An options hash;
+ # @param options [{Symbol => Object}] An options hash;
# see {file:SASS_REFERENCE.md#sass_options the Sass options documentation}
def initialize(template, options={})
@options = DEFAULT_OPTIONS.merge(options)
diff --git a/lib/middleman/vendor/gems/gems/haml-2.2.15/lib/sass/environment.rb b/lib/middleman/vendor/gems/gems/haml-2.2.16/lib/sass/environment.rb
similarity index 98%
rename from lib/middleman/vendor/gems/gems/haml-2.2.15/lib/sass/environment.rb
rename to lib/middleman/vendor/gems/gems/haml-2.2.16/lib/sass/environment.rb
index 1fc53e19..5440c213 100644
--- a/lib/middleman/vendor/gems/gems/haml-2.2.15/lib/sass/environment.rb
+++ b/lib/middleman/vendor/gems/gems/haml-2.2.16/lib/sass/environment.rb
@@ -30,7 +30,7 @@ module Sass
# The options hash.
# See {file:SASS_REFERENCE.md#sass_options the Sass options documentation}.
#
- # @return [Hash]
+ # @return [{Symbol => Object}]
def options
@options || (parent && parent.options) || {}
end
diff --git a/lib/middleman/vendor/gems/gems/haml-2.2.15/lib/sass/error.rb b/lib/middleman/vendor/gems/gems/haml-2.2.16/lib/sass/error.rb
similarity index 100%
rename from lib/middleman/vendor/gems/gems/haml-2.2.15/lib/sass/error.rb
rename to lib/middleman/vendor/gems/gems/haml-2.2.16/lib/sass/error.rb
diff --git a/lib/middleman/vendor/gems/gems/haml-2.2.15/lib/sass/files.rb b/lib/middleman/vendor/gems/gems/haml-2.2.16/lib/sass/files.rb
similarity index 98%
rename from lib/middleman/vendor/gems/gems/haml-2.2.15/lib/sass/files.rb
rename to lib/middleman/vendor/gems/gems/haml-2.2.16/lib/sass/files.rb
index 182a9384..94056ee9 100644
--- a/lib/middleman/vendor/gems/gems/haml-2.2.15/lib/sass/files.rb
+++ b/lib/middleman/vendor/gems/gems/haml-2.2.16/lib/sass/files.rb
@@ -12,7 +12,7 @@ module Sass
# reading it from the Sass cache if possible.
#
# @param filename [String] The path to the Sass file
- # @param options [Hash] The options hash.
+ # @param options [{Symbol => Object}] The options hash.
# Only the {file:SASS_REFERENCE.md#cache-option `:cache_location`} option is used
# @raise [Sass::SyntaxError] if there's an error in the document
def tree_for(filename, options)
diff --git a/lib/middleman/vendor/gems/gems/haml-2.2.15/lib/sass/plugin.rb b/lib/middleman/vendor/gems/gems/haml-2.2.16/lib/sass/plugin.rb
similarity index 96%
rename from lib/middleman/vendor/gems/gems/haml-2.2.15/lib/sass/plugin.rb
rename to lib/middleman/vendor/gems/gems/haml-2.2.16/lib/sass/plugin.rb
index 126d8cd8..f78bf672 100644
--- a/lib/middleman/vendor/gems/gems/haml-2.2.15/lib/sass/plugin.rb
+++ b/lib/middleman/vendor/gems/gems/haml-2.2.16/lib/sass/plugin.rb
@@ -30,21 +30,21 @@ module Sass
# An options hash.
# See {file:SASS_REFERENCE.md#sass_options the Sass options documentation}.
#
- # @return [Hash]
+ # @return [{Symbol => Object}]
attr_reader :options
# Sets the options hash.
# See {file:SASS_REFERENCE.md#sass_options the Sass options documentation}.
#
- # @param value [Hash] The options hash
+ # @param value [{Symbol => Object}] The options hash
def options=(value)
@options.merge!(value)
end
# Non-destructively modifies \{#options} so that default values are properly set.
#
- # @param additional_options [Hash] An options hash with which to merge \{#options}
- # @return [Hash] The modified options hash
+ # @param additional_options [{Symbol => Object}] An options hash with which to merge \{#options}
+ # @return [{Symbol => Object}] The modified options hash
def engine_options(additional_options = {})
opts = options.dup.merge(additional_options)
opts[:load_paths] = load_paths(opts)
diff --git a/lib/middleman/vendor/gems/gems/haml-2.2.15/lib/sass/plugin/merb.rb b/lib/middleman/vendor/gems/gems/haml-2.2.16/lib/sass/plugin/merb.rb
similarity index 100%
rename from lib/middleman/vendor/gems/gems/haml-2.2.15/lib/sass/plugin/merb.rb
rename to lib/middleman/vendor/gems/gems/haml-2.2.16/lib/sass/plugin/merb.rb
diff --git a/lib/middleman/vendor/gems/gems/haml-2.2.15/lib/sass/plugin/rack.rb b/lib/middleman/vendor/gems/gems/haml-2.2.16/lib/sass/plugin/rack.rb
similarity index 96%
rename from lib/middleman/vendor/gems/gems/haml-2.2.15/lib/sass/plugin/rack.rb
rename to lib/middleman/vendor/gems/gems/haml-2.2.16/lib/sass/plugin/rack.rb
index 73953960..9275b4ba 100644
--- a/lib/middleman/vendor/gems/gems/haml-2.2.15/lib/sass/plugin/rack.rb
+++ b/lib/middleman/vendor/gems/gems/haml-2.2.16/lib/sass/plugin/rack.rb
@@ -38,7 +38,7 @@ module Sass
# and updating them if necessary.
#
# @param env The Rack request environment
- # @return [(#to_i, Hash, Object)] The Rack response
+ # @return [(#to_i, {String => String}, Object)] The Rack response
def call(env)
Sass::Plugin.check_for_updates
@app.call(env)
diff --git a/lib/middleman/vendor/gems/gems/haml-2.2.15/lib/sass/plugin/rails.rb b/lib/middleman/vendor/gems/gems/haml-2.2.16/lib/sass/plugin/rails.rb
similarity index 100%
rename from lib/middleman/vendor/gems/gems/haml-2.2.15/lib/sass/plugin/rails.rb
rename to lib/middleman/vendor/gems/gems/haml-2.2.16/lib/sass/plugin/rails.rb
diff --git a/lib/middleman/vendor/gems/gems/haml-2.2.15/lib/sass/repl.rb b/lib/middleman/vendor/gems/gems/haml-2.2.16/lib/sass/repl.rb
similarity index 95%
rename from lib/middleman/vendor/gems/gems/haml-2.2.15/lib/sass/repl.rb
rename to lib/middleman/vendor/gems/gems/haml-2.2.16/lib/sass/repl.rb
index 1154ee11..ee955bf8 100644
--- a/lib/middleman/vendor/gems/gems/haml-2.2.15/lib/sass/repl.rb
+++ b/lib/middleman/vendor/gems/gems/haml-2.2.16/lib/sass/repl.rb
@@ -7,7 +7,7 @@ module Sass
# evaluates them,
# and prints the result.
class Repl
- # @param options [Hash] An options hash.
+ # @param options [{Symbol => Object}] An options hash.
def initialize(options = {})
@options = options
end
diff --git a/lib/middleman/vendor/gems/gems/haml-2.2.15/lib/sass/script.rb b/lib/middleman/vendor/gems/gems/haml-2.2.16/lib/sass/script.rb
similarity index 100%
rename from lib/middleman/vendor/gems/gems/haml-2.2.15/lib/sass/script.rb
rename to lib/middleman/vendor/gems/gems/haml-2.2.16/lib/sass/script.rb
diff --git a/lib/middleman/vendor/gems/gems/haml-2.2.15/lib/sass/script/bool.rb b/lib/middleman/vendor/gems/gems/haml-2.2.16/lib/sass/script/bool.rb
similarity index 100%
rename from lib/middleman/vendor/gems/gems/haml-2.2.15/lib/sass/script/bool.rb
rename to lib/middleman/vendor/gems/gems/haml-2.2.16/lib/sass/script/bool.rb
diff --git a/lib/middleman/vendor/gems/gems/haml-2.2.15/lib/sass/script/color.rb b/lib/middleman/vendor/gems/gems/haml-2.2.16/lib/sass/script/color.rb
similarity index 99%
rename from lib/middleman/vendor/gems/gems/haml-2.2.15/lib/sass/script/color.rb
rename to lib/middleman/vendor/gems/gems/haml-2.2.16/lib/sass/script/color.rb
index 84851ebc..6e1cce11 100644
--- a/lib/middleman/vendor/gems/gems/haml-2.2.15/lib/sass/script/color.rb
+++ b/lib/middleman/vendor/gems/gems/haml-2.2.16/lib/sass/script/color.rb
@@ -69,7 +69,7 @@ END
# Color.new([126, 126, 126]).with(:red => 0, :green => 255)
# #=> rgb(0, 255, 126)
#
- # @param attrs [Hash]
+ # @param attrs [{Symbol => Fixnum}]
# A map of channel names (`:red`, `:green`, or `:blue`) to values
# @return [Color] The new Color object
def with(attrs)
diff --git a/lib/middleman/vendor/gems/gems/haml-2.2.15/lib/sass/script/funcall.rb b/lib/middleman/vendor/gems/gems/haml-2.2.16/lib/sass/script/funcall.rb
similarity index 100%
rename from lib/middleman/vendor/gems/gems/haml-2.2.15/lib/sass/script/funcall.rb
rename to lib/middleman/vendor/gems/gems/haml-2.2.16/lib/sass/script/funcall.rb
diff --git a/lib/middleman/vendor/gems/gems/haml-2.2.15/lib/sass/script/functions.rb b/lib/middleman/vendor/gems/gems/haml-2.2.16/lib/sass/script/functions.rb
similarity index 96%
rename from lib/middleman/vendor/gems/gems/haml-2.2.15/lib/sass/script/functions.rb
rename to lib/middleman/vendor/gems/gems/haml-2.2.16/lib/sass/script/functions.rb
index f9547fc0..590405a6 100644
--- a/lib/middleman/vendor/gems/gems/haml-2.2.15/lib/sass/script/functions.rb
+++ b/lib/middleman/vendor/gems/gems/haml-2.2.16/lib/sass/script/functions.rb
@@ -67,16 +67,18 @@ module Sass::Script
# That means that all instance methods of {EvaluationContext}
# are available to use in functions.
class EvaluationContext
- include Sass::Script::Functions
-
# The options hash for the {Sass::Engine} that is processing the function call
#
- # @return [Hash]
+ # @return [{Symbol => Object}]
attr_reader :options
- # @param options [Hash] See \{#options}
+ # @param options [{Symbol => Object}] See \{#options}
def initialize(options)
@options = options
+
+ # We need to include this individually in each instance
+ # because of an icky Ruby restriction
+ class << self; include Sass::Script::Functions; end
end
# Asserts that the type of a given SassScript value
diff --git a/lib/middleman/vendor/gems/gems/haml-2.2.15/lib/sass/script/lexer.rb b/lib/middleman/vendor/gems/gems/haml-2.2.16/lib/sass/script/lexer.rb
similarity index 100%
rename from lib/middleman/vendor/gems/gems/haml-2.2.15/lib/sass/script/lexer.rb
rename to lib/middleman/vendor/gems/gems/haml-2.2.16/lib/sass/script/lexer.rb
diff --git a/lib/middleman/vendor/gems/gems/haml-2.2.15/lib/sass/script/literal.rb b/lib/middleman/vendor/gems/gems/haml-2.2.16/lib/sass/script/literal.rb
similarity index 100%
rename from lib/middleman/vendor/gems/gems/haml-2.2.15/lib/sass/script/literal.rb
rename to lib/middleman/vendor/gems/gems/haml-2.2.16/lib/sass/script/literal.rb
diff --git a/lib/middleman/vendor/gems/gems/haml-2.2.15/lib/sass/script/node.rb b/lib/middleman/vendor/gems/gems/haml-2.2.16/lib/sass/script/node.rb
similarity index 100%
rename from lib/middleman/vendor/gems/gems/haml-2.2.15/lib/sass/script/node.rb
rename to lib/middleman/vendor/gems/gems/haml-2.2.16/lib/sass/script/node.rb
diff --git a/lib/middleman/vendor/gems/gems/haml-2.2.15/lib/sass/script/number.rb b/lib/middleman/vendor/gems/gems/haml-2.2.16/lib/sass/script/number.rb
similarity index 100%
rename from lib/middleman/vendor/gems/gems/haml-2.2.15/lib/sass/script/number.rb
rename to lib/middleman/vendor/gems/gems/haml-2.2.16/lib/sass/script/number.rb
diff --git a/lib/middleman/vendor/gems/gems/haml-2.2.15/lib/sass/script/operation.rb b/lib/middleman/vendor/gems/gems/haml-2.2.16/lib/sass/script/operation.rb
similarity index 100%
rename from lib/middleman/vendor/gems/gems/haml-2.2.15/lib/sass/script/operation.rb
rename to lib/middleman/vendor/gems/gems/haml-2.2.16/lib/sass/script/operation.rb
diff --git a/lib/middleman/vendor/gems/gems/haml-2.2.15/lib/sass/script/parser.rb b/lib/middleman/vendor/gems/gems/haml-2.2.16/lib/sass/script/parser.rb
similarity index 100%
rename from lib/middleman/vendor/gems/gems/haml-2.2.15/lib/sass/script/parser.rb
rename to lib/middleman/vendor/gems/gems/haml-2.2.16/lib/sass/script/parser.rb
diff --git a/lib/middleman/vendor/gems/gems/haml-2.2.15/lib/sass/script/string.rb b/lib/middleman/vendor/gems/gems/haml-2.2.16/lib/sass/script/string.rb
similarity index 100%
rename from lib/middleman/vendor/gems/gems/haml-2.2.15/lib/sass/script/string.rb
rename to lib/middleman/vendor/gems/gems/haml-2.2.16/lib/sass/script/string.rb
diff --git a/lib/middleman/vendor/gems/gems/haml-2.2.15/lib/sass/script/unary_operation.rb b/lib/middleman/vendor/gems/gems/haml-2.2.16/lib/sass/script/unary_operation.rb
similarity index 100%
rename from lib/middleman/vendor/gems/gems/haml-2.2.15/lib/sass/script/unary_operation.rb
rename to lib/middleman/vendor/gems/gems/haml-2.2.16/lib/sass/script/unary_operation.rb
diff --git a/lib/middleman/vendor/gems/gems/haml-2.2.15/lib/sass/script/variable.rb b/lib/middleman/vendor/gems/gems/haml-2.2.16/lib/sass/script/variable.rb
similarity index 100%
rename from lib/middleman/vendor/gems/gems/haml-2.2.15/lib/sass/script/variable.rb
rename to lib/middleman/vendor/gems/gems/haml-2.2.16/lib/sass/script/variable.rb
diff --git a/lib/middleman/vendor/gems/gems/haml-2.2.15/lib/sass/tree/comment_node.rb b/lib/middleman/vendor/gems/gems/haml-2.2.16/lib/sass/tree/comment_node.rb
similarity index 100%
rename from lib/middleman/vendor/gems/gems/haml-2.2.15/lib/sass/tree/comment_node.rb
rename to lib/middleman/vendor/gems/gems/haml-2.2.16/lib/sass/tree/comment_node.rb
diff --git a/lib/middleman/vendor/gems/gems/haml-2.2.15/lib/sass/tree/debug_node.rb b/lib/middleman/vendor/gems/gems/haml-2.2.16/lib/sass/tree/debug_node.rb
similarity index 100%
rename from lib/middleman/vendor/gems/gems/haml-2.2.15/lib/sass/tree/debug_node.rb
rename to lib/middleman/vendor/gems/gems/haml-2.2.16/lib/sass/tree/debug_node.rb
diff --git a/lib/middleman/vendor/gems/gems/haml-2.2.15/lib/sass/tree/directive_node.rb b/lib/middleman/vendor/gems/gems/haml-2.2.16/lib/sass/tree/directive_node.rb
similarity index 100%
rename from lib/middleman/vendor/gems/gems/haml-2.2.15/lib/sass/tree/directive_node.rb
rename to lib/middleman/vendor/gems/gems/haml-2.2.16/lib/sass/tree/directive_node.rb
diff --git a/lib/middleman/vendor/gems/gems/haml-2.2.15/lib/sass/tree/for_node.rb b/lib/middleman/vendor/gems/gems/haml-2.2.16/lib/sass/tree/for_node.rb
similarity index 100%
rename from lib/middleman/vendor/gems/gems/haml-2.2.15/lib/sass/tree/for_node.rb
rename to lib/middleman/vendor/gems/gems/haml-2.2.16/lib/sass/tree/for_node.rb
diff --git a/lib/middleman/vendor/gems/gems/haml-2.2.15/lib/sass/tree/if_node.rb b/lib/middleman/vendor/gems/gems/haml-2.2.16/lib/sass/tree/if_node.rb
similarity index 100%
rename from lib/middleman/vendor/gems/gems/haml-2.2.15/lib/sass/tree/if_node.rb
rename to lib/middleman/vendor/gems/gems/haml-2.2.16/lib/sass/tree/if_node.rb
diff --git a/lib/middleman/vendor/gems/gems/haml-2.2.15/lib/sass/tree/import_node.rb b/lib/middleman/vendor/gems/gems/haml-2.2.16/lib/sass/tree/import_node.rb
similarity index 100%
rename from lib/middleman/vendor/gems/gems/haml-2.2.15/lib/sass/tree/import_node.rb
rename to lib/middleman/vendor/gems/gems/haml-2.2.16/lib/sass/tree/import_node.rb
diff --git a/lib/middleman/vendor/gems/gems/haml-2.2.15/lib/sass/tree/mixin_def_node.rb b/lib/middleman/vendor/gems/gems/haml-2.2.16/lib/sass/tree/mixin_def_node.rb
similarity index 100%
rename from lib/middleman/vendor/gems/gems/haml-2.2.15/lib/sass/tree/mixin_def_node.rb
rename to lib/middleman/vendor/gems/gems/haml-2.2.16/lib/sass/tree/mixin_def_node.rb
diff --git a/lib/middleman/vendor/gems/gems/haml-2.2.15/lib/sass/tree/mixin_node.rb b/lib/middleman/vendor/gems/gems/haml-2.2.16/lib/sass/tree/mixin_node.rb
similarity index 100%
rename from lib/middleman/vendor/gems/gems/haml-2.2.15/lib/sass/tree/mixin_node.rb
rename to lib/middleman/vendor/gems/gems/haml-2.2.16/lib/sass/tree/mixin_node.rb
diff --git a/lib/middleman/vendor/gems/gems/haml-2.2.15/lib/sass/tree/node.rb b/lib/middleman/vendor/gems/gems/haml-2.2.16/lib/sass/tree/node.rb
similarity index 98%
rename from lib/middleman/vendor/gems/gems/haml-2.2.15/lib/sass/tree/node.rb
rename to lib/middleman/vendor/gems/gems/haml-2.2.16/lib/sass/tree/node.rb
index 262bea2a..95e24e32 100644
--- a/lib/middleman/vendor/gems/gems/haml-2.2.15/lib/sass/tree/node.rb
+++ b/lib/middleman/vendor/gems/gems/haml-2.2.16/lib/sass/tree/node.rb
@@ -36,7 +36,7 @@ module Sass
# The options hash for the node.
# See {file:SASS_REFERENCE.md#sass_options the Sass options documentation}.
#
- # @return [Hash]
+ # @return [{Symbol => Object}]
attr_reader :options
def initialize
@@ -45,7 +45,7 @@ module Sass
# Sets the options hash for the node and all its children.
#
- # @param options [Hash] The options
+ # @param options [{Symbol => Object}] The options
# @see #options
def options=(options)
children.each {|c| c.options = options}
diff --git a/lib/middleman/vendor/gems/gems/haml-2.2.15/lib/sass/tree/prop_node.rb b/lib/middleman/vendor/gems/gems/haml-2.2.16/lib/sass/tree/prop_node.rb
similarity index 100%
rename from lib/middleman/vendor/gems/gems/haml-2.2.15/lib/sass/tree/prop_node.rb
rename to lib/middleman/vendor/gems/gems/haml-2.2.16/lib/sass/tree/prop_node.rb
diff --git a/lib/middleman/vendor/gems/gems/haml-2.2.15/lib/sass/tree/rule_node.rb b/lib/middleman/vendor/gems/gems/haml-2.2.16/lib/sass/tree/rule_node.rb
similarity index 100%
rename from lib/middleman/vendor/gems/gems/haml-2.2.15/lib/sass/tree/rule_node.rb
rename to lib/middleman/vendor/gems/gems/haml-2.2.16/lib/sass/tree/rule_node.rb
diff --git a/lib/middleman/vendor/gems/gems/haml-2.2.15/lib/sass/tree/variable_node.rb b/lib/middleman/vendor/gems/gems/haml-2.2.16/lib/sass/tree/variable_node.rb
similarity index 100%
rename from lib/middleman/vendor/gems/gems/haml-2.2.15/lib/sass/tree/variable_node.rb
rename to lib/middleman/vendor/gems/gems/haml-2.2.16/lib/sass/tree/variable_node.rb
diff --git a/lib/middleman/vendor/gems/gems/haml-2.2.15/lib/sass/tree/while_node.rb b/lib/middleman/vendor/gems/gems/haml-2.2.16/lib/sass/tree/while_node.rb
similarity index 100%
rename from lib/middleman/vendor/gems/gems/haml-2.2.15/lib/sass/tree/while_node.rb
rename to lib/middleman/vendor/gems/gems/haml-2.2.16/lib/sass/tree/while_node.rb
diff --git a/lib/middleman/vendor/gems/gems/haml-2.2.15/rails/init.rb b/lib/middleman/vendor/gems/gems/haml-2.2.16/rails/init.rb
similarity index 100%
rename from lib/middleman/vendor/gems/gems/haml-2.2.15/rails/init.rb
rename to lib/middleman/vendor/gems/gems/haml-2.2.16/rails/init.rb
diff --git a/lib/middleman/vendor/gems/gems/haml-2.2.15/test/benchmark.rb b/lib/middleman/vendor/gems/gems/haml-2.2.16/test/benchmark.rb
similarity index 100%
rename from lib/middleman/vendor/gems/gems/haml-2.2.15/test/benchmark.rb
rename to lib/middleman/vendor/gems/gems/haml-2.2.16/test/benchmark.rb
diff --git a/lib/middleman/vendor/gems/gems/haml-2.2.15/test/haml/engine_test.rb b/lib/middleman/vendor/gems/gems/haml-2.2.16/test/haml/engine_test.rb
similarity index 100%
rename from lib/middleman/vendor/gems/gems/haml-2.2.15/test/haml/engine_test.rb
rename to lib/middleman/vendor/gems/gems/haml-2.2.16/test/haml/engine_test.rb
diff --git a/lib/middleman/vendor/gems/gems/haml-2.2.15/test/haml/helper_test.rb b/lib/middleman/vendor/gems/gems/haml-2.2.16/test/haml/helper_test.rb
similarity index 99%
rename from lib/middleman/vendor/gems/gems/haml-2.2.15/test/haml/helper_test.rb
rename to lib/middleman/vendor/gems/gems/haml-2.2.16/test/haml/helper_test.rb
index b3814f98..42a8bb25 100644
--- a/lib/middleman/vendor/gems/gems/haml-2.2.15/test/haml/helper_test.rb
+++ b/lib/middleman/vendor/gems/gems/haml-2.2.16/test/haml/helper_test.rb
@@ -73,7 +73,7 @@ class HelperTest < Test::Unit::TestCase
begin
ActionView::Base.new.render(:inline => "<%= flatten('Foo\\nBar') %>")
- rescue NoMethodError, ActionView::TemplateError
+ rescue NoMethodError, Haml::Util.av_template_class(:Error)
proper_behavior = true
end
assert(proper_behavior)
diff --git a/lib/middleman/vendor/gems/gems/haml-2.2.15/test/haml/html2haml_test.rb b/lib/middleman/vendor/gems/gems/haml-2.2.16/test/haml/html2haml_test.rb
similarity index 100%
rename from lib/middleman/vendor/gems/gems/haml-2.2.15/test/haml/html2haml_test.rb
rename to lib/middleman/vendor/gems/gems/haml-2.2.16/test/haml/html2haml_test.rb
diff --git a/lib/middleman/vendor/gems/gems/haml-2.2.15/test/haml/markaby/standard.mab b/lib/middleman/vendor/gems/gems/haml-2.2.16/test/haml/markaby/standard.mab
similarity index 100%
rename from lib/middleman/vendor/gems/gems/haml-2.2.15/test/haml/markaby/standard.mab
rename to lib/middleman/vendor/gems/gems/haml-2.2.16/test/haml/markaby/standard.mab
diff --git a/lib/middleman/vendor/gems/gems/haml-2.2.15/test/haml/mocks/article.rb b/lib/middleman/vendor/gems/gems/haml-2.2.16/test/haml/mocks/article.rb
similarity index 100%
rename from lib/middleman/vendor/gems/gems/haml-2.2.15/test/haml/mocks/article.rb
rename to lib/middleman/vendor/gems/gems/haml-2.2.16/test/haml/mocks/article.rb
diff --git a/lib/middleman/vendor/gems/gems/haml-2.2.15/test/haml/results/content_for_layout.xhtml b/lib/middleman/vendor/gems/gems/haml-2.2.16/test/haml/results/content_for_layout.xhtml
similarity index 100%
rename from lib/middleman/vendor/gems/gems/haml-2.2.15/test/haml/results/content_for_layout.xhtml
rename to lib/middleman/vendor/gems/gems/haml-2.2.16/test/haml/results/content_for_layout.xhtml
diff --git a/lib/middleman/vendor/gems/gems/haml-2.2.15/test/haml/results/eval_suppressed.xhtml b/lib/middleman/vendor/gems/gems/haml-2.2.16/test/haml/results/eval_suppressed.xhtml
similarity index 100%
rename from lib/middleman/vendor/gems/gems/haml-2.2.15/test/haml/results/eval_suppressed.xhtml
rename to lib/middleman/vendor/gems/gems/haml-2.2.16/test/haml/results/eval_suppressed.xhtml
diff --git a/lib/middleman/vendor/gems/gems/haml-2.2.15/test/haml/results/filters.xhtml b/lib/middleman/vendor/gems/gems/haml-2.2.16/test/haml/results/filters.xhtml
similarity index 100%
rename from lib/middleman/vendor/gems/gems/haml-2.2.15/test/haml/results/filters.xhtml
rename to lib/middleman/vendor/gems/gems/haml-2.2.16/test/haml/results/filters.xhtml
diff --git a/lib/middleman/vendor/gems/gems/haml-2.2.15/test/haml/results/helpers.xhtml b/lib/middleman/vendor/gems/gems/haml-2.2.16/test/haml/results/helpers.xhtml
similarity index 100%
rename from lib/middleman/vendor/gems/gems/haml-2.2.15/test/haml/results/helpers.xhtml
rename to lib/middleman/vendor/gems/gems/haml-2.2.16/test/haml/results/helpers.xhtml
diff --git a/lib/middleman/vendor/gems/gems/haml-2.2.15/test/haml/results/helpful.xhtml b/lib/middleman/vendor/gems/gems/haml-2.2.16/test/haml/results/helpful.xhtml
similarity index 100%
rename from lib/middleman/vendor/gems/gems/haml-2.2.15/test/haml/results/helpful.xhtml
rename to lib/middleman/vendor/gems/gems/haml-2.2.16/test/haml/results/helpful.xhtml
diff --git a/lib/middleman/vendor/gems/gems/haml-2.2.15/test/haml/results/just_stuff.xhtml b/lib/middleman/vendor/gems/gems/haml-2.2.16/test/haml/results/just_stuff.xhtml
similarity index 100%
rename from lib/middleman/vendor/gems/gems/haml-2.2.15/test/haml/results/just_stuff.xhtml
rename to lib/middleman/vendor/gems/gems/haml-2.2.16/test/haml/results/just_stuff.xhtml
diff --git a/lib/middleman/vendor/gems/gems/haml-2.2.15/test/haml/results/list.xhtml b/lib/middleman/vendor/gems/gems/haml-2.2.16/test/haml/results/list.xhtml
similarity index 100%
rename from lib/middleman/vendor/gems/gems/haml-2.2.15/test/haml/results/list.xhtml
rename to lib/middleman/vendor/gems/gems/haml-2.2.16/test/haml/results/list.xhtml
diff --git a/lib/middleman/vendor/gems/gems/haml-2.2.15/test/haml/results/nuke_inner_whitespace.xhtml b/lib/middleman/vendor/gems/gems/haml-2.2.16/test/haml/results/nuke_inner_whitespace.xhtml
similarity index 100%
rename from lib/middleman/vendor/gems/gems/haml-2.2.15/test/haml/results/nuke_inner_whitespace.xhtml
rename to lib/middleman/vendor/gems/gems/haml-2.2.16/test/haml/results/nuke_inner_whitespace.xhtml
diff --git a/lib/middleman/vendor/gems/gems/haml-2.2.15/test/haml/results/nuke_outer_whitespace.xhtml b/lib/middleman/vendor/gems/gems/haml-2.2.16/test/haml/results/nuke_outer_whitespace.xhtml
similarity index 100%
rename from lib/middleman/vendor/gems/gems/haml-2.2.15/test/haml/results/nuke_outer_whitespace.xhtml
rename to lib/middleman/vendor/gems/gems/haml-2.2.16/test/haml/results/nuke_outer_whitespace.xhtml
diff --git a/lib/middleman/vendor/gems/gems/haml-2.2.15/test/haml/results/original_engine.xhtml b/lib/middleman/vendor/gems/gems/haml-2.2.16/test/haml/results/original_engine.xhtml
similarity index 100%
rename from lib/middleman/vendor/gems/gems/haml-2.2.15/test/haml/results/original_engine.xhtml
rename to lib/middleman/vendor/gems/gems/haml-2.2.16/test/haml/results/original_engine.xhtml
diff --git a/lib/middleman/vendor/gems/gems/haml-2.2.15/test/haml/results/partial_layout.xhtml b/lib/middleman/vendor/gems/gems/haml-2.2.16/test/haml/results/partial_layout.xhtml
similarity index 100%
rename from lib/middleman/vendor/gems/gems/haml-2.2.15/test/haml/results/partial_layout.xhtml
rename to lib/middleman/vendor/gems/gems/haml-2.2.16/test/haml/results/partial_layout.xhtml
diff --git a/lib/middleman/vendor/gems/gems/haml-2.2.15/test/haml/results/partials.xhtml b/lib/middleman/vendor/gems/gems/haml-2.2.16/test/haml/results/partials.xhtml
similarity index 100%
rename from lib/middleman/vendor/gems/gems/haml-2.2.15/test/haml/results/partials.xhtml
rename to lib/middleman/vendor/gems/gems/haml-2.2.16/test/haml/results/partials.xhtml
diff --git a/lib/middleman/vendor/gems/gems/haml-2.2.15/test/haml/results/render_layout.xhtml b/lib/middleman/vendor/gems/gems/haml-2.2.16/test/haml/results/render_layout.xhtml
similarity index 100%
rename from lib/middleman/vendor/gems/gems/haml-2.2.15/test/haml/results/render_layout.xhtml
rename to lib/middleman/vendor/gems/gems/haml-2.2.16/test/haml/results/render_layout.xhtml
diff --git a/lib/middleman/vendor/gems/gems/haml-2.2.15/test/haml/results/silent_script.xhtml b/lib/middleman/vendor/gems/gems/haml-2.2.16/test/haml/results/silent_script.xhtml
similarity index 100%
rename from lib/middleman/vendor/gems/gems/haml-2.2.15/test/haml/results/silent_script.xhtml
rename to lib/middleman/vendor/gems/gems/haml-2.2.16/test/haml/results/silent_script.xhtml
diff --git a/lib/middleman/vendor/gems/gems/haml-2.2.15/test/haml/results/standard.xhtml b/lib/middleman/vendor/gems/gems/haml-2.2.16/test/haml/results/standard.xhtml
similarity index 100%
rename from lib/middleman/vendor/gems/gems/haml-2.2.15/test/haml/results/standard.xhtml
rename to lib/middleman/vendor/gems/gems/haml-2.2.16/test/haml/results/standard.xhtml
diff --git a/lib/middleman/vendor/gems/gems/haml-2.2.15/test/haml/results/tag_parsing.xhtml b/lib/middleman/vendor/gems/gems/haml-2.2.16/test/haml/results/tag_parsing.xhtml
similarity index 100%
rename from lib/middleman/vendor/gems/gems/haml-2.2.15/test/haml/results/tag_parsing.xhtml
rename to lib/middleman/vendor/gems/gems/haml-2.2.16/test/haml/results/tag_parsing.xhtml
diff --git a/lib/middleman/vendor/gems/gems/haml-2.2.15/test/haml/results/very_basic.xhtml b/lib/middleman/vendor/gems/gems/haml-2.2.16/test/haml/results/very_basic.xhtml
similarity index 100%
rename from lib/middleman/vendor/gems/gems/haml-2.2.15/test/haml/results/very_basic.xhtml
rename to lib/middleman/vendor/gems/gems/haml-2.2.16/test/haml/results/very_basic.xhtml
diff --git a/lib/middleman/vendor/gems/gems/haml-2.2.15/test/haml/results/whitespace_handling.xhtml b/lib/middleman/vendor/gems/gems/haml-2.2.16/test/haml/results/whitespace_handling.xhtml
similarity index 100%
rename from lib/middleman/vendor/gems/gems/haml-2.2.15/test/haml/results/whitespace_handling.xhtml
rename to lib/middleman/vendor/gems/gems/haml-2.2.16/test/haml/results/whitespace_handling.xhtml
diff --git a/lib/middleman/vendor/gems/gems/haml-2.2.15/test/haml/rhtml/_av_partial_1.rhtml b/lib/middleman/vendor/gems/gems/haml-2.2.16/test/haml/rhtml/_av_partial_1.rhtml
similarity index 100%
rename from lib/middleman/vendor/gems/gems/haml-2.2.15/test/haml/rhtml/_av_partial_1.rhtml
rename to lib/middleman/vendor/gems/gems/haml-2.2.16/test/haml/rhtml/_av_partial_1.rhtml
diff --git a/lib/middleman/vendor/gems/gems/haml-2.2.15/test/haml/rhtml/_av_partial_2.rhtml b/lib/middleman/vendor/gems/gems/haml-2.2.16/test/haml/rhtml/_av_partial_2.rhtml
similarity index 100%
rename from lib/middleman/vendor/gems/gems/haml-2.2.15/test/haml/rhtml/_av_partial_2.rhtml
rename to lib/middleman/vendor/gems/gems/haml-2.2.16/test/haml/rhtml/_av_partial_2.rhtml
diff --git a/lib/middleman/vendor/gems/gems/haml-2.2.15/test/haml/rhtml/action_view.rhtml b/lib/middleman/vendor/gems/gems/haml-2.2.16/test/haml/rhtml/action_view.rhtml
similarity index 100%
rename from lib/middleman/vendor/gems/gems/haml-2.2.15/test/haml/rhtml/action_view.rhtml
rename to lib/middleman/vendor/gems/gems/haml-2.2.16/test/haml/rhtml/action_view.rhtml
diff --git a/lib/middleman/vendor/gems/gems/haml-2.2.15/test/haml/rhtml/standard.rhtml b/lib/middleman/vendor/gems/gems/haml-2.2.16/test/haml/rhtml/standard.rhtml
similarity index 100%
rename from lib/middleman/vendor/gems/gems/haml-2.2.15/test/haml/rhtml/standard.rhtml
rename to lib/middleman/vendor/gems/gems/haml-2.2.16/test/haml/rhtml/standard.rhtml
diff --git a/lib/middleman/vendor/gems/gems/haml-2.2.15/test/haml/spec/README.md b/lib/middleman/vendor/gems/gems/haml-2.2.16/test/haml/spec/README.md
similarity index 100%
rename from lib/middleman/vendor/gems/gems/haml-2.2.15/test/haml/spec/README.md
rename to lib/middleman/vendor/gems/gems/haml-2.2.16/test/haml/spec/README.md
diff --git a/lib/middleman/vendor/gems/gems/haml-2.2.15/test/haml/spec/lua_haml_spec.lua b/lib/middleman/vendor/gems/gems/haml-2.2.16/test/haml/spec/lua_haml_spec.lua
similarity index 100%
rename from lib/middleman/vendor/gems/gems/haml-2.2.15/test/haml/spec/lua_haml_spec.lua
rename to lib/middleman/vendor/gems/gems/haml-2.2.16/test/haml/spec/lua_haml_spec.lua
diff --git a/lib/middleman/vendor/gems/gems/haml-2.2.15/test/haml/spec/ruby_haml_test.rb b/lib/middleman/vendor/gems/gems/haml-2.2.16/test/haml/spec/ruby_haml_test.rb
similarity index 100%
rename from lib/middleman/vendor/gems/gems/haml-2.2.15/test/haml/spec/ruby_haml_test.rb
rename to lib/middleman/vendor/gems/gems/haml-2.2.16/test/haml/spec/ruby_haml_test.rb
diff --git a/lib/middleman/vendor/gems/gems/haml-2.2.15/test/haml/spec/tests.json b/lib/middleman/vendor/gems/gems/haml-2.2.16/test/haml/spec/tests.json
similarity index 100%
rename from lib/middleman/vendor/gems/gems/haml-2.2.15/test/haml/spec/tests.json
rename to lib/middleman/vendor/gems/gems/haml-2.2.16/test/haml/spec/tests.json
diff --git a/lib/middleman/vendor/gems/gems/haml-2.2.15/test/haml/template_test.rb b/lib/middleman/vendor/gems/gems/haml-2.2.16/test/haml/template_test.rb
similarity index 99%
rename from lib/middleman/vendor/gems/gems/haml-2.2.15/test/haml/template_test.rb
rename to lib/middleman/vendor/gems/gems/haml-2.2.16/test/haml/template_test.rb
index ee5f0603..e813ee9b 100644
--- a/lib/middleman/vendor/gems/gems/haml-2.2.15/test/haml/template_test.rb
+++ b/lib/middleman/vendor/gems/gems/haml-2.2.16/test/haml/template_test.rb
@@ -109,7 +109,7 @@ class TemplateTest < Test::Unit::TestCase
message = "template: #{name}\nline: #{line}"
assert_equal(pair.first, pair.last, message)
end
- rescue ActionView::TemplateError => e
+ rescue Haml::Util.av_template_class(:Error) => e
if e.message =~ /Can't run [\w:]+ filter; required (one of|file) ((?:'\w+'(?: or )?)+)(, but none were found| not found)/
puts "\nCouldn't require #{$2}; skipping a test."
else
diff --git a/lib/middleman/vendor/gems/gems/haml-2.2.15/test/haml/templates/_av_partial_1.haml b/lib/middleman/vendor/gems/gems/haml-2.2.16/test/haml/templates/_av_partial_1.haml
similarity index 100%
rename from lib/middleman/vendor/gems/gems/haml-2.2.15/test/haml/templates/_av_partial_1.haml
rename to lib/middleman/vendor/gems/gems/haml-2.2.16/test/haml/templates/_av_partial_1.haml
diff --git a/lib/middleman/vendor/gems/gems/haml-2.2.15/test/haml/templates/_av_partial_1_ugly.haml b/lib/middleman/vendor/gems/gems/haml-2.2.16/test/haml/templates/_av_partial_1_ugly.haml
similarity index 100%
rename from lib/middleman/vendor/gems/gems/haml-2.2.15/test/haml/templates/_av_partial_1_ugly.haml
rename to lib/middleman/vendor/gems/gems/haml-2.2.16/test/haml/templates/_av_partial_1_ugly.haml
diff --git a/lib/middleman/vendor/gems/gems/haml-2.2.15/test/haml/templates/_av_partial_2.haml b/lib/middleman/vendor/gems/gems/haml-2.2.16/test/haml/templates/_av_partial_2.haml
similarity index 100%
rename from lib/middleman/vendor/gems/gems/haml-2.2.15/test/haml/templates/_av_partial_2.haml
rename to lib/middleman/vendor/gems/gems/haml-2.2.16/test/haml/templates/_av_partial_2.haml
diff --git a/lib/middleman/vendor/gems/gems/haml-2.2.15/test/haml/templates/_av_partial_2_ugly.haml b/lib/middleman/vendor/gems/gems/haml-2.2.16/test/haml/templates/_av_partial_2_ugly.haml
similarity index 100%
rename from lib/middleman/vendor/gems/gems/haml-2.2.15/test/haml/templates/_av_partial_2_ugly.haml
rename to lib/middleman/vendor/gems/gems/haml-2.2.16/test/haml/templates/_av_partial_2_ugly.haml
diff --git a/lib/middleman/vendor/gems/gems/haml-2.2.15/test/haml/templates/_layout.erb b/lib/middleman/vendor/gems/gems/haml-2.2.16/test/haml/templates/_layout.erb
similarity index 100%
rename from lib/middleman/vendor/gems/gems/haml-2.2.15/test/haml/templates/_layout.erb
rename to lib/middleman/vendor/gems/gems/haml-2.2.16/test/haml/templates/_layout.erb
diff --git a/lib/middleman/vendor/gems/gems/haml-2.2.15/test/haml/templates/_layout_for_partial.haml b/lib/middleman/vendor/gems/gems/haml-2.2.16/test/haml/templates/_layout_for_partial.haml
similarity index 100%
rename from lib/middleman/vendor/gems/gems/haml-2.2.15/test/haml/templates/_layout_for_partial.haml
rename to lib/middleman/vendor/gems/gems/haml-2.2.16/test/haml/templates/_layout_for_partial.haml
diff --git a/lib/middleman/vendor/gems/gems/haml-2.2.15/test/haml/templates/_partial.haml b/lib/middleman/vendor/gems/gems/haml-2.2.16/test/haml/templates/_partial.haml
similarity index 100%
rename from lib/middleman/vendor/gems/gems/haml-2.2.15/test/haml/templates/_partial.haml
rename to lib/middleman/vendor/gems/gems/haml-2.2.16/test/haml/templates/_partial.haml
diff --git a/lib/middleman/vendor/gems/gems/haml-2.2.15/test/haml/templates/_text_area.haml b/lib/middleman/vendor/gems/gems/haml-2.2.16/test/haml/templates/_text_area.haml
similarity index 100%
rename from lib/middleman/vendor/gems/gems/haml-2.2.15/test/haml/templates/_text_area.haml
rename to lib/middleman/vendor/gems/gems/haml-2.2.16/test/haml/templates/_text_area.haml
diff --git a/lib/middleman/vendor/gems/gems/haml-2.2.15/test/haml/templates/action_view.haml b/lib/middleman/vendor/gems/gems/haml-2.2.16/test/haml/templates/action_view.haml
similarity index 100%
rename from lib/middleman/vendor/gems/gems/haml-2.2.15/test/haml/templates/action_view.haml
rename to lib/middleman/vendor/gems/gems/haml-2.2.16/test/haml/templates/action_view.haml
diff --git a/lib/middleman/vendor/gems/gems/haml-2.2.15/test/haml/templates/action_view_ugly.haml b/lib/middleman/vendor/gems/gems/haml-2.2.16/test/haml/templates/action_view_ugly.haml
similarity index 100%
rename from lib/middleman/vendor/gems/gems/haml-2.2.15/test/haml/templates/action_view_ugly.haml
rename to lib/middleman/vendor/gems/gems/haml-2.2.16/test/haml/templates/action_view_ugly.haml
diff --git a/lib/middleman/vendor/gems/gems/haml-2.2.15/test/haml/templates/breakage.haml b/lib/middleman/vendor/gems/gems/haml-2.2.16/test/haml/templates/breakage.haml
similarity index 100%
rename from lib/middleman/vendor/gems/gems/haml-2.2.15/test/haml/templates/breakage.haml
rename to lib/middleman/vendor/gems/gems/haml-2.2.16/test/haml/templates/breakage.haml
diff --git a/lib/middleman/vendor/gems/gems/haml-2.2.15/test/haml/templates/content_for_layout.haml b/lib/middleman/vendor/gems/gems/haml-2.2.16/test/haml/templates/content_for_layout.haml
similarity index 100%
rename from lib/middleman/vendor/gems/gems/haml-2.2.15/test/haml/templates/content_for_layout.haml
rename to lib/middleman/vendor/gems/gems/haml-2.2.16/test/haml/templates/content_for_layout.haml
diff --git a/lib/middleman/vendor/gems/gems/haml-2.2.15/test/haml/templates/eval_suppressed.haml b/lib/middleman/vendor/gems/gems/haml-2.2.16/test/haml/templates/eval_suppressed.haml
similarity index 100%
rename from lib/middleman/vendor/gems/gems/haml-2.2.15/test/haml/templates/eval_suppressed.haml
rename to lib/middleman/vendor/gems/gems/haml-2.2.16/test/haml/templates/eval_suppressed.haml
diff --git a/lib/middleman/vendor/gems/gems/haml-2.2.15/test/haml/templates/filters.haml b/lib/middleman/vendor/gems/gems/haml-2.2.16/test/haml/templates/filters.haml
similarity index 100%
rename from lib/middleman/vendor/gems/gems/haml-2.2.15/test/haml/templates/filters.haml
rename to lib/middleman/vendor/gems/gems/haml-2.2.16/test/haml/templates/filters.haml
diff --git a/lib/middleman/vendor/gems/gems/haml-2.2.15/test/haml/templates/helpers.haml b/lib/middleman/vendor/gems/gems/haml-2.2.16/test/haml/templates/helpers.haml
similarity index 100%
rename from lib/middleman/vendor/gems/gems/haml-2.2.15/test/haml/templates/helpers.haml
rename to lib/middleman/vendor/gems/gems/haml-2.2.16/test/haml/templates/helpers.haml
diff --git a/lib/middleman/vendor/gems/gems/haml-2.2.15/test/haml/templates/helpful.haml b/lib/middleman/vendor/gems/gems/haml-2.2.16/test/haml/templates/helpful.haml
similarity index 100%
rename from lib/middleman/vendor/gems/gems/haml-2.2.15/test/haml/templates/helpful.haml
rename to lib/middleman/vendor/gems/gems/haml-2.2.16/test/haml/templates/helpful.haml
diff --git a/lib/middleman/vendor/gems/gems/haml-2.2.15/test/haml/templates/just_stuff.haml b/lib/middleman/vendor/gems/gems/haml-2.2.16/test/haml/templates/just_stuff.haml
similarity index 100%
rename from lib/middleman/vendor/gems/gems/haml-2.2.15/test/haml/templates/just_stuff.haml
rename to lib/middleman/vendor/gems/gems/haml-2.2.16/test/haml/templates/just_stuff.haml
diff --git a/lib/middleman/vendor/gems/gems/haml-2.2.15/test/haml/templates/list.haml b/lib/middleman/vendor/gems/gems/haml-2.2.16/test/haml/templates/list.haml
similarity index 100%
rename from lib/middleman/vendor/gems/gems/haml-2.2.15/test/haml/templates/list.haml
rename to lib/middleman/vendor/gems/gems/haml-2.2.16/test/haml/templates/list.haml
diff --git a/lib/middleman/vendor/gems/gems/haml-2.2.15/test/haml/templates/nuke_inner_whitespace.haml b/lib/middleman/vendor/gems/gems/haml-2.2.16/test/haml/templates/nuke_inner_whitespace.haml
similarity index 100%
rename from lib/middleman/vendor/gems/gems/haml-2.2.15/test/haml/templates/nuke_inner_whitespace.haml
rename to lib/middleman/vendor/gems/gems/haml-2.2.16/test/haml/templates/nuke_inner_whitespace.haml
diff --git a/lib/middleman/vendor/gems/gems/haml-2.2.15/test/haml/templates/nuke_outer_whitespace.haml b/lib/middleman/vendor/gems/gems/haml-2.2.16/test/haml/templates/nuke_outer_whitespace.haml
similarity index 100%
rename from lib/middleman/vendor/gems/gems/haml-2.2.15/test/haml/templates/nuke_outer_whitespace.haml
rename to lib/middleman/vendor/gems/gems/haml-2.2.16/test/haml/templates/nuke_outer_whitespace.haml
diff --git a/lib/middleman/vendor/gems/gems/haml-2.2.15/test/haml/templates/original_engine.haml b/lib/middleman/vendor/gems/gems/haml-2.2.16/test/haml/templates/original_engine.haml
similarity index 100%
rename from lib/middleman/vendor/gems/gems/haml-2.2.15/test/haml/templates/original_engine.haml
rename to lib/middleman/vendor/gems/gems/haml-2.2.16/test/haml/templates/original_engine.haml
diff --git a/lib/middleman/vendor/gems/gems/haml-2.2.15/test/haml/templates/partial_layout.haml b/lib/middleman/vendor/gems/gems/haml-2.2.16/test/haml/templates/partial_layout.haml
similarity index 100%
rename from lib/middleman/vendor/gems/gems/haml-2.2.15/test/haml/templates/partial_layout.haml
rename to lib/middleman/vendor/gems/gems/haml-2.2.16/test/haml/templates/partial_layout.haml
diff --git a/lib/middleman/vendor/gems/gems/haml-2.2.15/test/haml/templates/partialize.haml b/lib/middleman/vendor/gems/gems/haml-2.2.16/test/haml/templates/partialize.haml
similarity index 100%
rename from lib/middleman/vendor/gems/gems/haml-2.2.15/test/haml/templates/partialize.haml
rename to lib/middleman/vendor/gems/gems/haml-2.2.16/test/haml/templates/partialize.haml
diff --git a/lib/middleman/vendor/gems/gems/haml-2.2.15/test/haml/templates/partials.haml b/lib/middleman/vendor/gems/gems/haml-2.2.16/test/haml/templates/partials.haml
similarity index 100%
rename from lib/middleman/vendor/gems/gems/haml-2.2.15/test/haml/templates/partials.haml
rename to lib/middleman/vendor/gems/gems/haml-2.2.16/test/haml/templates/partials.haml
diff --git a/lib/middleman/vendor/gems/gems/haml-2.2.15/test/haml/templates/render_layout.haml b/lib/middleman/vendor/gems/gems/haml-2.2.16/test/haml/templates/render_layout.haml
similarity index 100%
rename from lib/middleman/vendor/gems/gems/haml-2.2.15/test/haml/templates/render_layout.haml
rename to lib/middleman/vendor/gems/gems/haml-2.2.16/test/haml/templates/render_layout.haml
diff --git a/lib/middleman/vendor/gems/gems/haml-2.2.15/test/haml/templates/silent_script.haml b/lib/middleman/vendor/gems/gems/haml-2.2.16/test/haml/templates/silent_script.haml
similarity index 100%
rename from lib/middleman/vendor/gems/gems/haml-2.2.15/test/haml/templates/silent_script.haml
rename to lib/middleman/vendor/gems/gems/haml-2.2.16/test/haml/templates/silent_script.haml
diff --git a/lib/middleman/vendor/gems/gems/haml-2.2.15/test/haml/templates/standard.haml b/lib/middleman/vendor/gems/gems/haml-2.2.16/test/haml/templates/standard.haml
similarity index 100%
rename from lib/middleman/vendor/gems/gems/haml-2.2.15/test/haml/templates/standard.haml
rename to lib/middleman/vendor/gems/gems/haml-2.2.16/test/haml/templates/standard.haml
diff --git a/lib/middleman/vendor/gems/gems/haml-2.2.15/test/haml/templates/standard_ugly.haml b/lib/middleman/vendor/gems/gems/haml-2.2.16/test/haml/templates/standard_ugly.haml
similarity index 100%
rename from lib/middleman/vendor/gems/gems/haml-2.2.15/test/haml/templates/standard_ugly.haml
rename to lib/middleman/vendor/gems/gems/haml-2.2.16/test/haml/templates/standard_ugly.haml
diff --git a/lib/middleman/vendor/gems/gems/haml-2.2.15/test/haml/templates/tag_parsing.haml b/lib/middleman/vendor/gems/gems/haml-2.2.16/test/haml/templates/tag_parsing.haml
similarity index 100%
rename from lib/middleman/vendor/gems/gems/haml-2.2.15/test/haml/templates/tag_parsing.haml
rename to lib/middleman/vendor/gems/gems/haml-2.2.16/test/haml/templates/tag_parsing.haml
diff --git a/lib/middleman/vendor/gems/gems/haml-2.2.15/test/haml/templates/very_basic.haml b/lib/middleman/vendor/gems/gems/haml-2.2.16/test/haml/templates/very_basic.haml
similarity index 100%
rename from lib/middleman/vendor/gems/gems/haml-2.2.15/test/haml/templates/very_basic.haml
rename to lib/middleman/vendor/gems/gems/haml-2.2.16/test/haml/templates/very_basic.haml
diff --git a/lib/middleman/vendor/gems/gems/haml-2.2.15/test/haml/templates/whitespace_handling.haml b/lib/middleman/vendor/gems/gems/haml-2.2.16/test/haml/templates/whitespace_handling.haml
similarity index 100%
rename from lib/middleman/vendor/gems/gems/haml-2.2.15/test/haml/templates/whitespace_handling.haml
rename to lib/middleman/vendor/gems/gems/haml-2.2.16/test/haml/templates/whitespace_handling.haml
diff --git a/lib/middleman/vendor/gems/gems/haml-2.2.15/test/haml/util_test.rb b/lib/middleman/vendor/gems/gems/haml-2.2.16/test/haml/util_test.rb
similarity index 100%
rename from lib/middleman/vendor/gems/gems/haml-2.2.15/test/haml/util_test.rb
rename to lib/middleman/vendor/gems/gems/haml-2.2.16/test/haml/util_test.rb
diff --git a/lib/middleman/vendor/gems/gems/haml-2.2.15/test/linked_rails.rb b/lib/middleman/vendor/gems/gems/haml-2.2.16/test/linked_rails.rb
similarity index 100%
rename from lib/middleman/vendor/gems/gems/haml-2.2.15/test/linked_rails.rb
rename to lib/middleman/vendor/gems/gems/haml-2.2.16/test/linked_rails.rb
diff --git a/lib/middleman/vendor/gems/gems/haml-2.2.15/test/sass/css2sass_test.rb b/lib/middleman/vendor/gems/gems/haml-2.2.16/test/sass/css2sass_test.rb
similarity index 100%
rename from lib/middleman/vendor/gems/gems/haml-2.2.15/test/sass/css2sass_test.rb
rename to lib/middleman/vendor/gems/gems/haml-2.2.16/test/sass/css2sass_test.rb
diff --git a/lib/middleman/vendor/gems/gems/haml-2.2.15/test/sass/engine_test.rb b/lib/middleman/vendor/gems/gems/haml-2.2.16/test/sass/engine_test.rb
similarity index 100%
rename from lib/middleman/vendor/gems/gems/haml-2.2.15/test/sass/engine_test.rb
rename to lib/middleman/vendor/gems/gems/haml-2.2.16/test/sass/engine_test.rb
diff --git a/lib/middleman/vendor/gems/gems/haml-2.2.15/test/sass/functions_test.rb b/lib/middleman/vendor/gems/gems/haml-2.2.16/test/sass/functions_test.rb
similarity index 95%
rename from lib/middleman/vendor/gems/gems/haml-2.2.15/test/sass/functions_test.rb
rename to lib/middleman/vendor/gems/gems/haml-2.2.16/test/sass/functions_test.rb
index ef45ad94..721db5e3 100644
--- a/lib/middleman/vendor/gems/gems/haml-2.2.15/test/sass/functions_test.rb
+++ b/lib/middleman/vendor/gems/gems/haml-2.2.16/test/sass/functions_test.rb
@@ -2,6 +2,16 @@ require 'test/unit'
require File.dirname(__FILE__) + '/../../lib/sass'
require 'sass/script'
+module UserFunctions
+ def user_defined
+ Sass::Script::String.new("I'm a user-defined string!")
+ end
+end
+
+module Sass::Script::Functions
+ include UserFunctions
+end
+
class SassFunctionTest < Test::Unit::TestCase
def test_hsl
# These tests adapted from the w3c browser tests
@@ -138,6 +148,10 @@ class SassFunctionTest < Test::Unit::TestCase
assert_error_message("\"foo\" is not a number for `rgb'", "rgb(10, 10, \"foo\")");
end
+ def test_user_defined_function
+ assert_equal("I'm a user-defined string!", evaluate("user_defined()"))
+ end
+
private
def assert_rgb_hsl(rgb, hsl)
diff --git a/lib/middleman/vendor/gems/gems/haml-2.2.15/test/sass/more_results/more1.css b/lib/middleman/vendor/gems/gems/haml-2.2.16/test/sass/more_results/more1.css
similarity index 100%
rename from lib/middleman/vendor/gems/gems/haml-2.2.15/test/sass/more_results/more1.css
rename to lib/middleman/vendor/gems/gems/haml-2.2.16/test/sass/more_results/more1.css
diff --git a/lib/middleman/vendor/gems/gems/haml-2.2.15/test/sass/more_results/more1_with_line_comments.css b/lib/middleman/vendor/gems/gems/haml-2.2.16/test/sass/more_results/more1_with_line_comments.css
similarity index 100%
rename from lib/middleman/vendor/gems/gems/haml-2.2.15/test/sass/more_results/more1_with_line_comments.css
rename to lib/middleman/vendor/gems/gems/haml-2.2.16/test/sass/more_results/more1_with_line_comments.css
diff --git a/lib/middleman/vendor/gems/gems/haml-2.2.15/test/sass/more_results/more_import.css b/lib/middleman/vendor/gems/gems/haml-2.2.16/test/sass/more_results/more_import.css
similarity index 100%
rename from lib/middleman/vendor/gems/gems/haml-2.2.15/test/sass/more_results/more_import.css
rename to lib/middleman/vendor/gems/gems/haml-2.2.16/test/sass/more_results/more_import.css
diff --git a/lib/middleman/vendor/gems/gems/haml-2.2.15/test/sass/more_templates/_more_partial.sass b/lib/middleman/vendor/gems/gems/haml-2.2.16/test/sass/more_templates/_more_partial.sass
similarity index 100%
rename from lib/middleman/vendor/gems/gems/haml-2.2.15/test/sass/more_templates/_more_partial.sass
rename to lib/middleman/vendor/gems/gems/haml-2.2.16/test/sass/more_templates/_more_partial.sass
diff --git a/lib/middleman/vendor/gems/gems/haml-2.2.15/test/sass/more_templates/more1.sass b/lib/middleman/vendor/gems/gems/haml-2.2.16/test/sass/more_templates/more1.sass
similarity index 100%
rename from lib/middleman/vendor/gems/gems/haml-2.2.15/test/sass/more_templates/more1.sass
rename to lib/middleman/vendor/gems/gems/haml-2.2.16/test/sass/more_templates/more1.sass
diff --git a/lib/middleman/vendor/gems/gems/haml-2.2.15/test/sass/more_templates/more_import.sass b/lib/middleman/vendor/gems/gems/haml-2.2.16/test/sass/more_templates/more_import.sass
similarity index 100%
rename from lib/middleman/vendor/gems/gems/haml-2.2.15/test/sass/more_templates/more_import.sass
rename to lib/middleman/vendor/gems/gems/haml-2.2.16/test/sass/more_templates/more_import.sass
diff --git a/lib/middleman/vendor/gems/gems/haml-2.2.15/test/sass/plugin_test.rb b/lib/middleman/vendor/gems/gems/haml-2.2.16/test/sass/plugin_test.rb
similarity index 100%
rename from lib/middleman/vendor/gems/gems/haml-2.2.15/test/sass/plugin_test.rb
rename to lib/middleman/vendor/gems/gems/haml-2.2.16/test/sass/plugin_test.rb
diff --git a/lib/middleman/vendor/gems/gems/haml-2.2.15/test/sass/results/alt.css b/lib/middleman/vendor/gems/gems/haml-2.2.16/test/sass/results/alt.css
similarity index 100%
rename from lib/middleman/vendor/gems/gems/haml-2.2.15/test/sass/results/alt.css
rename to lib/middleman/vendor/gems/gems/haml-2.2.16/test/sass/results/alt.css
diff --git a/lib/middleman/vendor/gems/gems/haml-2.2.15/test/sass/results/basic.css b/lib/middleman/vendor/gems/gems/haml-2.2.16/test/sass/results/basic.css
similarity index 100%
rename from lib/middleman/vendor/gems/gems/haml-2.2.15/test/sass/results/basic.css
rename to lib/middleman/vendor/gems/gems/haml-2.2.16/test/sass/results/basic.css
diff --git a/lib/middleman/vendor/gems/gems/haml-2.2.15/test/sass/results/compact.css b/lib/middleman/vendor/gems/gems/haml-2.2.16/test/sass/results/compact.css
similarity index 100%
rename from lib/middleman/vendor/gems/gems/haml-2.2.15/test/sass/results/compact.css
rename to lib/middleman/vendor/gems/gems/haml-2.2.16/test/sass/results/compact.css
diff --git a/lib/middleman/vendor/gems/gems/haml-2.2.15/test/sass/results/complex.css b/lib/middleman/vendor/gems/gems/haml-2.2.16/test/sass/results/complex.css
similarity index 100%
rename from lib/middleman/vendor/gems/gems/haml-2.2.15/test/sass/results/complex.css
rename to lib/middleman/vendor/gems/gems/haml-2.2.16/test/sass/results/complex.css
diff --git a/lib/middleman/vendor/gems/gems/haml-2.2.15/test/sass/results/compressed.css b/lib/middleman/vendor/gems/gems/haml-2.2.16/test/sass/results/compressed.css
similarity index 100%
rename from lib/middleman/vendor/gems/gems/haml-2.2.15/test/sass/results/compressed.css
rename to lib/middleman/vendor/gems/gems/haml-2.2.16/test/sass/results/compressed.css
diff --git a/lib/middleman/vendor/gems/gems/haml-2.2.15/test/sass/results/expanded.css b/lib/middleman/vendor/gems/gems/haml-2.2.16/test/sass/results/expanded.css
similarity index 100%
rename from lib/middleman/vendor/gems/gems/haml-2.2.15/test/sass/results/expanded.css
rename to lib/middleman/vendor/gems/gems/haml-2.2.16/test/sass/results/expanded.css
diff --git a/lib/middleman/vendor/gems/gems/haml-2.2.15/test/sass/results/import.css b/lib/middleman/vendor/gems/gems/haml-2.2.16/test/sass/results/import.css
similarity index 100%
rename from lib/middleman/vendor/gems/gems/haml-2.2.15/test/sass/results/import.css
rename to lib/middleman/vendor/gems/gems/haml-2.2.16/test/sass/results/import.css
diff --git a/lib/middleman/vendor/gems/gems/haml-2.2.15/test/sass/results/line_numbers.css b/lib/middleman/vendor/gems/gems/haml-2.2.16/test/sass/results/line_numbers.css
similarity index 100%
rename from lib/middleman/vendor/gems/gems/haml-2.2.15/test/sass/results/line_numbers.css
rename to lib/middleman/vendor/gems/gems/haml-2.2.16/test/sass/results/line_numbers.css
diff --git a/lib/middleman/vendor/gems/gems/haml-2.2.15/test/sass/results/mixins.css b/lib/middleman/vendor/gems/gems/haml-2.2.16/test/sass/results/mixins.css
similarity index 100%
rename from lib/middleman/vendor/gems/gems/haml-2.2.15/test/sass/results/mixins.css
rename to lib/middleman/vendor/gems/gems/haml-2.2.16/test/sass/results/mixins.css
diff --git a/lib/middleman/vendor/gems/gems/haml-2.2.15/test/sass/results/multiline.css b/lib/middleman/vendor/gems/gems/haml-2.2.16/test/sass/results/multiline.css
similarity index 100%
rename from lib/middleman/vendor/gems/gems/haml-2.2.15/test/sass/results/multiline.css
rename to lib/middleman/vendor/gems/gems/haml-2.2.16/test/sass/results/multiline.css
diff --git a/lib/middleman/vendor/gems/gems/haml-2.2.15/test/sass/results/nested.css b/lib/middleman/vendor/gems/gems/haml-2.2.16/test/sass/results/nested.css
similarity index 100%
rename from lib/middleman/vendor/gems/gems/haml-2.2.15/test/sass/results/nested.css
rename to lib/middleman/vendor/gems/gems/haml-2.2.16/test/sass/results/nested.css
diff --git a/lib/middleman/vendor/gems/gems/haml-2.2.15/test/sass/results/parent_ref.css b/lib/middleman/vendor/gems/gems/haml-2.2.16/test/sass/results/parent_ref.css
similarity index 100%
rename from lib/middleman/vendor/gems/gems/haml-2.2.15/test/sass/results/parent_ref.css
rename to lib/middleman/vendor/gems/gems/haml-2.2.16/test/sass/results/parent_ref.css
diff --git a/lib/middleman/vendor/gems/gems/haml-2.2.15/test/sass/results/script.css b/lib/middleman/vendor/gems/gems/haml-2.2.16/test/sass/results/script.css
similarity index 100%
rename from lib/middleman/vendor/gems/gems/haml-2.2.15/test/sass/results/script.css
rename to lib/middleman/vendor/gems/gems/haml-2.2.16/test/sass/results/script.css
diff --git a/lib/middleman/vendor/gems/gems/haml-2.2.15/test/sass/results/subdir/nested_subdir/nested_subdir.css b/lib/middleman/vendor/gems/gems/haml-2.2.16/test/sass/results/subdir/nested_subdir/nested_subdir.css
similarity index 100%
rename from lib/middleman/vendor/gems/gems/haml-2.2.15/test/sass/results/subdir/nested_subdir/nested_subdir.css
rename to lib/middleman/vendor/gems/gems/haml-2.2.16/test/sass/results/subdir/nested_subdir/nested_subdir.css
diff --git a/lib/middleman/vendor/gems/gems/haml-2.2.15/test/sass/results/subdir/subdir.css b/lib/middleman/vendor/gems/gems/haml-2.2.16/test/sass/results/subdir/subdir.css
similarity index 100%
rename from lib/middleman/vendor/gems/gems/haml-2.2.15/test/sass/results/subdir/subdir.css
rename to lib/middleman/vendor/gems/gems/haml-2.2.16/test/sass/results/subdir/subdir.css
diff --git a/lib/middleman/vendor/gems/gems/haml-2.2.15/test/sass/results/units.css b/lib/middleman/vendor/gems/gems/haml-2.2.16/test/sass/results/units.css
similarity index 100%
rename from lib/middleman/vendor/gems/gems/haml-2.2.15/test/sass/results/units.css
rename to lib/middleman/vendor/gems/gems/haml-2.2.16/test/sass/results/units.css
diff --git a/lib/middleman/vendor/gems/gems/haml-2.2.15/test/sass/script_test.rb b/lib/middleman/vendor/gems/gems/haml-2.2.16/test/sass/script_test.rb
similarity index 100%
rename from lib/middleman/vendor/gems/gems/haml-2.2.15/test/sass/script_test.rb
rename to lib/middleman/vendor/gems/gems/haml-2.2.16/test/sass/script_test.rb
diff --git a/lib/middleman/vendor/gems/gems/haml-2.2.15/test/sass/templates/_partial.sass b/lib/middleman/vendor/gems/gems/haml-2.2.16/test/sass/templates/_partial.sass
similarity index 100%
rename from lib/middleman/vendor/gems/gems/haml-2.2.15/test/sass/templates/_partial.sass
rename to lib/middleman/vendor/gems/gems/haml-2.2.16/test/sass/templates/_partial.sass
diff --git a/lib/middleman/vendor/gems/gems/haml-2.2.15/test/sass/templates/alt.sass b/lib/middleman/vendor/gems/gems/haml-2.2.16/test/sass/templates/alt.sass
similarity index 100%
rename from lib/middleman/vendor/gems/gems/haml-2.2.15/test/sass/templates/alt.sass
rename to lib/middleman/vendor/gems/gems/haml-2.2.16/test/sass/templates/alt.sass
diff --git a/lib/middleman/vendor/gems/gems/haml-2.2.15/test/sass/templates/basic.sass b/lib/middleman/vendor/gems/gems/haml-2.2.16/test/sass/templates/basic.sass
similarity index 100%
rename from lib/middleman/vendor/gems/gems/haml-2.2.15/test/sass/templates/basic.sass
rename to lib/middleman/vendor/gems/gems/haml-2.2.16/test/sass/templates/basic.sass
diff --git a/lib/middleman/vendor/gems/gems/haml-2.2.15/test/sass/templates/bork.sass b/lib/middleman/vendor/gems/gems/haml-2.2.16/test/sass/templates/bork.sass
similarity index 100%
rename from lib/middleman/vendor/gems/gems/haml-2.2.15/test/sass/templates/bork.sass
rename to lib/middleman/vendor/gems/gems/haml-2.2.16/test/sass/templates/bork.sass
diff --git a/lib/middleman/vendor/gems/gems/haml-2.2.15/test/sass/templates/bork2.sass b/lib/middleman/vendor/gems/gems/haml-2.2.16/test/sass/templates/bork2.sass
similarity index 100%
rename from lib/middleman/vendor/gems/gems/haml-2.2.15/test/sass/templates/bork2.sass
rename to lib/middleman/vendor/gems/gems/haml-2.2.16/test/sass/templates/bork2.sass
diff --git a/lib/middleman/vendor/gems/gems/haml-2.2.15/test/sass/templates/compact.sass b/lib/middleman/vendor/gems/gems/haml-2.2.16/test/sass/templates/compact.sass
similarity index 100%
rename from lib/middleman/vendor/gems/gems/haml-2.2.15/test/sass/templates/compact.sass
rename to lib/middleman/vendor/gems/gems/haml-2.2.16/test/sass/templates/compact.sass
diff --git a/lib/middleman/vendor/gems/gems/haml-2.2.15/test/sass/templates/complex.sass b/lib/middleman/vendor/gems/gems/haml-2.2.16/test/sass/templates/complex.sass
similarity index 100%
rename from lib/middleman/vendor/gems/gems/haml-2.2.15/test/sass/templates/complex.sass
rename to lib/middleman/vendor/gems/gems/haml-2.2.16/test/sass/templates/complex.sass
diff --git a/lib/middleman/vendor/gems/gems/haml-2.2.15/test/sass/templates/compressed.sass b/lib/middleman/vendor/gems/gems/haml-2.2.16/test/sass/templates/compressed.sass
similarity index 100%
rename from lib/middleman/vendor/gems/gems/haml-2.2.15/test/sass/templates/compressed.sass
rename to lib/middleman/vendor/gems/gems/haml-2.2.16/test/sass/templates/compressed.sass
diff --git a/lib/middleman/vendor/gems/gems/haml-2.2.15/test/sass/templates/expanded.sass b/lib/middleman/vendor/gems/gems/haml-2.2.16/test/sass/templates/expanded.sass
similarity index 100%
rename from lib/middleman/vendor/gems/gems/haml-2.2.15/test/sass/templates/expanded.sass
rename to lib/middleman/vendor/gems/gems/haml-2.2.16/test/sass/templates/expanded.sass
diff --git a/lib/middleman/vendor/gems/gems/haml-2.2.15/test/sass/templates/import.sass b/lib/middleman/vendor/gems/gems/haml-2.2.16/test/sass/templates/import.sass
similarity index 100%
rename from lib/middleman/vendor/gems/gems/haml-2.2.15/test/sass/templates/import.sass
rename to lib/middleman/vendor/gems/gems/haml-2.2.16/test/sass/templates/import.sass
diff --git a/lib/middleman/vendor/gems/gems/haml-2.2.15/test/sass/templates/importee.sass b/lib/middleman/vendor/gems/gems/haml-2.2.16/test/sass/templates/importee.sass
similarity index 100%
rename from lib/middleman/vendor/gems/gems/haml-2.2.15/test/sass/templates/importee.sass
rename to lib/middleman/vendor/gems/gems/haml-2.2.16/test/sass/templates/importee.sass
diff --git a/lib/middleman/vendor/gems/gems/haml-2.2.15/test/sass/templates/line_numbers.sass b/lib/middleman/vendor/gems/gems/haml-2.2.16/test/sass/templates/line_numbers.sass
similarity index 100%
rename from lib/middleman/vendor/gems/gems/haml-2.2.15/test/sass/templates/line_numbers.sass
rename to lib/middleman/vendor/gems/gems/haml-2.2.16/test/sass/templates/line_numbers.sass
diff --git a/lib/middleman/vendor/gems/gems/haml-2.2.15/test/sass/templates/mixins.sass b/lib/middleman/vendor/gems/gems/haml-2.2.16/test/sass/templates/mixins.sass
similarity index 100%
rename from lib/middleman/vendor/gems/gems/haml-2.2.15/test/sass/templates/mixins.sass
rename to lib/middleman/vendor/gems/gems/haml-2.2.16/test/sass/templates/mixins.sass
diff --git a/lib/middleman/vendor/gems/gems/haml-2.2.15/test/sass/templates/multiline.sass b/lib/middleman/vendor/gems/gems/haml-2.2.16/test/sass/templates/multiline.sass
similarity index 100%
rename from lib/middleman/vendor/gems/gems/haml-2.2.15/test/sass/templates/multiline.sass
rename to lib/middleman/vendor/gems/gems/haml-2.2.16/test/sass/templates/multiline.sass
diff --git a/lib/middleman/vendor/gems/gems/haml-2.2.15/test/sass/templates/nested.sass b/lib/middleman/vendor/gems/gems/haml-2.2.16/test/sass/templates/nested.sass
similarity index 100%
rename from lib/middleman/vendor/gems/gems/haml-2.2.15/test/sass/templates/nested.sass
rename to lib/middleman/vendor/gems/gems/haml-2.2.16/test/sass/templates/nested.sass
diff --git a/lib/middleman/vendor/gems/gems/haml-2.2.15/test/sass/templates/parent_ref.sass b/lib/middleman/vendor/gems/gems/haml-2.2.16/test/sass/templates/parent_ref.sass
similarity index 100%
rename from lib/middleman/vendor/gems/gems/haml-2.2.15/test/sass/templates/parent_ref.sass
rename to lib/middleman/vendor/gems/gems/haml-2.2.16/test/sass/templates/parent_ref.sass
diff --git a/lib/middleman/vendor/gems/gems/haml-2.2.15/test/sass/templates/script.sass b/lib/middleman/vendor/gems/gems/haml-2.2.16/test/sass/templates/script.sass
similarity index 100%
rename from lib/middleman/vendor/gems/gems/haml-2.2.15/test/sass/templates/script.sass
rename to lib/middleman/vendor/gems/gems/haml-2.2.16/test/sass/templates/script.sass
diff --git a/lib/middleman/vendor/gems/gems/haml-2.2.15/test/sass/templates/subdir/nested_subdir/_nested_partial.sass b/lib/middleman/vendor/gems/gems/haml-2.2.16/test/sass/templates/subdir/nested_subdir/_nested_partial.sass
similarity index 100%
rename from lib/middleman/vendor/gems/gems/haml-2.2.15/test/sass/templates/subdir/nested_subdir/_nested_partial.sass
rename to lib/middleman/vendor/gems/gems/haml-2.2.16/test/sass/templates/subdir/nested_subdir/_nested_partial.sass
diff --git a/lib/middleman/vendor/gems/gems/haml-2.2.15/test/sass/templates/subdir/nested_subdir/nested_subdir.sass b/lib/middleman/vendor/gems/gems/haml-2.2.16/test/sass/templates/subdir/nested_subdir/nested_subdir.sass
similarity index 100%
rename from lib/middleman/vendor/gems/gems/haml-2.2.15/test/sass/templates/subdir/nested_subdir/nested_subdir.sass
rename to lib/middleman/vendor/gems/gems/haml-2.2.16/test/sass/templates/subdir/nested_subdir/nested_subdir.sass
diff --git a/lib/middleman/vendor/gems/gems/haml-2.2.15/test/sass/templates/subdir/subdir.sass b/lib/middleman/vendor/gems/gems/haml-2.2.16/test/sass/templates/subdir/subdir.sass
similarity index 100%
rename from lib/middleman/vendor/gems/gems/haml-2.2.15/test/sass/templates/subdir/subdir.sass
rename to lib/middleman/vendor/gems/gems/haml-2.2.16/test/sass/templates/subdir/subdir.sass
diff --git a/lib/middleman/vendor/gems/gems/haml-2.2.15/test/sass/templates/units.sass b/lib/middleman/vendor/gems/gems/haml-2.2.16/test/sass/templates/units.sass
similarity index 100%
rename from lib/middleman/vendor/gems/gems/haml-2.2.15/test/sass/templates/units.sass
rename to lib/middleman/vendor/gems/gems/haml-2.2.16/test/sass/templates/units.sass
diff --git a/lib/middleman/vendor/gems/gems/haml-2.2.15/test/test_helper.rb b/lib/middleman/vendor/gems/gems/haml-2.2.16/test/test_helper.rb
similarity index 100%
rename from lib/middleman/vendor/gems/gems/haml-2.2.15/test/test_helper.rb
rename to lib/middleman/vendor/gems/gems/haml-2.2.16/test/test_helper.rb
diff --git a/lib/middleman/vendor/gems/gems/highline-1.5.1/INSTALL b/lib/middleman/vendor/gems/gems/highline-1.5.1/INSTALL
old mode 100755
new mode 100644
diff --git a/lib/middleman/vendor/gems/gems/highline-1.5.1/LICENSE b/lib/middleman/vendor/gems/gems/highline-1.5.1/LICENSE
old mode 100755
new mode 100644
diff --git a/lib/middleman/vendor/gems/gems/highline-1.5.1/README b/lib/middleman/vendor/gems/gems/highline-1.5.1/README
old mode 100755
new mode 100644
diff --git a/lib/middleman/vendor/gems/gems/highline-1.5.1/TODO b/lib/middleman/vendor/gems/gems/highline-1.5.1/TODO
old mode 100755
new mode 100644
diff --git a/lib/middleman/vendor/gems/gems/json-1.2.0/benchmarks/generator_benchmark.rb b/lib/middleman/vendor/gems/gems/json-1.2.0/benchmarks/generator_benchmark.rb
old mode 100644
new mode 100755
diff --git a/lib/middleman/vendor/gems/gems/json-1.2.0/benchmarks/parser_benchmark.rb b/lib/middleman/vendor/gems/gems/json-1.2.0/benchmarks/parser_benchmark.rb
old mode 100644
new mode 100755
diff --git a/lib/middleman/vendor/gems/gems/json-1.2.0/ext/json/ext/generator.bundle b/lib/middleman/vendor/gems/gems/json-1.2.0/ext/json/ext/generator.bundle
old mode 100644
new mode 100755
diff --git a/lib/middleman/vendor/gems/gems/json-1.2.0/ext/json/ext/generator/generator.bundle b/lib/middleman/vendor/gems/gems/json-1.2.0/ext/json/ext/generator/generator.bundle
old mode 100644
new mode 100755
diff --git a/lib/middleman/vendor/gems/gems/json-1.2.0/ext/json/ext/parser.bundle b/lib/middleman/vendor/gems/gems/json-1.2.0/ext/json/ext/parser.bundle
old mode 100644
new mode 100755
diff --git a/lib/middleman/vendor/gems/gems/json-1.2.0/ext/json/ext/parser/parser.bundle b/lib/middleman/vendor/gems/gems/json-1.2.0/ext/json/ext/parser/parser.bundle
old mode 100644
new mode 100755
diff --git a/lib/middleman/vendor/gems/gems/json-1.2.0/install.rb b/lib/middleman/vendor/gems/gems/json-1.2.0/install.rb
old mode 100644
new mode 100755
diff --git a/lib/middleman/vendor/gems/gems/json-1.2.0/tests/test_json.rb b/lib/middleman/vendor/gems/gems/json-1.2.0/tests/test_json.rb
old mode 100644
new mode 100755
diff --git a/lib/middleman/vendor/gems/gems/json-1.2.0/tests/test_json_addition.rb b/lib/middleman/vendor/gems/gems/json-1.2.0/tests/test_json_addition.rb
old mode 100644
new mode 100755
diff --git a/lib/middleman/vendor/gems/gems/json-1.2.0/tests/test_json_fixtures.rb b/lib/middleman/vendor/gems/gems/json-1.2.0/tests/test_json_fixtures.rb
old mode 100644
new mode 100755
diff --git a/lib/middleman/vendor/gems/gems/json-1.2.0/tests/test_json_generate.rb b/lib/middleman/vendor/gems/gems/json-1.2.0/tests/test_json_generate.rb
old mode 100644
new mode 100755
diff --git a/lib/middleman/vendor/gems/gems/json-1.2.0/tests/test_json_rails.rb b/lib/middleman/vendor/gems/gems/json-1.2.0/tests/test_json_rails.rb
old mode 100644
new mode 100755
diff --git a/lib/middleman/vendor/gems/gems/json-1.2.0/tests/test_json_unicode.rb b/lib/middleman/vendor/gems/gems/json-1.2.0/tests/test_json_unicode.rb
old mode 100644
new mode 100755
diff --git a/lib/middleman/vendor/gems/gems/json-1.2.0/tools/fuzz.rb b/lib/middleman/vendor/gems/gems/json-1.2.0/tools/fuzz.rb
old mode 100644
new mode 100755
diff --git a/lib/middleman/vendor/gems/gems/json-1.2.0/tools/server.rb b/lib/middleman/vendor/gems/gems/json-1.2.0/tools/server.rb
old mode 100644
new mode 100755
diff --git a/lib/middleman/vendor/gems/gems/json_pure-1.2.0/benchmarks/generator_benchmark.rb b/lib/middleman/vendor/gems/gems/json_pure-1.2.0/benchmarks/generator_benchmark.rb
old mode 100644
new mode 100755
diff --git a/lib/middleman/vendor/gems/gems/json_pure-1.2.0/benchmarks/parser_benchmark.rb b/lib/middleman/vendor/gems/gems/json_pure-1.2.0/benchmarks/parser_benchmark.rb
old mode 100644
new mode 100755
diff --git a/lib/middleman/vendor/gems/gems/json_pure-1.2.0/install.rb b/lib/middleman/vendor/gems/gems/json_pure-1.2.0/install.rb
old mode 100644
new mode 100755
diff --git a/lib/middleman/vendor/gems/gems/json_pure-1.2.0/tests/test_json.rb b/lib/middleman/vendor/gems/gems/json_pure-1.2.0/tests/test_json.rb
old mode 100644
new mode 100755
diff --git a/lib/middleman/vendor/gems/gems/json_pure-1.2.0/tests/test_json_addition.rb b/lib/middleman/vendor/gems/gems/json_pure-1.2.0/tests/test_json_addition.rb
old mode 100644
new mode 100755
diff --git a/lib/middleman/vendor/gems/gems/json_pure-1.2.0/tests/test_json_fixtures.rb b/lib/middleman/vendor/gems/gems/json_pure-1.2.0/tests/test_json_fixtures.rb
old mode 100644
new mode 100755
diff --git a/lib/middleman/vendor/gems/gems/json_pure-1.2.0/tests/test_json_generate.rb b/lib/middleman/vendor/gems/gems/json_pure-1.2.0/tests/test_json_generate.rb
old mode 100644
new mode 100755
diff --git a/lib/middleman/vendor/gems/gems/json_pure-1.2.0/tests/test_json_rails.rb b/lib/middleman/vendor/gems/gems/json_pure-1.2.0/tests/test_json_rails.rb
old mode 100644
new mode 100755
diff --git a/lib/middleman/vendor/gems/gems/json_pure-1.2.0/tests/test_json_unicode.rb b/lib/middleman/vendor/gems/gems/json_pure-1.2.0/tests/test_json_unicode.rb
old mode 100644
new mode 100755
diff --git a/lib/middleman/vendor/gems/gems/json_pure-1.2.0/tools/fuzz.rb b/lib/middleman/vendor/gems/gems/json_pure-1.2.0/tools/fuzz.rb
old mode 100644
new mode 100755
diff --git a/lib/middleman/vendor/gems/gems/json_pure-1.2.0/tools/server.rb b/lib/middleman/vendor/gems/gems/json_pure-1.2.0/tools/server.rb
old mode 100644
new mode 100755
diff --git a/lib/middleman/vendor/gems/gems/launchy-0.3.3/LICENSE b/lib/middleman/vendor/gems/gems/launchy-0.3.3/LICENSE
deleted file mode 100755
index 3f153842..00000000
--- a/lib/middleman/vendor/gems/gems/launchy-0.3.3/LICENSE
+++ /dev/null
@@ -1,31 +0,0 @@
-Copyright (c) 2007, Jeremy Hinegardner
-
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are met:
-
- * Redistributions of source code must retain the above copyright notice,
- this list of conditions and the following disclaimer.
-
- * Redistributions in binary form must reproduce the above copyright notice,
- this list of conditions and the following disclaimer in the
- documentation and/or other materials provided with the
- distribution.
-
- * Neither the name of Jeremy Hinegardner nor the
- names of its contributors may be used to endorse or promote
- products derived from this software without specific prior written
- permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
-IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
-TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
-PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER
-OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
-EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
-PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
-LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/lib/middleman/vendor/gems/gems/launchy-0.3.3/HISTORY b/lib/middleman/vendor/gems/gems/launchy-0.3.5/HISTORY
old mode 100755
new mode 100644
similarity index 91%
rename from lib/middleman/vendor/gems/gems/launchy-0.3.3/HISTORY
rename to lib/middleman/vendor/gems/gems/launchy-0.3.5/HISTORY
index 55596ee5..d1a0b125
--- a/lib/middleman/vendor/gems/gems/launchy-0.3.3/HISTORY
+++ b/lib/middleman/vendor/gems/gems/launchy-0.3.5/HISTORY
@@ -1,5 +1,10 @@
= Launchy Changlog
+== Version 0.3.5 - 2009-12-17
+
+* clarify that launchy is under ISC license
+* fix missing data file in released gem needed for running specs
+
== Version 0.3.3 - 2009-02-19
* pass command line as discrete items to system() to avoid string
diff --git a/lib/middleman/vendor/gems/gems/launchy-0.3.5/LICENSE b/lib/middleman/vendor/gems/gems/launchy-0.3.5/LICENSE
new file mode 100644
index 00000000..6d5b33d0
--- /dev/null
+++ b/lib/middleman/vendor/gems/gems/launchy-0.3.5/LICENSE
@@ -0,0 +1,16 @@
+ISC LICENSE - http://opensource.org/licenses/isc-license.txt
+
+Copyright (c) 2007-2009 Jeremy Hinegardner
+
+Permission to use, copy, modify, and/or distribute this software for any
+purpose with or without fee is hereby granted, provided that the above
+copyright notice and this permission notice appear in all copies.
+
+THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+
diff --git a/lib/middleman/vendor/gems/gems/launchy-0.3.3/README b/lib/middleman/vendor/gems/gems/launchy-0.3.5/README
old mode 100755
new mode 100644
similarity index 93%
rename from lib/middleman/vendor/gems/gems/launchy-0.3.3/README
rename to lib/middleman/vendor/gems/gems/launchy-0.3.5/README
index fbd6b781..97697531
--- a/lib/middleman/vendor/gems/gems/launchy-0.3.3/README
+++ b/lib/middleman/vendor/gems/gems/launchy-0.3.5/README
@@ -34,11 +34,14 @@ OR
== ISC LICENSE
+http://opensource.org/licenses/isc-license.txt
+
Copyright (c) 2007-2009 Jeremy Hinegardner
Permission to use, copy, modify, and/or distribute this software for any
purpose with or without fee is hereby granted, provided that the above
-copyright notice and this permission notice appear in all copies.
+copyright notice
+and this permission notice appear in all copies.
THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
@@ -47,3 +50,4 @@ ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+
diff --git a/lib/middleman/vendor/gems/gems/launchy-0.3.3/Rakefile b/lib/middleman/vendor/gems/gems/launchy-0.3.5/Rakefile
old mode 100755
new mode 100644
similarity index 100%
rename from lib/middleman/vendor/gems/gems/launchy-0.3.3/Rakefile
rename to lib/middleman/vendor/gems/gems/launchy-0.3.5/Rakefile
diff --git a/lib/middleman/vendor/gems/gems/launchy-0.3.3/bin/launchy b/lib/middleman/vendor/gems/gems/launchy-0.3.5/bin/launchy
similarity index 100%
rename from lib/middleman/vendor/gems/gems/launchy-0.3.3/bin/launchy
rename to lib/middleman/vendor/gems/gems/launchy-0.3.5/bin/launchy
diff --git a/lib/middleman/vendor/gems/gems/launchy-0.3.3/gemspec.rb b/lib/middleman/vendor/gems/gems/launchy-0.3.5/gemspec.rb
old mode 100755
new mode 100644
similarity index 100%
rename from lib/middleman/vendor/gems/gems/launchy-0.3.3/gemspec.rb
rename to lib/middleman/vendor/gems/gems/launchy-0.3.5/gemspec.rb
diff --git a/lib/middleman/vendor/gems/gems/launchy-0.3.3/lib/launchy.rb b/lib/middleman/vendor/gems/gems/launchy-0.3.5/lib/launchy.rb
old mode 100755
new mode 100644
similarity index 100%
rename from lib/middleman/vendor/gems/gems/launchy-0.3.3/lib/launchy.rb
rename to lib/middleman/vendor/gems/gems/launchy-0.3.5/lib/launchy.rb
diff --git a/lib/middleman/vendor/gems/gems/launchy-0.3.3/lib/launchy/application.rb b/lib/middleman/vendor/gems/gems/launchy-0.3.5/lib/launchy/application.rb
similarity index 100%
rename from lib/middleman/vendor/gems/gems/launchy-0.3.3/lib/launchy/application.rb
rename to lib/middleman/vendor/gems/gems/launchy-0.3.5/lib/launchy/application.rb
diff --git a/lib/middleman/vendor/gems/gems/launchy-0.3.3/lib/launchy/browser.rb b/lib/middleman/vendor/gems/gems/launchy-0.3.5/lib/launchy/browser.rb
similarity index 98%
rename from lib/middleman/vendor/gems/gems/launchy-0.3.3/lib/launchy/browser.rb
rename to lib/middleman/vendor/gems/gems/launchy-0.3.5/lib/launchy/browser.rb
index ce161d7f..371c76f4 100644
--- a/lib/middleman/vendor/gems/gems/launchy-0.3.3/lib/launchy/browser.rb
+++ b/lib/middleman/vendor/gems/gems/launchy-0.3.5/lib/launchy/browser.rb
@@ -37,7 +37,7 @@ module Launchy
def initialize
@browser = nil
- @nix_app_list = nil
+ @nix_app_list = []
raise "Unable to find browser to launch for os family '#{my_os_family}'." unless browser
end
@@ -56,7 +56,7 @@ module Launchy
# 3) desktop environment launcher program
# 4) a list of fallback browsers
def nix_app_list
- if not @nix_app_list then
+ if @nix_app_list.empty?
browser_cmds = ['xdg-open']
browser_cmds << desktop_environment_browser_launchers[nix_desktop_environment]
browser_cmds << fallback_browsers
diff --git a/lib/middleman/vendor/gems/gems/launchy-0.3.3/lib/launchy/command_line.rb b/lib/middleman/vendor/gems/gems/launchy-0.3.5/lib/launchy/command_line.rb
similarity index 100%
rename from lib/middleman/vendor/gems/gems/launchy-0.3.3/lib/launchy/command_line.rb
rename to lib/middleman/vendor/gems/gems/launchy-0.3.5/lib/launchy/command_line.rb
diff --git a/lib/middleman/vendor/gems/gems/launchy-0.3.3/lib/launchy/paths.rb b/lib/middleman/vendor/gems/gems/launchy-0.3.5/lib/launchy/paths.rb
similarity index 100%
rename from lib/middleman/vendor/gems/gems/launchy-0.3.3/lib/launchy/paths.rb
rename to lib/middleman/vendor/gems/gems/launchy-0.3.5/lib/launchy/paths.rb
diff --git a/lib/middleman/vendor/gems/gems/launchy-0.3.3/lib/launchy/version.rb b/lib/middleman/vendor/gems/gems/launchy-0.3.5/lib/launchy/version.rb
similarity index 93%
rename from lib/middleman/vendor/gems/gems/launchy-0.3.3/lib/launchy/version.rb
rename to lib/middleman/vendor/gems/gems/launchy-0.3.5/lib/launchy/version.rb
index f504e4ec..630b9cbd 100644
--- a/lib/middleman/vendor/gems/gems/launchy-0.3.3/lib/launchy/version.rb
+++ b/lib/middleman/vendor/gems/gems/launchy-0.3.5/lib/launchy/version.rb
@@ -2,7 +2,7 @@ module Launchy
module Version
MAJOR = 0
MINOR = 3
- BUILD = 3
+ BUILD = 5
def self.to_a
[MAJOR, MINOR, BUILD]
diff --git a/lib/middleman/vendor/gems/gems/launchy-0.3.3/spec/application_spec.rb b/lib/middleman/vendor/gems/gems/launchy-0.3.5/spec/application_spec.rb
similarity index 90%
rename from lib/middleman/vendor/gems/gems/launchy-0.3.3/spec/application_spec.rb
rename to lib/middleman/vendor/gems/gems/launchy-0.3.5/spec/application_spec.rb
index 1d3446e3..2266a4b0 100644
--- a/lib/middleman/vendor/gems/gems/launchy-0.3.3/spec/application_spec.rb
+++ b/lib/middleman/vendor/gems/gems/launchy-0.3.5/spec/application_spec.rb
@@ -23,8 +23,12 @@ describe Launchy::Application do
@app.my_os.should_not eql(nil)
end
- it "should find open" do
- @app.find_executable('open').should eql("/usr/bin/open")
+ it "should find open or curl" do
+ r = "found open or curl"
+ found = %w[ open curl ].collect do |app|
+ @app.find_executable(app).nil?
+ end
+ found.should be_include( false )
end
it "should not find app xyzzy" do
diff --git a/lib/middleman/vendor/gems/gems/launchy-0.3.3/spec/browser_spec.rb b/lib/middleman/vendor/gems/gems/launchy-0.3.5/spec/browser_spec.rb
similarity index 74%
rename from lib/middleman/vendor/gems/gems/launchy-0.3.3/spec/browser_spec.rb
rename to lib/middleman/vendor/gems/gems/launchy-0.3.5/spec/browser_spec.rb
index f9556059..4f1a9efc 100644
--- a/lib/middleman/vendor/gems/gems/launchy-0.3.3/spec/browser_spec.rb
+++ b/lib/middleman/vendor/gems/gems/launchy-0.3.5/spec/browser_spec.rb
@@ -2,7 +2,11 @@ require File.join(File.dirname(__FILE__),"spec_helper.rb")
require 'stringio'
describe Launchy::Browser do
it "should find a path to a executable" do
- File.executable?(Launchy::Browser.new.browser).should == true
+ begin
+ File.executable?(Launchy::Browser.new.browser).should == true
+ rescue => e
+ e.message.should == "Unable to find browser to launch for os family 'nix'."
+ end
end
it "should handle an http url" do
@@ -22,11 +26,15 @@ describe Launchy::Browser do
end
it "creates a default unix application list" do
- Launchy::Browser.new.nix_app_list.class.should == Array
+ begin
+ Launchy::Browser.new.nix_app_list.class.should == Array
+ rescue => e
+ e.message.should == "Unable to find browser to launch for os family 'nix'."
+ end
end
- { "BROWSER" => "/usr/bin/true",
- "LAUNCHY_BROWSER" => "/usr/bin/true"}.each_pair do |e,v|
+ { "BROWSER" => "/bin/sh",
+ "LAUNCHY_BROWSER" => "/bin/sh"}.each_pair do |e,v|
it "can use environmental variable overrides of #{e} for the browser" do
ENV[e] = v
Launchy::Browser.new.browser.should eql(v)
diff --git a/lib/middleman/vendor/gems/gems/launchy-0.3.3/spec/launchy_spec.rb b/lib/middleman/vendor/gems/gems/launchy-0.3.5/spec/launchy_spec.rb
similarity index 100%
rename from lib/middleman/vendor/gems/gems/launchy-0.3.3/spec/launchy_spec.rb
rename to lib/middleman/vendor/gems/gems/launchy-0.3.5/spec/launchy_spec.rb
diff --git a/lib/middleman/vendor/gems/gems/launchy-0.3.3/spec/paths_spec.rb b/lib/middleman/vendor/gems/gems/launchy-0.3.5/spec/paths_spec.rb
similarity index 100%
rename from lib/middleman/vendor/gems/gems/launchy-0.3.3/spec/paths_spec.rb
rename to lib/middleman/vendor/gems/gems/launchy-0.3.5/spec/paths_spec.rb
diff --git a/lib/middleman/vendor/gems/gems/launchy-0.3.3/spec/spec_helper.rb b/lib/middleman/vendor/gems/gems/launchy-0.3.5/spec/spec_helper.rb
similarity index 100%
rename from lib/middleman/vendor/gems/gems/launchy-0.3.3/spec/spec_helper.rb
rename to lib/middleman/vendor/gems/gems/launchy-0.3.5/spec/spec_helper.rb
diff --git a/lib/middleman/vendor/gems/gems/launchy-0.3.5/spec/tattle-host-os.yml b/lib/middleman/vendor/gems/gems/launchy-0.3.5/spec/tattle-host-os.yml
new file mode 100644
index 00000000..500acebd
--- /dev/null
+++ b/lib/middleman/vendor/gems/gems/launchy-0.3.5/spec/tattle-host-os.yml
@@ -0,0 +1,427 @@
+# SOURCE: http://tattle.rubygarden.org
+---
+ruby_version:
+ 1.8.4: 506
+ 1.8.5: 842
+ 1.8.6: 270
+ 1.9.0: 1
+ 1.8.1: 9
+ 1.8.2: 36
+host_vendor:
+ "": 1
+ mandrake: 1
+ sun: 18
+ apple: 619
+ mandriva: 1
+ slackware: 1
+ portbld: 27
+ pc: 858
+ ibm: 1
+ suse: 5
+ Apple Computer, Inc.: 13
+ Sun Microsystems Inc.: 6
+ unknown: 45
+ redhat: 70
+ruby_install_name:
+ jruby.bat: 2
+ ruby185: 1
+ jruby: 17
+ ruby18: 175
+ ruby1.8: 222
+ ruby1.8.4: 1
+ ruby: 1248
+build:
+ sparc-sun-solaris2.9: 8
+ i686-apple-darwin8.6.1: 81
+ i686-apple-darwin8.5.2: 11
+ java1.5: 3
+ i386-unknown-freebsd4.11: 1
+ powerpc-apple-darwin8.2.0: 3
+ i386-pc-solaris2.8: 2
+ x86_64-suse-linux-gnu: 2
+ x86_64-pc-linux-gnu: 89
+ i686-apple-darwin8.7.1: 31
+ i686-apple-darwin8.6.2: 15
+ java1.6: 6
+ i686-apple-darwin8.5.3: 4
+ i686-pc-mswin32: 375
+ i386-pc-linux-gnu: 2
+ i386-pc-linux: 3
+ powerpc-apple-darwin8.3.0: 3
+ i686-apple-darwin8.8.1: 140
+ i686-redhat-linux-gnu: 30
+ i686-apple-darwin8.7.2: 2
+ powerpc-apple-darwin8.4.0: 6
+ amd64-portbld-freebsd6: 2
+ i686-apple-darwin8.8.2: 53
+ i686-apple-darwin8.9.1: 27
+ i686-apple-darwin8.7.3: 3
+ x86_64-unknown-linux-gnu: 29
+ i686-suse-linux-gnu: 2
+ powerpc-apple-darwin8.10.0: 2
+ i686-apple-darwin8.8.3: 15
+ powerpc-apple-darwin7.9.0: 12
+ powerpc-apple-darwin8.5.0: 8
+ i386-mingw32: 1
+ i686-apple-darwin8.9.3: 1
+ i686-apple-darwin8.8.4: 5
+ x86_64-redhat-linux-gnu: 7
+ powerpc-apple-darwin8.6.0: 25
+ sparc-sun-solaris2.10: 7
+ i686-apple-darwin8.9.4: 3
+ i686-apple-darwin8.8.5: 3
+ powerpc-apple-darwin8.7.0: 39
+ powerpc-apple-darwin8.11.0: 1
+ powerpc-ibm-aix5.3.0.0: 1
+ powerpc-apple-darwin8.8.0: 53
+ i386-unknown-netbsdelf3.1.: 1
+ powerpc-unknown-linux-gnu: 3
+ powerpc-apple-darwin8.8.1: 1
+ i486-slackware-linux: 1
+ i386-pc-solaris2.10: 7
+ powerpc-apple-darwin8.9.0: 8
+ i686-pc-cygwin: 14
+ x86_64-unknown-openbsd4.0: 4
+ i686-pc-linux-gnu: 343
+ java: 8
+ i586-mandrake-linux-gnu: 1
+ i386-redhat-linux-gnu: 33
+ i686-apple-darwin9.0: 29
+ i586-mandriva-linux-gnu: 1
+ i386-portbld-freebsd5: 3
+ powerpc-apple-darwin8.0: 10
+ i386-unknown-freebsd6.0: 2
+ i486-pc-linux-gnu: 22
+ i686-suse-linux: 1
+ i686-apple-darwin: 1
+ i386-portbld-freebsd6: 20
+ powerpc-apple-darwin9.0: 5
+ i386-unknown-freebsd6.1: 1
+ x86_64-unknown-openbsd3.9: 1
+ i686-apple-darwin8.10.1: 13
+ i386-portbld-freebsd7: 2
+ i686-apple-darwin9.1.0: 1
+ i686-apple-darwin8.4.1: 1
+ i686-apple-darwin8.11.1: 2
+ powerpc64-unknown-linux-gnu: 2
+ i686-apple-darwin8.5.1: 1
+ i686-apple-darwin8.10.3: 1
+ java1.4: 2
+ sparc-sun-solaris2.8: 3
+ i386-unknown-openbsd4.0: 2
+arch:
+ x86-java1.5: 1
+ i686-darwin8.8.1: 140
+ i686-darwin8.7.2: 2
+ i386-mswin32: 375
+ i686-darwin8.8.2: 53
+ i686-darwin8.9.1: 27
+ i686-darwin8.7.3: 3
+ x86-java1.6: 1
+ i686-darwin8.8.3: 15
+ i686-darwin8.9.3: 1
+ i686-darwin8.8.4: 5
+ amd64-freebsd6: 2
+ sparc-solaris2.8: 3
+ x86_64-openbsd4.0: 4
+ powerpc-aix5.3.0.0: 1
+ powerpc-darwin8.2.0: 3
+ sparc-solaris2.9: 8
+ i386-netbsdelf: 1
+ i386-mingw32: 1
+ powerpc-darwin8.3.0: 3
+ i686-darwin8.9.4: 3
+ i686-darwin8.8.5: 3
+ i386-linux-gnu: 8
+ powerpc-darwin8.10.0: 2
+ i586-linux-gnu: 2
+ powerpc-darwin8.4.0: 6
+ powerpc-darwin8.11.0: 1
+ powerpc-darwin8.5.0: 8
+ i386-freebsd5: 3
+ powerpc-darwin8.6.0: 25
+ i386-linux: 71
+ i386-freebsd6: 20
+ powerpc-darwin8.7.0: 39
+ i486-linux: 188
+ x86_64-linux: 127
+ i386-freebsd7: 2
+ powerpc-darwin8.8.0: 53
+ i586-linux: 3
+ java: 8
+ i386-freebsd4.11: 1
+ powerpc-darwin8.9.0: 8
+ powerpc-darwin8.8.1: 1
+ x86_64-openbsd3.9: 1
+ i686-darwin: 1
+ powerpc-darwin8.0: 7
+ sparc-solaris2.10: 7
+ universal-darwin8.0: 5
+ powerpc-linux: 3
+ i386-freebsd6.0: 2
+ powerpc64-linux: 2
+ universal-darwin9.0: 34
+ i386-cygwin: 14
+ powerpc-darwin7.9.0: 12
+ i386-freebsd6.1: 1
+ i386-solaris2.10: 7
+ i386-java1.5: 2
+ i386-openbsd4.0: 2
+ i686-darwin8.4.1: 1
+ i686-darwin8.10.1: 11
+ i386-solaris2.8: 2
+ i686-darwin9.1.0: 1
+ i686-darwin8.5.1: 1
+ i686-darwin8.11.1: 2
+ i386-java1.6: 7
+ i686-darwin8.6.1: 81
+ i686-darwin8.5.2: 11
+ i686-darwin8.10.3: 1
+ i686-linux: 167
+ i686-darwin8.7.1: 31
+ i686-darwin8.6.2: 15
+ i686-darwin8.5.3: 4
+target_cpu:
+ x86: 2
+ powerpc64: 2
+ i686: 610
+ powerpc: 180
+ amd64: 2
+ x86_64: 132
+ i386: 527
+ i486: 188
+ i586: 5
+ sparc: 18
+host_os:
+ freebsd6.1: 1
+ darwin8.11.1: 2
+ darwin8.5.3: 4
+ solaris2.9: 8
+ darwin7.9.0: 12
+ darwin8.6.2: 15
+ darwin8.7.1: 31
+ darwin8.8.0: 53
+ darwin8.10.3: 1
+ freebsd4.11: 1
+ darwin9.1.0: 1
+ darwin8.7.2: 2
+ darwin8.9.0: 8
+ darwin8.0: 10
+ darwin8.8.1: 141
+ darwin8.7.3: 3
+ linux: 9
+ darwin8.9.1: 27
+ darwin9.0: 34
+ darwin8.8.2: 53
+ openbsd3.9: 1
+ Windows XP: 2
+ cygwin: 14
+ darwin8.8.3: 15
+ darwin8.9.3: 1
+ darwin8.2.0: 3
+ darwin8.8.4: 5
+ darwin8.8.5: 3
+ darwin8.9.4: 3
+ darwin8.3.0: 3
+ openbsd4.0: 6
+ Mac OS X: 13
+ aix5.3.0.0: 1
+ darwin: 1
+ freebsd5: 3
+ darwin8.4.0: 6
+ darwin8.4.1: 1
+ darwin8.10.0: 2
+ darwin8.5.0: 8
+ freebsd6: 22
+ netbsdelf: 1
+ darwin8.5.1: 1
+ darwin8.11.0: 1
+ freebsd7: 2
+ darwin8.10.1: 13
+ darwin8.6.0: 25
+ freebsd6.0: 2
+ solaris2.8: 5
+ darwin8.5.2: 11
+ solaris2.10: 14
+ darwin8.7.0: 39
+ darwin8.6.1: 81
+ mswin32: 376
+ linux-gnu: 566
+rubygems_version:
+ 1.1.0: 11
+ 0.9.3: 11
+ 0.9.0.8: 16
+ 1.0.1: 71
+ 0.8.5: 2
+ 0.8.10: 12
+ 1.1.1: 16
+ 0.9.0.9: 21
+ 0.9.4: 95
+ 0.9.5: 6
+ 0.8.11: 235
+ 0.9.4.7: 1
+ 0.8.8: 1
+ 0.9.0.10: 5
+ 0.9.0: 912
+ 0.9.1: 78
+ 0.9.0.6: 5
+ 0.9.2: 162
+ 0.9.0.7: 2
+ 1.0.0: 2
+SHELL:
+ /bin/bash: 75
+ /bin/sh: 1212
+ $(COMSPEC): 375
+ cmd.exe: 2
+ /usr/local/bin/bash: 2
+host_cpu:
+ powerpc64: 2
+ x86: 2
+ i686: 1208
+ powerpc: 180
+ amd64: 2
+ x86_64: 132
+ i386: 97
+ i486: 23
+ i586: 2
+ sparc: 18
+LIBRUBY:
+ libruby.so.1.8.6: 9
+ libruby1.8.4.1.8.4.dylib: 1
+ libruby18.so.1.8.4: 3
+ libruby185-static.a: 1
+ libruby1.8.so.1.8.2: 7
+ libruby18.so.1.8.5: 127
+ libruby18.so.1.8.6: 17
+ libruby.1.8.5.dylib: 166
+ jruby: 8
+ libruby.1.8.6.dylib: 41
+ libruby.so.1.9.0: 1
+ libruby.so.1.8.1: 8
+ libruby1.8.so.1.8.4: 125
+ libruby.so.1.8.2: 1
+ libruby18.so.18.5: 1
+ libruby.so.1.84: 2
+ jruby.jar: 11
+ libruby1.8.so.1.8.5: 62
+ libmsvcrt-ruby18.dll.a: 1
+ libruby.so.1.85: 1
+ libruby1.8-static.a: 1
+ libruby.so.1: 4
+ libruby.1.8.2.dylib: 5
+ libruby1.8.so.1.8.6: 26
+ libruby.dll.a: 14
+ libruby.so.1.8.4: 15
+ libruby.1.dylib: 43
+ libruby-static.a: 454
+ libruby.1.8.4.dylib: 50
+ libruby.so.1.8.5: 59
+ msvcrt-ruby18.lib: 375
+ libruby18.so.18: 27
+LIBRUBY_SO:
+ libruby.so.1.8.6: 47
+ libruby1.8.4.1.8.4.dylib: 1
+ libruby18.so.1.8.4: 3
+ libruby1.8.so.1.8.2: 7
+ libruby18.so.1.8.5: 127
+ libruby18.so.1.8.6: 17
+ libruby.1.8.5.dylib: 166
+ jruby: 8
+ libruby.1.8.6.dylib: 41
+ libruby.so.1.9.0: 1
+ libruby.so.1.8.1: 9
+ libruby1.8.so.1.8.4: 125
+ libruby18.so.18.5: 1
+ libruby.so.1.84: 2
+ libruby.so.1.8.2: 3
+ jruby.jar: 11
+ libruby1.8.so.1.8.5: 63
+ libruby.so.1.85: 1
+ libruby.so.1: 4
+ libruby.1.8.2.dylib: 5
+ libruby1.8.so.1.8.6: 26
+ libruby185.so.1.8.5: 1
+ cygruby18.dll: 14
+ libruby.1.dylib: 43
+ libruby.so.1.8.4: 253
+ msvcrt-ruby18.dll: 376
+ libruby.1.8.4.dylib: 50
+ libruby.so.1.8.5: 234
+ libruby18.so.18: 27
+target:
+ sparc-sun-solaris2.9: 8
+ i686-apple-darwin8.6.1: 81
+ i686-apple-darwin8.5.2: 11
+ i386--netbsdelf: 1
+ powerpc-apple-darwin8.2.0: 3
+ i386-unknown-freebsd4.11: 1
+ i386-pc-solaris2.8: 2
+ x86_64-pc-linux-gnu: 105
+ i686-apple-darwin8.7.1: 31
+ i686-apple-darwin8.6.2: 15
+ i686-apple-darwin8.5.3: 4
+ x86_64-suse-linux: 2
+ i386-pc-linux-gnu: 2
+ i386-pc-linux: 15
+ powerpc-apple-darwin8.3.0: 3
+ i686-apple-darwin8.8.1: 140
+ i686-apple-darwin8.7.2: 2
+ powerpc-apple-darwin8.4.0: 6
+ amd64-portbld-freebsd6: 2
+ i686-apple-darwin8.8.2: 53
+ i686-apple-darwin8.9.1: 27
+ i686-apple-darwin8.7.3: 3
+ x86_64-unknown-linux-gnu: 13
+ powerpc-apple-darwin8.10.0: 2
+ i686-apple-darwin8.8.3: 15
+ powerpc-apple-darwin7.9.0: 12
+ powerpc-apple-darwin8.5.0: 8
+ i386-mingw32: 1
+ i686-apple-darwin8.9.3: 1
+ i586-suse-linux: 3
+ i686-apple-darwin8.8.4: 5
+ x86_64-redhat-linux-gnu: 7
+ powerpc-apple-darwin8.6.0: 25
+ powerpc-apple-darwin8.11.0: 1
+ sparc-sun-solaris2.10: 7
+ i686-apple-darwin8.9.4: 3
+ i686-apple-darwin8.8.5: 3
+ powerpc-apple-darwin8.7.0: 39
+ powerpc-ibm-aix5.3.0.0: 1
+ i386-redhat-linux: 1
+ powerpc-apple-darwin8.8.0: 53
+ powerpc-unknown-linux-gnu: 3
+ i486-slackware-linux: 1
+ i386-pc-solaris2.10: 7
+ powerpc-apple-darwin8.9.0: 8
+ powerpc-apple-darwin8.8.1: 1
+ i686-pc-cygwin: 14
+ x86_64-unknown-openbsd4.0: 4
+ i686-pc-linux-gnu: 166
+ java: 8
+ i586-mandrake-linux-gnu: 1
+ i386-redhat-linux-gnu: 61
+ i586-mandriva-linux-gnu: 1
+ i686-apple-darwin9.0: 29
+ i386-portbld-freebsd5: 3
+ powerpc-apple-darwin8.0: 10
+ i386-unknown-freebsd6.0: 2
+ i486-pc-linux-gnu: 187
+ i686-apple-darwin: 1
+ i386-portbld-freebsd6: 20
+ powerpc-apple-darwin9.0: 5
+ i386-unknown-freebsd6.1: 1
+ x86_64-unknown-openbsd3.9: 1
+ i686-redhat-linux: 1
+ i686-apple-darwin8.10.1: 13
+ i386-portbld-freebsd7: 2
+ i686-apple-darwin9.1.0: 1
+ i686-apple-darwin8.4.1: 1
+ i686-apple-darwin8.11.1: 2
+ powerpc64-unknown-linux-gnu: 2
+ i386-pc-mswin32: 375
+ i686-apple-darwin8.5.1: 1
+ java1.4: 11
+ sparc-sun-solaris2.8: 3
+ i386-unknown-openbsd4.0: 2
+ i686-apple-darwin8.10.3: 1
diff --git a/lib/middleman/vendor/gems/gems/launchy-0.3.3/spec/version_spec.rb b/lib/middleman/vendor/gems/gems/launchy-0.3.5/spec/version_spec.rb
similarity index 100%
rename from lib/middleman/vendor/gems/gems/launchy-0.3.3/spec/version_spec.rb
rename to lib/middleman/vendor/gems/gems/launchy-0.3.5/spec/version_spec.rb
diff --git a/lib/middleman/vendor/gems/gems/launchy-0.3.3/tasks/announce.rake b/lib/middleman/vendor/gems/gems/launchy-0.3.5/tasks/announce.rake
similarity index 100%
rename from lib/middleman/vendor/gems/gems/launchy-0.3.3/tasks/announce.rake
rename to lib/middleman/vendor/gems/gems/launchy-0.3.5/tasks/announce.rake
diff --git a/lib/middleman/vendor/gems/gems/launchy-0.3.3/tasks/config.rb b/lib/middleman/vendor/gems/gems/launchy-0.3.5/tasks/config.rb
old mode 100755
new mode 100644
similarity index 98%
rename from lib/middleman/vendor/gems/gems/launchy-0.3.3/tasks/config.rb
rename to lib/middleman/vendor/gems/gems/launchy-0.3.5/tasks/config.rb
index 297da9ef..fa09fd2e
--- a/lib/middleman/vendor/gems/gems/launchy-0.3.3/tasks/config.rb
+++ b/lib/middleman/vendor/gems/gems/launchy-0.3.5/tasks/config.rb
@@ -31,7 +31,7 @@ Configuration.for('packaging') {
examples FileList["examples/*.rb"]
lib FileList["lib/**/*.rb"]
test FileList["spec/**/*.rb", "test/**/*.rb"]
- data FileList["data/**/*"]
+ data FileList["data/**/*", "spec/**/*.yml"]
tasks FileList["tasks/**/*.r{ake,b}"]
rdoc FileList[proj_conf.readme, proj_conf.history,
proj_conf.license] + lib + FileList["ext/*.c"]
diff --git a/lib/middleman/vendor/gems/gems/launchy-0.3.3/tasks/distribution.rake b/lib/middleman/vendor/gems/gems/launchy-0.3.5/tasks/distribution.rake
similarity index 100%
rename from lib/middleman/vendor/gems/gems/launchy-0.3.3/tasks/distribution.rake
rename to lib/middleman/vendor/gems/gems/launchy-0.3.5/tasks/distribution.rake
diff --git a/lib/middleman/vendor/gems/gems/launchy-0.3.3/tasks/documentation.rake b/lib/middleman/vendor/gems/gems/launchy-0.3.5/tasks/documentation.rake
similarity index 100%
rename from lib/middleman/vendor/gems/gems/launchy-0.3.3/tasks/documentation.rake
rename to lib/middleman/vendor/gems/gems/launchy-0.3.5/tasks/documentation.rake
diff --git a/lib/middleman/vendor/gems/gems/launchy-0.3.3/tasks/rspec.rake b/lib/middleman/vendor/gems/gems/launchy-0.3.5/tasks/rspec.rake
old mode 100755
new mode 100644
similarity index 100%
rename from lib/middleman/vendor/gems/gems/launchy-0.3.3/tasks/rspec.rake
rename to lib/middleman/vendor/gems/gems/launchy-0.3.5/tasks/rspec.rake
diff --git a/lib/middleman/vendor/gems/gems/launchy-0.3.3/tasks/rubyforge.rake b/lib/middleman/vendor/gems/gems/launchy-0.3.5/tasks/rubyforge.rake
similarity index 100%
rename from lib/middleman/vendor/gems/gems/launchy-0.3.3/tasks/rubyforge.rake
rename to lib/middleman/vendor/gems/gems/launchy-0.3.5/tasks/rubyforge.rake
diff --git a/lib/middleman/vendor/gems/gems/launchy-0.3.3/tasks/utils.rb b/lib/middleman/vendor/gems/gems/launchy-0.3.5/tasks/utils.rb
old mode 100755
new mode 100644
similarity index 100%
rename from lib/middleman/vendor/gems/gems/launchy-0.3.3/tasks/utils.rb
rename to lib/middleman/vendor/gems/gems/launchy-0.3.5/tasks/utils.rb
diff --git a/lib/middleman/vendor/gems/gems/rack-1.0.1/COPYING b/lib/middleman/vendor/gems/gems/rack-1.0.1/COPYING
old mode 100755
new mode 100644
diff --git a/lib/middleman/vendor/gems/gems/rack-1.0.1/KNOWN-ISSUES b/lib/middleman/vendor/gems/gems/rack-1.0.1/KNOWN-ISSUES
old mode 100755
new mode 100644
diff --git a/lib/middleman/vendor/gems/gems/rack-1.0.1/RDOX b/lib/middleman/vendor/gems/gems/rack-1.0.1/RDOX
old mode 100755
new mode 100644
diff --git a/lib/middleman/vendor/gems/gems/rack-1.0.1/README b/lib/middleman/vendor/gems/gems/rack-1.0.1/README
old mode 100755
new mode 100644
diff --git a/lib/middleman/vendor/gems/gems/rack-1.0.1/Rakefile b/lib/middleman/vendor/gems/gems/rack-1.0.1/Rakefile
old mode 100755
new mode 100644
diff --git a/lib/middleman/vendor/gems/gems/rack-1.0.1/SPEC b/lib/middleman/vendor/gems/gems/rack-1.0.1/SPEC
old mode 100755
new mode 100644
diff --git a/lib/middleman/vendor/gems/gems/rack-1.0.1/example/lobster.ru b/lib/middleman/vendor/gems/gems/rack-1.0.1/example/lobster.ru
old mode 100755
new mode 100644
diff --git a/lib/middleman/vendor/gems/gems/rack-1.0.1/lib/rack.rb b/lib/middleman/vendor/gems/gems/rack-1.0.1/lib/rack.rb
old mode 100755
new mode 100644
diff --git a/lib/middleman/vendor/gems/gems/rack-1.0.1/lib/rack/builder.rb b/lib/middleman/vendor/gems/gems/rack-1.0.1/lib/rack/builder.rb
old mode 100755
new mode 100644
diff --git a/lib/middleman/vendor/gems/gems/rack-1.0.1/lib/rack/cascade.rb b/lib/middleman/vendor/gems/gems/rack-1.0.1/lib/rack/cascade.rb
old mode 100755
new mode 100644
diff --git a/lib/middleman/vendor/gems/gems/rack-1.0.1/lib/rack/chunked.rb b/lib/middleman/vendor/gems/gems/rack-1.0.1/lib/rack/chunked.rb
old mode 100755
new mode 100644
diff --git a/lib/middleman/vendor/gems/gems/rack-1.0.1/lib/rack/deflater.rb b/lib/middleman/vendor/gems/gems/rack-1.0.1/lib/rack/deflater.rb
old mode 100755
new mode 100644
diff --git a/lib/middleman/vendor/gems/gems/rack-1.0.1/lib/rack/file.rb b/lib/middleman/vendor/gems/gems/rack-1.0.1/lib/rack/file.rb
old mode 100755
new mode 100644
diff --git a/lib/middleman/vendor/gems/gems/rack-1.0.1/lib/rack/handler.rb b/lib/middleman/vendor/gems/gems/rack-1.0.1/lib/rack/handler.rb
old mode 100755
new mode 100644
diff --git a/lib/middleman/vendor/gems/gems/rack-1.0.1/lib/rack/head.rb b/lib/middleman/vendor/gems/gems/rack-1.0.1/lib/rack/head.rb
old mode 100755
new mode 100644
diff --git a/lib/middleman/vendor/gems/gems/rack-1.0.1/lib/rack/lint.rb b/lib/middleman/vendor/gems/gems/rack-1.0.1/lib/rack/lint.rb
old mode 100755
new mode 100644
diff --git a/lib/middleman/vendor/gems/gems/rack-1.0.1/lib/rack/lobster.rb b/lib/middleman/vendor/gems/gems/rack-1.0.1/lib/rack/lobster.rb
old mode 100755
new mode 100644
diff --git a/lib/middleman/vendor/gems/gems/rack-1.0.1/lib/rack/lock.rb b/lib/middleman/vendor/gems/gems/rack-1.0.1/lib/rack/lock.rb
old mode 100755
new mode 100644
diff --git a/lib/middleman/vendor/gems/gems/rack-1.0.1/lib/rack/mime.rb b/lib/middleman/vendor/gems/gems/rack-1.0.1/lib/rack/mime.rb
old mode 100755
new mode 100644
diff --git a/lib/middleman/vendor/gems/gems/rack-1.0.1/lib/rack/mock.rb b/lib/middleman/vendor/gems/gems/rack-1.0.1/lib/rack/mock.rb
old mode 100755
new mode 100644
diff --git a/lib/middleman/vendor/gems/gems/rack-1.0.1/lib/rack/request.rb b/lib/middleman/vendor/gems/gems/rack-1.0.1/lib/rack/request.rb
old mode 100755
new mode 100644
diff --git a/lib/middleman/vendor/gems/gems/rack-1.0.1/lib/rack/static.rb b/lib/middleman/vendor/gems/gems/rack-1.0.1/lib/rack/static.rb
old mode 100755
new mode 100644
diff --git a/lib/middleman/vendor/gems/gems/rack-1.0.1/lib/rack/urlmap.rb b/lib/middleman/vendor/gems/gems/rack-1.0.1/lib/rack/urlmap.rb
old mode 100755
new mode 100644
diff --git a/lib/middleman/vendor/gems/gems/rack-1.0.1/lib/rack/utils.rb b/lib/middleman/vendor/gems/gems/rack-1.0.1/lib/rack/utils.rb
old mode 100755
new mode 100644
diff --git a/lib/middleman/vendor/gems/gems/rack-1.0.1/rack.gemspec b/lib/middleman/vendor/gems/gems/rack-1.0.1/rack.gemspec
old mode 100755
new mode 100644
diff --git a/lib/middleman/vendor/gems/gems/rack-1.0.1/test/multipart/ie b/lib/middleman/vendor/gems/gems/rack-1.0.1/test/multipart/ie
old mode 100755
new mode 100644
diff --git a/lib/middleman/vendor/gems/gems/rack-1.0.1/test/multipart/none b/lib/middleman/vendor/gems/gems/rack-1.0.1/test/multipart/none
old mode 100755
new mode 100644
diff --git a/lib/middleman/vendor/gems/gems/rack-1.0.1/test/multipart/text b/lib/middleman/vendor/gems/gems/rack-1.0.1/test/multipart/text
old mode 100755
new mode 100644
diff --git a/lib/middleman/vendor/gems/gems/rack-1.0.1/test/testrequest.rb b/lib/middleman/vendor/gems/gems/rack-1.0.1/test/testrequest.rb
old mode 100755
new mode 100644
diff --git a/lib/middleman/vendor/gems/gems/rake-0.8.7/CHANGES b/lib/middleman/vendor/gems/gems/rake-0.8.7/CHANGES
old mode 100755
new mode 100644
diff --git a/lib/middleman/vendor/gems/gems/rake-0.8.7/MIT-LICENSE b/lib/middleman/vendor/gems/gems/rake-0.8.7/MIT-LICENSE
old mode 100755
new mode 100644
diff --git a/lib/middleman/vendor/gems/gems/rake-0.8.7/README b/lib/middleman/vendor/gems/gems/rake-0.8.7/README
old mode 100755
new mode 100644
diff --git a/lib/middleman/vendor/gems/gems/rake-0.8.7/Rakefile b/lib/middleman/vendor/gems/gems/rake-0.8.7/Rakefile
old mode 100755
new mode 100644
diff --git a/lib/middleman/vendor/gems/gems/rake-0.8.7/TODO b/lib/middleman/vendor/gems/gems/rake-0.8.7/TODO
old mode 100755
new mode 100644
diff --git a/lib/middleman/vendor/gems/gems/rake-0.8.7/doc/example/a.c b/lib/middleman/vendor/gems/gems/rake-0.8.7/doc/example/a.c
old mode 100755
new mode 100644
diff --git a/lib/middleman/vendor/gems/gems/rake-0.8.7/doc/example/b.c b/lib/middleman/vendor/gems/gems/rake-0.8.7/doc/example/b.c
old mode 100755
new mode 100644
diff --git a/lib/middleman/vendor/gems/gems/rake-0.8.7/doc/example/main.c b/lib/middleman/vendor/gems/gems/rake-0.8.7/doc/example/main.c
old mode 100755
new mode 100644
diff --git a/lib/middleman/vendor/gems/gems/rake-0.8.7/doc/glossary.rdoc b/lib/middleman/vendor/gems/gems/rake-0.8.7/doc/glossary.rdoc
old mode 100755
new mode 100644
diff --git a/lib/middleman/vendor/gems/gems/rake-0.8.7/doc/jamis.rb b/lib/middleman/vendor/gems/gems/rake-0.8.7/doc/jamis.rb
old mode 100755
new mode 100644
diff --git a/lib/middleman/vendor/gems/gems/rake-0.8.7/doc/proto_rake.rdoc b/lib/middleman/vendor/gems/gems/rake-0.8.7/doc/proto_rake.rdoc
old mode 100755
new mode 100644
diff --git a/lib/middleman/vendor/gems/gems/rake-0.8.7/doc/rake.1.gz b/lib/middleman/vendor/gems/gems/rake-0.8.7/doc/rake.1.gz
old mode 100755
new mode 100644
diff --git a/lib/middleman/vendor/gems/gems/rake-0.8.7/doc/rakefile.rdoc b/lib/middleman/vendor/gems/gems/rake-0.8.7/doc/rakefile.rdoc
old mode 100755
new mode 100644
diff --git a/lib/middleman/vendor/gems/gems/rake-0.8.7/doc/rational.rdoc b/lib/middleman/vendor/gems/gems/rake-0.8.7/doc/rational.rdoc
old mode 100755
new mode 100644
diff --git a/lib/middleman/vendor/gems/gems/rake-0.8.7/doc/release_notes/rake-0.7.3.rdoc b/lib/middleman/vendor/gems/gems/rake-0.8.7/doc/release_notes/rake-0.7.3.rdoc
old mode 100644
new mode 100755
diff --git a/lib/middleman/vendor/gems/gems/rake-0.8.7/install.rb b/lib/middleman/vendor/gems/gems/rake-0.8.7/install.rb
old mode 100755
new mode 100644
diff --git a/lib/middleman/vendor/gems/gems/rake-0.8.7/lib/rake/clean.rb b/lib/middleman/vendor/gems/gems/rake-0.8.7/lib/rake/clean.rb
old mode 100755
new mode 100644
diff --git a/lib/middleman/vendor/gems/gems/rake-0.8.7/lib/rake/ruby182_test_unit_fix.rb b/lib/middleman/vendor/gems/gems/rake-0.8.7/lib/rake/ruby182_test_unit_fix.rb
old mode 100644
new mode 100755
diff --git a/lib/middleman/vendor/gems/gems/rake-0.8.7/lib/rake/runtest.rb b/lib/middleman/vendor/gems/gems/rake-0.8.7/lib/rake/runtest.rb
old mode 100755
new mode 100644
diff --git a/lib/middleman/vendor/gems/gems/rake-0.8.7/lib/rake/tasklib.rb b/lib/middleman/vendor/gems/gems/rake-0.8.7/lib/rake/tasklib.rb
old mode 100755
new mode 100644
diff --git a/lib/middleman/vendor/gems/gems/rake-0.8.7/lib/rake/win32.rb b/lib/middleman/vendor/gems/gems/rake-0.8.7/lib/rake/win32.rb
old mode 100755
new mode 100644
diff --git a/lib/middleman/vendor/gems/gems/rake-0.8.7/test/data/sample.mf b/lib/middleman/vendor/gems/gems/rake-0.8.7/test/data/sample.mf
old mode 100755
new mode 100644
diff --git a/lib/middleman/vendor/gems/gems/rake-0.8.7/test/filecreation.rb b/lib/middleman/vendor/gems/gems/rake-0.8.7/test/filecreation.rb
old mode 100755
new mode 100644
diff --git a/lib/middleman/vendor/gems/gems/rake-0.8.7/test/functional.rb b/lib/middleman/vendor/gems/gems/rake-0.8.7/test/functional.rb
old mode 100755
new mode 100644
diff --git a/lib/middleman/vendor/gems/gems/rake-0.8.7/test/reqfile.rb b/lib/middleman/vendor/gems/gems/rake-0.8.7/test/reqfile.rb
old mode 100755
new mode 100644
diff --git a/lib/middleman/vendor/gems/gems/rake-0.8.7/test/reqfile2.rb b/lib/middleman/vendor/gems/gems/rake-0.8.7/test/reqfile2.rb
old mode 100755
new mode 100644
diff --git a/lib/middleman/vendor/gems/gems/rake-0.8.7/test/test_clean.rb b/lib/middleman/vendor/gems/gems/rake-0.8.7/test/test_clean.rb
old mode 100755
new mode 100644
diff --git a/lib/middleman/vendor/gems/gems/rake-0.8.7/test/test_ftp.rb b/lib/middleman/vendor/gems/gems/rake-0.8.7/test/test_ftp.rb
old mode 100755
new mode 100644
diff --git a/lib/middleman/vendor/gems/gems/rake-0.8.7/test/test_rake.rb b/lib/middleman/vendor/gems/gems/rake-0.8.7/test/test_rake.rb
old mode 100755
new mode 100644
diff --git a/lib/middleman/vendor/gems/gems/rake-0.8.7/test/test_rules.rb b/lib/middleman/vendor/gems/gems/rake-0.8.7/test/test_rules.rb
old mode 100755
new mode 100644
diff --git a/lib/middleman/vendor/gems/gems/rake-0.8.7/test/test_tasks.rb b/lib/middleman/vendor/gems/gems/rake-0.8.7/test/test_tasks.rb
old mode 100755
new mode 100644
diff --git a/lib/middleman/vendor/gems/gems/rake-0.8.7/test/test_win32.rb b/lib/middleman/vendor/gems/gems/rake-0.8.7/test/test_win32.rb
old mode 100755
new mode 100644
diff --git a/lib/middleman/vendor/gems/gems/shotgun-0.4/COPYING b/lib/middleman/vendor/gems/gems/shotgun-0.4/COPYING
old mode 100755
new mode 100644
diff --git a/lib/middleman/vendor/gems/gems/shotgun-0.4/README b/lib/middleman/vendor/gems/gems/shotgun-0.4/README
old mode 100755
new mode 100644
diff --git a/lib/middleman/vendor/gems/gems/shotgun-0.4/Rakefile b/lib/middleman/vendor/gems/gems/shotgun-0.4/Rakefile
old mode 100755
new mode 100644
diff --git a/lib/middleman/vendor/gems/gems/shotgun-0.4/lib/shotgun.rb b/lib/middleman/vendor/gems/gems/shotgun-0.4/lib/shotgun.rb
old mode 100755
new mode 100644
diff --git a/lib/middleman/vendor/gems/gems/shotgun-0.4/shotgun.gemspec b/lib/middleman/vendor/gems/gems/shotgun-0.4/shotgun.gemspec
old mode 100755
new mode 100644
diff --git a/lib/middleman/vendor/gems/gems/sinatra-0.9.4/AUTHORS b/lib/middleman/vendor/gems/gems/sinatra-0.9.4/AUTHORS
old mode 100755
new mode 100644
diff --git a/lib/middleman/vendor/gems/gems/sinatra-0.9.4/CHANGES b/lib/middleman/vendor/gems/gems/sinatra-0.9.4/CHANGES
old mode 100755
new mode 100644
diff --git a/lib/middleman/vendor/gems/gems/sinatra-0.9.4/LICENSE b/lib/middleman/vendor/gems/gems/sinatra-0.9.4/LICENSE
old mode 100755
new mode 100644
diff --git a/lib/middleman/vendor/gems/gems/sinatra-0.9.4/Rakefile b/lib/middleman/vendor/gems/gems/sinatra-0.9.4/Rakefile
old mode 100755
new mode 100644
diff --git a/lib/middleman/vendor/gems/gems/sprockets-1.0.2/ext/nph-sprockets.cgi b/lib/middleman/vendor/gems/gems/sprockets-1.0.2/ext/nph-sprockets.cgi
old mode 100644
new mode 100755
diff --git a/lib/middleman/vendor/gems/gems/templater-1.0.0/script/console b/lib/middleman/vendor/gems/gems/templater-1.0.0/script/console
old mode 100644
new mode 100755
diff --git a/lib/middleman/vendor/gems/gems/templater-1.0.0/script/destroy b/lib/middleman/vendor/gems/gems/templater-1.0.0/script/destroy
old mode 100644
new mode 100755
diff --git a/lib/middleman/vendor/gems/gems/templater-1.0.0/script/generate b/lib/middleman/vendor/gems/gems/templater-1.0.0/script/generate
old mode 100644
new mode 100755
diff --git a/lib/middleman/vendor/gems/gems/yui-compressor-0.9.1/vendor/yuicompressor-2.4.2.jar b/lib/middleman/vendor/gems/gems/yui-compressor-0.9.1/vendor/yuicompressor-2.4.2.jar
old mode 100644
new mode 100755
diff --git a/lib/middleman/vendor/gems/specifications/fancy-buttons-0.3.6.gemspec b/lib/middleman/vendor/gems/specifications/fancy-buttons-0.3.7.gemspec
similarity index 97%
rename from lib/middleman/vendor/gems/specifications/fancy-buttons-0.3.6.gemspec
rename to lib/middleman/vendor/gems/specifications/fancy-buttons-0.3.7.gemspec
index 27377580..24101d5d 100644
--- a/lib/middleman/vendor/gems/specifications/fancy-buttons-0.3.6.gemspec
+++ b/lib/middleman/vendor/gems/specifications/fancy-buttons-0.3.7.gemspec
@@ -2,11 +2,11 @@
Gem::Specification.new do |s|
s.name = %q{fancy-buttons}
- s.version = "0.3.6"
+ s.version = "0.3.7"
s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
s.authors = ["Brandon Mathis"]
- s.date = %q{2009-12-10}
+ s.date = %q{2009-12-14}
s.description = %q{Make fancy buttons with the Compass stylesheet authoring framework.}
s.email = %q{brandon@imathis.com}
s.extra_rdoc_files = ["README.markdown"]
diff --git a/lib/middleman/vendor/gems/specifications/haml-2.2.15.gemspec b/lib/middleman/vendor/gems/specifications/haml-2.2.16.gemspec
similarity index 99%
rename from lib/middleman/vendor/gems/specifications/haml-2.2.15.gemspec
rename to lib/middleman/vendor/gems/specifications/haml-2.2.16.gemspec
index 15050506..791f6a33 100644
--- a/lib/middleman/vendor/gems/specifications/haml-2.2.15.gemspec
+++ b/lib/middleman/vendor/gems/specifications/haml-2.2.16.gemspec
@@ -2,11 +2,11 @@
Gem::Specification.new do |s|
s.name = %q{haml}
- s.version = "2.2.15"
+ s.version = "2.2.16"
s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
s.authors = ["Nathan Weizenbaum", "Hampton Catlin"]
- s.date = %q{2009-12-01}
+ s.date = %q{2009-12-16}
s.description = %q{ Haml (HTML Abstraction Markup Language) is a layer on top of XHTML or XML
that's designed to express the structure of XHTML or XML documents
in a non-repetitive, elegant, easy way,
diff --git a/lib/middleman/vendor/gems/specifications/launchy-0.3.3.gemspec b/lib/middleman/vendor/gems/specifications/launchy-0.3.5.gemspec
similarity index 74%
rename from lib/middleman/vendor/gems/specifications/launchy-0.3.3.gemspec
rename to lib/middleman/vendor/gems/specifications/launchy-0.3.5.gemspec
index 13be819f..076355b7 100644
--- a/lib/middleman/vendor/gems/specifications/launchy-0.3.3.gemspec
+++ b/lib/middleman/vendor/gems/specifications/launchy-0.3.5.gemspec
@@ -2,17 +2,23 @@
Gem::Specification.new do |s|
s.name = %q{launchy}
- s.version = "0.3.3"
+ s.version = "0.3.5"
s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
s.authors = ["Jeremy Hinegardner"]
- s.date = %q{2009-02-18}
+ s.date = %q{2009-12-16}
s.default_executable = %q{launchy}
- s.description = %q{Launchy is helper class for launching cross-platform applications in a fire and forget manner. There are application concepts (browser, email client, etc) that are common across all platforms, and they may be launched differently on each platform. Launchy is here to make a common approach to launching external application from within ruby programs.}
+ s.description = %q{Launchy is helper class for launching cross-platform applications in a
+fire and forget manner.
+
+There are application concepts (browser, email client, etc) that are
+common across all platforms, and they may be launched differently on
+each platform. Launchy is here to make a common approach to launching
+external application from within ruby programs.}
s.email = %q{jeremy@copiousfreetime.org}
s.executables = ["launchy"]
s.extra_rdoc_files = ["README", "HISTORY", "LICENSE", "lib/launchy/application.rb", "lib/launchy/browser.rb", "lib/launchy/command_line.rb", "lib/launchy/paths.rb", "lib/launchy/version.rb", "lib/launchy.rb"]
- s.files = ["bin/launchy", "lib/launchy/application.rb", "lib/launchy/browser.rb", "lib/launchy/command_line.rb", "lib/launchy/paths.rb", "lib/launchy/version.rb", "lib/launchy.rb", "spec/application_spec.rb", "spec/browser_spec.rb", "spec/launchy_spec.rb", "spec/paths_spec.rb", "spec/spec_helper.rb", "spec/version_spec.rb", "README", "HISTORY", "LICENSE", "tasks/announce.rake", "tasks/distribution.rake", "tasks/documentation.rake", "tasks/rspec.rake", "tasks/rubyforge.rake", "tasks/config.rb", "tasks/utils.rb", "Rakefile", "gemspec.rb"]
+ s.files = ["bin/launchy", "lib/launchy/application.rb", "lib/launchy/browser.rb", "lib/launchy/command_line.rb", "lib/launchy/paths.rb", "lib/launchy/version.rb", "lib/launchy.rb", "spec/application_spec.rb", "spec/browser_spec.rb", "spec/launchy_spec.rb", "spec/paths_spec.rb", "spec/spec_helper.rb", "spec/version_spec.rb", "spec/tattle-host-os.yml", "README", "HISTORY", "LICENSE", "tasks/announce.rake", "tasks/distribution.rake", "tasks/documentation.rake", "tasks/rspec.rake", "tasks/rubyforge.rake", "tasks/config.rb", "tasks/utils.rb", "Rakefile", "gemspec.rb"]
s.homepage = %q{http://copiousfreetime.rubyforge.org/launchy/}
s.rdoc_options = ["--line-numbers", "--inline-source", "--main", "README"]
s.require_paths = ["lib"]
@@ -22,7 +28,7 @@ Gem::Specification.new do |s|
if s.respond_to? :specification_version then
current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
- s.specification_version = 2
+ s.specification_version = 3
if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
s.add_runtime_dependency(%q, [">= 0.8.1"])
diff --git a/lib/middleman/vendor/gems/specifications/rack-1.0.1.gemspec b/lib/middleman/vendor/gems/specifications/rack-1.0.1.gemspec
old mode 100755
new mode 100644
diff --git a/lib/middleman/vendor/gems/specifications/rake-0.8.7.gemspec b/lib/middleman/vendor/gems/specifications/rake-0.8.7.gemspec
old mode 100755
new mode 100644
diff --git a/lib/middleman/vendor/gems/specifications/shotgun-0.4.gemspec b/lib/middleman/vendor/gems/specifications/shotgun-0.4.gemspec
old mode 100755
new mode 100644
diff --git a/spec/fixtures/sample/init.rb b/spec/fixtures/sample/init.rb
old mode 100644
new mode 100755
diff --git a/spec/fixtures/sample/views/cache-buster.html.haml b/spec/fixtures/sample/views/cache-buster.html.haml
old mode 100755
new mode 100644
diff --git a/spec/fixtures/sample/views/layout.haml b/spec/fixtures/sample/views/layout.haml
old mode 100644
new mode 100755
diff --git a/spec/helpers_spec.rb b/spec/helpers_spec.rb
old mode 100644
new mode 100755
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
old mode 100644
new mode 100755