middleman 0.12.1 → 0.12.2

data/VERSION

@@ -1 +1 @@
-0.12.1
+0.12.2

data/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")

data/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")
+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"))

data/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")
+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"))

data/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")
+require File.expand_path(File.join(File.dirname(__FILE__), "../gems/environment"))
+load File.expand_path(File.join(File.dirname(__FILE__), "../gems/gems/json-1.2.0/bin/edit_json.rb"))

data/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")
+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"))

data/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")
+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"))

data/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")
+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"))

data/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")
+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"))

data/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")
+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"))

data/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")
+require File.expand_path(File.join(File.dirname(__FILE__), "../gems/environment"))
+load File.expand_path(File.join(File.dirname(__FILE__), "../gems/gems/json-1.2.0/bin/prettify_json.rb"))

data/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")
+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"))

data/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")
+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"))

data/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")
+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"))

data/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")
+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"))

data/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")
+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"))

data/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")
+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"))

data/lib/middleman/vendor/gems/environment.rb

@@ -24,16 +24,16 @@ module Bundler
   $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/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/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/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/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")
@@ -48,12 +48,12 @@ module Bundler
   $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/fancy-buttons-0.3.7/bin")
+  $LOAD_PATH.unshift File.expand_path("#{dir}/gems/fancy-buttons-0.3.7/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")
 
   @gemfile = "#{dir}/../../../../Gemfile"
 
@@ -76,16 +76,16 @@ module Bundler
   @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["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["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["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["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"))
@@ -100,12 +100,12 @@ module Bundler
   @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["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"
   @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"
 
   def self.add_specs_to_loaded_specs
     Gem.loaded_specs.merge! @bundled_specs

data/lib/middleman/vendor/gems/gems/{fancy-buttons-0.3.6 → 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:
 

data/lib/middleman/vendor/gems/gems/{fancy-buttons-0.3.6 → 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 = [

data/lib/middleman/vendor/gems/gems/{fancy-buttons-0.3.6 → 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

data/lib/middleman/vendor/gems/gems/{fancy-buttons-0.3.6 → fancy-buttons-0.3.7}/lib/templates/project/index.html

@@ -21,6 +21,11 @@
       <button class="light">Click Me</button>
       <button class="matte-blue">Click Me</button>
     </div>
+    <h2>Disabled Buttons</h2>
+    <div>
+      <button class="green" disabled>Click Me</button>
+      <button class="red" disabled>Click Me</button>
+    </div>
     <h2>Custom Radial Gradient</h2>
     <div>
       <button class="custom heart">&hearts;</button>

data/lib/middleman/vendor/gems/gems/haml-2.2.16/VERSION

@@ -0,0 +1 @@
+2.2.16

data/lib/middleman/vendor/gems/gems/{haml-2.2.15 → haml-2.2.16}/lib/haml/buffer.rb

@@ -15,7 +15,7 @@ module Haml
 
     # The options hash passed in from {Haml::Engine}.
     #
-    # @return [Hash<String, Object>]
+    # @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<Symbol, Object>] 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<String, String>] The attribute hash to merge into
-    # @param from [Hash<String, String>] The attribute hash to merge from
-    # @return [Hash<String, String>] `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

data/lib/middleman/vendor/gems/gems/{haml-2.2.15 → 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<Symbol, Object>]
+    # @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<Symbol, Object>] 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<Symbol, Object>] 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<Symbol, Object>] The options hash
+    # @return [{Symbol => Object}] The options hash
     def options_for_buffer
       {
         :autoclose => @options[:autoclose],

data/lib/middleman/vendor/gems/gems/{haml-2.2.15 → haml-2.2.16}/lib/haml/filters.rb

@@ -4,7 +4,7 @@ module Haml
   #
   # @see Haml::Filters::Base
   module Filters
-    # @return [Hash<String, Haml::Filters::Base>] a hash of filter names to classes
+    # @return [{String => Haml::Filters::Base}] a hash of filter names to classes
     def self.defined
       @defined ||= {}
     end

data/lib/middleman/vendor/gems/gems/{haml-2.2.15 → haml-2.2.16}/lib/haml/helpers.rb

@@ -198,7 +198,7 @@ MESSAGE
     #     <html xmlns='http://www.w3.org/1999/xhtml' xml:lang='en-US' lang='en-US'>
     #
     # @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