sass 3.1.21 → 3.2.0.alpha.3

data/lib/sass/version.rb

@@ -1,5 +1,3 @@
-require 'date'
-
 # This is necessary for loading Sass when Haml is required in Rails 3.
 # Once the split is complete, we can remove it.
 require File.dirname(__FILE__) + '/../sass'
@@ -18,7 +16,6 @@ module Sass
     # 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.
-    # The `:date` key, which is not guaranteed to be defined, is the [DateTime] at which this release was cut.
     # If Sass is checked out from Git, the `:rev` key will have the revision hash.
     # For example:
     #
@@ -26,7 +23,6 @@ module Sass
     #       :string => "2.1.0.9616393",
     #       :rev    => "9616393b8924ef36639c7e82aa88a51a24d16949",
     #       :number => "2.1.0",
-    #       :date   => DateTime.parse("Apr 30 13:52:01 2009 -0700"),
     #       :major  => 2, :minor => 1, :teeny => 0
     #     }
     #
@@ -40,7 +36,6 @@ module Sass
     #     {
     #       :string => "3.0.beta.1",
     #       :number => "3.0.beta.1",
-    #       :date   => DateTime.parse("Mar 31 00:38:04 2010 -0700"),
     #       :major => 3, :minor => 0, :teeny => -1,
     #       :prerelease => "beta",
     #       :prerelease_number => 1
@@ -60,10 +55,6 @@ module Sass
         :name => name
       }
 
-      if date = version_date
-        @@version[:date] = date
-      end
-
       if numbers[3].is_a?(String)
         @@version[:teeny] = -1
         @@version[:prerelease] = numbers[3]
@@ -110,11 +101,6 @@ module Sass
       end
       return nil
     end
-
-    def version_date
-      return unless File.exists?(scope('VERSION_DATE'))
-      return DateTime.parse(File.read(scope('VERSION_DATE')).strip)
-    end
   end
 
   extend Sass::Version

data/test/sass/cache_test.rb

@@ -1,6 +1,5 @@
 #!/usr/bin/env ruby
 require File.dirname(__FILE__) + '/../test_helper'
-require File.dirname(__FILE__) + '/test_helper'
 require 'sass/engine'
 
 class CacheTest < Test::Unit::TestCase
@@ -12,7 +11,6 @@ class CacheTest < Test::Unit::TestCase
 
   def teardown
     FileUtils.rm_rf @@cache_dir
-    clean_up_sassc
   end
 
   def test_file_cache_writes_a_file
@@ -66,19 +64,6 @@ class CacheTest < Test::Unit::TestCase
     assert_equal an_object, cache.retrieve("an_object", "")
   end
 
-  class Unmarshalable
-    def _dump(_)
-      raise 'Unmarshalable'
-    end
-  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
-  end
-
   private
   def root_node
     Sass::Engine.new(<<-SCSS, :syntax => :scss).to_tree

data/test/sass/conversion_test.rb

@@ -180,7 +180,7 @@ SCSS
   def test_multiline_properties
     assert_scss_to_sass <<SASS, <<SCSS
 foo bar
-  baz: bip bam boon
+  baz: bip   bam         boon
 SASS
 foo bar {
   baz:
@@ -191,7 +191,7 @@ SCSS
 
     assert_scss_to_scss <<OUT, <<IN
 foo bar {
-  baz: bip bam boon; }
+  baz: bip   bam         boon; }
 OUT
 foo bar {
   baz:
@@ -771,16 +771,6 @@ SASS
 SCSS
   end
 
-  def test_comma_extendee
-    assert_renders <<SASS, <<SCSS
-.baz
-  @extend .foo, .bar
-SASS
-.baz {
-  @extend .foo, .bar; }
-SCSS
-  end
-
   def test_argless_mixin_definition
     assert_renders <<SASS, <<SCSS
 =foo-bar
@@ -1141,13 +1131,17 @@ div
 SASS
   end
 
-   def test_loud_comment_conversion
+  def test_loud_comment_conversion
     assert_renders(<<SASS, <<SCSS)
 /*! \#{"interpolated"}
+/*!
+ *  \#{"also interpolated"}
 SASS
 /*! \#{"interpolated"} */
+/*!
+ *  \#{"also interpolated"} */
 SCSS
-    silence_warnings {assert_renders(<<SASS, <<SCSS)}
+    assert_renders(<<SASS, <<SCSS)
 //! \#{"interpolated"}
 //!
 //! \#{"also interpolated"}
@@ -1158,42 +1152,6 @@ SASS
 SCSS
   end
 
-  ## Regression Tests
-
-  def test_empty_lists
-    assert_renders(<<SASS, <<SCSS)
-$foo: ()
-SASS
-$foo: ();
-SCSS
-  end
-
-  def test_nested_if_statements
-    assert_renders(<<SASS, <<SCSS)
-@if $foo
-  one
-    a: b
-@else
-  @if $bar
-    two
-      a: b
-  @else
-    three
-      a: b
-SASS
-@if $foo {
-  one {
-    a: b; } }
-@else {
-  @if $bar {
-    two {
-      a: b; } }
-  @else {
-    three {
-      a: b; } } }
-SCSS
-  end
-
   private
 
   def assert_sass_to_sass(sass, options = {})

data/test/sass/css2sass_test.rb

@@ -268,39 +268,6 @@ SASS
 CSS
   end
 
-  def test_double_comma
-    assert_equal(<<SASS, css2sass(<<CSS))
-foo, bar
-  a: b
-SASS
-foo, , bar { a: b }
-CSS
-  end
-
-  def test_selector_splitting
-    assert_equal(<<SASS, css2sass(<<CSS))
-.foo >
-  .bar
-    a: b
-  .baz
-    c: d
-SASS
-.foo>.bar {a: b}
-.foo>.baz {c: d}
-CSS
-
-    assert_equal(<<SASS, css2sass(<<CSS))
-.foo
-  &::bar
-    a: b
-  &::baz
-    c: d
-SASS
-.foo::bar {a: b}
-.foo::baz {c: d}
-CSS
-  end
-
   # Error reporting
 
   def test_error_reporting

data/test/sass/engine_test.rb

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 # -*- coding: utf-8 -*-
-require File.dirname(__FILE__) + '/../test_helper'
-require File.dirname(__FILE__) + '/test_helper'
+require 'test_helper'
+require 'sass/test_helper'
 require 'sass/engine'
 require 'stringio'
 require 'mock_importer'
@@ -57,14 +57,16 @@ MSG
     "& a\n  :b c" => ["Base-level rules cannot contain the parent-selector-referencing character '&'.", 1],
     "a\n  :b\n    c" => "Illegal nesting: Only properties may be nested beneath properties.",
     "$a: b\n  :c d\n" => "Illegal nesting: Nothing may be nested beneath variable declarations.",
+    "@import foo.sass" => "File to import not found or unreadable: foo.sass.",
     "$a: b\n  :c d\n" => "Illegal nesting: Nothing may be nested beneath variable declarations.",
+    "@import foo.sass" => <<MSG,
+File to import not found or unreadable: foo.sass.
+Load path: .
+MSG
     "@import templates/basic\n  foo" => "Illegal nesting: Nothing may be nested beneath import directives.",
     "foo\n  @import foo.css" => "CSS import directives may only be used at the root of a document.",
     "@if true\n  @import foo" => "Import directives may not be used within control directives or mixins.",
-    "@if true\n  .foo\n    @import foo" => "Import directives may not be used within control directives or mixins.",
     "@mixin foo\n  @import foo" => "Import directives may not be used within control directives or mixins.",
-    "@mixin foo\n  .foo\n    @import foo" => "Import directives may not be used within control directives or mixins.",
-    "@import foo;" => "Invalid @import: expected end of line, was \";\".",
     '$foo: "bar" "baz" !' => %Q{Invalid CSS after ""bar" "baz" ": expected expression (e.g. 1px, bold), was "!"},
     '$foo: "bar" "baz" $' => %Q{Invalid CSS after ""bar" "baz" ": expected expression (e.g. 1px, bold), was "$"},
     "=foo\n  :color red\n.bar\n  +bang" => "Undefined mixin 'bang'.",
@@ -142,7 +144,6 @@ MSG
     "$var: true\n@while $var\n  @extend .bar\n  $var: false" => ["Extend directives may only be used within rules.", 3],
     "@for $i from 0 to 1\n  @extend .bar" => ["Extend directives may only be used within rules.", 2],
     "@mixin foo\n  @extend .bar\n@include foo" => ["Extend directives may only be used within rules.", 2],
-    "@import \"foo\" // bar" => "Invalid @import: \"\"foo\" // bar\"",
 
     # Regression tests
     "a\n  b:\n    c\n    d" => ["Illegal nesting: Only properties may be nested beneath properties.", 3],
@@ -262,7 +263,7 @@ SASS
   end
 
   def test_imported_exception
-    [1, 2, 3, 4, 5].each do |i|
+    [1, 2, 3, 4].each do |i|
       begin
         Sass::Engine.new("@import bork#{i}", :load_paths => [File.dirname(__FILE__) + '/templates/']).render
       rescue Sass::SyntaxError => err
@@ -284,7 +285,7 @@ SASS
   end
 
   def test_double_imported_exception
-    [1, 2, 3, 4, 5].each do |i|
+    [1, 2, 3, 4].each do |i|
       begin
         Sass::Engine.new("@import nested_bork#{i}", :load_paths => [File.dirname(__FILE__) + '/templates/']).render
       rescue Sass::SyntaxError => err
@@ -309,23 +310,6 @@ SASS
     end
   end
 
-  def test_selector_tracing
-    actual_css = render(<<-SCSS, :syntax => :scss, :trace_selectors => true)
-      @mixin mixed {
-        .mixed { color: red; }
-      }
-      .context {
-        @include mixed;
-      }
-    SCSS
-    assert_equal(<<CSS,actual_css)
-/* on line 2 of test_selector_tracing_inline.scss, in `mixed'
-   from line 5 of test_selector_tracing_inline.scss */
-.context .mixed {
-  color: red; }
-CSS
-  end
-
   def test_mixin_exception
     render(<<SASS)
 =error-mixin($a)
@@ -473,53 +457,6 @@ MESSAGE
     assert_hash_has(err.sass_backtrace[2], :mixin => "foo", :line => 2)
   end
 
-  def test_basic_import_loop_exception
-    import = filename_for_test
-    importer = MockImporter.new
-    importer.add_import(import, "@import '#{import}'")
-
-    engine = Sass::Engine.new("@import '#{import}'", :filename => import,
-      :load_paths => [importer])
-
-    assert_raise_message(Sass::SyntaxError, <<ERR.rstrip) {engine.render}
-An @import loop has been found: #{import} imports itself
-ERR
-  end
-
-  def test_double_import_loop_exception
-    importer = MockImporter.new
-    importer.add_import("foo", "@import 'bar'")
-    importer.add_import("bar", "@import 'foo'")
-
-    engine = Sass::Engine.new('@import "foo"', :filename => filename_for_test,
-      :load_paths => [importer])
-
-    assert_raise_message(Sass::SyntaxError, <<ERR.rstrip) {engine.render}
-An @import loop has been found:
-    #{filename_for_test} imports foo
-    foo imports bar
-    bar imports foo
-ERR
-  end
-
-  def test_deep_import_loop_exception
-    importer = MockImporter.new
-    importer.add_import("foo", "@import 'bar'")
-    importer.add_import("bar", "@import 'baz'")
-    importer.add_import("baz", "@import 'foo'")
-
-    engine = Sass::Engine.new('@import "foo"', :filename => filename_for_test,
-      :load_paths => [importer])
-
-    assert_raise_message(Sass::SyntaxError, <<ERR.rstrip) {engine.render}
-An @import loop has been found:
-    #{filename_for_test} imports foo
-    foo imports bar
-    bar imports baz
-    baz imports foo
-ERR
-  end
-
   def test_exception_css_with_offset
     opts = {:full_exception => true, :line => 362}
     render(("a\n  b: c\n" * 10) + "d\n  e:\n" + ("f\n  g: h\n" * 10), opts)
@@ -611,21 +548,13 @@ CSS
   end
 
   def test_http_import
-    assert_equal("@import \"http://fonts.googleapis.com/css?family=Droid+Sans\";\n",
+    assert_equal("@import url(http://fonts.googleapis.com/css?family=Droid+Sans);\n",
       render("@import \"http://fonts.googleapis.com/css?family=Droid+Sans\""))
   end
 
-  def test_import_with_interpolation
-    assert_warning(<<WARNING) do
-DEPRECATION WARNING on line 2 of test_import_with_interpolation_inline.sass:
-@import directives using \#{} interpolation will need to use url() in Sass 3.2.
-For example:
-
-  @import url("http://\#{$url}/style.css");
-WARNING
-      assert_equal("@import \"http://fonts.googleapis.com/css?family=Droid+Sans\";\n",
-        render("$family: unquote(\"Droid+Sans\")\n@import \"http://fonts.googleapis.com/css?family=\#{$family}\"\n"))
-    end
+  def test_http_import_with_interpolation
+    assert_equal("@import url(http://fonts.googleapis.com/css?family=Droid+Sans);\n",
+      render("$family: unquote(\"Droid+Sans\")\n@import \"http://fonts.googleapis.com/css?family=\#{$family}\"\n"))
     assert_equal("@import url(\"http://fonts.googleapis.com/css?family=Droid+Sans\");\n",
       render("$family: unquote(\"Droid+Sans\")\n@import url(\"http://fonts.googleapis.com/css?family=\#{$family}\")\n"))
   end
@@ -650,21 +579,12 @@ WARNING
     assert File.exists?(sassc_file)
   end
 
-  def test_nonexistent_import
-    assert_raise_message(Sass::SyntaxError, <<ERR.rstrip) do
-File to import not found or unreadable: nonexistent.sass.
-Load path: #{Dir.pwd}
-ERR
-      render("@import nonexistent.sass")
-    end
-  end
-
   def test_nonexistent_extensionless_import
     assert_raise_message(Sass::SyntaxError, <<ERR.rstrip) do
 File to import not found or unreadable: nonexistent.
-Load path: #{Dir.pwd}
+Load path: .
 ERR
-      render("@import nonexistent")
+      assert_equal("@import url(nonexistent.css);\n", render("@import nonexistent"))
     end
   end
 
@@ -1017,23 +937,6 @@ foo
 SASS
   end
 
-  def test_debug_info_in_keyframes
-    assert_equal(<<CSS, render(<<SASS, :debug_info => true))
-@-webkit-keyframes warm {
-  from {
-    color: black; }
-
-  to {
-    color: red; } }
-CSS
-@-webkit-keyframes warm
-  from
-    color: black
-  to
-    color: red
-SASS
-  end
-
   def test_empty_first_line
     assert_equal("#a {\n  b: c; }\n", render("#a\n\n  b: c"))
   end
@@ -1278,18 +1181,6 @@ bar
 SASS
   end
 
-  def test_control_directive_in_nested_property
-    assert_equal(<<CSS, render(<<SASS))
-foo {
-  a-b: c; }
-CSS
-foo
-  a:
-    @if true
-      b: c
-SASS
-  end
-
   def test_interpolation
     assert_equal("a-1 {\n  b-2-3: c-3; }\n", render(<<SASS))
 $a: 1
@@ -1657,11 +1548,11 @@ foo
    */
 SASS
   end
-
   def test_loud_comment_in_silent_comment
-    silence_warnings {assert_equal <<CSS, render(<<SASS, :style => :compressed)}
+    assert_equal <<CSS, render(<<SASS, :style => :compressed)
 foo{color:blue;/* foo */
 /* bar */
+/* */
 /* bip */
 /* baz */}
 CSS
@@ -1677,7 +1568,8 @@ SASS
 
   def test_loud_comment_is_evaluated
     assert_equal <<CSS, render(<<SASS)
-/* Hue: 327.216deg */
+/*
+ * Hue: 327.216deg */
 CSS
 /*!
   Hue: \#{hue(#f836a0)}
@@ -1880,22 +1772,22 @@ SASS
 
   def test_interpolation_doesnt_deep_unquote_strings
     assert_equal(<<CSS, render(<<SASS))
-.foo {
-  a: "bar" "baz"; }
+.foo- "bar" "baz" {
+  a: b; }
 CSS
-.foo
-  a: \#{"bar" "baz"}
+.foo-\#{"bar" "baz"}
+  a: b
 SASS
   end
 
   def test_warn_directive
   expected_warning = <<EXPECTATION
 WARNING: this is a warning
-         on line 4 of test_warn_directive_inline.sass
+        on line 4 of test_warn_directive_inline.sass
 
 WARNING: this is a mixin warning
-         on line 2 of test_warn_directive_inline.sass, in `foo'
-         from line 7 of test_warn_directive_inline.sass
+        on line 2 of test_warn_directive_inline.sass, in `foo'
+        from line 7 of test_warn_directive_inline.sass
 EXPECTATION
     assert_warning expected_warning do
       assert_equal <<CSS, render(<<SASS)
@@ -1925,15 +1817,15 @@ SASS
   def test_warn_with_imports
     expected_warning = <<WARN
 WARNING: In the main file
-         on line 1 of #{File.dirname(__FILE__)}/templates/warn.sass
+        on line 1 of #{File.dirname(__FILE__)}/templates/warn.sass
 
 WARNING: Imported
-         on line 1 of #{File.dirname(__FILE__)}/templates/warn_imported.sass
-         from line 2 of #{File.dirname(__FILE__)}/templates/warn.sass
+        on line 1 of #{File.dirname(__FILE__)}/templates/warn_imported.sass
+        from line 2 of #{File.dirname(__FILE__)}/templates/warn.sass
 
 WARNING: In an imported mixin
-         on line 4 of #{File.dirname(__FILE__)}/templates/warn_imported.sass, in `emits-a-warning'
-         from line 3 of #{File.dirname(__FILE__)}/templates/warn.sass
+        on line 4 of #{File.dirname(__FILE__)}/templates/warn_imported.sass, in `emits-a-warning'
+        from line 3 of #{File.dirname(__FILE__)}/templates/warn.sass
 WARN
     assert_warning expected_warning do
       renders_correctly "warn", :style => :compact, :load_paths => [File.dirname(__FILE__) + "/templates"]
@@ -2054,19 +1946,6 @@ CSS
 SASS
   end
 
-  def test_double_media_bubbling_with_commas
-    assert_equal <<CSS, render(<<SASS)
-@media foo and baz, foo and bang, bar and baz, bar and bang {
-  .foo {
-    c: d; } }
-CSS
-@media foo, bar
-  @media baz, bang
-    .foo
-      c: d
-SASS
-  end
-
   def test_rule_media_rule_bubbling
     assert_equal <<CSS, render(<<SASS)
 @media bar {
@@ -2129,49 +2008,6 @@ CSS
 
   # Regression tests
 
-  def test_tricky_mixin_loop_exception
-    render <<SASS
-@mixin foo($a)
-  @if $a
-    @include foo(false)
-    @include foo(true)
-  @else
-    a: b
-
-a
-  @include foo(true)
-SASS
-    assert(false, "Exception not raised")
-  rescue Sass::SyntaxError => err
-    assert_equal("An @include loop has been found: foo includes itself", err.message)
-    assert_hash_has(err.sass_backtrace[0], :mixin => "foo", :line => 3)
-  end
-
-  def test_interpolated_comment_in_mixin
-    assert_equal <<CSS, render(<<SASS)
-/* color: red */
-.foo {
-  color: red; }
-
-/* color: blue */
-.foo {
-  color: blue; }
-
-/* color: green */
-.foo {
-  color: green; }
-CSS
-=foo($var)
-  /*! color: \#{$var}
-  .foo
-    color: $var
-
-+foo(red)
-+foo(blue)
-+foo(green)
-SASS
-  end
-
   def test_parens_in_mixins
     assert_equal(<<CSS, render(<<SASS))
 .foo {
@@ -2450,16 +2286,7 @@ SASS
 WARNING:
 On line 1 of 'test_comment_interpolation_warning_inline.sass'
 Comments will evaluate the contents of interpolations (\#{ ... }) in Sass 3.2.
-Please escape the interpolation by adding a backslash before the `#`.
-END
-  end
-
-  def test_loud_silent_comment_warning
-    assert_warning(<<END) {render("//! \#{foo}")}
-WARNING:
-On line 1 of 'test_loud_silent_comment_warning_inline.sass'
-`//` comments will no longer be allowed to use the `!` flag in Sass 3.2.
-Please change to `/*` comments.
+Please escape the interpolation by adding a backslash before the hash sign.
 END
   end
 
@@ -2476,38 +2303,6 @@ CSS
 SASS
   end
 
-  def test_selector_compression
-    assert_equal <<CSS, render(<<SASS, :style => :compressed)
-a>b,c+d,:-moz-any(e,f,g){h:i}
-CSS
-a > b, c + d, :-moz-any(e, f, g)
-  h: i
-SASS
-  end
-
-  def test_comment_like_selector
-    assert_raise_message(Sass::SyntaxError, 'Invalid CSS after "": expected selector, was "/ foo"') {render(<<SASS)}
-/ foo
-  a: b
-SASS
-  end
-
-  def test_nested_empty_directive
-    assert_equal <<CSS, render(<<SASS)
-@media screen {
-  .foo {
-    a: b; }
-
-  @unknown-directive; }
-CSS
-@media screen
-  .foo
-    a: b
-
-  @unknown-directive
-SASS
-  end
-
   # Encodings
 
   unless Sass::Util.ruby1_8?
@@ -2620,31 +2415,6 @@ CSS
   a: b
 SASS
     end
-
-    # Encoding Regression Test
-
-    def test_multibyte_prop_name
-      assert_equal(<<CSS, render(<<SASS))
-@charset "UTF-8";
-#bar {
-  cölor: blue; }
-CSS
-#bar
-  cölor: blue
-SASS
-    end
-
-    def test_multibyte_and_interpolation
-      assert_equal(<<CSS, render(<<SCSS, :syntax => :scss))
-#bar {
-  background: a 0%; }
-CSS
-#bar {
-  // 
-  background: \#{a} 0%;
-}
-SCSS
-    end
   end
 
   def test_original_filename_set
@@ -2660,27 +2430,6 @@ SCSS
     assert_equal original_filename, importer.engine("imported").options[:original_filename]
   end
 
-  def test_deprecated_PRECISION
-    assert_warning(<<END) {assert_equal 1000.0, Sass::Script::Number::PRECISION}
-Sass::Script::Number::PRECISION is deprecated and will be removed in a future release. Use Sass::Script::Number.precision_factor instead.
-END
-  end
-  def test_changing_precision
-    begin
-      Sass::Script::Number.precision = 8
-      assert_equal <<CSS, render(<<SASS)
-div {
-  maximum: 1.00000001;
-  too-much: 1.0; }
-CSS
-div
-  maximum : 1.00000001
-  too-much: 1.000000001
-SASS
-    ensure
-      Sass::Script::Number.precision = 3
-    end
-  end
 
   private