sass 3.2.0.alpha.242 → 3.2.0.alpha.244

data/REVISION

@@ -1 +1 @@
-ca12bc5911f02eebd05ec141a2e552a82f0cb3f1
+b255878dc6283a5cb4c03879de4eb25f7621f82d

data/VERSION

@@ -1 +1 @@
-3.2.0.alpha.242
+3.2.0.alpha.244

data/test/sass/cache_test.rb

@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
-require File.dirname(__FILE__) + '/../test_helper'
-require File.dirname(__FILE__) + '/test_helper'
+require 'test_helper'
+require 'sass/test_helper'
 require 'sass/engine'
 
 class CacheTest < Test::Unit::TestCase

data/test/sass/callbacks_test.rb

@@ -1,5 +1,5 @@
 #!/usr/bin/env ruby
-require File.dirname(__FILE__) + '/../test_helper'
+require 'test_helper'
 require 'sass/callbacks'
 
 class CallerBack

data/test/sass/conversion_test.rb

@@ -1,5 +1,5 @@
 #!/usr/bin/env ruby
-require File.dirname(__FILE__) + '/../test_helper'
+require 'test_helper'
 
 class ConversionTest < Test::Unit::TestCase
   def test_basic
@@ -152,17 +152,6 @@ foo bar {
 SCSS
   end
 
-  def test_property_name_interpolation
-    assert_renders <<SASS, <<SCSS
-foo bar
-  baz\#{$bang}bip\#{$bop}: 12
-SASS
-foo bar {
-  baz\#{$bang}bip\#{$bop}: 12;
-}
-SCSS
-  end
-
   def test_property_value_interpolation
     assert_renders <<SASS, <<SCSS
 foo bar

data/test/sass/css2sass_test.rb

@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 require 'test/unit'
-require File.dirname(__FILE__) + '/../test_helper'
+require 'test_helper'
 require 'sass/css'
 
 class CSS2SassTest < Test::Unit::TestCase

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'

data/test/sass/extend_test.rb

@@ -1,5 +1,5 @@
 #!/usr/bin/env ruby
-require File.dirname(__FILE__) + '/../test_helper'
+require 'test_helper'
 
 class ExtendTest < Test::Unit::TestCase
   def test_basic

data/test/sass/functions_test.rb

@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 require 'test/unit'
-require File.dirname(__FILE__) + '/../test_helper'
+require 'test_helper'
 require 'sass/script'
 
 module Sass::Script::Functions
@@ -47,25 +47,29 @@ class SassFunctionTest < Test::Unit::TestCase
     hsls, rgbs = chunk.strip.split("====")
     hsls.strip.split("\n").zip(rgbs.strip.split("\n")) do |hsl, rgb|
       hsl_method = "test_hsl: #{hsl} = #{rgb}"
-      define_method(hsl_method) do
-        assert_equal(evaluate(rgb), evaluate(hsl))
+      unless method_defined?(hsl_method)
+        define_method(hsl_method) do
+          assert_equal(evaluate(rgb), evaluate(hsl))
+        end
       end
 
       rgb_to_hsl_method = "test_rgb_to_hsl: #{rgb} = #{hsl}"
-      define_method(rgb_to_hsl_method) do
-        rgb_color = perform(rgb)
-        hsl_color = perform(hsl)
-
-        white = hsl_color.lightness == 100
-        black = hsl_color.lightness == 0
-        grayscale = white || black || hsl_color.saturation == 0
-
-        assert_in_delta(hsl_color.hue, rgb_color.hue, 0.0001,
-          "Hues should be equal") unless grayscale
-        assert_in_delta(hsl_color.saturation, rgb_color.saturation, 0.0001,
-          "Saturations should be equal") unless white || black
-        assert_in_delta(hsl_color.lightness, rgb_color.lightness, 0.0001,
-          "Lightnesses should be equal")
+      unless method_defined?(rgb_to_hsl_method)
+        define_method(rgb_to_hsl_method) do
+          rgb_color = perform(rgb)
+          hsl_color = perform(hsl)
+
+          white = hsl_color.lightness == 100
+          black = hsl_color.lightness == 0
+          grayscale = white || black || hsl_color.saturation == 0
+
+          assert_in_delta(hsl_color.hue, rgb_color.hue, 0.0001,
+            "Hues should be equal") unless grayscale
+          assert_in_delta(hsl_color.saturation, rgb_color.saturation, 0.0001,
+            "Saturations should be equal") unless white || black
+          assert_in_delta(hsl_color.lightness, rgb_color.lightness, 0.0001,
+            "Lightnesses should be equal")
+        end
       end
     end
   end
@@ -223,7 +227,7 @@ class SassFunctionTest < Test::Unit::TestCase
     assert_equal("rgba(0, 255, 127, 0)", evaluate("rgba($red: 0, $green: 255, $blue: 127, $alpha: 0)"))
   end
 
-  def test_rgb_tests_bounds
+  def test_rgba_tests_bounds
     assert_error_message("Color value 256 must be between 0 and 255 for `rgba'",
       "rgba(256, 1, 1, 0.3)")
     assert_error_message("Color value 256 must be between 0 and 255 for `rgba'",

data/test/sass/importer_test.rb

@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
-require File.dirname(__FILE__) + '/../test_helper'
-require File.dirname(__FILE__) + '/test_helper'
+require 'test_helper'
+require 'sass/test_helper'
 
 require 'sass/plugin'
 

data/test/sass/less_conversion_test.rb

@@ -1,5 +1,5 @@
 #!/usr/bin/env ruby
-require File.dirname(__FILE__) + '/../test_helper'
+require 'test_helper'
 
 begin
 require 'sass/less'

data/test/sass/logger_test.rb

@@ -1,5 +1,5 @@
 #!/usr/bin/env ruby
-require File.dirname(__FILE__) + '/../test_helper'
+require 'test_helper'
 require 'pathname'
 
 class LoggerTest < Test::Unit::TestCase

data/test/sass/plugin_test.rb

@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
-require File.dirname(__FILE__) + '/../test_helper'
-require File.dirname(__FILE__) + '/test_helper'
+require 'test_helper'
+require 'sass/test_helper'
 require 'sass/plugin'
 require 'fileutils'
 

data/test/sass/script_conversion_test.rb

@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 # -*- coding: utf-8 -*-
-require File.dirname(__FILE__) + '/../test_helper'
+require 'test_helper'
 require 'sass/engine'
 
 class SassScriptConversionTest < Test::Unit::TestCase

data/test/sass/script_test.rb

@@ -1,5 +1,5 @@
 #!/usr/bin/env ruby
-require File.dirname(__FILE__) + '/../test_helper'
+require 'test_helper'
 require 'sass/engine'
 
 module Sass::Script::Functions::UserFunctions
@@ -42,12 +42,6 @@ class SassScriptTest < Test::Unit::TestCase
     assert_equal "\\02fa", resolve("'\\02fa'")
   end
 
-  def test_string_interpolation
-    assert_equal "foo2bar", resolve('\'foo#{1 + 1}bar\'')
-    assert_equal "foo2bar", resolve('"foo#{1 + 1}bar"')
-    assert_equal "foo1bar5baz4bang", resolve('\'foo#{1 + "bar#{2 + 3}baz" + 4}bang\'')
-  end
-
   def test_color_names
     assert_equal "white", resolve("white")
     assert_equal "white", resolve("#ffffff")
@@ -177,6 +171,9 @@ class SassScriptTest < Test::Unit::TestCase
     assert_equal "foo bar baz bang", resolve('"foo #{"#{"ba" + "r"} baz"} bang"')
     assert_equal 'foo #{bar baz} bang', resolve('"foo \#{#{"ba" + "r"} baz} bang"')
     assert_equal 'foo #{baz bang', resolve('"foo #{"\#{" + "baz"} bang"')
+    assert_equal "foo2bar", resolve('\'foo#{1 + 1}bar\'')
+    assert_equal "foo2bar", resolve('"foo#{1 + 1}bar"')
+    assert_equal "foo1bar5baz4bang", resolve('\'foo#{1 + "bar#{2 + 3}baz" + 4}bang\'')
   end
 
   def test_rule_interpolation

data/test/sass/scss/css_test.rb

@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 # -*- coding: utf-8 -*-
-require File.dirname(__FILE__) + '/test_helper'
+require 'sass/scss/test_helper'
 require 'sass/scss/css_parser'
 
 # These tests just test the parsing of CSS

data/test/sass/scss/rx_test.rb

@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 # -*- coding: utf-8 -*-
-require File.dirname(__FILE__) + '/../../test_helper'
+require "sass/scss/test_helper"
 require 'sass/engine'
 
 class ScssRxTest < Test::Unit::TestCase

data/test/sass/scss/scss_test.rb

@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 # -*- coding: utf-8 -*-
-require File.dirname(__FILE__) + '/test_helper'
+require "sass/scss/test_helper"
 
 class ScssTest < Test::Unit::TestCase
   include ScssTestHelper
@@ -1174,9 +1174,9 @@ SCSS
 
   def test_parent_in_mid_selector_error
     assert_raise_message(Sass::SyntaxError, <<MESSAGE.rstrip) {render <<SCSS}
-Invalid CSS after ".foo": expected "{", was "&.bar"
+Invalid CSS after "  .foo": expected "{", was "&.bar {a: b}"
 
-"&" may only be used at the beginning of a selector.
+"&.bar" may only be used at the beginning of a selector.
 MESSAGE
 flim {
   .foo&.bar {a: b}
@@ -1184,7 +1184,7 @@ flim {
 SCSS
   end
 
-  def test_parent_in_mid_selector_error
+  def test_parent_after_selector_error
     assert_raise_message(Sass::SyntaxError, <<MESSAGE.rstrip) {render <<SCSS}
 Invalid CSS after "  .foo.bar": expected "{", was "& {a: b}"
 

data/test/sass/scss/test_helper.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../test_helper'
+require 'test_helper'
 require 'sass/engine'
 
 module ScssTestHelper

data/test/sass/util/multibyte_string_scanner_test.rb

@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 # -*- coding: utf-8 -*-
-require File.dirname(__FILE__) + '/../../test_helper'
+require 'test_helper'
 
 unless Sass::Util.ruby1_8?
   class MultibyteStringScannerTest < Test::Unit::TestCase

data/test/sass/util/subset_map_test.rb

@@ -1,5 +1,5 @@
 #!/usr/bin/env ruby
-require File.dirname(__FILE__) + '/../../test_helper'
+require 'test_helper'
 
 class SubsetMapTest < Test::Unit::TestCase
   def setup

data/test/sass/util_test.rb

@@ -1,5 +1,5 @@
 #!/usr/bin/env ruby
-require File.dirname(__FILE__) + '/../test_helper'
+require 'test_helper'
 require 'pathname'
 
 class UtilTest < Test::Unit::TestCase

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: sass
 version: !ruby/object:Gem::Version 
-  hash: 592302841
+  hash: 592302837
   prerelease: 6
   segments: 
   - 3
   - 2
   - 0
   - alpha
-  - 242
-  version: 3.2.0.alpha.242
+  - 244
+  version: 3.2.0.alpha.244
 platform: ruby
 authors: 
 - Nathan Weizenbaum
@@ -19,7 +19,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-05-25 00:00:00 -04:00
+date: 2012-05-31 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency