sass 3.7.4 → 4.0.0.alpha.1

data/VERSION

@@ -1 +1 @@
-3.7.4
+4.0.0.alpha.1

data/VERSION_DATE

@@ -1 +1 @@
-04 April 2019 00:49:58 UTC
+09 December 2015 23:19:20 UTC

data/lib/sass.rb

@@ -47,7 +47,7 @@ module Sass
   #
   # @param contents [String] The contents of the Sass file.
   # @param options [{Symbol => Object}] An options hash;
-  #   see {file:SASS_REFERENCE.md#Options the Sass options documentation}
+  #   see {file:SASS_REFERENCE.md#options the Sass options documentation}
   # @raise [Sass::SyntaxError] if there's an error in the document
   # @raise [Encoding::UndefinedConversionError] if the source encoding
   #   cannot be converted to UTF-8
@@ -69,7 +69,7 @@ module Sass
   #
   #   @param filename [String] The path to the Sass, SCSS, or CSS file on disk.
   #   @param options [{Symbol => Object}] An options hash;
-  #     see {file:SASS_REFERENCE.md#Options the Sass options documentation}
+  #     see {file:SASS_REFERENCE.md#options the Sass options documentation}
   #   @return [String] The compiled CSS.
   #
   # @overload compile_file(filename, css_filename, options = {})
@@ -77,7 +77,7 @@ module Sass
   #
   #   @param filename [String] The path to the Sass, SCSS, or CSS file on disk.
   #   @param options [{Symbol => Object}] An options hash;
-  #     see {file:SASS_REFERENCE.md#Options the Sass options documentation}
+  #     see {file:SASS_REFERENCE.md#options the Sass options documentation}
   #   @param css_filename [String] The location to which to write the compiled CSS.
   def self.compile_file(filename, *args)
     options = args.last.is_a?(Hash) ? args.pop : {}

data/lib/sass/cache_stores/filesystem.rb

@@ -36,7 +36,7 @@ module Sass
       def _store(key, version, sha, contents)
         compiled_filename = path_to(key)
         FileUtils.mkdir_p(File.dirname(compiled_filename))
-        Sass::Util.atomic_create_and_write_file(compiled_filename) do |f|
+        Sass::Util.atomic_create_and_write_file(compiled_filename, 0600) do |f|
           f.puts(version)
           f.puts(sha)
           f.write(contents)
@@ -52,7 +52,7 @@ module Sass
       # @param key [String]
       # @return [String] The path to the cache file.
       def path_to(key)
-        key = key.gsub(/[<>:\\|?*%]/) {|c| "%%%03d" % c.ord}
+        key = key.gsub(/[<>:\\|?*%]/) {|c| "%%%03d" % Sass::Util.ord(c)}
         File.join(cache_location, key)
       end
     end

data/lib/sass/cache_stores/memory.rb

@@ -26,10 +26,11 @@ module Sass
 
       # @see Base#retrieve
       def retrieve(key, sha)
-        return unless @contents.has_key?(key)
-        return unless @contents[key][:sha] == sha
-        obj = @contents[key][:obj]
-        obj.respond_to?(:deep_copy) ? obj.deep_copy : obj.dup
+        if @contents.has_key?(key)
+          return unless @contents[key][:sha] == sha
+          obj = @contents[key][:obj]
+          obj.respond_to?(:deep_copy) ? obj.deep_copy : obj.dup
+        end
       end
 
       # @see Base#store

data/lib/sass/callbacks.rb

@@ -51,12 +51,12 @@ module Sass
     def define_callback(name)
       class_eval <<RUBY, __FILE__, __LINE__ + 1
 def on_#{name}(&block)
-  @_sass_callbacks = {} unless defined? @_sass_callbacks
+  @_sass_callbacks ||= {}
   (@_sass_callbacks[#{name.inspect}] ||= []) << block
 end
 
 def run_#{name}(*args)
-  return unless defined? @_sass_callbacks
+  return unless @_sass_callbacks
   return unless @_sass_callbacks[#{name.inspect}]
   @_sass_callbacks[#{name.inspect}].each {|c| c[*args]}
 end

data/lib/sass/css.rb

@@ -18,7 +18,7 @@ module Sass
     #   that can be converted to Unicode.
     #   If the stylesheet contains an `@charset` declaration,
     #   that overrides the Ruby encoding
-    #   (see {file:SASS_REFERENCE.md#Encodings the encoding documentation})
+    #   (see {file:SASS_REFERENCE.md#encodings the encoding documentation})
     # @option options :old [Boolean] (false)
     #     Whether or not to output old property syntax
     #     (`:color blue` as opposed to `color: blue`).
@@ -31,11 +31,10 @@ module Sass
         template = template.read
       end
 
-      @options = options.merge(:_convert => true)
+      @options = options.dup
       # Backwards compatibility
       @options[:old] = true if @options[:alternate] == false
       @template = template
-      @checked_encoding = false
     end
 
     # Converts the CSS template into Sass or SCSS code.
@@ -51,7 +50,8 @@ module Sass
       raise err
     end
 
-    # Returns the original encoding of the document.
+    # Returns the original encoding of the document,
+    # or `nil` under Ruby 1.8.
     #
     # @return [Encoding, nil]
     # @raise [Encoding::UndefinedConversionError] if the source encoding
@@ -75,14 +75,14 @@ module Sass
     # @return [Tree::Node] The root node of the parsed tree
     def build_tree
       root = Sass::SCSS::CssParser.new(@template, @options[:filename], nil).parse
-      parse_selectors(root)
-      expand_commas(root)
-      nest_seqs(root)
-      parent_ref_rules(root)
-      flatten_rules(root)
-      bubble_subject(root)
-      fold_commas(root)
-      dump_selectors(root)
+      parse_selectors    root
+      expand_commas      root
+      nest_seqs          root
+      parent_ref_rules   root
+      flatten_rules      root
+      bubble_subject     root
+      fold_commas        root
+      dump_selectors     root
       root
     end
 

data/lib/sass/engine.rb

@@ -1,7 +1,6 @@
 require 'set'
 require 'digest/sha1'
 require 'sass/cache_stores'
-require 'sass/deprecation'
 require 'sass/source/position'
 require 'sass/source/range'
 require 'sass/source/map'
@@ -80,13 +79,7 @@ module Sass
   #
   # `type`: `String`
   # : The user-friendly name of the type of the callable.
-  #
-  # `origin`: `Symbol`
-  # : From whence comes the callable: `:stylesheet`, `:builtin`, `:css`
-  #   A callable with an origin of `:stylesheet` was defined in the stylesheet itself.
-  #   A callable with an origin of `:builtin` was defined in ruby.
-  #   A callable (function) with an origin of `:css` returns a function call with arguments to CSS.
-  Callable = Struct.new(:name, :args, :splat, :environment, :tree, :has_content, :type, :origin)
+  Callable = Struct.new(:name, :args, :splat, :environment, :tree, :has_content, :type)
 
   # This class handles the parsing and compilation of the Sass template.
   # Example usage:
@@ -96,20 +89,18 @@ module Sass
   #     output = sass_engine.render
   #     puts output
   class Engine
-    @@old_property_deprecation = Deprecation.new
-
     # A line of Sass code.
     #
     # `text`: `String`
     # : The text in the line, without any whitespace at the beginning or end.
     #
-    # `tabs`: `Integer`
+    # `tabs`: `Fixnum`
     # : The level of indentation of the line.
     #
-    # `index`: `Integer`
+    # `index`: `Fixnum`
     # : The line number in the original document.
     #
-    # `offset`: `Integer`
+    # `offset`: `Fixnum`
     # : The number of bytes in on the line that the text begins.
     #   This ends up being the number of bytes of leading whitespace.
     #
@@ -177,11 +168,11 @@ module Sass
     # default values and resolving aliases.
     #
     # @param options [{Symbol => Object}] The options hash;
-    #   see {file:SASS_REFERENCE.md#Options the Sass options documentation}
+    #   see {file:SASS_REFERENCE.md#options the Sass options documentation}
     # @return [{Symbol => Object}] The normalized options hash.
     # @private
     def self.normalize_options(options)
-      options = DEFAULT_OPTIONS.merge(options.reject {|_k, v| v.nil?})
+      options = DEFAULT_OPTIONS.merge(options.reject {|k, v| v.nil?})
 
       # If the `:filename` option is passed in without an importer,
       # assume it's using the default filesystem importer.
@@ -231,7 +222,7 @@ module Sass
     #
     # @param filename [String] The path to the Sass or SCSS file
     # @param options [{Symbol => Object}] The options hash;
-    #   See {file:SASS_REFERENCE.md#Options the Sass options documentation}.
+    #   See {file:SASS_REFERENCE.md#options the Sass options documentation}.
     # @return [Sass::Engine] The Engine for the given Sass or SCSS file.
     # @raise [Sass::SyntaxError] if there's an error in the document.
     def self.for_file(filename, options)
@@ -249,7 +240,7 @@ module Sass
     end
 
     # The options for the Sass engine.
-    # See {file:SASS_REFERENCE.md#Options the Sass options documentation}.
+    # See {file:SASS_REFERENCE.md#options the Sass options documentation}.
     #
     # @return [{Symbol => Object}]
     attr_reader :options
@@ -266,17 +257,14 @@ module Sass
     #   that can be converted to Unicode.
     #   If the template contains an `@charset` declaration,
     #   that overrides the Ruby encoding
-    #   (see {file:SASS_REFERENCE.md#Encodings the encoding documentation})
+    #   (see {file:SASS_REFERENCE.md#encodings the encoding documentation})
     # @param options [{Symbol => Object}] An options hash.
-    #   See {file:SASS_REFERENCE.md#Options the Sass options documentation}.
+    #   See {file:SASS_REFERENCE.md#options the Sass options documentation}.
     # @see {Sass::Engine.for_file}
     # @see {Sass::Plugin}
     def initialize(template, options = {})
       @options = self.class.normalize_options(options)
       @template = template
-      @checked_encoding = false
-      @filename = nil
-      @line = nil
     end
 
     # Render the template to CSS.
@@ -322,7 +310,8 @@ module Sass
                 end
     end
 
-    # Returns the original encoding of the document.
+    # Returns the original encoding of the document,
+    # or `nil` under Ruby 1.8.
     #
     # @return [Encoding, nil]
     # @raise [Encoding::UndefinedConversionError] if the source encoding
@@ -375,7 +364,7 @@ Error generating source map: couldn't determine public URL for "#{filename}".
   Without a public URL, there's nothing for the source map to link to.
   An importer was not set for this file.
 ERR
-      elsif Sass::Util.silence_sass_warnings do
+      elsif Sass::Util.silence_warnings do
               sourcemap_dir = nil if @options[:sourcemap] == :file
               importer.public_url(filename, sourcemap_dir).nil?
             end
@@ -391,7 +380,7 @@ ERR
       rendered << "\n" if rendered[-1] != ?\n
       rendered << "\n" unless compressed
       rendered << "/*# sourceMappingURL="
-      rendered << URI::DEFAULT_PARSER.escape(sourcemap_uri)
+      rendered << Sass::Util.escape_uri(sourcemap_uri)
       rendered << " */\n"
       return rendered, sourcemap
     end
@@ -487,7 +476,7 @@ ERR
 
         line_tabs = line_tab_str.scan(tab_str).size
         if tab_str * line_tabs != line_tab_str
-          message = <<END.strip.tr("\n", ' ')
+          message = <<END.strip.gsub("\n", ' ')
 Inconsistent indentation: #{Sass::Shared.human_indentation line_tab_str, true} used for indentation,
 but the rest of the document was indented using #{Sass::Shared.human_indentation tab_str}.
 END
@@ -499,13 +488,16 @@ END
       lines
     end
 
+    # @comment
+    #   rubocop:disable ParameterLists
     def try_comment(line, last, tab_str, comment_tab_str, index)
+      # rubocop:enable ParameterLists
       return unless last && last.comment?
       # Nested comment stuff must be at least one whitespace char deeper
       # than the normal indentation
       return unless line =~ /^#{tab_str}\s/
       unless line =~ /^(?:#{comment_tab_str})(.*)$/
-        raise SyntaxError.new(<<MSG.strip.tr("\n", " "), :line => index)
+        raise SyntaxError.new(<<MSG.strip.gsub("\n", " "), :line => index)
 Inconsistent indentation:
 previous line was indented by #{Sass::Shared.human_indentation comment_tab_str},
 but this line was indented by #{Sass::Shared.human_indentation line[/^\s*/]}.
@@ -524,6 +516,10 @@ MSG
       nodes = []
       while (line = arr[i]) && line.tabs >= base
         if line.tabs > base
+          raise SyntaxError.new(
+            "The line was indented #{line.tabs - base} levels deeper than the previous line.",
+            :line => line.index) if line.tabs > base + 1
+
           nodes.last.children, i = tree(arr, i)
         else
           nodes << line
@@ -578,8 +574,8 @@ MSG
           if continued_comment &&
               child.line == continued_comment.line +
               continued_comment.lines + 1
-            continued_comment.value.last.sub!(%r{ \*/\Z}, '')
-            child.value.first.gsub!(%r{\A/\*}, ' *')
+            continued_comment.value.last.sub!(/ \*\/\Z/, '')
+            child.value.first.gsub!(/\A\/\*/, ' *')
             continued_comment.value += ["\n"] + child.value
             next
           end
@@ -628,11 +624,6 @@ WARNING
           raise SyntaxError.new("Invalid property: \"#{line.text}\".",
             :line => @line) if name.nil? || value.nil?
 
-          @@old_property_deprecation.warn(@options[:filename], @line, <<WARNING)
-Old-style properties like "#{line.text}" are deprecated and will be an error in future versions of Sass.
-Use "#{name}: #{value}" instead.
-WARNING
-
           value_start_offset = name_end_offset = name_start_offset + name.length
           unless value.empty?
             # +1 and -1 both compensate for the leading ':', which is part of line.text
@@ -695,14 +686,7 @@ WARNING
       end
 
       name = line.text[0...scanner.pos]
-      could_be_property =
-        if name.start_with?('--')
-          (scanned = scanner.scan(/\s*:/))
-        else
-          (scanned = scanner.scan(/\s*:(?:\s+|$)/))
-        end
-
-      if could_be_property # test for a property
+      if (scanned = scanner.scan(/\s*:(?:\s+|$)/)) # test for a property
         offset += scanned.length
         property = parse_property(name, res, scanner.rest, :new, line, offset)
         property.name_source_range = ident_range
@@ -725,33 +709,23 @@ WARNING
       end
     end
 
+    # @comment
+    #   rubocop:disable ParameterLists
     def parse_property(name, parsed_name, value, prop, line, start_offset)
-
-      if name.start_with?('--')
-        unless line.children.empty?
-          raise SyntaxError.new("Illegal nesting: Nothing may be nested beneath custom properties.",
-            :line => @line + 1)
-        end
-
-        parser = Sass::SCSS::Parser.new(value,
-          @options[:filename], @options[:importer],
-          @line, to_parser_offset(@offset))
-        parsed_value = parser.parse_declaration_value
-        end_offset = start_offset + value.length
-      elsif value.strip.empty?
-        parsed_value = [Sass::Script::Tree::Literal.new(Sass::Script::Value::String.new(""))]
+      # rubocop:enable ParameterLists
+      if value.strip.empty?
+        expr = Sass::Script::Tree::Literal.new(Sass::Script::Value::String.new(""))
         end_offset = start_offset
       else
         expr = parse_script(value, :offset => to_parser_offset(start_offset))
         end_offset = expr.source_range.end_pos.offset - 1
-        parsed_value = [expr]
       end
-      node = Tree::PropNode.new(parse_interp(name), parsed_value, prop)
+      node = Tree::PropNode.new(parse_interp(name), expr, prop)
       node.value_source_range = Sass::Source::Range.new(
         Sass::Source::Position.new(line.index, to_parser_offset(start_offset)),
         Sass::Source::Position.new(line.index, to_parser_offset(end_offset)),
         @options[:filename], @options[:importer])
-      if !node.custom_property? && value.strip.empty? && line.children.empty?
+      if value.strip.empty? && line.children.empty?
         raise SyntaxError.new(
           "Invalid property: \"#{node.declaration}\" (no value)." +
           node.pseudo_class_selector_message)
@@ -824,12 +798,14 @@ WARNING
       :each, :while, :if, :else, :extend, :import, :media, :charset, :content,
       :at_root, :error]
 
+    # @comment
+    #   rubocop:disable MethodLength
     def parse_directive(parent, line, root)
       directive, whitespace, value = line.text[1..-1].split(/(\s+)/, 2)
       raise SyntaxError.new("Invalid directive: '@'.") unless directive
       offset = directive.size + whitespace.size + 1 if whitespace
 
-      directive_name = directive.tr('-', '_').to_sym
+      directive_name = directive.gsub('-', '_').to_sym
       if DIRECTIVES.include?(directive_name)
         return send("parse_#{directive_name}_directive", parent, line, root, value, offset)
       end
@@ -884,6 +860,8 @@ WARNING
       )
       Tree::ExtendNode.new(interp_parsed, optional, selector_range)
     end
+    # @comment
+    #   rubocop:enable MethodLength
 
     def parse_warn_directive(parent, line, root, value, offset)
       raise SyntaxError.new("Invalid warn directive '@warn': expected expression.") unless value
@@ -1034,6 +1012,8 @@ WARNING
       values
     end
 
+    # @comment
+    #   rubocop:disable MethodLength
     def parse_import_arg(scanner, offset)
       return if scanner.eos?
 
@@ -1108,6 +1088,8 @@ WARNING
       end
       node
     end
+    # @comment
+    #   rubocop:enable MethodLength
 
     def parse_mixin_directive(parent, line, root, value, offset)
       parse_mixin_definition(line)
@@ -1178,7 +1160,7 @@ WARNING
       end
 
       return "/* */" if content.empty?
-      content.last.gsub!(%r{ ?\*/ *$}, '')
+      content.last.gsub!(/ ?\*\/ *$/, '')
       first = content.shift unless removed_first
       content.map! {|l| l.gsub!(/^\*( ?)/, '\1') || (l.empty? ? "" : " ") + l}
       content.unshift first unless removed_first
@@ -1220,7 +1202,7 @@ WARNING
         else
           res << "\\" * [0, escapes - 1].max
           if scan[1].include?("\n")
-            line += scan[1].count("\n")
+            line = line + scan[1].count("\n")
             offset = scan.matched_size - scan[1].rindex("\n")
           else
             offset += scan.matched_size

data/lib/sass/environment.rb

@@ -81,19 +81,12 @@ module Sass
     inherited_hash_reader :function
 
     # @param options [{Symbol => Object}] The options hash. See
-    #   {file:SASS_REFERENCE.md#Options the Sass options documentation}.
+    #   {file:SASS_REFERENCE.md#options the Sass options documentation}.
     # @param parent [Environment] See \{#parent}
     def initialize(parent = nil, options = nil)
       @parent = parent
       @options = options || (parent && parent.options) || {}
-      @stack = @parent.nil? ? Sass::Stack.new : nil
-      @caller = nil
-      @content = nil
-      @filename = nil
-      @functions = nil
-      @mixins = nil
-      @selector = nil
-      @vars = nil
+      @stack = Sass::Stack.new if @parent.nil?
     end
 
     # Returns whether this is the global environment.
@@ -175,10 +168,6 @@ module Sass
 
   # A read-only wrapper for a lexical environment for SassScript.
   class ReadOnlyEnvironment < BaseEnvironment
-    def initialize(parent = nil, options = nil)
-      super
-      @content_cached = nil
-    end
     # The read-only environment of the caller of this environment's mixin or function.
     #
     # @see BaseEnvironment#caller
@@ -189,31 +178,14 @@ module Sass
       @caller ||= env.is_a?(ReadOnlyEnvironment) ? env : ReadOnlyEnvironment.new(env, env.options)
     end
 
-    # The content passed to this environment. If the content's environment isn't already
-    # read-only, it's made read-only.
+    # The read-only content passed to this environment.
     #
     # @see BaseEnvironment#content
-    #
-    # @return {[Array<Sass::Tree::Node>, ReadOnlyEnvironment]?} The content nodes and
-    #   the lexical environment of the content block.
-    #   Returns `nil` when there is no content in this environment.
+    # @return {ReadOnlyEnvironment}
     def content
-      # Return the cached content from a previous invocation if any
-      return @content if @content_cached
-      # get the content with a read-write environment from the superclass
-      read_write_content = super
-      if read_write_content
-        tree, env = read_write_content
-        # make the content's environment read-only
-        if env && !env.is_a?(ReadOnlyEnvironment)
-          env = ReadOnlyEnvironment.new(env, env.options)
-        end
-        @content_cached = true
-        @content = [tree, env]
-      else
-        @content_cached = true
-        @content = nil
-      end
+      return @content if @content
+      env = super
+      @content ||= env.is_a?(ReadOnlyEnvironment) ? env : ReadOnlyEnvironment.new(env, env.options)
     end
   end