haml-edge 2.1.41 → 2.1.42

data/EDGE_GEM_VERSION

@@ -1 +1 @@
-2.1.41
+2.1.42

data/Rakefile

@@ -71,8 +71,9 @@ end
 
 desc "Release a new Haml package to Rubyforge. Requires the NAME and VERSION flags."
 task :release => [:package] do
-  name, version = ENV['NAME'], ENV['VERSION']
-  raise "Must supply NAME and VERSION for release task." unless name && version
+  name = File.read("VERSION_NAME").strip
+  version = File.read("VERSION").strip
+  raise "VERSION_NAME must not be 'Bleeding Edge'" if name == "Bleeding Edge"
   sh %{rubyforge login}
   sh %{rubyforge add_release haml haml "#{name} (v#{version})" pkg/haml-#{version}.gem}
   sh %{rubyforge add_file    haml haml "#{name} (v#{version})" pkg/haml-#{version}.tar.gz}

data/VERSION

@@ -1 +1 @@
-2.1.41
+2.1.42

data/VERSION_NAME

@@ -0,0 +1 @@
+Bleeding Edge

data/lib/haml/buffer.rb

@@ -90,12 +90,8 @@ module Haml
     def initialize(upper = nil, options = {})
       @active = true
       @upper = upper
-      @options = {
-        :attr_wrapper => "'",
-        :ugly => false,
-        :format => :xhtml
-      }.merge options
-      @buffer = ""
+      @options = options
+      @buffer = ruby1_8? ? "" : "".encode(Encoding.find(options[:encoding]))
       @tabulation = 0
 
       # The number of tabs that Engine thinks we should have

data/lib/haml/engine.rb

@@ -23,11 +23,6 @@ module Haml
     # @return [Hash<Symbol, Object>]
     attr_accessor :options
 
-    # The source code that is evaluated to produce the Haml document.
-    #
-    # @return [String]
-    attr_accessor :precompiled
-
     # The indentation used in the Haml document,
     # or `nil` if the indentation is ambiguous
     # (for example, for a single-level document).
@@ -55,6 +50,17 @@ module Haml
       @options[:format] == :html5
     end
 
+    # The source code that is evaluated to produce the Haml document.
+    #
+    # In Ruby 1.9, this is automatically converted to the correct encoding
+    # (see {file:HAML_REFERENCE.md#encoding-option the `:encoding` option}).
+    #
+    # @return [String]
+    def precompiled
+      return @precompiled if ruby1_8?
+      return @precompiled.encode(Encoding.find(@options[:encoding]))
+    end
+
     # Precompiles the Haml template.
     #
     # @param template [String] The Haml template
@@ -74,8 +80,11 @@ module Haml
         :line => 1,
         :ugly => false,
         :format => :xhtml,
-        :escape_html => false
+        :escape_html => false,
       }
+      unless ruby1_8?
+        @options[:encoding] = Encoding.default_internal || "utf-8"
+      end
       @options.merge! options
       @index = 0
 
@@ -83,6 +92,10 @@ module Haml
         raise Haml::Error, "Invalid format #{@options[:format].inspect}"
       end
 
+      if @options[:encoding] && @options[:encoding].is_a?(Encoding)
+        @options[:encoding] = @options[:encoding].name
+      end
+
       # :eod is a special end-of-document marker
       @template = (template.rstrip).split(/\r\n|\r|\n/) + [:eod, :eod]
       @template_index = 0
@@ -169,7 +182,7 @@ END
         @haml_buffer = buffer
       end
 
-      eval(@precompiled, scope, @options[:filename], @options[:line])
+      eval(precompiled, scope, @options[:filename], @options[:line])
 
       # Get rid of the current buffer
       scope_object.instance_eval do
@@ -276,7 +289,8 @@ END
         :preserve => @options[:preserve],
         :attr_wrapper => @options[:attr_wrapper],
         :ugly => @options[:ugly],
-        :format => @options[:format]
+        :format => @options[:format],
+        :encoding => @options[:encoding],
       }
     end
 

data/lib/haml/precompiler.rb

@@ -101,7 +101,7 @@ END
 @haml_buffer = @haml_buffer.upper
 _erbout
 END
-      preamble + locals_code(local_names) + @precompiled + postamble
+      preamble + locals_code(local_names) + precompiled + postamble
     end
 
     def locals_code(names)

data/lib/haml/version.rb

@@ -10,27 +10,33 @@ module Haml
 
     # Returns a hash representing the version of Haml.
     # The `:major`, `:minor`, and `:teeny` keys have their respective numbers as Fixnums.
+    # The `:name` key has the name of the version.
     # The `:string` key contains a human-readable string representation of the version.
+    # The `:number` key is the major, minor, and teeny keys separated by periods.
     # If Haml is checked out from Git, the `:rev` key will have the revision hash.
     # For example:
     #
     #     {
-    #       :string=>"2.1.0.9616393",
-    #       :rev => "9616393b8924ef36639c7e82aa88a51a24d16949",
-    #       :major => 2, :minor => 1, :teeny => 0
+    #       :string => "2.1.0.9616393",
+    #       :rev    => "9616393b8924ef36639c7e82aa88a51a24d16949",
+    #       :number => "2.1.0",
+    #       :major  => 2, :minor => 1, :teeny => 0
     #     }
     #
-    # @return [Hash<Symbol, String/Symbol>] The version hash
+    # @return [Hash<Symbol, String/Fixnum>] The version hash
     def version
       return @@version if defined?(@@version)
 
       numbers = File.read(scope('VERSION')).strip.split('.').map { |n| n.to_i }
+      name = File.read(scope('VERSION_NAME')).strip
       @@version = {
         :major => numbers[0],
         :minor => numbers[1],
-        :teeny => numbers[2]
+        :teeny => numbers[2],
+        :name => name
       }
-      @@version[:string] = [:major, :minor, :teeny].map { |comp| @@version[comp] }.compact.join('.')
+      @@version[:number] = [:major, :minor, :teeny].map { |comp| @@version[comp] }.compact.join('.')
+      @@version[:string] = @@version[:number].dup
 
       if File.exists?(scope('REVISION'))
         rev = File.read(scope('REVISION')).strip
@@ -47,9 +53,9 @@ module Haml
       if rev
         @@version[:rev] = rev
         unless rev[0] == ?(
-          @@version[:string] << "."
-          @@version[:string] << rev[0...7]
+          @@version[:string] << "." << rev[0...7]
         end
+        @@version[:string] << " (#{name})"
       end
 
       @@version

data/lib/sass/error.rb

@@ -50,4 +50,8 @@ module Sass
       @message
     end
   end
+
+  # The class for Sass errors that are raised due to invalid unit conversions
+  # in SassScript.
+  class UnitConversionError < SyntaxError; end
 end

data/lib/sass/script/functions.rb

@@ -61,6 +61,21 @@ module Sass::Script
 
     instance_methods.each { |m| undef_method m unless m.to_s =~ /^__/ }
 
+
+    # Creates a {Color} object from red, green, and blue values.
+    # @param red
+    #   A number between 0 and 255 inclusive
+    # @param green
+    #   A number between 0 and 255 inclusive
+    # @param blue
+    #   A number between 0 and 255 inclusive
+    def rgb(red, green, blue)
+      [red.value, green.value, blue.value].each do |v|
+        raise ArgumentError.new("Color value #{v} must be between 0 and 255 inclusive") if v <= 0 || v >= 255
+      end
+      Color.new([red.value, green.value, blue.value])
+    end
+
     # Creates a {Color} object from hue, saturation, and lightness
     # as per the CSS3 spec (http://www.w3.org/TR/css3-color/#hsl-color).
     #

data/lib/sass/script/literal.rb

@@ -170,5 +170,8 @@ module Sass::Script
     def to_i
       raise Sass::SyntaxError.new("#{self.inspect} is not an integer.")
     end
+
+    # @raise [Sass::SyntaxError] if this literal isn't an integer
+    def assert_int!; to_i; end
   end
 end

data/lib/sass/script/number.rb

@@ -54,7 +54,7 @@ module Sass::Script
     #
     # @param other [Literal] The right-hand side of the operator
     # @return [Literal] The result of the operation
-    # @raise [Sass::SyntaxError] if `other` is a number with incompatible units
+    # @raise [Sass::UnitConversionError] if `other` is a number with incompatible units
     def plus(other)
       if other.is_a? Number
         operate(other, :+)
@@ -76,7 +76,7 @@ module Sass::Script
     #
     # @param other [Literal] The right-hand side of the operator
     # @return [Literal] The result of the operation
-    # @raise [Sass::SyntaxError] if `other` is a number with incompatible units
+    # @raise [Sass::UnitConversionError] if `other` is a number with incompatible units
     def minus(other)
       if other.is_a? Number
         operate(other, :-)
@@ -138,11 +138,11 @@ module Sass::Script
     # @param other [Number] The right-hand side of the operator
     # @return [Number] This number modulo the other
     # @raise [NoMethodError] if `other` is an invalid type
-    # @raise [Sass::SyntaxError] if `other` has any units
+    # @raise [Sass::UnitConversionError] if `other` has any units
     def mod(other)
       if other.is_a?(Number)
         unless other.unitless?
-          raise Sass::SyntaxError.new("Cannot modulo by a number with units: #{other.inspect}.")
+          raise Sass::UnitConversionError.new("Cannot modulo by a number with units: #{other.inspect}.")
         end
         operate(other, :%)
       else
@@ -155,9 +155,19 @@ module Sass::Script
     # @param other [Literal] The right-hand side of the operator
     # @return [Boolean] Whether this number is equal to the other object
     def eq(other)
-      Sass::Script::Bool.new(super.to_bool &&
-        self.numerator_units.sort == other.numerator_units.sort &&
-        self.denominator_units.sort == other.denominator_units.sort)
+      return Sass::Script::Bool.new(false) unless other.is_a?(Sass::Script::Number)
+      this = self
+      begin
+        if unitless?
+          this = this.coerce(other.numerator_units, other.denominator_units)
+        else
+          other = other.coerce(numerator_units, denominator_units)
+        end
+      rescue Sass::UnitConversionError
+        return Sass::Script::Bool.new(false)
+      end
+
+      Sass::Script::Bool.new(this.value == other.value)
     end
 
     # The SassScript `>` operation.
@@ -249,11 +259,36 @@ module Sass::Script
       (numerator_units.empty? || numerator_units.size == 1) && denominator_units.empty?
     end
 
+    # Returns this number converted to other units.
+    # The conversion takes into account the relationship between e.g. mm and cm,
+    # as well as between e.g. in and cm.
+    #
+    # If this number has no units, it will simply return itself
+    # with the given units.
+    #
+    # An incompatible coercion, e.g. between px and cm, will raise an error.
+    #
+    # @param num_units [Array<String>] The numerator units to coerce this number into.
+    #   See {#numerator\_units}
+    # @param den_units [Array<String>] The denominator units to coerce this number into.
+    #   See {#denominator\_units}
+    # @return [Number] The number with the new units
+    # @raise [Sass::UnitConversionError] if the given units are incompatible with the number's
+    #   current units
+    def coerce(num_units, den_units)
+      Number.new(if unitless?
+                   self.value
+                 else
+                   self.value * coercion_factor(self.numerator_units, num_units) /
+                     coercion_factor(self.denominator_units, den_units)
+                 end, num_units, den_units)
+    end
+
     protected
 
     def operate(other, operation)
       this = self
-      if [:+, :-].include?(operation)
+      if [:+, :-, :<=, :<, :>, :>=].include?(operation)
         if unitless?
           this = this.coerce(other.numerator_units, other.denominator_units)
         else
@@ -271,21 +306,12 @@ module Sass::Script
       end
     end
 
-    def coerce(num_units, den_units)
-      Number.new(if unitless?
-                          self.value
-                        else
-                          self.value * coercion_factor(self.numerator_units, num_units) /
-                            coercion_factor(self.denominator_units, den_units)
-                        end, num_units, den_units)
-    end
-    
     def coercion_factor(from_units, to_units)
       # get a list of unmatched units
       from_units, to_units = sans_common_units(from_units, to_units)
 
       if from_units.size != to_units.size || !convertable?(from_units | to_units)
-        raise Sass::SyntaxError.new("Incompatible units: '#{from_units.join('*')}' and '#{to_units.join('*')}'.")
+        raise Sass::UnitConversionError.new("Incompatible units: '#{from_units.join('*')}' and '#{to_units.join('*')}'.")
       end
 
       from_units.zip(to_units).inject(1) {|m,p| m * conversion_factor(p[0], p[1]) }

data/lib/sass/tree/for_node.rb

@@ -28,14 +28,18 @@ module Sass::Tree
     # @return [Array<Tree::Node>] The resulting static nodes
     # @see Sass::Tree
     def _perform(environment)
-      from = @from.perform(environment).to_i
-      to = @to.perform(environment).to_i
-      range = Range.new(from, to, @exclusive)
+      from = @from.perform(environment)
+      to = @to.perform(environment)
+      from.assert_int!
+      to.assert_int!
+
+      to = to.coerce(from.numerator_units, from.denominator_units)
+      range = Range.new(from.to_i, to.to_i, @exclusive)
 
       children = []
       environment = Sass::Environment.new(environment)
       range.each do |i|
-        environment.set_local_var(@var, Sass::Script::Number.new(i))
+        environment.set_local_var(@var, Sass::Script::Number.new(i, from.numerator_units, from.denominator_units))
         children += perform_children(environment)
       end
       children

data/test/haml/engine_test.rb

@@ -1,4 +1,5 @@
 #!/usr/bin/env ruby
+# -*- coding: utf-8 -*-
 require File.dirname(__FILE__) + '/../test_helper'
 
 class EngineTest < Test::Unit::TestCase
@@ -803,4 +804,55 @@ END
   def test_html5_doctype
     assert_equal %{<!DOCTYPE html>\n}, render('!!!', :format => :html5)
   end
+
+  # Encodings
+
+  unless Haml::Util.ruby1_8?
+    def test_default_encoding
+      assert_equal(Encoding.find("utf-8"), render(<<HAML.encode("us-ascii")).encoding)
+HTML
+%p bar
+%p foo
+HAML
+    end
+
+    def test_convert_template_render
+      assert_equal(<<HTML, render(<<HAML.encode("iso-8859-1"), :encoding => "utf-8"))
+<p>bâr</p>
+<p>föö</p>
+HTML
+%p bâr
+%p föö
+HAML
+    end
+
+    def test_convert_template_render_proc
+      assert_converts_template_properly {|e| e.render_proc.call}
+    end
+
+    def test_convert_template_render
+      assert_converts_template_properly {|e| e.render}
+    end
+
+    def test_convert_template_def_method
+      assert_converts_template_properly do |e|
+        o = Object.new
+        e.def_method(o, :render)
+        o.render
+      end
+    end
+  end
+
+  private
+
+  def assert_converts_template_properly
+    engine = Haml::Engine.new(<<HAML.encode("iso-8859-1"), :encoding => "utf-8")
+%p bâr
+%p föö
+HAML
+    assert_equal(<<HTML, yield(engine))
+<p>bâr</p>
+<p>föö</p>
+HTML
+  end
 end

data/test/sass/engine_test.rb

@@ -33,6 +33,10 @@ class SassEngineTest < Test::Unit::TestCase
     "! a" => 'Invalid variable: "! a".',
     "!a b" => 'Invalid variable: "!a b".',
     "!a = 1b + 2c" => "Incompatible units: 'c' and 'b'.",
+    "!a = 1b < 2c" => "Incompatible units: 'c' and 'b'.",
+    "!a = 1b > 2c" => "Incompatible units: 'c' and 'b'.",
+    "!a = 1b <= 2c" => "Incompatible units: 'c' and 'b'.",
+    "!a = 1b >= 2c" => "Incompatible units: 'c' and 'b'.",
     "a\n  :b= 1b * 2c" => "2b*c isn't a valid CSS value.",
     "a\n  :b= 1b % 2c" => "Cannot modulo by a number with units: 2c.",
     "!a = 2px + #ccc" => "Cannot add a number with units (2px) to a color (#cccccc).",
@@ -76,8 +80,11 @@ class SassEngineTest < Test::Unit::TestCase
     "@if false\n@else if " => "Invalid else directive '@else if': expected 'if <expr>'.",
     "a\n  !b = 12\nc\n  d = !b" => 'Undefined variable: "!b".',
     "=foo\n  !b = 12\nc\n  +foo\n  d = !b" => 'Undefined variable: "!b".',
+    '@for !a from "foo" to 1' => '"foo" is not an integer.',
+    '@for !a from 1 to "2"' => '"2" is not an integer.',
     '@for !a from 1 to "foo"' => '"foo" is not an integer.',
     '@for !a from 1 to 1.232323' => '1.232 is not an integer.',
+    '@for !a from 1px to 3em' => "Incompatible units: 'em' and 'px'.",
     '@if' => "Invalid if directive '@if': expected expression.",
     '@while' => "Invalid while directive '@while': expected expression.",
     '@debug' => "Invalid debug directive '@debug': expected expression.",

data/test/sass/functions_test.rb

@@ -88,6 +88,22 @@ class SassFunctionTest < Test::Unit::TestCase
     assert_error_message("#aaaaaa is not a number for `abs'", "abs(#aaa)")
   end
 
+  def test_rgb
+    assert_equal("#123456", evaluate("rgb(18, 52, 86)"))
+    assert_equal("#beaded", evaluate("rgb(190, 173, 237)"))
+
+    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'",
+      "rgb(1, 256, 1)")
+    assert_error_message("Color value 256 must be between 0 and 255 inclusive for `rgb'",
+      "rgb(1, 1, 256)")
+    assert_error_message("Color value 256 must be between 0 and 255 inclusive for `rgb'",
+      "rgb(1, 256, 257)")
+    assert_error_message("Color value -1 must be between 0 and 255 inclusive for `rgb'",
+      "rgb(-1, 1, 1)")
+  end
+
   private
 
   def assert_rgb_hsl(rgb, hsl)

data/test/sass/script_test.rb

@@ -199,6 +199,14 @@ WARN
     assert_equal "#81ff81", resolve("hsl(120, 100%, 75%) + #010001")
   end
 
+  def test_operator_unit_conversion
+    assert_equal "1.1cm", resolve("1cm + 1mm")
+    assert_equal "true", resolve("2mm < 1cm")
+    assert_equal "true", resolve("10mm == 1cm")
+    assert_equal "true", resolve("1 == 1cm")
+    assert_equal "true", resolve("1.1cm == 11mm")
+  end
+
   private
 
   def resolve(str, opts = {}, environment = env)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: haml-edge
 version: !ruby/object:Gem::Version 
-  version: 2.1.41
+  version: 2.1.42
 platform: ruby
 authors: 
 - Nathan Weizenbaum
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-06-28 00:00:00 -04:00
+date: 2009-07-04 00:00:00 -04:00
 default_executable: 
 dependencies: []
 
@@ -27,6 +27,7 @@ extra_rdoc_files:
 - README.md
 - MIT-LICENSE
 - VERSION
+- VERSION_NAME
 - REVISION
 - EDGE_GEM_VERSION
 files: 
@@ -230,6 +231,7 @@ files:
 - README.md
 - MIT-LICENSE
 - VERSION
+- VERSION_NAME
 - REVISION
 - EDGE_GEM_VERSION
 has_rdoc: true