RubyGems - haml - Versions diffs - 2.2.13 → 2.2.14 - Mend

haml 2.2.13 → 2.2.14

Potentially problematic release.

This version of haml might be problematic. Click here for more details.

Files changed (22) hide show

data/README.md +10 -0
data/Rakefile +3 -2
data/VERSION +1 -1
data/lib/haml/helpers.rb +3 -1
data/lib/haml/html.rb +1 -4
data/lib/haml/precompiler.rb +3 -1
data/lib/haml/util.rb +11 -0
data/lib/sass/plugin.rb +4 -2
data/lib/sass/plugin/merb.rb +2 -10
data/lib/sass/plugin/rack.rb +65 -0
data/lib/sass/plugin/rails.rb +1 -1
data/lib/sass/script/color.rb +25 -7
data/lib/sass/script/funcall.rb +1 -1
data/lib/sass/script/functions.rb +67 -16
data/lib/sass/script/lexer.rb +2 -2
data/test/haml/engine_test.rb +6 -0
data/test/haml/html2haml_test.rb +9 -0
data/test/haml/util_test.rb +10 -0
data/test/sass/functions_test.rb +37 -4
data/test/sass/script_test.rb +6 -0
data/test/test_helper.rb +2 -5
metadata +142 -141

data/README.md CHANGED

@@ -49,6 +49,16 @@ To do so, just add
 to `config/dependencies.rb` (or `config/init.rb` in a flat/very flat Merb application).
 Then it'll work just like it does in Rails.
+Sass can also be used with any Rack-enabled web framework.
+To do so, just add
+    require 'sass/plugin/rack'
+    use Sass::Plugin::Rack
+to `config.ru`.
+Then any Sass files in `public/stylesheets/sass`
+will be compiled CSS files in `public/stylesheets` on every request.
 To use Haml and Sass programatically,
 check out the [YARD documentation](http://haml-lang.com/docs/yardoc).

data/Rakefile CHANGED

@@ -80,6 +80,7 @@ task :release => [:check_release, :release_elpa, :package] do
   sh %{rubyforge add_file    haml haml "#{name} (v#{version})" pkg/haml-#{version}.tar.gz}
   sh %{rubyforge add_file    haml haml "#{name} (v#{version})" pkg/haml-#{version}.tar.bz2}
   sh %{rubyforge add_file    haml haml "#{name} (v#{version})" pkg/haml-#{version}.zip}
+  sh %{gem push pkg/haml-#{version}.gem}
 end
 # Releases haml-mode.el and sass-mode.el to ELPA.
@@ -312,11 +313,11 @@ rescue LoadError; end
 # ----- Testing Multiple Rails Versions -----
 rails_versions = [
-  "v2.3.0",
+  "v2.3.4",
   "v2.2.2",
   "v2.1.2",
-  "v2.0.5"
 ]
+rails_versions << "v2.0.5" if RUBY_VERSION =~ /^1\.8/
 namespace :test do
   desc "Test all supported versions of rails. This takes a while."

data/VERSION CHANGED

	@@ -1 +1 @@
1	- 2.2.13
1	+ 2.2.14

data/lib/haml/helpers.rb CHANGED

@@ -483,7 +483,9 @@ END
     # @param text [String] The string to sanitize
     # @return [String] The sanitized string
     def escape_once(text)
-      text.to_s.gsub(/[\"><]|&(?!(?:[a-zA-Z]+|(#\d+));)/n) {|s| HTML_ESCAPE[s]}
+      Haml::Util.silence_warnings do
+        text.to_s.gsub(/[\"><]|&(?!(?:[a-zA-Z]+|(#\d+));)/n) {|s| HTML_ESCAPE[s]}
+      end
     end
     # Returns whether or not the current template is a Haml template.

data/lib/haml/html.rb CHANGED

@@ -152,10 +152,7 @@ module Haml
         end
         version = " #{version}" if version
-        if strictness
-          strictness[0] = strictness[0] - 32
-          strictness = " #{strictness}"
-        end
+        strictness = " #{strictness.capitalize}" if strictness
         "#{tabulate(tabs)}!!!#{version}#{strictness}\n"
       end

data/lib/haml/precompiler.rb CHANGED

@@ -82,7 +82,7 @@ module Haml
     MID_BLOCK_KEYWORD_REGEX = /^-\s*(#{%w[else elsif rescue ensure when end].join('|')})\b/
     # The Regex that matches a Doctype command.
-    DOCTYPE_REGEX = /(\d\.\d)?[\s]*([a-z]*)/i
+    DOCTYPE_REGEX = /(\d(?:\.\d)?)?[\s]*([a-z]*)/i
     # The Regex that matches a literal string or symbol value
     LITERAL_VALUE_REGEX = /:(\w*)|(["'])((?![\\#]|\2).|\\.)*\2/
@@ -848,6 +848,8 @@ END
         if xhtml?
           if version == "1.1"
             '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">'
+          elsif version == "5"
+            '<!DOCTYPE html>'
           else
             case type
             when "strict";   '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">'

data/lib/haml/util.rb CHANGED

@@ -1,6 +1,7 @@
 require 'erb'
 require 'set'
 require 'enumerator'
+require 'stringio'
 module Haml
   # A module containing various useful functions.
@@ -122,6 +123,16 @@ module Haml
       end
     end
+    # Silence all output to STDERR within a block.
+    #
+    # @yield A block in which no output will be printed to STDERR
+    def silence_warnings
+      the_real_stderr, $stderr = $stderr, StringIO.new
+      yield
+    ensure
+      $stderr = the_real_stderr
+    end
     ## Cross Rails Version Compatibility
     # Returns the root of the Rails application,

data/lib/sass/plugin.rb CHANGED

@@ -1,4 +1,4 @@
-require 'sass/engine'
+require 'sass'
 module Sass
   # This module handles the compilation of Sass files.
@@ -7,7 +7,9 @@ module Sass
   #
   # This module is used as the primary interface with Sass
   # when it's used as a plugin for various frameworks.
-  # Currently Rails and Merb are supported out of the box.
+  # All Rack-enabled frameworks are supported out of the box.
+  # The plugin is {file:SASS_REFERENCE.md#rails_merb_plugin automatically activated for Rails and Merb}.
+  # Other frameworks must enable it explicitly; see {Sass::Plugin::Rack}.
   module Plugin
     extend self

data/lib/sass/plugin/merb.rb CHANGED

@@ -27,11 +27,7 @@ unless defined?(Sass::MERB_LOADED)
     class Merb::Rack::Application
       def call_with_sass(env)
-        if !Sass::Plugin.checked_for_updates ||
-            Sass::Plugin.options[:always_update] || Sass::Plugin.options[:always_check]
-          Sass::Plugin.update_stylesheets
-        end
+        Sass::Plugin.check_for_updates
         call_without_sass(env)
       end
       alias_method :call_without_sass, :call
@@ -42,11 +38,7 @@ unless defined?(Sass::MERB_LOADED)
     class MerbHandler
       def process_with_sass(request, response)
-        if !Sass::Plugin.checked_for_updates ||
-            Sass::Plugin.options[:always_update] || Sass::Plugin.options[:always_check]
-          Sass::Plugin.update_stylesheets
-        end
+        Sass::Plugin.check_for_updates
         process_without_sass(request, response)
       end
       alias_method :process_without_sass, :process

data/lib/sass/plugin/rack.rb ADDED

@@ -0,0 +1,65 @@
+require 'sass/plugin'
+module Sass
+  module Plugin
+    # Rack middleware for compiling Sass code.
+    #
+    # ## Activate
+    #
+    #     require 'sass/plugin/rack'
+    #     use Sass::Plugin::Rack
+    #
+    # ## Customize
+    #
+    #     Sass::Plugin.options.merge(
+    #       :cache_location => './tmp/sass-cache',
+    #       :never_update => environment != :production,
+    #       :full_exception => environment != :production)
+    #
+    # {file:SASS_REFERENCE.md#options See the Reference for more options}.
+    #
+    # ## Use
+    #
+    # Put your Sass files in `public/stylesheets/sass`.
+    # Your CSS will be generated in `public/stylesheets`,
+    # and regenerated every request if necessary.
+    # The locations and frequency {file:SASS_REFERENCE.md#options can be customized}.
+    # That's all there is to it!
+    class Rack
+      # Initialize the middleware.
+      #
+      # @param app [#call] The Rack application
+      def initialize(app)
+        @app = app
+        self.class.disable_native_plugin!
+      end
+      # Process a request, checking the Sass stylesheets for changes
+      # and updating them if necessary.
+      #
+      # @param env The Rack request environment
+      # @return [(#to_i, Hash<String, String>, Object)] The Rack response
+      def call(env)
+        Sass::Plugin.check_for_updates
+        @app.call(env)
+      end
+      # Disable the native Rails or Merb plugins, if they're enabled.
+      # This is automatically done once the Rack plugin is activated.
+      # This is done so that the stylesheets aren't checked twice for each request.
+      def self.disable_native_plugin!
+        if defined?(Merb::Rack::Application) &&
+            Haml::Util.has?(:instance_method, Merb::Rack::Application, :call_without_sass)
+          Merb::Rack::Application.instance_eval {alias_method :call, :call_without_sass}
+        end
+        if defined?(ActionDispatch::Callbacks.to_prepare)
+          ActionDispatch::Callbacks.skip_callback(:prepare, :__sass_process)
+        elsif defined?(ActionController::Base) &&
+            Haml::Util.has?(:instance_method, ActionController::Base, :sass_old_process)
+          ActionController::Base.instance_eval {alias_method :process, :sass_old_process}
+        end
+      end
+    end
+  end
+end

data/lib/sass/plugin/rails.rb CHANGED

@@ -9,7 +9,7 @@ unless defined?(Sass::RAILS_LOADED)
   if defined?(ActionDispatch::Callbacks.to_prepare)
     # Rails >= 3.0.0
-    ActionDispatch::Callbacks.to_prepare {Sass::Plugin.check_for_updates}
+    ActionDispatch::Callbacks.to_prepare(:sass_process) {Sass::Plugin.check_for_updates}
   else
     module ActionController
       class Base

data/lib/sass/script/color.rb CHANGED

@@ -36,6 +36,25 @@ module Sass::Script
       super(rgb)
     end
+    # @deprecated This will be removed in version 2.6.
+    # @see #rgb
+    def value
+      warn <<END
+DEPRECATION WARNING:
+The Sass::Script::Color #value attribute is deprecated and will be
+removed in version 2.6. Use the #rgb attribute instead.
+END
+      rgb
+    end
+    # Returns the red, green, and blue components of the color.
+    #
+    # @return [Array<Fixnum>] A three-element array of the red, green, and blue
+    #   values (respectively) of the color
+    def rgb
+      @value
+    end
     # The SassScript `+` operation.
     # Its functionality depends on the type of its argument:
     #
@@ -157,8 +176,8 @@ module Sass::Script
     #
     # @return [String] The string representation
     def to_s
-      return HTML4_COLORS_REVERSE[@value] if HTML4_COLORS_REVERSE[@value]
-      red, green, blue = @value.map { |num| num.to_s(16).rjust(2, '0') }
+      return HTML4_COLORS_REVERSE[rgb] if HTML4_COLORS_REVERSE[rgb]
+      red, green, blue = rgb.map { |num| num.to_s(16).rjust(2, '0') }
       "##{red}#{green}#{blue}"
     end
     alias_method :inspect, :to_s
@@ -167,17 +186,16 @@ module Sass::Script
     def piecewise(other, operation)
       other_num = other.is_a? Number
-      other_val = other.value
       if other_num && !other.unitless?
         raise Sass::SyntaxError.new("Cannot add a number with units (#{other}) to a color (#{self}).")
       end
-      rgb = []
+      result = []
       for i in (0...3)
-        res = @value[i].send(operation, other_num ? other_val : other_val[i])
-        rgb[i] = [ [res, 255].min, 0 ].max
+        res = rgb[i].send(operation, other_num ? other.value : other.rgb[i])
+        result[i] = [ [res, 255].min, 0 ].max
       end
-      Color.new(rgb)
+      Color.new(result)
     end
   end
 end

data/lib/sass/script/funcall.rb CHANGED

@@ -42,7 +42,7 @@ module Sass
         return Functions::EvaluationContext.new(environment.options).send(name, *args)
       rescue ArgumentError => e
-        raise e unless e.backtrace.first =~ /:in `(block in )?(#{name}|perform)'$/
+        raise e unless e.backtrace.any? {|t| t =~ /:in `(block in )?(#{name}|perform)'$/}
         raise Sass::SyntaxError.new("#{e.message} for `#{name}'")
       end
     end

data/lib/sass/script/functions.rb CHANGED

@@ -11,6 +11,9 @@ module Sass::Script
   # \{#hsl}
   # : Converts an `hsl(hue, saturation, lightness)` triplet into a color.
   #
+  # \{#rgb}
+  # : Converts an `rgb(red, green, blue)` triplet into a color.
+  #
   # \{#percentage}
   # : Converts a unitless number to a percentage.
   #
@@ -26,10 +29,28 @@ module Sass::Script
   # \{#abs}
   # : Returns the absolute value of a number.
   #
-  # You can add your own functions to this module,
-  # but there are a few things to keep in mind.
+  # These functions are described in more detail below.
+  #
+  # ## Adding Custom Functions
+  #
+  # New Sass functions can be added by adding Ruby methods to this module.
+  # For example:
+  #
+  #     module Sass::Script::Functions
+  #       def reverse(string)
+  #         assert_type string, :String
+  #         Sass::Script::String.new(string.value.reverse)
+  #       end
+  #     end
+  #
+  # There are a few things to keep in mind when modifying this module.
   # First of all, the arguments passed are {Sass::Script::Literal} objects.
   # Literal objects are also expected to be returned.
+  # This means that Ruby values must be unwrapped and wrapped.
+  #
+  # Most Literal objects support the {Sass::Script::Literal#value value} accessor
+  # for getting their Ruby values.
+  # Color objects, though, must be accessed using {Sass::Script::Color#rgb rgb}.
   #
   # Second, making Ruby functions accessible from Sass introduces the temptation
   # to do things like database access within stylesheets.
@@ -57,6 +78,22 @@ module Sass::Script
       def initialize(options)
         @options = options
       end
+      # Asserts that the type of a given SassScript value
+      # is the expected type (designated by a symbol).
+      # For example:
+      #
+      #     assert_type value, :String
+      #     assert_type value, :Number
+      #
+      # Valid types are `:Bool`, `:Color`, `:Number`, and `:String`.
+      #
+      # @param value [Sass::Script::Literal] A SassScript value
+      # @param type [Symbol] The name of the type the value is expected to be
+      def assert_type(value, type)
+        return if value.is_a?(Sass::Script.const_get(type))
+        raise ArgumentError.new("#{value.inspect} is not a #{type.to_s.downcase}")
+      end
     end
     instance_methods.each { |m| undef_method m unless m.to_s =~ /^__/ }
@@ -64,21 +101,34 @@ module Sass::Script
     # Creates a {Color} object from red, green, and blue values.
     # @param red
-    #   A number between 0 and 255 inclusive
+    #   A number between 0 and 255 inclusive,
+    #   or between 0% and 100% inclusive
     # @param green
-    #   A number between 0 and 255 inclusive
+    #   A number between 0 and 255 inclusive,
+    #   or between 0% and 100% inclusive
     # @param blue
-    #   A number between 0 and 255 inclusive
+    #   A number between 0 and 255 inclusive,
+    #   or between 0% and 100% inclusive
     def rgb(red, green, blue)
-      [red.value, green.value, blue.value].each do |v|
-        next unless v < 0 || v > 255
-        raise ArgumentError.new("Color value #{v} must be between 0 and 255 inclusive")
+      assert_type red, :Number
+      assert_type green, :Number
+      assert_type blue, :Number
+      rgb = [red, green, blue].map do |c|
+        v = c.value
+        if c.numerator_units == ["%"] && c.denominator_units.empty?
+          next v * 255 / 100.0 if (0..100).include?(v)
+          raise ArgumentError.new("Color value #{c} must be between 0% and 100% inclusive")
+        else
+          next v if (0..255).include?(v)
+          raise ArgumentError.new("Color value #{v} must be between 0 and 255 inclusive")
+        end
       end
-      Color.new([red.value, green.value, blue.value])
+      Color.new(rgb)
     end
-    # Creates a {Color} object from hue, saturation, and lightness
-    # as per the CSS3 spec (http://www.w3.org/TR/css3-color/#hsl-color).
+    # Creates a {Color} object from hue, saturation, and lightness.
+    # Uses the algorithm from the [CSS3 spec](http://www.w3.org/TR/css3-color/#hsl-color).
     #
     # @param hue [Number] The hue of the color.
     #   Should be between 0 and 360 degrees, inclusive
@@ -89,6 +139,10 @@ module Sass::Script
     # @return [Color] The resulting color
     # @raise [ArgumentError] if `saturation` or `lightness` are out of bounds
     def hsl(hue, saturation, lightness)
+      assert_type hue, :Number
+      assert_type saturation, :Number
+      assert_type lightness, :Number
       original_s = saturation
       original_l = lightness
       # This algorithm is from http://www.w3.org/TR/css3-color#hsl-color
@@ -117,7 +171,7 @@ module Sass::Script
     # @raise [ArgumentError] If `value` isn't a unitless number
     def percentage(value)
       unless value.is_a?(Sass::Script::Number) && value.unitless?
-        raise ArgumentError.new("#{value} is not a unitless number")
+        raise ArgumentError.new("#{value.inspect} is not a unitless number")
       end
       Sass::Script::Number.new(value.value * 100, ['%'])
     end
@@ -180,10 +234,7 @@ module Sass::Script
     # another numeric value with the same units.
     # It yields a number to a block to perform the operation and return a number
     def numeric_transformation(value)
-      unless value.is_a?(Sass::Script::Number)
-        calling_function = caller.first.scan(/`([^']+)'/).first.first
-        raise Sass::SyntaxError.new("#{value} is not a number for `#{calling_function}'")
-      end
+      assert_type value, :Number
       Sass::Script::Number.new(yield(value.value), value.numerator_units, value.denominator_units)
     end

data/lib/sass/script/lexer.rb CHANGED

@@ -53,8 +53,8 @@ module Sass
       REGULAR_EXPRESSIONS = {
         :whitespace => /\s*/,
         :variable => /!(\w+)/,
-        :ident => /(\\.|\#\{|[^\s\\+\-*\/%(),=!])+/,
-        :string_end => /((?:\\.|\#[^{]|[^"\\#])*)(?:"|(?=#\{))/,
+        :ident => /(\\.|[^\s\\+\-*\/%(),=!])+/,
+        :string_end => /((?:\\.|\#(?!\{)|[^"\\#])*)(?:"|(?=#\{))/,
         :number => /(-)?(?:(\d*\.\d+)|(\d+))([a-zA-Z%]+)?/,
         :color => /\##{"([0-9a-fA-F]{1,2})" * 3}|(#{Color::HTML4_COLORS.keys.join("|")})/,
         :bool => /(true|false)\b/,

data/test/haml/engine_test.rb CHANGED

@@ -729,6 +729,7 @@ HAML
   def test_doctypes
     assert_equal('<!DOCTYPE html>',
       render('!!!', :format => :html5).strip)
+    assert_equal('<!DOCTYPE html>', render('!!! 5').strip)
     assert_equal('<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">',
       render('!!! strict').strip)
     assert_equal('<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Frameset//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-frameset.dtd">',
@@ -1033,6 +1034,11 @@ END
     assert_equal("<a></a>\n", render('%a{:b => "a #{1 + 1} b", :c => "d"}', :suppress_eval => true))
   end
+  def test_utf8_attrs
+    assert_equal("<a href='héllo'></a>\n", render("%a{:href => 'héllo'}"))
+    assert_equal("<a href='héllo'></a>\n", render("%a(href='héllo')"))
+  end
   # HTML 4.0
   def test_html_has_no_self_closing_tags

data/test/haml/html2haml_test.rb CHANGED

@@ -112,6 +112,15 @@ HTML
       render_rhtml('<p foo="<%= "#{bar} baz" %>"></p>'))
   end
+  # Regression Tests
+  def test_xhtml_strict_doctype
+    assert_equal('!!! Strict', render(<<HTML))
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+  "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+HTML
+  end
   protected
   def render(text, options = {})

data/test/haml/util_test.rb CHANGED

@@ -59,6 +59,16 @@ class UtilTest < Test::Unit::TestCase
       merge_adjacent_strings(["foo ", "bar ", "baz", :bang, "biz", " bop", 12]))
   end
+  def test_silence_warnings
+    old_stderr, $stderr = $stderr, StringIO.new
+    warn "Out"
+    assert_equal("Out\n", $stderr.string)
+    silence_warnings {warn "In"}
+    assert_equal("Out\n", $stderr.string)
+  ensure
+    $stderr = old_stderr
+  end
   def test_has
     assert(has?(:instance_method, String, :chomp!))
     assert(has?(:private_instance_method, Haml::Engine, :set_locals))

data/test/sass/functions_test.rb CHANGED

@@ -48,13 +48,22 @@ class SassFunctionTest < Test::Unit::TestCase
     assert_error_message("Lightness 256 must be between 0% and 100% for `hsl'", "hsl(10, 10, 256%)");
   end
+  def test_hsl_checks_types
+    assert_error_message("\"foo\" is not a number for `hsl'", "hsl(\"foo\", 10, 12)");
+    assert_error_message("\"foo\" is not a number for `hsl'", "hsl(10, \"foo\", 12)");
+    assert_error_message("\"foo\" is not a number for `hsl'", "hsl(10, 10, \"foo\")");
+  end
   def test_percentage
     assert_equal("50%",  evaluate("percentage(.5)"))
     assert_equal("100%", evaluate("percentage(1)"))
     assert_equal("25%",  evaluate("percentage(25px / 100px)"))
+  end
+  def test_percentage_checks_types
     assert_error_message("25px is not a unitless number for `percentage'", "percentage(25px)")
     assert_error_message("#cccccc is not a unitless number for `percentage'", "percentage(#ccc)")
-    assert_error_message("string is not a unitless number for `percentage'", %Q{percentage("string")})
+    assert_error_message("\"string\" is not a unitless number for `percentage'", %Q{percentage("string")})
   end
   def test_round
@@ -69,14 +78,14 @@ class SassFunctionTest < Test::Unit::TestCase
     assert_equal("4",   evaluate("floor(4.8)"))
     assert_equal("4px", evaluate("floor(4.8px)"))
-    assert_error_message("foo is not a number for `floor'", "floor(\"foo\")")
+    assert_error_message("\"foo\" is not a number for `floor'", "floor(\"foo\")")
   end
   def test_ceil
     assert_equal("5",   evaluate("ceil(4.1)"))
     assert_equal("5px", evaluate("ceil(4.8px)"))
-    assert_error_message("a is not a number for `ceil'", "ceil(\"a\")")
+    assert_error_message("\"a\" is not a number for `ceil'", "ceil(\"a\")")
   end
   def test_abs
@@ -92,7 +101,16 @@ class SassFunctionTest < Test::Unit::TestCase
     assert_equal("#123456", evaluate("rgb(18, 52, 86)"))
     assert_equal("#beaded", evaluate("rgb(190, 173, 237)"))
     assert_equal("#00ff7f", evaluate("rgb(0, 255, 127)"))
+  end
+  def test_rgb_percent
+    assert_equal("#123456", evaluate("rgb(7.1%, 20.4%, 34%)"))
+    assert_equal("#beaded", evaluate("rgb(74.7%, 173, 93%)"))
+    assert_equal("#beaded", evaluate("rgb(190, 68%, 237)"))
+    assert_equal("#00ff7f", evaluate("rgb(0%, 100%, 50%)"))
+  end
+  def test_rgb_tests_bounds
     assert_error_message("Color value 256 must be between 0 and 255 inclusive for `rgb'",
       "rgb(256, 1, 1)")
     assert_error_message("Color value 256 must be between 0 and 255 inclusive for `rgb'",
@@ -105,11 +123,26 @@ class SassFunctionTest < Test::Unit::TestCase
       "rgb(-1, 1, 1)")
   end
+  def test_rgb_test_percent_bounds
+    assert_error_message("Color value 100.1% must be between 0% and 100% inclusive for `rgb'",
+      "rgb(100.1%, 0, 0)")
+    assert_error_message("Color value -0.1% must be between 0% and 100% inclusive for `rgb'",
+      "rgb(0, -0.1%, 0)")
+    assert_error_message("Color value 101% must be between 0% and 100% inclusive for `rgb'",
+      "rgb(0, 0, 101%)")
+  end
+  def test_rgb_tests_types
+    assert_error_message("\"foo\" is not a number for `rgb'", "rgb(\"foo\", 10, 12)");
+    assert_error_message("\"foo\" is not a number for `rgb'", "rgb(10, \"foo\", 12)");
+    assert_error_message("\"foo\" is not a number for `rgb'", "rgb(10, 10, \"foo\")");
+  end
   private
   def assert_rgb_hsl(rgb, hsl)
     hsl = hsl.map {|v| Sass::Script::Parser.parse v, 0, 0 }
-    assert_equal(rgb, Sass::Script::Functions::EvaluationContext.new({}).hsl(*hsl).value)
+    assert_equal(rgb, Sass::Script::Functions::EvaluationContext.new({}).hsl(*hsl).rgb)
   end
   def evaluate(value)

data/test/sass/script_test.rb CHANGED

@@ -225,6 +225,12 @@ WARN
     assert_equal "true", resolve("1.1cm == 11mm")
   end
+  # Regression tests
+  def test_interpolation_after_hash
+    assert_equal "#2", resolve('"##{1 + 1}"')
+  end
   private
   def resolve(str, opts = {}, environment = env)

data/test/test_helper.rb CHANGED

@@ -29,10 +29,7 @@ class Test::Unit::TestCase
     $stderr = the_real_stderr
   end
-  def silence_warnings
-    the_real_stderr, $stderr = $stderr, StringIO.new
-    yield
-  ensure
-    $stderr = the_real_stderr
+  def silence_warnings(&block)
+    Haml::Util.silence_warnings(&block)
   end
 end

metadata CHANGED

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: haml
 version: !ruby/object:Gem::Version
-  version: 2.2.13
+  version: 2.2.14
 platform: ruby
 authors:
 - Nathan Weizenbaum
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
-date: 2009-11-09 00:00:00 -08:00
+date: 2009-11-22 00:00:00 -08:00
 default_executable:
 dependencies:
 - !ruby/object:Gem::Dependency
@@ -43,200 +43,201 @@ executables:
 extensions: []
 extra_rdoc_files:
-- VERSION_NAME
-- CONTRIBUTING
-- README.md
-- MIT-LICENSE
 - VERSION
+- MIT-LICENSE
+- README.md
+- VERSION_NAME
 - REVISION
+- CONTRIBUTING
 files:
 - rails/init.rb
 - lib/sass.rb
-- lib/sass/css.rb
-- lib/sass/script/node.rb
-- lib/sass/script/number.rb
-- lib/sass/script/operation.rb
-- lib/sass/script/literal.rb
-- lib/sass/script/functions.rb
-- lib/sass/script/bool.rb
-- lib/sass/script/color.rb
-- lib/sass/script/lexer.rb
-- lib/sass/script/parser.rb
-- lib/sass/script/variable.rb
-- lib/sass/script/string.rb
-- lib/sass/script/funcall.rb
-- lib/sass/script/unary_operation.rb
+- lib/sass/plugin/rails.rb
+- lib/sass/plugin/rack.rb
+- lib/sass/plugin/merb.rb
 - lib/sass/script.rb
 - lib/sass/error.rb
-- lib/sass/repl.rb
-- lib/sass/tree/comment_node.rb
-- lib/sass/tree/node.rb
 - lib/sass/tree/for_node.rb
-- lib/sass/tree/debug_node.rb
-- lib/sass/tree/import_node.rb
-- lib/sass/tree/while_node.rb
-- lib/sass/tree/mixin_def_node.rb
-- lib/sass/tree/if_node.rb
 - lib/sass/tree/mixin_node.rb
-- lib/sass/tree/directive_node.rb
-- lib/sass/tree/rule_node.rb
+- lib/sass/tree/if_node.rb
 - lib/sass/tree/prop_node.rb
+- lib/sass/tree/mixin_def_node.rb
 - lib/sass/tree/variable_node.rb
-- lib/sass/plugin/rails.rb
-- lib/sass/plugin/merb.rb
-- lib/sass/environment.rb
+- lib/sass/tree/debug_node.rb
+- lib/sass/tree/directive_node.rb
+- lib/sass/tree/node.rb
+- lib/sass/tree/comment_node.rb
+- lib/sass/tree/rule_node.rb
+- lib/sass/tree/import_node.rb
+- lib/sass/tree/while_node.rb
 - lib/sass/files.rb
-- lib/sass/engine.rb
 - lib/sass/plugin.rb
-- lib/haml/filters.rb
+- lib/sass/script/parser.rb
+- lib/sass/script/color.rb
+- lib/sass/script/string.rb
+- lib/sass/script/unary_operation.rb
+- lib/sass/script/number.rb
+- lib/sass/script/funcall.rb
+- lib/sass/script/variable.rb
+- lib/sass/script/functions.rb
+- lib/sass/script/bool.rb
+- lib/sass/script/lexer.rb
+- lib/sass/script/operation.rb
+- lib/sass/script/node.rb
+- lib/sass/script/literal.rb
+- lib/sass/css.rb
+- lib/sass/engine.rb
+- lib/sass/repl.rb
+- lib/sass/environment.rb
+- lib/haml/util.rb
 - lib/haml/exec.rb
+- lib/haml/html.rb
 - lib/haml/error.rb
+- lib/haml/buffer.rb
 - lib/haml/template.rb
-- lib/haml/shared.rb
-- lib/haml/engine.rb
-- lib/haml/version.rb
-- lib/haml/template/patch.rb
 - lib/haml/template/plugin.rb
+- lib/haml/template/patch.rb
 - lib/haml/helpers.rb
-- lib/haml/buffer.rb
-- lib/haml/html.rb
+- lib/haml/version.rb
+- lib/haml/filters.rb
+- lib/haml/engine.rb
 - lib/haml/precompiler.rb
-- lib/haml/util.rb
+- lib/haml/shared.rb
+- lib/haml/helpers/action_view_extensions.rb
 - lib/haml/helpers/action_view_mods.rb
 - lib/haml/helpers/xss_mods.rb
-- lib/haml/helpers/action_view_extensions.rb
 - lib/haml.rb
-- bin/sass
 - bin/css2sass
-- bin/html2haml
+- bin/sass
 - bin/haml
-- test/linked_rails.rb
-- test/benchmark.rb
+- bin/html2haml
 - test/sass/script_test.rb
-- test/sass/css2sass_test.rb
-- test/sass/results/units.css
-- test/sass/results/parent_ref.css
-- test/sass/results/compressed.css
-- test/sass/results/complex.css
-- test/sass/results/compact.css
-- test/sass/results/mixins.css
-- test/sass/results/line_numbers.css
-- test/sass/results/alt.css
-- test/sass/results/subdir/subdir.css
-- test/sass/results/subdir/nested_subdir/nested_subdir.css
-- test/sass/results/nested.css
-- test/sass/results/import.css
-- test/sass/results/multiline.css
-- test/sass/results/script.css
-- test/sass/results/basic.css
-- test/sass/results/expanded.css
-- test/sass/more_results/more_import.css
 - test/sass/more_results/more1_with_line_comments.css
 - test/sass/more_results/more1.css
-- test/sass/templates/basic.sass
-- test/sass/templates/bork.sass
+- test/sass/more_results/more_import.css
+- test/sass/templates/bork2.sass
 - test/sass/templates/compressed.sass
-- test/sass/templates/import.sass
-- test/sass/templates/script.sass
 - test/sass/templates/expanded.sass
-- test/sass/templates/nested.sass
+- test/sass/templates/import.sass
+- test/sass/templates/subdir/subdir.sass
+- test/sass/templates/subdir/nested_subdir/_nested_partial.sass
+- test/sass/templates/subdir/nested_subdir/nested_subdir.sass
+- test/sass/templates/basic.sass
 - test/sass/templates/_partial.sass
+- test/sass/templates/units.sass
+- test/sass/templates/mixins.sass
+- test/sass/templates/multiline.sass
 - test/sass/templates/line_numbers.sass
+- test/sass/templates/nested.sass
 - test/sass/templates/compact.sass
-- test/sass/templates/subdir/subdir.sass
-- test/sass/templates/subdir/nested_subdir/nested_subdir.sass
-- test/sass/templates/subdir/nested_subdir/_nested_partial.sass
-- test/sass/templates/parent_ref.sass
 - test/sass/templates/alt.sass
+- test/sass/templates/script.sass
 - test/sass/templates/importee.sass
-- test/sass/templates/mixins.sass
-- test/sass/templates/multiline.sass
-- test/sass/templates/units.sass
+- test/sass/templates/parent_ref.sass
+- test/sass/templates/bork.sass
 - test/sass/templates/complex.sass
-- test/sass/templates/bork2.sass
-- test/sass/more_templates/_more_partial.sass
+- test/sass/css2sass_test.rb
+- test/sass/plugin_test.rb
 - test/sass/more_templates/more1.sass
 - test/sass/more_templates/more_import.sass
+- test/sass/more_templates/_more_partial.sass
 - test/sass/functions_test.rb
+- test/sass/results/nested.css
+- test/sass/results/units.css
+- test/sass/results/script.css
+- test/sass/results/subdir/nested_subdir/nested_subdir.css
+- test/sass/results/subdir/subdir.css
+- test/sass/results/import.css
+- test/sass/results/compact.css
+- test/sass/results/expanded.css
+- test/sass/results/alt.css
+- test/sass/results/mixins.css
+- test/sass/results/complex.css
+- test/sass/results/compressed.css
+- test/sass/results/parent_ref.css
+- test/sass/results/line_numbers.css
+- test/sass/results/multiline.css
+- test/sass/results/basic.css
 - test/sass/engine_test.rb
-- test/sass/plugin_test.rb
 - test/haml/mocks/article.rb
-- test/haml/rhtml/_av_partial_2.rhtml
-- test/haml/rhtml/standard.rhtml
-- test/haml/rhtml/_av_partial_1.rhtml
-- test/haml/rhtml/action_view.rhtml
 - test/haml/util_test.rb
-- test/haml/spec/ruby_haml_test.rb
-- test/haml/spec/README.md
-- test/haml/spec/lua_haml_spec.lua
-- test/haml/spec/tests.json
-- test/haml/html2haml_test.rb
 - test/haml/template_test.rb
+- test/haml/html2haml_test.rb
+- test/haml/rhtml/_av_partial_1.rhtml
+- test/haml/rhtml/standard.rhtml
+- test/haml/rhtml/action_view.rhtml
+- test/haml/rhtml/_av_partial_2.rhtml
 - test/haml/helper_test.rb
-- test/haml/results/tag_parsing.xhtml
-- test/haml/results/content_for_layout.xhtml
-- test/haml/results/helpers.xhtml
-- test/haml/results/original_engine.xhtml
-- test/haml/results/very_basic.xhtml
-- test/haml/results/helpful.xhtml
-- test/haml/results/list.xhtml
-- test/haml/results/partials.xhtml
-- test/haml/results/eval_suppressed.xhtml
-- test/haml/results/nuke_inner_whitespace.xhtml
-- test/haml/results/whitespace_handling.xhtml
-- test/haml/results/render_layout.xhtml
-- test/haml/results/silent_script.xhtml
-- test/haml/results/standard.xhtml
-- test/haml/results/just_stuff.xhtml
-- test/haml/results/partial_layout.xhtml
-- test/haml/results/filters.xhtml
-- test/haml/results/nuke_outer_whitespace.xhtml
-- test/haml/markaby/standard.mab
-- test/haml/templates/tag_parsing.haml
-- test/haml/templates/nuke_inner_whitespace.haml
+- test/haml/templates/action_view_ugly.haml
+- test/haml/templates/list.haml
+- test/haml/templates/_text_area.haml
+- test/haml/templates/_partial.haml
+- test/haml/templates/nuke_outer_whitespace.haml
+- test/haml/templates/render_layout.haml
+- test/haml/templates/_av_partial_2.haml
 - test/haml/templates/partial_layout.haml
-- test/haml/templates/_av_partial_2_ugly.haml
+- test/haml/templates/helpful.haml
+- test/haml/templates/_av_partial_1_ugly.haml
+- test/haml/templates/just_stuff.haml
+- test/haml/templates/standard_ugly.haml
+- test/haml/templates/silent_script.haml
+- test/haml/templates/very_basic.haml
+- test/haml/templates/nuke_inner_whitespace.haml
+- test/haml/templates/eval_suppressed.haml
+- test/haml/templates/tag_parsing.haml
+- test/haml/templates/whitespace_handling.haml
 - test/haml/templates/partials.haml
+- test/haml/templates/standard.haml
+- test/haml/templates/partialize.haml
 - test/haml/templates/_layout_for_partial.haml
-- test/haml/templates/original_engine.haml
-- test/haml/templates/helpers.haml
+- test/haml/templates/_av_partial_1.haml
+- test/haml/templates/filters.haml
 - test/haml/templates/_layout.erb
-- test/haml/templates/action_view_ugly.haml
 - test/haml/templates/content_for_layout.haml
-- test/haml/templates/silent_script.haml
-- test/haml/templates/very_basic.haml
-- test/haml/templates/render_layout.haml
-- test/haml/templates/filters.haml
-- test/haml/templates/_av_partial_1.haml
-- test/haml/templates/standard_ugly.haml
-- test/haml/templates/_partial.haml
-- test/haml/templates/nuke_outer_whitespace.haml
+- test/haml/templates/_av_partial_2_ugly.haml
+- test/haml/templates/helpers.haml
+- test/haml/templates/original_engine.haml
 - test/haml/templates/breakage.haml
-- test/haml/templates/list.haml
-- test/haml/templates/standard.haml
-- test/haml/templates/whitespace_handling.haml
-- test/haml/templates/eval_suppressed.haml
 - test/haml/templates/action_view.haml
-- test/haml/templates/_av_partial_2.haml
-- test/haml/templates/partialize.haml
-- test/haml/templates/just_stuff.haml
-- test/haml/templates/helpful.haml
-- test/haml/templates/_av_partial_1_ugly.haml
-- test/haml/templates/_text_area.haml
+- test/haml/spec/tests.json
+- test/haml/spec/lua_haml_spec.lua
+- test/haml/spec/ruby_haml_test.rb
+- test/haml/spec/README.md
+- test/haml/results/content_for_layout.xhtml
+- test/haml/results/just_stuff.xhtml
+- test/haml/results/whitespace_handling.xhtml
+- test/haml/results/nuke_outer_whitespace.xhtml
+- test/haml/results/silent_script.xhtml
+- test/haml/results/filters.xhtml
+- test/haml/results/standard.xhtml
+- test/haml/results/nuke_inner_whitespace.xhtml
+- test/haml/results/helpful.xhtml
+- test/haml/results/very_basic.xhtml
+- test/haml/results/eval_suppressed.xhtml
+- test/haml/results/partials.xhtml
+- test/haml/results/render_layout.xhtml
+- test/haml/results/original_engine.xhtml
+- test/haml/results/helpers.xhtml
+- test/haml/results/list.xhtml
+- test/haml/results/partial_layout.xhtml
+- test/haml/results/tag_parsing.xhtml
+- test/haml/markaby/standard.mab
 - test/haml/engine_test.rb
+- test/linked_rails.rb
+- test/benchmark.rb
 - test/test_helper.rb
-- extra/haml-mode.el
 - extra/sass-mode.el
+- extra/haml-mode.el
 - extra/update_watch.rb
 - Rakefile
 - init.rb
 - .yardopts
-- VERSION_NAME
-- CONTRIBUTING
-- README.md
-- MIT-LICENSE
 - VERSION
+- MIT-LICENSE
+- README.md
+- VERSION_NAME
 - REVISION
+- CONTRIBUTING
 has_rdoc: true
 homepage: http://haml.hamptoncatlin.com/
 licenses: []
@@ -268,19 +269,19 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 rubyforge_project: haml
-rubygems_version: 1.3.4
+rubygems_version: 1.3.5
 signing_key:
 specification_version: 3
 summary: An elegant, structured XHTML/XML templating engine. Comes with Sass, a similar CSS templating engine.
 test_files:
 - test/sass/script_test.rb
 - test/sass/css2sass_test.rb
+- test/sass/plugin_test.rb
 - test/sass/functions_test.rb
 - test/sass/engine_test.rb
-- test/sass/plugin_test.rb
 - test/haml/util_test.rb
-- test/haml/spec/ruby_haml_test.rb
-- test/haml/html2haml_test.rb
 - test/haml/template_test.rb
+- test/haml/html2haml_test.rb
 - test/haml/helper_test.rb
+- test/haml/spec/ruby_haml_test.rb
 - test/haml/engine_test.rb