sass 3.3.0.alpha.256 → 3.3.0.alpha.353

data/REVISION

@@ -1 +1 @@
-9fcd76973ba3ac7df7f5cc595ae0283a0c16f28a
+da2d3e225bd2eb195eef404a6dc5ae48e51b1fdc

data/Rakefile

@@ -19,6 +19,26 @@ Rake::TestTask.new do |t|
   t.verbose = true
 end
 
+# ----- Code Style Enforcement -----
+
+if RUBY_VERSION !~ /^(1\.8|2\.1)/ && (ENV.has_key?("RUBOCOP") && ENV["RUBOCOP"] == "true" || !ENV.has_key?("RUBOCOP"))
+  require 'rubocop/rake_task'
+  require "#{File.dirname(__FILE__)}/test/rubocop_extensions.rb"
+  Rubocop::RakeTask.new do |t|
+    t.patterns = FileList["lib/**/*"]
+  end
+else
+  task :rubocop do
+    puts "Skipping rubocop style check."
+    if !ENV.has_key?("RUBOCOP")
+      puts "Passing this check is required in order for your patch to be accepted."
+      puts "Use ruby 1.9 or greater and then run the style check with: rake rubocop"
+    end
+  end
+end
+
+task :test => :rubocop
+
 # ----- Packaging -----
 
 # Don't use Rake::GemPackageTast because we want prerequisites to run
@@ -191,7 +211,7 @@ begin
     task :undocumented do
       opts = ENV["YARD_OPTS"] || ""
       ENV["YARD_OPTS"] = opts.dup + <<OPTS
- --list --query "
+ --list --tag comment --hide-tag comment --query "
   object.docstring.blank? &&
   !(object.type == :method && object.is_alias?)"
 OPTS

data/VERSION

@@ -1 +1 @@
-3.3.0.alpha.256
+3.3.0.alpha.353

data/VERSION_DATE

@@ -1 +1 @@
-25 September 2013 20:25:47 GMT
+04 October 2013 22:23:30 GMT

data/lib/sass.rb

@@ -35,8 +35,11 @@ module Sass
   #   Sass.load_paths << File.dirname(__FILE__ + '/sass')
   # @return [Array<String, Pathname, Sass::Importers::Base>]
   def self.load_paths
-    @load_paths ||= ENV['SASS_PATH'] ?
-      ENV['SASS_PATH'].split(Sass::Util.windows? ? ';' : ':') : []
+    @load_paths ||= if ENV['SASS_PATH']
+                      ENV['SASS_PATH'].split(Sass::Util.windows? ? ';' : ':')
+                    else
+                      []
+                    end
   end
 
   # Compile a Sass or SCSS string to CSS.
@@ -82,7 +85,7 @@ module Sass
     result = Sass::Engine.for_file(filename, options).render
     if css_filename
       options[:css_filename] ||= css_filename
-      open(css_filename,"w") {|css_file| css_file.write(result)}
+      open(css_filename, "w") {|css_file| css_file.write(result)}
       nil
     else
       result

data/lib/sass/cache_stores/base.rb

@@ -27,7 +27,7 @@ module Sass
 
       # Retrieved cached contents.
       # Must be implemented by all subclasses.
-      # 
+      #
       # Note: if the key exists but the sha or version have changed,
       # then the key may be deleted by the cache store, if it wants to do so.
       #

data/lib/sass/cache_stores/chain.rb

@@ -22,7 +22,8 @@ module Sass
       # @see Base#retrieve
       def retrieve(key, sha)
         @caches.each_with_index do |c, i|
-          next unless obj = c.retrieve(key, sha)
+          obj = c.retrieve(key, sha)
+          next unless obj
           @caches[0...i].each {|prev| prev.store(key, sha, obj)}
           return obj
         end

data/lib/sass/cache_stores/filesystem.rb

@@ -30,19 +30,15 @@ module Sass
 
       # @see Base#\_store
       def _store(key, version, sha, contents)
-        # return unless File.writable?(File.dirname(@cache_location))
-        # return if File.exists?(@cache_location) && !File.writable?(@cache_location)
         compiled_filename = path_to(key)
-        # return if File.exists?(File.dirname(compiled_filename)) && !File.writable?(File.dirname(compiled_filename))
-        # return if File.exists?(compiled_filename) && !File.writable?(compiled_filename)
         FileUtils.mkdir_p(File.dirname(compiled_filename))
-        File.open(compiled_filename, "wb") do |f|
+        Sass::Util.atomic_create_and_write_file(compiled_filename) do |f|
           f.puts(version)
           f.puts(sha)
           f.write(contents)
         end
       rescue Errno::EACCES
-        #pass
+        # pass
       end
 
       private

data/lib/sass/cache_stores/memory.rb

@@ -37,7 +37,7 @@ module Sass
       def store(key, sha, obj)
         @contents[key] = {:sha => sha, :obj => obj}
       end
-      
+
       # Destructively clear the cache.
       def reset!
         @contents = {}

data/lib/sass/cache_stores/null.rb

@@ -12,11 +12,11 @@ module Sass
       def _retrieve(key, version, sha)
         nil
       end
-      
+
       def _store(key, version, sha, contents)
         @keys[key] = true
       end
-      
+
       def was_set?(key)
         @keys[key]
       end

data/lib/sass/callbacks.rb

@@ -30,6 +30,7 @@ module Sass
     def self.extended(base)
       base.send(:include, InstanceMethods)
     end
+
     protected
 
     module InstanceMethods

data/lib/sass/css.rb

@@ -169,11 +169,11 @@ module Sass
           current_rule.parsed_rules = make_seq(first)
         end
 
-        unless rest.empty?
+        if rest.empty?
+          current_rule.children += child.children
+        else
           child.parsed_rules = make_seq(*rest)
           current_rule << child
-        else
-          current_rule.children += child.children
         end
 
         current_rule
@@ -220,12 +220,12 @@ module Sass
           current_rule.parsed_rules = make_sseq(last_simple_subject, *firsts)
         end
 
-        unless rest.empty?
+        if rest.empty?
+          current_rule.children += child.children
+        else
           rest.unshift Sass::Selector::Parent.new
           child.parsed_rules = make_sseq(sseq.subject?, *rest)
           current_rule << child
-        else
-          current_rule.children += child.children
         end
 
         current_rule

data/lib/sass/engine.rb

@@ -196,9 +196,11 @@ module Sass
       # Remove any deprecated importers if the location is imported explicitly
       options[:load_paths].reject! do |importer|
         importer.is_a?(Sass::Importers::DeprecatedPath) &&
-          options[:load_paths].find {|other_importer| other_importer.is_a?(Sass::Importers::Filesystem) &&
-                                                      other_importer != importer &&
-                                                      other_importer.root == importer.root}
+          options[:load_paths].find do |other_importer|
+            other_importer.is_a?(Sass::Importers::Filesystem) &&
+              other_importer != importer &&
+              other_importer.root == importer.root
+          end
       end
 
       # Backwards compatibility
@@ -259,7 +261,7 @@ module Sass
     #   See {file:SASS_REFERENCE.md#sass_options the Sass options documentation}.
     # @see {Sass::Engine.for_file}
     # @see {Sass::Plugin}
-    def initialize(template, options={})
+    def initialize(template, options = {})
       @options = self.class.normalize_options(options)
       @template = template
     end
@@ -300,9 +302,11 @@ module Sass
     # @return [Sass::Tree::Node] The root of the parse tree.
     # @raise [Sass::SyntaxError] if there's an error in the document
     def to_tree
-      @tree ||= @options[:quiet] ?
-        Sass::Util.silence_sass_warnings {_to_tree} :
-        _to_tree
+      @tree ||= if @options[:quiet]
+                  Sass::Util.silence_sass_warnings {_to_tree}
+                else
+                  _to_tree
+                end
     end
 
     # Returns the original encoding of the document,
@@ -331,7 +335,8 @@ module Sass
     #
     # @private
     def _dependencies(seen, engines)
-      return if seen.include?(key = [@options[:filename], @options[:importer]])
+      key = [@options[:filename], @options[:importer]]
+      return if seen.include?(key)
       seen << key
       engines << self
       to_tree.grep(Tree::ImportNode) do |n|
@@ -387,7 +392,7 @@ ERR
         key = sassc_key
         sha = Digest::SHA1.hexdigest(@template)
 
-        if root = @options[:cache_store].retrieve(key, sha)
+        if (root = @options[:cache_store].retrieve(key, sha))
           root.options = @options
           return root
         end
@@ -486,7 +491,10 @@ 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
@@ -511,7 +519,8 @@ 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.",
+          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)
@@ -617,7 +626,7 @@ WARNING
             :line => @line) if name.nil? || value.nil?
 
           value_start_offset = name_end_offset = name_start_offset + name.length
-          if !value.empty?
+          unless value.empty?
             # +1 and -1 both compensate for the leading ':', which is part of line.text
             value_start_offset = name_start_offset + line.text.index(value, name.length + 1) - 1
           end
@@ -659,7 +668,7 @@ WARNING
         @options[:filename], @options[:importer],
         @line, to_parser_offset(offset))
 
-      unless res = parser.parse_interp_ident
+      unless (res = parser.parse_interp_ident)
         parsed = parse_interp(line.text, line.offset)
         return Tree::RuleNode.new(parsed, full_line_range(line))
       end
@@ -672,13 +681,13 @@ WARNING
       res.unshift(hack_char) if hack_char
 
       # Handle comments after a property name but before the colon.
-      if comment = scanner.scan(Sass::SCSS::RX::COMMENT)
+      if (comment = scanner.scan(Sass::SCSS::RX::COMMENT))
         res << comment
         offset += comment.length
       end
 
       name = line.text[0...scanner.pos]
-      if scanned = scanner.scan(/\s*:(?:\s+|$)/) # 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
@@ -686,9 +695,8 @@ WARNING
       else
         res.pop if comment
 
-        if trailing = (scanner.scan(/\s*#{Sass::SCSS::RX::COMMENT}/) ||
-                       scanner.scan(/\s*#{Sass::SCSS::RX::SINGLE_LINE_COMMENT}/))
-          offset += trailing.length # skip over comment for rule processing
+        if (trailing = (scanner.scan(/\s*#{Sass::SCSS::RX::COMMENT}/) ||
+                        scanner.scan(/\s*#{Sass::SCSS::RX::SINGLE_LINE_COMMENT}/)))
           trailing.strip!
         end
         interp_parsed = parse_interp(scanner.rest)
@@ -702,7 +710,10 @@ WARNING
       end
     end
 
+    # @comment
+    #   rubocop:disable ParameterLists
     def parse_property(name, parsed_name, value, prop, line, start_offset)
+      # rubocop:enable ParameterLists
       if value.strip.empty?
         expr = Sass::Script::Tree::Literal.new(Sass::Script::Value::String.new(""))
         end_offset = start_offset
@@ -755,7 +766,13 @@ WARNING
           str = str.gsub(/^#{line.comment_tab_str}/m, '')[2..-1] # get rid of // or /*
           format_comment_text(str, silent)
         end
-        type = if silent then :silent elsif loud then :loud else :normal end
+        type = if silent
+                 :silent
+               elsif loud
+                 :loud
+               else
+                 :normal
+               end
         Tree::CommentNode.new(value, type)
       else
         Tree::RuleNode.new(parse_interp(line.text), full_line_range(line))
@@ -766,6 +783,8 @@ WARNING
       :each, :while, :if, :else, :extend, :import, :media, :charset, :content,
       :at_root]
 
+    # @comment
+    #   rubocop:disable MethodLength
     def parse_directive(parent, line, root)
       directive, whitespace, value = line.text[1..-1].split(/(\s+)/, 2)
       offset = directive.size + whitespace.size + 1 if whitespace
@@ -781,7 +800,7 @@ WARNING
         return Tree::SupportsNode.new(directive, parser.parse_supports_condition)
       end
 
-      return Tree::DirectiveNode.new(
+      Tree::DirectiveNode.new(
         value.nil? ? ["@#{directive}"] : ["@#{directive} "] + parse_interp(value, offset))
     end
 
@@ -817,6 +836,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
@@ -835,7 +856,7 @@ WARNING
     end
 
     def parse_charset_directive(parent, line, root, value, offset)
-      name = value && value[/\A(["'])(.*)\1\Z/, 2] #"
+      name = value && value[/\A(["'])(.*)\1\Z/, 2] # "
       raise SyntaxError.new("Invalid charset directive '@charset': expected string.") unless name
       raise SyntaxError.new("Illegal nesting: Nothing may be nested beneath charset directives.",
         :line => @line + 1) unless line.children.empty?
@@ -861,10 +882,6 @@ WARNING
       return at_root_node unless value
 
       parsed = parse_interp(value, offset)
-      selector_range = Sass::Source::Range.new(
-        Sass::Source::Position.new(@line, to_parser_offset(offset)),
-        Sass::Source::Position.new(@line, to_parser_offset(line.offset) + line.text.length),
-        @options[:filename], @options[:importer])
       rule_node = Tree::RuleNode.new(parsed, full_line_range(line))
 
       # The caller expects to automatically add children to the returned node
@@ -878,7 +895,8 @@ WARNING
     end
 
     def parse_for_directive(parent, line, root, value, offset)
-      var, from_expr, to_name, to_expr = value.scan(/^([^\s]+)\s+from\s+(.+)\s+(to|through)\s+(.+)$/).first
+      var, from_expr, to_name, to_expr =
+        value.scan(/^([^\s]+)\s+from\s+(.+)\s+(to|through)\s+(.+)$/).first
 
       if var.nil? # scan failed, try to figure out why for error message
         if value !~ /^[^\s]+/
@@ -945,8 +963,9 @@ WARNING
       values = []
 
       loop do
-        unless node = parse_import_arg(scanner, offset + scanner.pos)
-          raise SyntaxError.new("Invalid @import: expected file to import, was #{scanner.rest.inspect}",
+        unless (node = parse_import_arg(scanner, offset + scanner.pos))
+          raise SyntaxError.new(
+            "Invalid @import: expected file to import, was #{scanner.rest.inspect}",
             :line => @line)
         end
         values << node
@@ -958,9 +977,11 @@ WARNING
           :line => @line)
       end
 
-      return values
+      values
     end
 
+    # @comment
+    #   rubocop:disable MethodLength
     def parse_import_arg(scanner, offset)
       return if scanner.eos?
 
@@ -971,7 +992,7 @@ WARNING
         media_parser = Sass::SCSS::Parser.new(scanner,
           @options[:filename], @options[:importer],
           @line, str.source_range.end_pos.offset)
-        if media = media_parser.parse_media_query_list
+        if (media = media_parser.parse_media_query_list)
           end_pos = Sass::Source::Position.new(@line, media_parser.offset + 1)
           node = Tree::CssImportNode.new(str, media.to_a)
         else
@@ -985,7 +1006,7 @@ WARNING
         return node
       end
 
-      unless str = scanner.scan(Sass::SCSS::RX::STRING)
+      unless (str = scanner.scan(Sass::SCSS::RX::STRING))
         scanned = scanner.scan(/[^,;]+/)
         node = Tree::ImportNode.new(scanned)
         start_parser_offset = to_parser_offset(offset)
@@ -1010,7 +1031,7 @@ WARNING
           Sass::Source::Position.new(@line, to_parser_offset(start_offset)),
           Sass::Source::Position.new(@line, media_parser.offset),
           @options[:filename], @options[:importer])
-      elsif val =~ /^(https?:)?\/\//
+      elsif val =~ %r{^(https?:)?//}
         node = Tree::CssImportNode.new("url(#{val})")
         node.source_range = Sass::Source::Range.new(
           Sass::Source::Position.new(@line, to_parser_offset(start_offset)),
@@ -1025,6 +1046,8 @@ WARNING
       end
       node
     end
+    # @comment
+    #   rubocop:enable MethodLength
 
     def parse_mixin_directive(parent, line, root, value, offset)
       parse_mixin_definition(line)
@@ -1044,7 +1067,10 @@ WARNING
     CONTENT_RE = /^@content\s*(.+)?$/
     def parse_content_directive(parent, line, root, value, offset)
       trailing = line.text.scan(CONTENT_RE).first.first
-      raise SyntaxError.new("Invalid content directive. Trailing characters found: \"#{trailing}\".") unless trailing.nil?
+      unless trailing.nil?
+        raise SyntaxError.new(
+          "Invalid content directive. Trailing characters found: \"#{trailing}\".")
+      end
       raise SyntaxError.new("Illegal nesting: Nothing may be nested beneath @content directives.",
         :line => line.index + 1) unless line.children.empty?
       Tree::ContentNode.new
@@ -1092,7 +1118,7 @@ WARNING
       end
 
       return silent ? "//" : "/* */" if content.empty?
-      content.last.gsub!(%r{ ?\*/ *$}, '')
+      content.last.gsub!(/ ?\*\/ *$/, '')
       content.map! {|l| l.gsub!(/^\*( ?)/, '\1') || (l.empty? ? "" : " ") + l}
       content.first.gsub!(/^ /, '') unless removed_first
       if silent
@@ -1128,7 +1154,7 @@ WARNING
       rest = Sass::Shared.handle_interpolation text do |scan|
         escapes = scan[2].size
         res << scan.matched[0...-2 - escapes]
-        if escapes % 2 == 1
+        if escapes.odd?
           res << "\\" * (escapes - 1) << '#{'
         else
           res << "\\" * [0, escapes - 1].max