sass 3.2.0.alpha.104 → 3.2.0.alpha.236

data/REVISION

@@ -1 +1 @@
-50209c8c1a8488b0180e42d5fbb63d1ba0297d54
+4f1b0c5be641db7ccb1d6cd7e50d1b8c809f3b4d

data/Rakefile

@@ -51,7 +51,7 @@ task :permissions do
 end
 
 task :revision_file do
-  require 'lib/sass'
+  require scope('lib/sass')
 
   release = Rake.application.top_level_tasks.include?('release') || File.exist?(scope('EDGE_GEM_VERSION'))
   if Sass.version[:rev] && !release
@@ -147,7 +147,7 @@ def get_version
   version.map! {|n| n =~ /^[0-9]+$/ ? n.to_i : n}
   return written_version unless version.size == 5 && version[3] == "alpha" # prerelease
 
-  return written_version if (commit_count = `git log --pretty=oneline --first-parent stable.. | wc -l`).empty?
+  return written_version if (commit_count = `git log --pretty=oneline HEAD ^stable | wc -l`).empty?
   version[4] = commit_count.strip
   version.join('.')
 end

data/VERSION

@@ -1 +1 @@
-3.2.0.alpha.104
+3.2.0.alpha.236

data/lib/sass/engine.rb

@@ -600,7 +600,14 @@ WARNING
       else
         expr = parse_script(value, :offset => line.offset + line.text.index(value))
       end
-      Tree::PropNode.new(parse_interp(name), expr, prop)
+      node = Tree::PropNode.new(parse_interp(name), expr, prop)
+      if value.strip.empty? && line.children.empty?
+        raise SyntaxError.new(
+          "Invalid property: \"#{node.declaration}\" (no value)." +
+          node.pseudo_class_selector_message)
+      end
+
+      node
     end
 
     def parse_variable(line)

data/lib/sass/exec.rb

@@ -452,7 +452,7 @@ MSG
       def probably_dest_dir?(path)
         return false unless path
         return false if colon_path?(path)
-        return Dir.glob(File.join(path, "*.s[ca]ss")).empty?
+        return Sass::Util.glob(File.join(path, "*.s[ca]ss")).empty?
       end
     end
 
@@ -595,7 +595,7 @@ END
         end
 
         ext = @options[:from]
-        Dir.glob("#{@options[:input]}/**/*.#{ext}") do |f|
+        Sass::Util.glob("#{@options[:input]}/**/*.#{ext}") do |f|
           output =
             if @options[:in_place]
               f

data/lib/sass/plugin/compiler.rb

@@ -5,7 +5,6 @@ require 'sass'
 require 'sass/callbacks'
 require 'sass/plugin/configuration'
 require 'sass/plugin/staleness_checker'
-require 'sass/plugin/listener'
 
 module Sass::Plugin
 
@@ -188,7 +187,7 @@ module Sass::Plugin
       staleness_checker = StalenessChecker.new(engine_options)
 
       template_location_array.each do |template_location, css_location|
-        Dir.glob(File.join(template_location, "**", "[^_]*.s[ca]ss")).sort.each do |file|
+        Sass::Util.glob(File.join(template_location, "**", "[^_]*.s[ca]ss")).sort.each do |file|
           # Get the relative path to the file
           name = file.sub(template_location.to_s.sub(/\/*$/, '/'), "")
           css = css_filename(name, css_location)
@@ -252,52 +251,61 @@ module Sass::Plugin
         end
       end
 
+      template_paths = template_locations # cache the locations
+      individual_files_hash = individual_files.inject({}) do |h, files|
+        parent = File.dirname(files.first)
+        (h[parent] ||= []) << files unless template_paths.include?(parent)
+        h
+      end
+      directories = template_paths + individual_files_hash.keys +
+        [{:relative_paths => true}]
+
       # TODO: Keep better track of what depends on what
       # so we don't have to run a global update every time anything changes.
-      Sass::Plugin::Listener.new do |l|
-        template_location_array.each do |template_location, css_location|
-          l.directory(template_location, {
-              :modified => lambda do |base, relative|
-              next if relative !~ /\.s[ac]ss$/
-              run_template_modified File.join(base, relative)
-              update_stylesheets(individual_files)
-            end,
-
-            :added => lambda do |base, relative|
-              next if relative !~ /\.s[ac]ss$/
-              run_template_created File.join(base, relative)
-              update_stylesheets(individual_files)
-            end,
-
-            :removed => lambda do |base, relative|
-              next if relative !~ /\.s[ac]ss$/
-              run_template_deleted File.join(base, relative)
-              css = File.join(css_location, relative.gsub(/\.s[ac]ss$/, '.css'))
-              try_delete_css css
-              update_stylesheets(individual_files)
-            end
-          })
+      listener = Listen::MultiListener.new(*directories) do |modified, added, removed|
+        modified.each do |f|
+          parent = File.dirname(f)
+          if files = individual_files_hash[parent]
+            next unless files.first == f
+          else
+            next unless f =~ /\.s[ac]ss$/
+          end
+          run_template_modified(f)
         end
 
-        individual_files.each do |template, css|
-          l.file(template, {
-            :modified => lambda do
-              run_template_modified template
-              update_stylesheets(individual_files)
-            end,
-
-            :added => lambda do
-              run_template_created template
-              update_stylesheets(individual_files)
-            end,
-
-            :removed => lambda do
-              run_template_deleted template
-              try_delete_css css
-              update_stylesheets(individual_files)
-            end
-          })
+        added.each do |f|
+          parent = File.dirname(f)
+          if files = individual_files_hash[parent]
+            next unless files.first == f
+          else
+            next unless f =~ /\.s[ac]ss$/
+          end
+          run_template_created(f)
+        end
+
+        removed.each do |f|
+          parent = File.dirname(f)
+          if files = individual_files_hash[parent]
+            next unless files.first == f
+            try_delete_css files[1]
+          else
+            next unless f =~ /\.s[ac]ss$/
+            try_delete_css f.gsub(/\.s[ac]ss$/, '.css')
+          end
+          run_template_deleted(f)
         end
+
+        update_stylesheets(individual_files)
+      end
+
+      # The native windows listener is much slower than the polling
+      # option, according to https://github.com/nex3/sass/commit/a3031856b22bc834a5417dedecb038b7be9b9e3e#commitcomment-1295118
+      listener.force_polling(true) if Sass::Util.windows?
+
+      begin
+        listener.start
+      rescue Exception => e
+        raise e unless e.is_a?(Interrupt)
       end
     end
 

data/lib/sass/script/color.rb

@@ -232,21 +232,16 @@ module Sass::Script
       [:red, :green, :blue].each do |k|
         next if @attrs[k].nil?
         @attrs[k] = @attrs[k].to_i
-        next if (0..255).include?(@attrs[k])
-        raise ArgumentError.new("#{k.to_s.capitalize} value must be between 0 and 255")
+        Sass::Util.check_range("#{k.to_s.capitalize} value", 0..255, @attrs[k])
       end
 
       [:saturation, :lightness].each do |k|
         next if @attrs[k].nil?
-        @attrs[k] = 0 if @attrs[k] < 0.00001 && @attrs[k] > -0.00001
-        @attrs[k] = 100 if @attrs[k] - 100 < 0.00001 && @attrs[k] - 100 > -0.00001
-        next if (0..100).include?(@attrs[k])
-        raise ArgumentError.new("#{k.to_s.capitalize} must be between 0 and 100")
+        value = Number.new(@attrs[k], ['%']) # Get correct unit for error messages
+        @attrs[k] = Sass::Util.check_range("#{k.to_s.capitalize}", 0..100, value, '%')
       end
 
-      unless (0..1).include?(@attrs[:alpha])
-        raise ArgumentError.new("Alpha channel must be between 0 and 1")
-      end
+      @attrs[:alpha] = Sass::Util.check_range("Alpha channel", 0..1, @attrs[:alpha])
     end
 
     # The red component of the color.

data/lib/sass/script/funcall.rb

@@ -136,7 +136,12 @@ module Sass
           if signature.var_kwargs
             args << keywords
           else
-            raise Sass::SyntaxError.new("Function #{name} doesn't take an argument named $#{keywords.keys.sort.first}")
+            argname = keywords.keys.sort.first
+            if signature.args.include?(argname)
+              raise Sass::SyntaxError.new("Function #{name} was passed argument $#{argname} both by position and by name")
+            else
+              raise Sass::SyntaxError.new("Function #{name} doesn't have an argument named $#{argname}")
+            end
           end
         end
 
@@ -158,9 +163,13 @@ module Sass
 
         environment = function.args.zip(args).
           inject(Sass::Environment.new(function.environment)) do |env, ((var, default), value)|
+          if value && keywords.include?(var.underscored_name)
+            raise Sass::SyntaxError.new("Function #{@name} was passed argument $#{var.name} both by position and by name")
+          end
+
           env.set_local_var(var.name,
             value || keywords[var.underscored_name] || (default && default.perform(env)))
-          raise Sass::SyntaxError.new("Function #{@name} is missing parameter #{var.inspect}.") unless env.var(var.name)
+          raise Sass::SyntaxError.new("Function #{@name} is missing argument #{var.inspect}") unless env.var(var.name)
           env
         end
 

data/lib/sass/script/functions.rb

@@ -375,11 +375,10 @@ module Sass::Script
       Color.new([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")
+            v = Sass::Util.check_range("Color value", 0..100, c, '%')
+            v * 255 / 100.0
           else
-            next v if (0..255).include?(v)
-            raise ArgumentError.new("Color value #{v} must be between 0 and 255 inclusive")
+            Sass::Util.check_range("Color value", 0..255, c)
           end
         end)
     end
@@ -419,10 +418,7 @@ module Sass::Script
         assert_type color, :Color
         assert_type alpha, :Number
 
-        unless (0..1).include?(alpha.value)
-          raise ArgumentError.new("Alpha channel #{alpha.value} must be between 0 and 1 inclusive")
-        end
-
+        Sass::Util.check_range('Alpha channel', 0..1, alpha)
         color.with(:alpha => alpha.value)
       when 4
         red, green, blue, alpha = args
@@ -472,16 +468,11 @@ module Sass::Script
       assert_type lightness, :Number
       assert_type alpha, :Number
 
-      unless (0..1).include?(alpha.value)
-        raise ArgumentError.new("Alpha channel #{alpha.value} must be between 0 and 1")
-      end
+      Sass::Util.check_range('Alpha channel', 0..1, alpha)
 
-      original_s = saturation
-      original_l = lightness
-      # This algorithm is from http://www.w3.org/TR/css3-color#hsl-color
-      h, s, l = [hue, saturation, lightness].map { |a| a.value }
-      raise ArgumentError.new("Saturation #{s} must be between 0% and 100%") unless (0..100).include?(s)
-      raise ArgumentError.new("Lightness #{l} must be between 0% and 100%") unless (0..100).include?(l)
+      h = hue.value
+      s = Sass::Util.check_range('Saturation', 0..100, saturation, '%')
+      l = Sass::Util.check_range('Lightness', 0..100, lightness, '%')
 
       Color.new(:hue => h, :saturation => s, :lightness => l, :alpha => alpha.value)
     end
@@ -804,9 +795,7 @@ module Sass::Script
 
         next unless val = kwargs.delete(name)
         assert_type val, :Number, name
-        if range && !range.include?(val.value)
-          raise ArgumentError.new("$#{name}: Amount #{val} must be between #{range.first}#{units} and #{range.last}#{units}")
-        end
+        Sass::Util.check_range("$#{name}: Amount", range, val, units) if range
         adjusted = color.send(name) + val.value
         adjusted = [0, Sass::Util.restrict(adjusted, range)].max if range
         [name.to_sym, adjusted]
@@ -875,8 +864,8 @@ module Sass::Script
         assert_type val, :Number, name
         if !(val.numerator_units == ['%'] && val.denominator_units.empty?)
           raise ArgumentError.new("$#{name}: Amount #{val} must be a % (e.g. #{val.value}%)")
-        elsif !(-100..100).include?(val.value)
-          raise ArgumentError.new("$#{name}: Amount #{val} must be between -100% and 100%")
+        else
+          Sass::Util.check_range("$#{name}: Amount", -100..100, val, '%')
         end
 
         current = color.send(name)
@@ -970,9 +959,7 @@ module Sass::Script
       assert_type color2, :Color
       assert_type weight, :Number
 
-      unless (0..100).include?(weight.value)
-        raise ArgumentError.new("Weight #{weight} must be between 0% and 100%")
-      end
+      Sass::Util.check_range("Weight", 0..100, weight, '%')
 
       # This algorithm factors in both the user-provided weight
       # and the difference between the alpha values of the two colors
@@ -1054,6 +1041,7 @@ module Sass::Script
         :green => (255 - color.green),
         :blue => (255 - color.blue))
     end
+    declare :invert, [:color]
 
     # Removes quotes from a string if the string is quoted,
     # or returns the same string if it's not.
@@ -1186,8 +1174,8 @@ module Sass::Script
     # Rounds a number up to the nearest whole number.
     #
     # @example
-    #   ciel(10.4px) => 11px
-    #   ciel(10.6px) => 11px
+    #   ceil(10.4px) => 11px
+    #   ceil(10.6px) => 11px
     # @param value [Number] The number
     # @return [Number] The rounded number
     # @raise [ArgumentError] if `value` isn't a number
@@ -1438,9 +1426,7 @@ module Sass::Script
     def _adjust(color, amount, attr, range, op, units = "")
       assert_type color, :Color
       assert_type amount, :Number
-      unless range.include?(amount.value)
-        raise ArgumentError.new("Amount #{amount} must be between #{range.first}#{units} and #{range.last}#{units}")
-      end
+      Sass::Util.check_range('Amount', range, amount, units)
 
       # TODO: is it worth restricting here,
       # or should we do so in the Color constructor itself,

data/lib/sass/script/lexer.rb

@@ -90,6 +90,7 @@ module Sass
         :number => /(-)?(?:(\d*\.\d+)|(\d+))([a-zA-Z%]+)?/,
         :color => HEXCOLOR,
         :bool => /(true|false)\b/,
+        :null => /null\b/,
         :ident_op => %r{(#{Regexp.union(*IDENT_OP_NAMES.map{|s| Regexp.new(Regexp.escape(s) + "(?!#{NMCHAR}|\Z)")})})},
         :op => %r{(#{Regexp.union(*OP_NAMES)})},
       }
@@ -234,7 +235,7 @@ module Sass
         end
 
         variable || string(:double, false) || string(:single, false) || number ||
-          color || bool || string(:uri, false) || raw(UNICODERANGE) ||
+          color || bool || null || string(:uri, false) || raw(UNICODERANGE) ||
           special_fun || special_val || ident_op || ident || op
       end
 
@@ -292,6 +293,11 @@ MESSAGE
         [:bool, Script::Bool.new(s == 'true')]
       end
 
+      def null
+        return unless scan(REGULAR_EXPRESSIONS[:null])
+        [:null, Script::Null.new]
+      end
+
       def special_fun
         return unless str1 = scan(/((-[\w-]+-)?(calc|element)|expression|progid:[a-z\.]*)\(/i)
         str2, _ = Sass::Shared.balance(@scanner, ?(, ?), 1)

data/lib/sass/script/list.rb

@@ -41,14 +41,14 @@ module Sass::Script
     # @see Node#to_s
     def to_s(opts = {})
       raise Sass::SyntaxError.new("() isn't a valid CSS value.") if value.empty?
-      return value.reject {|e| e.is_a?(List) && e.value.empty?}.map {|e| e.to_s(opts)}.join(sep_str)
+      return value.reject {|e| e.is_a?(Null) || e.is_a?(List) && e.value.empty?}.map {|e| e.to_s(opts)}.join(sep_str)
     end
 
     # @see Node#to_sass
     def to_sass(opts = {})
       return "()" if value.empty?
       precedence = Sass::Script::Parser.precedence_of(separator)
-      value.map do |v|
+      value.reject {|e| e.is_a?(Null)}.map do |v|
         if v.is_a?(List) && Sass::Script::Parser.precedence_of(v.separator) <= precedence
           "(#{v.to_sass(opts)})"
         else

data/lib/sass/script/literal.rb

@@ -9,6 +9,7 @@ module Sass::Script
     require 'sass/script/number'
     require 'sass/script/color'
     require 'sass/script/bool'
+    require 'sass/script/null'
     require 'sass/script/list'
 
     # Returns the Ruby value of the literal.
@@ -217,6 +218,13 @@ MSG
     end
     alias_method :to_sass, :to_s
 
+    # Returns whether or not this object is null.
+    #
+    # @return [Boolean] `false`
+    def null?
+      false
+    end
+
     protected
 
     # Evaluates the literal.

data/lib/sass/script/null.rb

@@ -0,0 +1,34 @@
+require 'sass/script/literal'
+
+module Sass::Script
+  # A SassScript object representing a null value.
+  class Null < Literal
+    # Creates a new null literal.
+    def initialize
+      super nil
+    end
+
+    # @return [Boolean] `false` (the Ruby boolean value)
+    def to_bool
+      false
+    end
+
+    # @return [Boolean] `true`
+    def null?
+      true
+    end
+
+    # @return [String] '' (An empty string)
+    def to_s(opts = {})
+      ''
+    end
+    alias_method :to_sass, :to_s
+
+    # Returns a string representing a null value.
+    #
+    # @return [String]
+    def inspect
+      'null'
+    end
+  end
+end

data/lib/sass/script/operation.rb

@@ -82,6 +82,10 @@ module Sass::Script
 
       literal2 = @operand2.perform(environment)
 
+      if literal1.is_a?(Null) || literal2.is_a?(Null)
+        raise Sass::SyntaxError.new("Invalid null operation: \"#{literal1.inspect} #{@operator} #{literal2.inspect}\".")
+      end
+
       begin
         opts(literal1.send(@operator, literal2))
       rescue NoMethodError => e