haml-edge 2.3.99 → 2.3.100

data/EDGE_GEM_VERSION

@@ -1 +1 @@
-2.3.99
+2.3.100

data/VERSION

@@ -1 +1 @@
-2.3.99
+2.3.100

data/lib/sass/engine.rb

@@ -470,7 +470,8 @@ LONG
       raise SyntaxError.new("Invalid mixin \"#{line.text[1..-1]}\".") if name.nil?
 
       offset = line.offset + line.text.size - arg_string.size
-      args = Script::Parser.new(arg_string.strip, @line, offset).parse_mixin_definition_arglist
+      args = Script::Parser.new(arg_string.strip, @line, offset, @options).
+        parse_mixin_definition_arglist
       default_arg_found = false
       Tree::MixinDefNode.new(name, args)
     end
@@ -480,7 +481,8 @@ LONG
       raise SyntaxError.new("Invalid mixin include \"#{line.text}\".") if name.nil?
 
       offset = line.offset + line.text.size - arg_string.size
-      args = Script::Parser.new(arg_string.strip, @line, offset).parse_mixin_include_arglist
+      args = Script::Parser.new(arg_string.strip, @line, offset, @options).
+        parse_mixin_include_arglist
       raise SyntaxError.new("Illegal nesting: Nothing may be nested beneath mixin directives.",
         :line => @line + 1) unless line.children.empty?
       Tree::MixinNode.new(name, args)
@@ -489,7 +491,7 @@ LONG
     def parse_script(script, options = {})
       line = options[:line] || @line
       offset = options[:offset] || 0
-      Script.parse(script, line, offset, @options[:filename])
+      Script.parse(script, line, offset, @options)
     end
   end
 end

data/lib/sass/script/color.rb

@@ -249,15 +249,38 @@ END
     #
     # @return [String] The string representation
     def to_s
-      return "rgba(#{rgb.join(', ')}, #{alpha % 1 == 0.0 ? alpha.to_i : alpha})" if alpha?
+      return rgba_str if alpha?
+      return smallest if options[:style] == :compressed
       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}"
+      hex_str
     end
     alias_method :inspect, :to_s
 
+    # Returns a string representation of the color.
+    #
+    # @return [String] The hex value
+    def inspect
+      alpha? ? rgba_str : hex_str
+    end
+
     private
 
+    def smallest
+      small_hex_str = hex_str.gsub(/^#(.)\1(.)\2(.)\3$/, '#\1\2\3')
+      return small_hex_str unless (color = HTML4_COLORS_REVERSE[rgb]) &&
+        color.size <= small_hex_str.size
+      return color
+    end
+
+    def rgba_str
+      "rgba(#{rgb.join(', ')}, #{alpha % 1 == 0.0 ? alpha.to_i : alpha})"
+    end
+
+    def hex_str
+      red, green, blue = rgb.map { |num| num.to_s(16).rjust(2, '0') }
+      "##{red}#{green}#{blue}"
+    end
+
     def piecewise(other, operation)
       other_num = other.is_a? Number
       if other_num && !other.unitless?

data/lib/sass/script/funcall.rb

@@ -41,11 +41,21 @@ module Sass
           return Script::String.new("#{name}(#{args.map {|a| a.perform(environment)}.join(', ')})")
         end
 
-        return Functions::EvaluationContext.new(environment.options).send(ruby_name, *args)
+        result = Functions::EvaluationContext.new(environment.options).send(ruby_name, *args)
+        result.options = environment.options
+        return result
       rescue ArgumentError => e
         raise e unless e.backtrace.any? {|t| t =~ /:in `(block in )?(#{name}|perform)'$/}
         raise Sass::SyntaxError.new("#{e.message} for `#{name}'")
       end
+
+      # Returns the arguments to the function.
+      #
+      # @return [Array<Node>]
+      # @see Node#children
+      def children
+        @args
+      end
     end
   end
 end

data/lib/sass/script/functions.rb

@@ -87,13 +87,18 @@ module Sass::Script
   #
   # Within one of the functions in this module,
   # methods of {EvaluationContext} can be used.
+  #
+  # ### Caveats
+  #
+  # When creating new {Literal} objects within functions,
+  # be aware that it's not safe to call {Literal#to_s #to_s}
+  # (or other methods that use the string representation)
+  # on those objects without first setting {Node#options= the #options attribute}.
   module Functions
     # The context in which methods in {Script::Functions} are evaluated.
     # 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 [{Symbol => Object}]
@@ -102,6 +107,10 @@ module Sass::Script
       # @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

data/lib/sass/script/lexer.rb

@@ -85,11 +85,13 @@ module Sass
       #   Used for error reporting
       # @param offset [Fixnum] The number of characters in on which the SassScript appears.
       #   Used for error reporting
-      def initialize(str, line, offset, filename)
+      # @param options [{Symbol => Object}] An options hash;
+      #   see {file:SASS_REFERENCE.md#sass_options the Sass options documentation}
+      def initialize(str, line, offset, options)
         @scanner = str.is_a?(StringScanner) ? str : StringScanner.new(str)
         @line = line
         @offset = offset
-        @filename = filename
+        @options = options
         @interpolation_stack = []
         @prev = nil
       end

data/lib/sass/script/literal.rb

@@ -31,6 +31,31 @@ module Sass::Script
       self
     end
 
+    # Returns an empty array.
+    #
+    # @return [Array<Node>] empty
+    # @see Node#children
+    def children
+      []
+    end
+
+    # Returns the options hash for this node.
+    #
+    # @return [{Symbol => Object}]
+    # @raise [Sass::SyntaxError] if the options hash hasn't been set.
+    #   This should only happen when the literal was created
+    #   outside of the parser and \{#to\_s} was called on it
+    def options
+      opts = super
+      return opts if opts
+      raise Sass::SyntaxError.new(<<MSG)
+The #options attribute is not set on this #{self.class}.
+  This error is probably occurring because #to_s was called
+  on this literal within a custom Sass function without first
+  setting the #option attribute.
+MSG
+    end
+
     # The SassScript `and` operation.
     #
     # @param other [Literal] The right-hand side of the operator
@@ -173,5 +198,13 @@ module Sass::Script
 
     # @raise [Sass::SyntaxError] if this literal isn't an integer
     def assert_int!; to_i; end
+
+    # Returns the string representation of this literal
+    # as it would be output to the CSS document.
+    #
+    # @return [String]
+    def to_s
+      raise Sass::SyntaxError.new("[BUG] All subclasses of Sass::Literal must implement #to_s.")
+    end
   end
 end

data/lib/sass/script/node.rb

@@ -3,6 +3,21 @@ module Sass::Script
   #
   # Use \{#perform} to evaluate a parse tree.
   class Node
+    # The options hash for this node.
+    #
+    # @return [{Symbol => Object}]
+    attr_reader :options
+
+    # Sets the options hash for this node,
+    # as well as for all child nodes.
+    # See {file:SASS_REFERENCE.md#sass_options the Sass options documentation}.
+    #
+    # @param options [{Symbol => Object}] The options
+    def options=(options)
+      @options = options
+      children.each {|c| c.options = options}
+    end
+
     # Evaluates the node.
     #
     # @param environment [Sass::Environment] The environment in which to evaluate the SassScript
@@ -10,5 +25,12 @@ module Sass::Script
     def perform(environment)
       raise NotImplementedError.new("All subclasses of Sass::Script::Node must override #perform.")
     end
+
+    # Returns all child nodes of this node.
+    #
+    # @return [Array<Node>]
+    def children
+      raise NotImplementedError.new("All subclasses of Sass::Script::Node must override #children.")
+    end
   end
 end

data/lib/sass/script/operation.rb

@@ -35,11 +35,21 @@ module Sass::Script
       literal1 = @operand1.perform(environment)
       literal2 = @operand2.perform(environment)
       begin
-        literal1.send(@operator, literal2)
+        res = literal1.send(@operator, literal2)
+        res.options = environment.options
+        res
       rescue NoMethodError => e
         raise e unless e.name.to_s == @operator.to_s
         raise Sass::SyntaxError.new("Undefined operation: \"#{literal1} #{@operator} #{literal2}\".")
       end
     end
+
+    # Returns the operands for this operation.
+    #
+    # @return [Array<Node>]
+    # @see Node#children
+    def children
+      [@operand1, @operand2]
+    end
   end
 end

data/lib/sass/script/parser.rb

@@ -10,11 +10,11 @@ module Sass
       #   Used for error reporting
       # @param offset [Fixnum] The number of characters in on which the SassScript appears.
       #   Used for error reporting
-      # @param filename [String] The name of the file in which the SassScript appears.
-      #   Used for error reporting
-      def initialize(str, line, offset, filename = nil)
-        @filename = filename
-        @lexer = Lexer.new(str, line, offset, filename)
+      # @param options [{Symbol => Object}] An options hash;
+      #   see {file:SASS_REFERENCE.md#sass_options the Sass options documentation}
+      def initialize(str, line, offset, options = {})
+        @options = options
+        @lexer = Lexer.new(str, line, offset, options)
       end
 
       # Parses a SassScript expression within an interpolated segment (`#{}`).
@@ -27,6 +27,7 @@ module Sass
       def parse_interpolated
         expr = assert_expr :expr
         assert_tok :end_interpolation
+        expr.options = @options
         expr
       end
 
@@ -37,6 +38,7 @@ module Sass
       def parse
         expr = assert_expr :expr
         assert_done
+        expr.options = @options
         expr
       end
 
@@ -53,6 +55,7 @@ module Sass
         end
         assert_done
 
+        args.each {|a| a.options = @options}
         args
       end
 
@@ -69,6 +72,10 @@ module Sass
         end
         assert_done
 
+        args.each do |k, v|
+          k.options = @options
+          v.options = @options if v
+        end
         args
       end
 
@@ -138,9 +145,10 @@ RUBY
         return paren unless name = try_tok(:ident)
         # An identifier without arguments is just a string
         unless try_tok(:lparen)
+          filename = @options[:filename]
           warn(<<END)
 DEPRECATION WARNING:
-On line #{name.line}, character #{name.offset}#{" of '#{@filename}'" if @filename}
+On line #{name.line}, character #{name.offset}#{" of '#{filename}'" if filename}
 Implicit strings have been deprecated and will be removed in version 2.4.
 '#{name.value}' was not quoted. Please add double quotes (e.g. "#{name.value}").
 END

data/lib/sass/script/unary_operation.rb

@@ -30,5 +30,13 @@ module Sass::Script
       raise e unless e.name.to_s == operator.to_s
       raise Sass::SyntaxError.new("Undefined unary operation: \"#{@operator} #{literal}\".")
     end
+
+    # Returns the operand of the operation.
+    #
+    # @return [Array<Node>]
+    # @see Node#children
+    def children
+      [@operand]
+    end
   end
 end

data/lib/sass/script/variable.rb

@@ -26,6 +26,14 @@ module Sass
         (val = environment.var(name)) && (return val)
         raise SyntaxError.new("Undefined variable: \"!#{name}\".")
       end
+
+      # Returns an empty array.
+      #
+      # @return [Array<Node>] empty
+      # @see Node#children
+      def children
+        []
+      end
     end
   end
 end

data/lib/sass/script.rb

@@ -28,14 +28,14 @@ module Sass
     #   Used for error reporting
     # @param offset [Fixnum] The number of characters in on `line` that the SassScript started.
     #   Used for error reporting
-    # @param filename [String] The path to the file in which the SassScript appeared.
-    #   Used for error reporting
+    # @param options [{Symbol => Object}] An options hash;
+    #   see {file:SASS_REFERENCE.md#sass_options the Sass options documentation}
     # @return [Script::Node] The root node of the parse tree
-    def self.parse(value, line, offset, filename = nil)
-      Parser.parse(value, line, offset, filename)
+    def self.parse(value, line, offset, options = {})
+      Parser.parse(value, line, offset, options)
     rescue Sass::SyntaxError => e
       e.message << ": #{value.inspect}." if e.message == "SassScript error"
-      e.modify_backtrace(:line => line, :filename => filename)
+      e.modify_backtrace(:line => line, :filename => options[:filename])
       raise e
     end
   end

data/test/sass/engine_test.rb

@@ -3,6 +3,12 @@ require File.dirname(__FILE__) + '/../test_helper'
 require 'sass/engine'
 require 'stringio'
 
+module Sass::Script::Functions::UserFunctions
+  def option(name)
+    Sass::Script::String.new(@options[name.value.to_sym].to_s)
+  end
+end
+
 class SassEngineTest < Test::Unit::TestCase
   # A map of erroneous Sass documents to the error messages they should produce.
   # The error messages may be arrays;

data/test/sass/functions_test.rb

@@ -2,6 +2,18 @@ require 'test/unit'
 require File.dirname(__FILE__) + '/../../lib/sass'
 require 'sass/script'
 
+module Sass::Script::Functions::UserFunctions
+  def call_options_on_new_literal
+    str = Sass::Script::String.new("foo")
+    str.options[:foo]
+    str
+  end
+
+  def user_defined
+    Sass::Script::String.new("I'm a user-defined string!")
+  end
+end
+
 class SassFunctionTest < Test::Unit::TestCase
   # Tests taken from:
   #   http://www.w3.org/Style/CSS/Test/CSS3/Color/20070927/html4/t040204-hsl-h-rotating-b.htm
@@ -237,6 +249,19 @@ class SassFunctionTest < Test::Unit::TestCase
     assert_error_message("\"foo\" is not a number for `transparentize'", "transparentize(#fff, \"foo\")")
   end
 
+  def test_user_defined_function
+    assert_equal("I'm a user-defined string!", evaluate("user_defined()"))
+  end
+
+  def test_options_on_new_literals_fails
+    assert_error_message(<<MSG, "call-options-on-new-literal()")
+The #options attribute is not set on this Sass::Script::String.
+  This error is probably occurring because #to_s was called
+  on this literal within a custom Sass function without first
+  setting the #option attribute.
+MSG
+  end
+
   private
 
   def evaluate(value)

data/test/sass/script_test.rb

@@ -2,6 +2,13 @@
 require File.dirname(__FILE__) + '/../test_helper'
 require 'sass/engine'
 
+module Sass::Script::Functions::UserFunctions
+  def assert_options(val)
+    val.options[:foo]
+    Sass::Script::String.new("Options defined!")
+  end
+end
+
 class SassScriptTest < Test::Unit::TestCase
   include Sass::Script
 
@@ -72,6 +79,18 @@ class SassScriptTest < Test::Unit::TestCase
     assert_equal "rgba(100, 100, 100, 0.75)", resolve("rgba(50, 50, 50, 0.75) * 2")
   end
 
+  def test_compressed_colors
+    assert_equal "#123456", resolve("#123456", :style => :compressed)
+    assert_equal "rgba(1, 2, 3, 0.5)", resolve("rgba(1, 2, 3, 0.5)", :style => :compressed)
+    assert_equal "#123", resolve("#112233", :style => :compressed)
+    assert_equal "#000", resolve("black", :style => :compressed)
+    assert_equal "red", resolve("#f00", :style => :compressed)
+    assert_equal "blue", resolve("#00f", :style => :compressed)
+    assert_equal "navy", resolve("#000080", :style => :compressed)
+    assert_equal "navy #fff", resolve("#000080 white", :style => :compressed)
+    assert_equal "This color is #fff", resolve('"This color is #{ white }"', :style => :compressed)
+  end
+
   def test_implicit_strings
     silence_warnings do
       assert_equal Sass::Script::String.new("foo"), eval("foo")
@@ -157,6 +176,11 @@ WARN
     assert_equal 'blam(foo)', resolve('blam("foo")')
   end
 
+  def test_function_results_have_options
+    assert_equal "Options defined!", resolve("assert_options(abs(1))")
+    assert_equal "Options defined!", resolve("assert_options(round(1.2))")
+  end
+
   def test_hyphenated_variables
     assert_equal("a-b", resolve("!a-b", {}, env("a-b" => Sass::Script::String.new("a-b"))))
   end
@@ -266,6 +290,11 @@ WARN
     assert_equal "true", resolve("1.1cm == 11mm")
   end
 
+  def test_operations_have_options
+    assert_equal "Options defined!", resolve("assert_options(1 + 1)")
+    assert_equal "Options defined!", resolve("assert_options('bar' + 'baz')")
+  end
+
   # Regression Tests
 
   def test_funcall_has_higher_precedence_than_color_name
@@ -288,8 +317,8 @@ WARN
 
   def eval(str, opts = {}, environment = env)
     munge_filename opts
-    Sass::Script.parse(str, opts[:line] || 1,
-      opts[:offset] || 0, opts[:filename]).perform(environment)
+    Sass::Script.parse(str, opts.delete(:line) || 1,
+      opts.delete(:offset) || 0, opts).perform(environment)
   end
 
   def render(sass, options = {})

data/test/test_helper.rb

@@ -10,9 +10,8 @@ require 'sass'
 Sass::RAILS_LOADED = true unless defined?(Sass::RAILS_LOADED)
 
 module Sass::Script::Functions
-  def option(name)
-    Sass::Script::String.new(@options[name.value.to_sym].to_s)
-  end
+  module UserFunctions; end
+  include UserFunctions
 end
 
 class Test::Unit::TestCase

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: haml-edge
 version: !ruby/object:Gem::Version 
-  version: 2.3.99
+  version: 2.3.100
 platform: ruby
 authors: 
 - Nathan Weizenbaum
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-12-01 00:00:00 -05:00
+date: 2009-12-03 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -46,9 +46,9 @@ extra_rdoc_files:
 - README.md
 - VERSION
 - REVISION
+- VERSION_NAME
 - CONTRIBUTING
 - MIT-LICENSE
-- VERSION_NAME
 - EDGE_GEM_VERSION
 files: 
 - rails/init.rb
@@ -245,9 +245,9 @@ files:
 - README.md
 - VERSION
 - REVISION
+- VERSION_NAME
 - CONTRIBUTING
 - MIT-LICENSE
-- VERSION_NAME
 - EDGE_GEM_VERSION
 has_rdoc: true
 homepage: http://haml-lang.com/