sass 3.3.0 → 3.4.25

data/lib/sass/version.rb

@@ -8,7 +8,7 @@ module Sass
   # if it was installed from Git.
   module Version
     # Returns a hash representing the version of Sass.
-    # The `:major`, `:minor`, and `:teeny` keys have their respective numbers as Fixnums.
+    # The `:major`, `:minor`, and `:teeny` keys have their respective numbers as Integers.
     # The `:name` key has the name of the version.
     # The `:string` key contains a human-readable string representation of the version.
     # The `:number` key is the major, minor, and teeny keys separated by periods.
@@ -41,7 +41,7 @@ module Sass
     #       :prerelease_number => 1
     #     }
     #
-    # @return [{Symbol => String/Fixnum}] The version hash
+    # @return [{Symbol => String/Integer}] The version hash
     # @comment
     #   rubocop:disable ClassVars
     def version
@@ -85,20 +85,20 @@ module Sass
     private
 
     def revision_number
-      if File.exists?(Sass::Util.scope('REVISION'))
+      if File.exist?(Sass::Util.scope('REVISION'))
         rev = File.read(Sass::Util.scope('REVISION')).strip
         return rev unless rev =~ /^([a-f0-9]+|\(.*\))$/ || rev == '(unknown)'
       end
 
-      return unless File.exists?(Sass::Util.scope('.git/HEAD'))
+      return unless File.exist?(Sass::Util.scope('.git/HEAD'))
       rev = File.read(Sass::Util.scope('.git/HEAD')).strip
       return rev unless rev =~ /^ref: (.*)$/
 
       ref_name = $1
       ref_file = Sass::Util.scope(".git/#{ref_name}")
       info_file = Sass::Util.scope(".git/info/refs")
-      return File.read(ref_file).strip if File.exists?(ref_file)
-      return unless File.exists?(info_file)
+      return File.read(ref_file).strip if File.exist?(ref_file)
+      return unless File.exist?(info_file)
       File.open(info_file) do |f|
         f.each do |l|
           sha, ref = l.strip.split("\t", 2)
@@ -110,7 +110,7 @@ module Sass
     end
 
     def version_date
-      return unless File.exists?(Sass::Util.scope('VERSION_DATE'))
+      return unless File.exist?(Sass::Util.scope('VERSION_DATE'))
       DateTime.parse(File.read(Sass::Util.scope('VERSION_DATE')).strip)
     end
   end

data/lib/sass.rb

@@ -1,11 +1,6 @@
 dir = File.dirname(__FILE__)
 $LOAD_PATH.unshift dir unless $LOAD_PATH.include?(dir)
 
-# This is necessary to set so that the Haml code that tries to load Sass
-# knows that Sass is indeed loading,
-# even if there's some crazy autoload stuff going on.
-SASS_BEGUN_TO_LOAD = true unless defined?(SASS_BEGUN_TO_LOAD)
-
 require 'sass/version'
 
 # The module that contains everything Sass-related:
@@ -52,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#sass_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
@@ -74,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#sass_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 = {})
@@ -82,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#sass_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 : {}
@@ -105,3 +100,10 @@ require 'sass/engine'
 require 'sass/plugin' if defined?(Merb::Plugins)
 require 'sass/railtie'
 require 'sass/features'
+
+if Sass::Util.ruby1?
+  Sass::Util.sass_warn(
+    "DEPRECATION WARNING:\n" +
+    "Sass 3.5 will no longer support Ruby #{RUBY_VERSION}.\n" +
+    "Please upgrade to Ruby 2.0.0 or greater as soon as possible.\n")
+end

data/test/sass/cache_test.rb

@@ -3,7 +3,7 @@ require File.dirname(__FILE__) + '/../test_helper'
 require File.dirname(__FILE__) + '/test_helper'
 require 'sass/engine'
 
-class CacheTest < Test::Unit::TestCase
+class CacheTest < MiniTest::Test
   @@cache_dir = "tmp/file_cache"
 
   def setup
@@ -18,42 +18,42 @@ class CacheTest < Test::Unit::TestCase
   def test_file_cache_writes_a_file
     file_store = Sass::CacheStores::Filesystem.new(@@cache_dir)
     file_store.store("asdf/foo.scssc", "fakesha1", root_node)
-    assert File.exists?("#{@@cache_dir}/asdf/foo.scssc")
+    assert File.exist?("#{@@cache_dir}/asdf/foo.scssc")
   end
 
   def test_file_cache_reads_a_file
     file_store = Sass::CacheStores::Filesystem.new(@@cache_dir)
-    assert !File.exists?("#{@@cache_dir}/asdf/foo.scssc")
+    assert !File.exist?("#{@@cache_dir}/asdf/foo.scssc")
     file_store.store("asdf/foo.scssc", "fakesha1", root_node)
-    assert File.exists?("#{@@cache_dir}/asdf/foo.scssc")
+    assert File.exist?("#{@@cache_dir}/asdf/foo.scssc")
     assert_kind_of Sass::Tree::RootNode, file_store.retrieve("asdf/foo.scssc", "fakesha1")
   end
 
   def test_file_cache_miss_returns_nil
     file_store = Sass::CacheStores::Filesystem.new(@@cache_dir)
-    assert !File.exists?("#{@@cache_dir}/asdf/foo.scssc")
+    assert !File.exist?("#{@@cache_dir}/asdf/foo.scssc")
     assert_nil file_store.retrieve("asdf/foo.scssc", "fakesha1")
   end
 
   def test_sha_change_invalidates_cache_and_cleans_up
     file_store = Sass::CacheStores::Filesystem.new(@@cache_dir)
-    assert !File.exists?("#{@@cache_dir}/asdf/foo.scssc")
+    assert !File.exist?("#{@@cache_dir}/asdf/foo.scssc")
     file_store.store("asdf/foo.scssc", "fakesha1", root_node)
-    assert File.exists?("#{@@cache_dir}/asdf/foo.scssc")
+    assert File.exist?("#{@@cache_dir}/asdf/foo.scssc")
     assert_nil file_store.retrieve("asdf/foo.scssc", "differentsha1")
-    assert !File.exists?("#{@@cache_dir}/asdf/foo.scssc")
+    assert !File.exist?("#{@@cache_dir}/asdf/foo.scssc")
   end
 
   def test_version_change_invalidates_cache_and_cleans_up
     file_store = Sass::CacheStores::Filesystem.new(@@cache_dir)
-    assert !File.exists?("#{@@cache_dir}/asdf/foo.scssc")
+    assert !File.exist?("#{@@cache_dir}/asdf/foo.scssc")
     file_store.store("asdf/foo.scssc", "fakesha1", root_node)
-    assert File.exists?("#{@@cache_dir}/asdf/foo.scssc")
+    assert File.exist?("#{@@cache_dir}/asdf/foo.scssc")
     real_version = Sass::VERSION
     begin
       Sass::VERSION.replace("a different version")
       assert_nil file_store.retrieve("asdf/foo.scssc", "fakesha1")
-      assert !File.exists?("#{@@cache_dir}/asdf/foo.scssc")
+      assert !File.exist?("#{@@cache_dir}/asdf/foo.scssc")
     ensure
       Sass::VERSION.replace(real_version)
     end
@@ -66,17 +66,52 @@ class CacheTest < Test::Unit::TestCase
     assert_equal an_object, cache.retrieve("an_object", "")
   end
 
-  class Unmarshalable
-    def _dump(_)
-      raise 'Unmarshalable'
-    end
+  def test_cache_node_with_unmarshalable_option
+    engine_with_unmarshalable_options("foo {a: b + c}").to_tree
   end
 
-  def test_cache_node_with_unmarshalable_option
-    engine = Sass::Engine.new("foo {a: b + c}",
-      :syntax => :scss, :object => Unmarshalable.new, :filename => 'file.scss',
-      :importer => Sass::Importers::Filesystem.new(absolutize('templates')))
-    engine.to_tree
+  # Regression tests
+
+  def test_cache_mixin_def_splat_sass_node_with_unmarshalable_option
+    engine_with_unmarshalable_options(<<SASS, :syntax => :sass).to_tree
+=color($args...)
+  color: red
+SASS
+  end
+
+  def test_cache_mixin_def_splat_scss_node_with_unmarshalable_option
+    engine_with_unmarshalable_options(<<SCSS, :syntax => :scss).to_tree
+@mixin color($args...) {
+  color: red;
+}
+SCSS
+  end
+
+  def test_cache_function_splat_sass_node_with_unmarshalable_option
+    engine_with_unmarshalable_options(<<SASS, :syntax => :sass).to_tree
+@function color($args...)
+  @return red
+SASS
+  end
+
+  def test_cache_function_splat_scss_node_with_unmarshalable_option
+    engine_with_unmarshalable_options(<<SCSS, :syntax => :scss).to_tree
+@function color($args...) {
+  @return red;
+}
+SCSS
+  end
+
+  def test_cache_include_splat_sass_node_with_unmarshalable_option
+    engine_with_unmarshalable_options(<<SASS, :syntax => :sass).to_tree
+@include color($args..., $kwargs...)
+SASS
+  end
+
+  def test_cache_include_splat_scss_node_with_unmarshalable_option
+    engine_with_unmarshalable_options(<<SCSS, :syntax => :scss).to_tree
+@include color($args..., $kwargs...);
+SCSS
   end
 
   private
@@ -86,4 +121,11 @@ class CacheTest < Test::Unit::TestCase
       div { @include color(red); }
     SCSS
   end
+
+  def engine_with_unmarshalable_options(src, options={})
+    Sass::Engine.new(src, {
+      :syntax => :scss, :object => Class.new.new, :filename => 'file.scss',
+      :importer => Sass::Importers::Filesystem.new(absolutize('templates'))
+    }.merge(options))
+  end
 end

data/test/sass/callbacks_test.rb

@@ -26,7 +26,7 @@ module ClassLevelCallerBack
   end
 end
 
-class SassCallbacksTest < Test::Unit::TestCase
+class SassCallbacksTest < MiniTest::Test
   def test_simple_callback
     cb = CallerBack.new
     there = false

data/test/sass/compiler_test.rb

@@ -1,10 +1,10 @@
 #!/usr/bin/env ruby
-require 'test/unit'
+require 'minitest/autorun'
 require File.dirname(__FILE__) + '/../test_helper'
 require 'sass/plugin'
 require 'sass/plugin/compiler'
 
-class CompilerTest < Test::Unit::TestCase
+class CompilerTest < MiniTest::Test
   class FakeListener
     attr_accessor :options
     attr_accessor :directories
@@ -18,7 +18,7 @@ class CompilerTest < Test::Unit::TestCase
       @start_called = false
       reset_events!
     end
-    
+
     def fire_events!(*args)
       @on_filesystem_event.call(@modified, @added, @removed)
       reset_events!
@@ -47,7 +47,11 @@ class CompilerTest < Test::Unit::TestCase
 
     # used for Listen >= 2.0
     def start
-      @thread = Thread.new {@run_during_start.call(self) if @run_during_start}
+      parent = Thread.current
+      @thread = Thread.new do
+        @run_during_start.call(self) if @run_during_start
+        parent.raise Interrupt
+      end
     end
 
     def stop
@@ -82,9 +86,18 @@ class CompilerTest < Test::Unit::TestCase
 
     private
     def create_listener(*args, &on_filesystem_event)
-      @fake_listener = FakeListener.new(*args, &on_filesystem_event)
-      @fake_listener.on_start!(&run_during_start)
-      @fake_listener
+      if Sass::Util.listen_geq_2?
+        args.pop if args.last.is_a?(Hash)
+        args.map do |dir|
+          @fake_listener = FakeListener.new(*args, &on_filesystem_event)
+          @fake_listener.on_start!(&run_during_start)
+          @fake_listener
+        end
+      else
+        @fake_listener = FakeListener.new(*args, &on_filesystem_event)
+        @fake_listener.on_start!(&run_during_start)
+        @fake_listener
+      end
     end
   end
 
@@ -174,12 +187,12 @@ class CompilerTest < Test::Unit::TestCase
     directories = nil
     c = watcher do |listener|
       directories = listener.directories
-      listener.removed "/asdf/foobar/sass/foo.scss"
+      listener.removed File.expand_path("./foo.scss")
       listener.fire_events!
     end
-    c.watch([["/asdf/foobar/sass/foo.scss", "/asdf/foobar/css/foo.css", nil]])
-    assert directories.include?("/asdf/foobar/sass"), directories.inspect
-    assert_equal "/asdf/foobar/css/foo.css", c.deleted_css_files.first, "the corresponding css file was not deleted"
+    c.watch([[File.expand_path("./foo.scss"), File.expand_path("./foo.css"), nil]])
+    assert directories.include?(File.expand_path(".")), directories.inspect
+    assert_equal File.expand_path("./foo.css"), c.deleted_css_files.first, "the corresponding css file was not deleted"
     assert_equal [], c.update_stylesheets_called_with[1], "the sass file should not have been compiled"
   end