sass 3.2.19 → 3.3.0.alpha.1

data/CONTRIBUTING

@@ -1,3 +1,3 @@
 Contributions are welcomed. Please see the following sites for guidelines:
 
-  http://sass-lang.com/community#Contribute
+  http://sass-lang.com/development.html#contributing

data/MIT-LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2006-2013 Hampton Catlin, Nathan Weizenbaum, and Chris Eppstein
+Copyright (c) 2006-2009 Hampton Catlin, Nathan Weizenbaum, and Chris Eppstein
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the
@@ -17,4 +17,4 @@ MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
 NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
 LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
 OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/README.md

@@ -1,4 +1,4 @@
-# Sass [![Gem Version](https://badge.fury.io/rb/sass.png)](http://badge.fury.io/rb/sass)
+# Sass
 
 **Sass makes CSS fun again**. Sass is an extension of CSS3,
 adding nested rules, variables, mixins, selector inheritance, and more.
@@ -56,8 +56,8 @@ to `config.ru`.
 Then any Sass files in `public/stylesheets/sass`
 will be compiled into CSS files in `public/stylesheets` on every request.
 
-To use Sass programmatically,
-check out the [YARD documentation](http://sass-lang.com/documentation/file.SASS_REFERENCE.html#using_sass).
+To use Sass programatically,
+check out the [YARD documentation](http://sass-lang.com/docs/yardoc/).
 
 ## Formatting
 
@@ -71,10 +71,10 @@ and get small stylesheets up and running quickly,
 particularly with the help of
 [the Compass style library](http://compass-style.org).
 
-[vars]:    http://sass-lang.com/documentation/file.SASS_REFERENCE.html#variables_
-[nested]:  http://sass-lang.com/documentation/file.SASS_REFERENCE.html#nested_rules
-[mixins]:  http://sass-lang.com/documentation/file.SASS_REFERENCE.html#mixins
-[imports]: http://sass-lang.com/documentation/file.SASS_REFERENCE.html#import
+[vars]:    http://beta.sass-lang.com/docs/yardoc/file.SASS_REFERENCE.html#variables_
+[nested]:  http://beta.sass-lang.com/docs/yardoc/file.SASS_REFERENCE.html#nested_rules_
+[mixins]:  http://beta.sass-lang.com/docs/yardoc/file.SASS_REFERENCE.html#mixins
+[imports]: http://beta.sass-lang.com/docs/yardoc/file.SASS_REFERENCE.html#import
 
 Sass has two syntaxes.
 The one presented here, known as "SCSS" (for "Sassy CSS"),
@@ -83,7 +83,7 @@ The other (older) syntax, known as the indented syntax or just "Sass",
 is whitespace-sensitive and indentation-based.
 For more information, see the [reference documentation][syntax].
 
-[syntax]: http://sass-lang.com/documentation/file.SASS_REFERENCE.html#syntax
+[syntax]: http://beta.sass-lang.com/docs/yardoc/file.SASS_REFERENCE.html#syntax
 
 To run the following examples and see the CSS they produce,
 put them in a file called `test.scss` and run `sass test.scss`.
@@ -152,7 +152,7 @@ You can even give them arguments.
     }
 
 A comprehensive list of features is available
-in the [Sass reference](http://sass-lang.com/documentation/file.SASS_REFERENCE.html).
+in the [Sass reference](http://beta.sass-lang.com/docs/yardoc/file.SASS_REFERENCE.html).
 
 ## Executables
 
@@ -173,11 +173,10 @@ See `sass-convert --help` for further information and options.
 
 ## Authors
 
-Sass was envisioned by [Hampton Catlin](http://www.hamptoncatlin.com)
-(@hcatlin). However, Hampton doesn't even know his way around the code anymore
-and now occasionally consults on the language issues. Hampton lives in San
-Francisco, California and works as VP of Technology
-at [Moovweb](http://www.moovweb.com/).
+Sass was envisioned by [Hampton Catlin](http://hamptoncatlin.com) (hcatlin).
+However, Hampton doesn't even know his way around the code anymore and now
+occasionally consults on the language issues. Hampton lives in Cambridge, UK and
+is the owner of [Catlin Software](http://www.catlinsoftware.com/).
 
 [Nathan Weizenbaum](http://nex-3.com) is the primary developer and architect of
 Sass. His hard work has kept the project alive by endlessly answering forum

data/REVISION

@@ -1 +1 @@
-(release)
+ec80ec8b58b347b4890c8c47a4cb2a6fcfd77406

data/Rakefile

@@ -1,5 +1,3 @@
-require 'rubygems/package'
-
 # ----- Utility Functions -----
 
 def scope(path)
@@ -30,7 +28,7 @@ task :package => [:revision_file, :date_file, :submodules, :permissions] do
   version = get_version
   File.open(scope('VERSION'), 'w') {|f| f.puts(version)}
   load scope('sass.gemspec')
-  Gem::Package.build(SASS_GEMSPEC)
+  Gem::Builder.new(SASS_GEMSPEC).build
   sh %{git checkout VERSION}
 
   pkg = "#{SASS_GEMSPEC.name}-#{SASS_GEMSPEC.version}"
@@ -87,8 +85,8 @@ desc "Release a new Sass package to Rubyforge."
 task :release => [:check_release, :package] do
   name = File.read(scope("VERSION_NAME")).strip
   version = File.read(scope("VERSION")).strip
-  # sh %{rubyforge add_release sass sass "#{name} (v#{version})" pkg/sass-#{version}.gem}
-  # sh %{rubyforge add_file    sass sass "#{name} (v#{version})" pkg/sass-#{version}.tar.gz}
+  sh %{rubyforge add_release sass sass "#{name} (v#{version})" pkg/sass-#{version}.gem}
+  sh %{rubyforge add_file    sass sass "#{name} (v#{version})" pkg/sass-#{version}.tar.gz}
   sh %{gem push pkg/sass-#{version}.gem}
 end
 
@@ -142,7 +140,7 @@ task :release_edge do
     sh %{git reset --hard origin/master}
     sh %{rake package}
     version = get_version
-    # sh %{rubyforge add_release sass sass "Bleeding Edge (v#{version})" pkg/sass-#{version}.gem}
+    sh %{rubyforge add_release sass sass "Bleeding Edge (v#{version})" pkg/sass-#{version}.gem}
     sh %{gem push pkg/sass-#{version}.gem}
   end
 end

data/VERSION

@@ -1 +1 @@
-3.2.19
+3.3.0.alpha.1

data/VERSION_DATE

@@ -1 +1 @@
-05 April 2014 19:55:56 UTC
+11 August 2012 01:22:07 GMT

data/VERSION_NAME

@@ -1 +1 @@
-Media Mark
+Bleeding Edge

data/bin/sass

@@ -1,12 +1,7 @@
 #!/usr/bin/env ruby
 # The command line Sass parser.
 
-THIS_FILE = File.symlink?(__FILE__) ? File.readlink(__FILE__) : __FILE__
-begin
-  require File.dirname(THIS_FILE) + '/../lib/sass'
-rescue LoadError
-  require 'sass'
-end
+require File.dirname(__FILE__) + '/../lib/sass'
 require 'sass/exec'
 
 opts = Sass::Exec::Sass.new(ARGV)

data/bin/sass-convert

@@ -1,11 +1,6 @@
 #!/usr/bin/env ruby
 
-THIS_FILE = File.symlink?(__FILE__) ? File.readlink(__FILE__) : __FILE__
-begin
-  require File.dirname(THIS_FILE) + '/../lib/sass'
-rescue LoadError
-  require 'sass'
-end
+require File.dirname(__FILE__) + '/../lib/sass'
 require 'sass/exec'
 
 opts = Sass::Exec::SassConvert.new(ARGV)

data/bin/scss

@@ -1,12 +1,7 @@
 #!/usr/bin/env ruby
 # The command line Sass parser.
 
-THIS_FILE = File.symlink?(__FILE__) ? File.readlink(__FILE__) : __FILE__
-begin
-  require File.dirname(THIS_FILE) + '/../lib/sass'
-rescue LoadError
-  require 'sass'
-end
+require File.dirname(__FILE__) + '/../lib/sass'
 require 'sass/exec'
 
 opts = Sass::Exec::Scss.new(ARGV)

data/lib/sass/cache_stores/base.rb

@@ -51,7 +51,6 @@ module Sass
         _store(key, Sass::VERSION, sha, Marshal.dump(root))
       rescue TypeError, LoadError => e
         Sass::Util.sass_warn "Warning. Error encountered while saving cache #{path_to(key)}: #{e}"
-        nil
       end
 
       # Retrieve a {Sass::Tree::RootNode}.
@@ -64,7 +63,6 @@ module Sass
         Marshal.load(contents) if contents
       rescue EOFError, TypeError, ArgumentError, LoadError => e
         Sass::Util.sass_warn "Warning. Error encountered while reading cache #{path_to(key)}: #{e}"
-        nil
       end
 
       # Return the key for the sass file.

data/lib/sass/cache_stores/chain.rb

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

data/lib/sass/cache_stores/filesystem.rb

@@ -17,16 +17,13 @@ module Sass
       # @see Base#\_retrieve
       def _retrieve(key, version, sha)
         return unless File.readable?(path_to(key))
+        contents = nil
         File.open(path_to(key), "rb") do |f|
           if f.readline("\n").strip == version && f.readline("\n").strip == sha
             return f.read
           end
         end
-        begin
-          File.unlink path_to(key)
-        rescue Errno::ENOENT
-          # Already deleted. Race condition?
-        end
+        File.unlink path_to(key)
         nil
       rescue EOFError, TypeError, ArgumentError => e
         Sass::Util.sass_warn "Warning. Error encountered while reading cache #{path_to(key)}: #{e}"
@@ -40,7 +37,7 @@ module Sass
         # 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))
-        Sass::Util.atomic_create_and_write_file(compiled_filename, 0600) do |f|
+        File.open(compiled_filename, "wb") do |f|
           f.puts(version)
           f.puts(sha)
           f.write(contents)

data/lib/sass/callbacks.rb

@@ -48,7 +48,7 @@ module Sass
     # @param name [Symbol] The name of the callback
     # @return [void]
     def define_callback(name)
-      class_eval <<RUBY, __FILE__, __LINE__ + 1
+      class_eval <<RUBY
 def on_#{name}(&block)
   @_sass_callbacks ||= {}
   (@_sass_callbacks[#{name.inspect}] ||= []) << block

data/lib/sass/css.rb

@@ -293,7 +293,7 @@ module Sass
     def bubble_subject(root)
       root.children.each do |child|
         bubble_subject(child) if child.is_a?(Tree::RuleNode) || child.is_a?(Tree::DirectiveNode)
-        next unless child.is_a?(Tree::RuleNode) && !child.children.empty?
+        next unless child.is_a?(Tree::RuleNode)
         next unless child.children.all? do |c|
           next unless c.is_a?(Tree::RuleNode)
           first_simple_sel(c).is_a?(Sass::Selector::Parent) && first_sseq(c).subject?

data/lib/sass/engine.rb

@@ -293,7 +293,7 @@ module Sass
     # @return [[Sass::Engine]] The dependency documents.
     def dependencies
       _dependencies(Set.new, engines = Set.new)
-      Sass::Util.array_minus(engines, [self])
+      engines - [self]
     end
 
     # Helper for \{#dependencies}.
@@ -379,7 +379,7 @@ module Sass
       comment_tab_str = nil
       first = true
       lines = []
-      string.gsub(/\r\n|\r|\n/, "\n").scan(/^[^\n]*?$/).each_with_index do |line, index|
+      string.gsub(/\r|\n|\r\n|\r\n/, "\n").scan(/^[^\n]*?$/).each_with_index do |line, index|
         index += (@options[:line] || 1)
         if line.strip.empty?
           lines.last.text << "\n" if lines.last && lines.last.comment?
@@ -637,6 +637,7 @@ WARNING
           value = [line.text]
         else
           value = self.class.parse_interp(line.text, line.index, line.offset, :filename => @filename)
+          value[0].slice!(2) if loud # get rid of the "!"
         end
         value = with_extracted_values(value) do |str|
           str = str.gsub(/^#{line.comment_tab_str}/m, '')[2..-1] # get rid of // or /*
@@ -712,15 +713,7 @@ WARNING
       when 'media'
         parser = Sass::SCSS::Parser.new(value, @options[:filename], @line)
         Tree::MediaNode.new(parser.parse_media_query_list.to_a)
-      when nil
-        raise SyntaxError.new("Invalid directive: '@'.")
       else
-        unprefixed_directive = directive.gsub(/^-[a-z0-9]+-/i, '')
-        if unprefixed_directive == 'supports'
-          parser = Sass::SCSS::Parser.new(value, @options[:filename], @line)
-          return Tree::SupportsNode.new(directive, parser.parse_supports_condition)
-        end
-
         Tree::DirectiveNode.new(
           value.nil? ? ["@#{directive}"] : ["@#{directive} "] + parse_interp(value, offset))
       end
@@ -827,7 +820,7 @@ WARNING
         media_parser = Sass::SCSS::Parser.new(scanner, @options[:filename], @line)
         media = media_parser.parse_media_query_list
         Tree::CssImportNode.new(str || uri, media.to_a)
-      elsif val =~ /^(https?:)?\/\//
+      elsif val =~ /^http:\/\//
         Tree::CssImportNode.new("url(#{val})")
       else
         Tree::ImportNode.new(val)

data/lib/sass/error.rb

@@ -165,9 +165,9 @@ module Sass
 
         <<END
 /*
-#{header.gsub("*/", "*\\/")}
+#{header}
 
-Backtrace:\n#{e.backtrace.join("\n").gsub("*/", "*\\/")}
+Backtrace:\n#{e.backtrace.join("\n")}
 */
 body:before {
   white-space: pre;

data/lib/sass/exec.rb

@@ -108,7 +108,7 @@ module Sass
             @options[:filename] = filename
             open_file(filename) || $stdin
           end
-        output ||= args.shift || $stdout
+        output ||= open_file(args.shift, 'w') || $stdout
 
         @options[:input], @options[:output] = input, output
       end
@@ -125,7 +125,6 @@ module Sass
       def puts_action(name, color, arg)
         return if @options[:for_engine][:quiet]
         printf color(color, "%11s %s\n"), name, arg
-        STDOUT.flush
       end
 
       # Same as \{Kernel.puts}, but doesn't print anything if the `--quiet` option is set.
@@ -155,23 +154,12 @@ module Sass
         return "\e[#{COLORS[color]}m#{str}\e[0m"
       end
 
-      def write_output(text, destination)
-        if destination.is_a?(String)
-          open_file(destination, 'w') {|file| file.write(text)}
-        else
-          destination.write(text)
-        end
-      end
-
       private
 
       def open_file(filename, flag = 'r')
         return if filename.nil?
         flag = 'wb' if @options[:unix_newlines] && flag == 'w'
-        file = File.open(filename, flag)
-        return file unless block_given?
-        yield file
-        file.close
+        File.open(filename, flag)
       end
 
       def handle_load_error(err)
@@ -241,10 +229,6 @@ END
                                    'Only meaningful for --watch and --update.') do
           @options[:stop_on_error] = true
         end
-        opts.on('--poll', 'Check for file changes manually, rather than relying on the OS.',
-                          'Only meaningful for --watch.') do
-          @options[:poll] = true
-        end
         opts.on('-f', '--force', 'Recompile all Sass files, even if the CSS file is newer.',
                                  'Only meaningful for --update.') do
           @options[:force] = true
@@ -293,16 +277,8 @@ END
           @options[:for_engine][:cache] = false
         end
 
-        encoding_desc = if ::Sass::Util.ruby1_8?
-          'Does not work in ruby 1.8.'
-        else
-          'Specify the default encoding for Sass files.'
-        end
-        opts.on('-E encoding', encoding_desc) do |encoding|
-          if ::Sass::Util.ruby1_8?
-            $stderr.puts "Specifying the encoding is not supported in ruby 1.8."
-            exit 1
-          else
+        unless ::Sass::Util.ruby1_8?
+          opts.on('-E encoding', 'Specify the default encoding for Sass files.') do |encoding|
             Encoding.default_external = encoding
           end
         end
@@ -326,7 +302,6 @@ END
         return watch_or_update if @options[:watch] || @options[:update]
         super
         @options[:for_engine][:filename] = @options[:filename]
-        @options[:for_engine][:css_filename] = @options[:output] if @options[:output].is_a?(String)
 
         begin
           input = @options[:input]
@@ -346,7 +321,8 @@ END
 
           input.close() if input.is_a?(File)
 
-          write_output(engine.render, output)
+          output.write(engine.render)
+          output.close() if output.is_a? File
         rescue ::Sass::SyntaxError => e
           raise e if @options[:trace]
           raise e.sass_backtrace_str("standard input")
@@ -381,7 +357,6 @@ END
         require 'sass/plugin'
         ::Sass::Plugin.options.merge! @options[:for_engine]
         ::Sass::Plugin.options[:unix_newlines] = @options[:unix_newlines]
-        ::Sass::Plugin.options[:poll] = @options[:poll]
 
         if @options[:force]
           raise "The --force flag may only be used with --update." unless @options[:update]
@@ -426,13 +401,6 @@ MSG
         ::Sass::Plugin.on_creating_directory {|dirname| puts_action :directory, :green, dirname}
         ::Sass::Plugin.on_deleting_css {|filename| puts_action :delete, :yellow, filename}
         ::Sass::Plugin.on_compilation_error do |error, _, _|
-          if error.is_a?(SystemCallError) && !@options[:stop_on_error]
-            had_error = true
-            puts_action :error, :red, error.message
-            STDOUT.flush
-            next
-          end
-
           raise error unless error.is_a?(::Sass::SyntaxError) && !@options[:stop_on_error]
           had_error = true
           puts_action :error, :red, "#{error.sass_filename} (Line #{error.sass_line}: #{error.message})"
@@ -620,6 +588,7 @@ END
         end
         @options[:output] ||= @options[:input]
 
+        from = @options[:from]
         if @options[:to] == @options[:from] && !@options[:in_place]
           fmt = @options[:from]
           raise "Error: converting from #{fmt} to #{fmt} without --in-place"
@@ -650,6 +619,7 @@ END
           end
 
           input = open_file(f)
+          output = @options[:in_place] ? input : open_file(output, "w")
           process_file(input, output)
         end
       end
@@ -693,8 +663,8 @@ END
             end
           end
 
-        output = input.path if @options[:in_place]
-        write_output(out, output)
+        output = File.open(input.path, 'w') if @options[:in_place]
+        output.write(out)
       rescue ::Sass::SyntaxError => e
         raise e if @options[:trace]
         file = " of #{e.sass_filename}" if e.sass_filename

data/lib/sass/importers/filesystem.rb

@@ -1,5 +1,4 @@
 require 'pathname'
-require 'set'
 
 module Sass
   module Importers
@@ -15,7 +14,6 @@ module Sass
       #   This importer will import files relative to this path.
       def initialize(root)
         @root = File.expand_path(root)
-        @same_name_warnings = Set.new
       end
 
       # @see Base#find_relative
@@ -30,7 +28,7 @@ module Sass
 
       # @see Base#mtime
       def mtime(name, options)
-        file, _ = Sass::Util.destructure(find_real_file(@root, name, options))
+        file, s = find_real_file(@root, name)
         File.mtime(file) if file
       rescue Errno::ENOENT
         nil
@@ -91,14 +89,8 @@ module Sass
         sorted_exts = extensions.sort
         syntax = extensions[extname]
 
-        if syntax
-          ret = [["#{dirname}/{_,}#{basename}.#{extensions.invert[syntax]}", syntax]]
-        else
-          ret = sorted_exts.map {|ext, syn| ["#{dirname}/{_,}#{basename}.#{ext}", syn]}
-        end
-
-        # JRuby chokes when trying to import files from JARs when the path starts with './'.
-        ret.map {|f, s| [f.sub(%r{^\./}, ''), s]}
+        return [["#{dirname}/{_,}#{basename}.#{extensions.invert[syntax]}", syntax]] if syntax
+        sorted_exts.map {|ext, syn| ["#{dirname}/{_,}#{basename}.#{ext}", syn]}
       end
 
       def escape_glob_characters(name)
@@ -114,48 +106,15 @@ module Sass
       # @param dir [String] The directory relative to which to search.
       # @param name [String] The filename to search for.
       # @return [(String, Symbol)] A filename-syntax pair.
-      def find_real_file(dir, name, options)
-        # on windows 'dir' can be in native File::ALT_SEPARATOR form
-        dir = dir.gsub(File::ALT_SEPARATOR, File::SEPARATOR) unless File::ALT_SEPARATOR.nil?
-
-        found = possible_files(remove_root(name)).map do |f, s|
-          path = (dir == "." || Pathname.new(f).absolute?) ? f : "#{escape_glob_characters(dir)}/#{f}"
-          Dir[path].map do |full_path|
-            full_path.gsub!(REDUNDANT_DIRECTORY, File::SEPARATOR)
-            [Pathname.new(full_path).cleanpath.to_s, s]
-          end
-        end
-        found = Sass::Util.flatten(found, 1)
-        return if found.empty?
-
-        if found.size > 1 && !@same_name_warnings.include?(found.first.first)
-          found.each {|(f, _)| @same_name_warnings << f}
-          relative_to = Pathname.new(dir)
-          if options[:_line]
-            # If _line exists, we're here due to an actual import in an
-            # import_node and we want to print a warning for a user writing an
-            # ambiguous import.
-            candidates = found.map {|(f, _)| "    " + Pathname.new(f).relative_path_from(relative_to).to_s}.join("\n")
-            Sass::Util.sass_warn <<WARNING
-WARNING: On line #{options[:_line]}#{" of #{options[:filename]}" if options[:filename]}:
-  It's not clear which file to import for '@import "#{name}"'.
-  Candidates:
-#{candidates}
-  For now I'll choose #{File.basename found.first.first}.
-  This will be an error in future versions of Sass.
-WARNING
-          else
-            # Otherwise, we're here via StalenessChecker, and we want to print a
-            # warning for a user running `sass --watch` with two ambiguous files.
-            candidates = found.map {|(f, _)| "    " + File.basename(f)}.join("\n")
-            Sass::Util.sass_warn <<WARNING
-WARNING: In #{File.dirname(name)}:
-  There are multiple files that match the name "#{File.basename(name)}":
-#{candidates}
-WARNING
+      def find_real_file(dir, name)
+        for (f,s) in possible_files(remove_root(name))
+          path = (dir == "." || Pathname.new(f).absolute?) ? f : "#{dir}/#{f}"
+          if full_path = Dir[path].first
+            full_path.gsub!(REDUNDANT_DIRECTORY,File::SEPARATOR)
+            return full_path, s
           end
         end
-        found.first
+        nil
       end
 
       # Splits a filename into three parts, a directory part, a basename, and an extension
@@ -173,7 +132,7 @@ WARNING
       private
 
       def _find(dir, name, options)
-        full_filename, syntax = Sass::Util.destructure(find_real_file(dir, name, options))
+        full_filename, syntax = find_real_file(dir, name)
         return unless full_filename && File.readable?(full_filename)
 
         options[:syntax] = syntax
@@ -181,6 +140,10 @@ WARNING
         options[:importer] = self
         Sass::Engine.new(File.read(full_filename), options)
       end
+
+      def join(base, path)
+        Pathname.new(base).join(path).to_s
+      end
     end
   end
 end