sass 3.1.0.alpha.12 → 3.1.0.alpha.13

data/EDGE_GEM_VERSION

@@ -1 +1 @@
-3.1.0.alpha.12
+3.1.0.alpha.13

data/VERSION

@@ -1 +1 @@
-3.1.0.alpha.12
+3.1.0.alpha.13

data/lib/sass/environment.rb

@@ -22,12 +22,12 @@ module Sass
 
     # @param parent [Environment] See \{#parent}
     def initialize(parent = nil)
-      @vars = {}
-      @mixins = {}
       @parent = parent
-      @stack = [] unless parent
-      @mixins_in_use = Set.new unless parent
-      set_var("important", Script::String.new("!important")) unless @parent
+      unless parent
+        @stack = []
+        @mixins_in_use = Set.new
+        set_var("important", Script::String.new("!important"))
+      end
     end
 
     # The options hash.
@@ -35,7 +35,7 @@ module Sass
     #
     # @return [{Symbol => Object}]
     def options
-      @options || (parent && parent.options) || {}
+      @options || parent_options || {}
     end
 
     # Push a new stack frame onto the mixin/include stack.
@@ -53,13 +53,13 @@ module Sass
     #   `:line`
     #   : The line of the file on which the lexical scope changed. Never nil.
     def push_frame(frame_info)
-      if stack.last && stack.last[:prepared]
-        stack.last.delete(:prepared)
-        stack.last.merge!(frame_info)
+      top_of_stack = stack.last
+      if top_of_stack && top_of_stack.delete(:prepared)
+        top_of_stack.merge!(frame_info)
       else
-        stack.push(frame_info)
+        stack.push(top_of_stack = frame_info)
       end
-      mixins_in_use << stack.last[:mixin] if stack.last[:mixin] && !stack.last[:prepared]
+      mixins_in_use << top_of_stack[:mixin] if top_of_stack[:mixin] && !top_of_stack[:prepared]
     end
 
     # Like \{#push\_frame}, but next time a stack frame is pushed,
@@ -93,28 +93,36 @@ module Sass
       @mixins_in_use ||= @parent.mixins_in_use
     end
 
+    private
+
+    def parent_options
+      @parent_options ||= @parent && @parent.options
+    end
+
     class << self
       private
+      UNDERSCORE, DASH = '_', '-'
 
       # Note: when updating this,
       # update sass/yard/inherited_hash.rb as well.
       def inherited_hash(name)
         class_eval <<RUBY, __FILE__, __LINE__ + 1
           def #{name}(name)
-            _#{name}(name.gsub('_', '-'))
+            _#{name}(name.tr(UNDERSCORE, DASH))
           end
 
           def _#{name}(name)
-            @#{name}s[name] || @parent && @parent._#{name}(name)
+            (@#{name}s && @#{name}s[name]) || @parent && @parent._#{name}(name)
           end
           protected :_#{name}
 
           def set_#{name}(name, value)
-            name = name.gsub('_', '-')
+            name = name.tr(UNDERSCORE, DASH)
             @#{name}s[name] = value unless try_set_#{name}(name, value)
           end
 
           def try_set_#{name}(name, value)
+            @#{name}s ||= {}
             if @#{name}s.include?(name)
               @#{name}s[name] = value
               true
@@ -127,7 +135,8 @@ module Sass
           protected :try_set_#{name}
 
           def set_local_#{name}(name, value)
-            @#{name}s[name.gsub('_', '-')] = value
+            @#{name}s ||= {}
+            @#{name}s[name.tr(UNDERSCORE, DASH)] = value
           end
 RUBY
       end

data/lib/sass/script/funcall.rb

@@ -60,12 +60,12 @@ module Sass
       # @return [Literal] The SassScript object that is the value of the function call
       # @raise [Sass::SyntaxError] if the function call raises an ArgumentError
       def _perform(environment)
-        args = self.args.map {|a| a.perform(environment)}
-        ruby_name = name.gsub('-', '_')
+        performed_args = @args.map {|a| a.perform(environment)}
+        ruby_name = @name.tr('-', '_')
         unless Sass::Util.has?(:public_instance_method, Functions, ruby_name) && ruby_name !~ /^__/
-          opts(Script::String.new("#{name}(#{args.map {|a| a.perform(environment)}.join(', ')})"))
+          opts(Script::String.new("#{name}(#{performed_args.join(', ')})"))
         else
-          opts(Functions::EvaluationContext.new(environment.options).send(ruby_name, *args))
+          opts(Functions::EvaluationContext.new(environment.options).send(ruby_name, *performed_args))
         end
       rescue ArgumentError => e
         raise e unless e.backtrace.any? {|t| t =~ /:in `(block in )?(#{name}|perform)'$/}

data/lib/sass/script/number.rb

@@ -41,10 +41,13 @@ module Sass::Script
     # @api public
     PRECISION = 1000.0
 
+    # Used so we don't allocate two new arrays for each new number.
+    NO_UNITS  = []
+
     # @param value [Numeric] The value of the number
     # @param numerator_units [Array<String>] See \{#numerator\_units}
     # @param denominator_units [Array<String>] See \{#denominator\_units}
-    def initialize(value, numerator_units = [], denominator_units = [])
+    def initialize(value, numerator_units = NO_UNITS, denominator_units = NO_UNITS)
       super(value)
       @numerator_units = numerator_units
       @denominator_units = denominator_units
@@ -107,7 +110,7 @@ module Sass::Script
     #
     # @return [Number] The negative value of this number
     def unary_minus
-      Number.new(-value, numerator_units, denominator_units)
+      Number.new(-value, @numerator_units, @denominator_units)
     end
 
     # The SassScript `*` operation.
@@ -183,7 +186,7 @@ module Sass::Script
         if unitless?
           this = this.coerce(other.numerator_units, other.denominator_units)
         else
-          other = other.coerce(numerator_units, denominator_units)
+          other = other.coerce(@numerator_units, @denominator_units)
         end
       rescue Sass::UnitConversionError
         return Sass::Script::Bool.new(false)
@@ -248,7 +251,8 @@ module Sass::Script
     #
     # @return [String] The representation
     def inspect(opts = {})
-      "#{self.class.round(self.value)}#{unit_str}"
+      value = self.class.round(self.value)
+      unitless? ? value.to_s : "#{value}#{unit_str}"
     end
     alias_method :to_sass, :inspect
 
@@ -266,13 +270,13 @@ module Sass::Script
 
     # @return [Boolean] Whether or not this number has no units.
     def unitless?
-      numerator_units.empty? && denominator_units.empty?
+      @numerator_units.empty? && @denominator_units.empty?
     end
 
     # @return [Boolean] Whether or not this number has units that can be represented in CSS
     #   (that is, zero or one \{#numerator\_units}).
     def legal_units?
-      (numerator_units.empty? || numerator_units.size == 1) && denominator_units.empty?
+      (@numerator_units.empty? || @numerator_units.size == 1) && @denominator_units.empty?
     end
 
     # Returns this number converted to other units.
@@ -295,8 +299,8 @@ module Sass::Script
       Number.new(if unitless?
                    self.value
                  else
-                   self.value * coercion_factor(self.numerator_units, num_units) /
-                     coercion_factor(self.denominator_units, den_units)
+                   self.value * coercion_factor(@numerator_units, num_units) /
+                     coercion_factor(@denominator_units, den_units)
                  end, num_units, den_units)
     end
 
@@ -316,10 +320,10 @@ module Sass::Script
     # numerator_unit1 * numerator_unit2 / denominator_unit1 * denominator_unit2
     # @return [String] a string that represents the units in this number
     def unit_str
-      rv = numerator_units.sort.join("*")
-      if denominator_units.any?
+      rv = @numerator_units.sort.join("*")
+      if @denominator_units.any?
         rv << "/"
-        rv << denominator_units.sort.join("*")
+        rv << @denominator_units.sort.join("*")
       end
       rv
     end
@@ -337,13 +341,15 @@ module Sass::Script
       end
     end
 
+    OPERATIONS = [:+, :-, :<=, :<, :>, :>=]
+
     def operate(other, operation)
       this = self
-      if [:+, :-, :<=, :<, :>, :>=].include?(operation)
+      if OPERATIONS.include?(operation)
         if unitless?
           this = this.coerce(other.numerator_units, other.denominator_units)
         else
-          other = other.coerce(numerator_units, denominator_units)
+          other = other.coerce(@numerator_units, @denominator_units)
         end
       end
       # avoid integer division
@@ -381,7 +387,7 @@ module Sass::Script
 
     def normalize!
       return if unitless?
-      @numerator_units, @denominator_units = sans_common_units(numerator_units, denominator_units)
+      @numerator_units, @denominator_units = sans_common_units(@numerator_units, @denominator_units)
 
       @denominator_units.each_with_index do |d, i|
         if convertable?(d) && (u = @numerator_units.detect(&method(:convertable?)))
@@ -407,7 +413,7 @@ module Sass::Script
     end
 
     def convertable?(units)
-      Array(units).all?(&CONVERTABLE_UNITS.method(:include?))
+      Array(units).all? {|u| CONVERTABLE_UNITS.include?(u)}
     end
 
     def sans_common_units(units1, units2)

data/lib/sass/script/string.rb

@@ -41,9 +41,8 @@ module Sass::Script
 
     # @see Node#to_s
     def to_s(opts = {})
-      if self.type == :identifier
-        return %q{""} if context == :equals && self.value.size == 0
-        return self.value.gsub("\n", " ")
+      if @type == :identifier
+        return @context == :equals && @value.empty? ? %q{""} : @value.tr("\n", " ")
       end
 
       return "\"#{value.gsub('"', "\\\"")}\"" if opts[:quote] == %q{"}

data/lib/sass/scss/parser.rb

@@ -821,17 +821,20 @@ MESSAGE
           :line => line)
       end
 
+      # Avoid allocating lots of new strings for `#tok`.
+      # This is important because `#tok` is called all the time.
+      NEWLINE = "\n"
+
       def tok(rx)
         res = @scanner.scan(rx)
         if res
-          @line += res.count("\n")
+          @line += res.count(NEWLINE)
           @expected = nil
           if !@strs.empty? && rx != COMMENT && rx != SINGLE_LINE_COMMENT
             @strs.each {|s| s << res}
           end
+          res
         end
-
-        res
       end
     end
   end

data/lib/sass/selector/sequence.rb

@@ -48,12 +48,12 @@ module Sass
       # @raise [Sass::SyntaxError] If a parent selector is invalid
       def resolve_parent_refs(super_seq)
         members = @members
-        members.slice!(0) if nl = (members.first == "\n")
+        nl = (members.first == "\n" && members.shift)
         unless members.any? do |seq_or_op|
             seq_or_op.is_a?(SimpleSequence) && seq_or_op.members.first.is_a?(Parent)
           end
           members = []
-          members << "\n" if nl
+          members << nl if nl
           members << SimpleSequence.new([Parent.new])
           members += @members
         end

data/lib/sass/tree/node.rb

@@ -148,8 +148,8 @@ module Sass
       # @param args [Array] Passed on to \{#\_to\_s}
       # @return [String, nil] The resulting CSS
       # @see Sass::Tree
-      def to_s(*args)
-        _to_s(*args)
+      def to_s(opts = nil)
+        _to_s(opts)
       rescue Sass::SyntaxError => e
         e.modify_backtrace(:filename => filename, :line => line)
         raise e

data/lib/sass/tree/prop_node.rb

@@ -88,8 +88,12 @@ module Sass::Tree
     # @param tabs [Fixnum] The level of indentation for the CSS
     # @return [String] The resulting CSS
     def _to_s(tabs)
-      to_return = '  ' * (tabs - 1 + self.tabs) + resolved_name + ":" +
-        (style == :compressed ? '' : ' ') + resolved_value + (style == :compressed ? "" : ";")
+      tab_str = '  ' * (tabs - 1 + self.tabs)
+      if style == :compressed
+        "#{tab_str}#{resolved_name}:#{resolved_value}"
+      else
+        "#{tab_str}#{resolved_name}: #{resolved_value};"
+      end
     end
 
     # Converts nested properties into flat properties.
@@ -154,10 +158,9 @@ module Sass::Tree
     private
 
     def check!
-      if @options[:property_syntax] == :old && @prop_syntax == :new
-        raise Sass::SyntaxError.new("Illegal property syntax: can't use new syntax when :property_syntax => :old is set.")
-      elsif @options[:property_syntax] == :new && @prop_syntax == :old
-        raise Sass::SyntaxError.new("Illegal property syntax: can't use old syntax when :property_syntax => :new is set.")
+      if @options[:property_syntax] && @options[:property_syntax] != @prop_syntax
+        raise Sass::SyntaxError.new(
+          "Illegal property syntax: can't use #{@prop_syntax} syntax when :property_syntax => #{@options[:property_syntax].inspect} is set.")
       elsif resolved_value.empty?
         raise Sass::SyntaxError.new("Invalid property: #{declaration.dump} (no value)." +
           pseudo_class_selector_message)

data/lib/sass/tree/rule_node.rb

@@ -121,17 +121,18 @@ module Sass::Tree
     # @param tabs [Fixnum] The level of indentation for the CSS
     # @return [String] The resulting CSS
     def _to_s(tabs)
+      output_style = style
       tabs = tabs + self.tabs
 
-      rule_separator = style == :compressed ? ',' : ', '
+      rule_separator = output_style == :compressed ? ',' : ', '
       line_separator =
-        case style
+        case output_style
           when :nested, :expanded; "\n"
           when :compressed; ""
           else; " "
         end
       rule_indent = '  ' * (tabs - 1)
-      per_rule_indent, total_indent = [:nested, :expanded].include?(style) ? [rule_indent, ''] : ['', rule_indent]
+      per_rule_indent, total_indent = [:nested, :expanded].include?(output_style) ? [rule_indent, ''] : ['', rule_indent]
 
       total_rule = total_indent + resolved_rules.members.
         map {|seq| seq.to_a.join.gsub(/([^,])\n/m, style == :compressed ? '\1 ' : "\\1\n")}.
@@ -142,7 +143,7 @@ module Sass::Tree
       to_return = ''
       old_spaces = '  ' * (tabs - 1)
       spaces = '  ' * tabs
-      if style != :compressed
+      if output_style != :compressed
         if @options[:debug_info]
           to_return << debug_info_rule.to_s(tabs) << "\n"
         elsif @options[:line_comments]
@@ -165,15 +166,15 @@ module Sass::Tree
         end
       end
 
-      if style == :compact
+      if output_style == :compact
         properties = children.map { |a| a.to_s(1) }.join(' ')
         to_return << "#{total_rule} { #{properties} }#{"\n" if group_end}"
-      elsif style == :compressed
+      elsif output_style == :compressed
         properties = children.map { |a| a.to_s(1) }.join(';')
         to_return << "#{total_rule}{#{properties}}"
       else
         properties = children.map { |a| a.to_s(tabs + 1) }.join("\n")
-        end_props = (style == :expanded ? "\n" + old_spaces : ' ')
+        end_props = (output_style == :expanded ? "\n" + old_spaces : ' ')
         to_return << "#{total_rule} {\n#{properties}#{end_props}}#{"\n" if group_end}"
       end
 
@@ -199,7 +200,7 @@ module Sass::Tree
     #   or nil if the parent isn't a {RuleNode}
     def _cssize(extends, parent)
       node = super
-      rules = node.children.select {|c| c.is_a?(RuleNode)}
+      rules = node.children.grep(RuleNode)
       props = node.children.reject {|c| c.is_a?(RuleNode) || c.invisible?}
 
       unless props.empty?

data/lib/sass/util.rb

@@ -121,10 +121,12 @@ module Sass
     # @example
     #   merge_adjacent_strings([1, "foo", "bar", 2, "baz"])
     #     #=> [1, "foobar", 2, "baz"]
-    # @param enum [Enumerable]
+    # @param arr [Array]
     # @return [Array] The enumerable with strings merged
-    def merge_adjacent_strings(enum)
-      enum.inject([]) do |a, e|
+    def merge_adjacent_strings(arr)
+      # Optimize for the common case of one element
+      return arr if arr.size < 2
+      arr.inject([]) do |a, e|
         if e.is_a?(String)
           if a.last.is_a?(String)
             a.last << e

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: sass
 version: !ruby/object:Gem::Version 
-  version: 3.1.0.alpha.12
+  version: 3.1.0.alpha.13
 platform: ruby
 authors: 
 - Nathan Weizenbaum
@@ -11,7 +11,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-01 00:00:00 -04:00
+date: 2010-10-03 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency