sass 3.3.0.rc.1 → 3.3.0.rc.2

data/lib/sass/util/normalized_map.rb

@@ -7,14 +7,11 @@ module Sass
     # to the original keys that were stored. If several different values normalize
     # to the same value, whichever is stored last wins.
     require 'sass/util/ordered_hash' if ruby1_8?
-    class NormalizedMap < DelegateClass(ruby1_8? ? OrderedHash : Hash)
+    class NormalizedMap
       # Create a normalized map
       def initialize
         @key_strings = {}
         @map = Util.ruby1_8? ? OrderedHash.new : {}
-
-        # We delegate all hash methods that are not overridden here to @map.
-        super(@map)
       end
 
       # Specifies how to transform the key.
@@ -27,25 +24,26 @@ module Sass
       # @private
       def []=(k, v)
         normalized = normalize(k)
-        super(normalized, v)
+        @map[normalized] = v
         @key_strings[normalized] = k
+        v
       end
 
       # @private
       def [](k)
-        super(normalize(k))
+        @map[normalize(k)]
       end
 
       # @private
       def has_key?(k)
-        super(normalize(k))
+        @map.has_key?(normalize(k))
       end
 
       # @private
       def delete(k)
         normalized = normalize(k)
         @key_strings.delete(normalized)
-        super(normalized)
+        @map.delete(normalized)
       end
 
       # @return [Hash] Hash with the keys as they were stored (before normalization).
@@ -53,12 +51,63 @@ module Sass
         Sass::Util.map_keys(@map) {|k| @key_strings[k]}
       end
 
-      # this is magically invoked by ruby, not sure why DelegateClass doesn't take care of it.
-      # @private
-      def initialize_dup(other)
-        super
-        @map = other.instance_variable_get("@map").dup
-        __setobj__(@map)
+      def empty?
+        @map.empty?
+      end
+
+      def values
+        @map.values
+      end
+
+      def keys
+        @map.keys
+      end
+
+      def each
+        @map.each {|k, v| yield(k, v)}
+      end
+
+      def size
+        @map.size
+      end
+
+      def to_hash
+        @map.dup
+      end
+
+      def to_a
+        @map.to_a
+      end
+
+      def map
+        @map.map {|k, v| yield(k, v)}
+      end
+
+      def dup
+        d = super
+        d.send(:instance_variable_set, "@map", @map.dup)
+        d
+      end
+
+      def sort_by
+        @map.sort_by {|k, v| yield k, v}
+      end
+
+      def method_missing(method, *args, &block)
+        if Sass.tests_running
+          raise ArgumentError.new("The method #{method} must be implemented explicitly")
+        end
+        @map.send(method, *args, &block)
+      end
+
+      if Sass::Util.ruby1_8?
+        def respond_to?(method, include_private = false)
+          super || @map.respond_to?(method, include_private)
+        end
+      end
+
+      def respond_to_missing?(method, include_private = false)
+        @map.respond_to?(method, include_private)
       end
     end
   end

data/lib/sass/util/ordered_hash.rb

@@ -31,7 +31,7 @@ class OrderedHash < ::Hash
   # For instance, we cannot use the inherited #merge! because albeit the algorithm
   # itself would work, our []= is not being called at all by the C code.
 
-  def initialize(*args, &block)
+  def initialize(*args)
     super
     @keys = []
   end
@@ -91,8 +91,8 @@ class OrderedHash < ::Hash
     self
   end
 
-  def reject(&block)
-    dup.reject!(&block)
+  def reject
+    dup.reject! {|h, k| yield h, k}
   end
 
   def keys
@@ -160,8 +160,12 @@ class OrderedHash < ::Hash
 
   alias_method :update, :merge!
 
-  def merge(other_hash, &block)
-    dup.merge!(other_hash, &block)
+  def merge(other_hash)
+    if block_given?
+      dup.merge!(other_hash) {|k, v1, v2| yield k, v1, v2}
+    else
+      dup.merge!(other_hash)
+    end
   end
 
   # When replacing with another hash, the initial order of our keys must come from the other hash --

data/lib/sass/version.rb

@@ -7,8 +7,6 @@ module Sass
   # but its Git revision hash as well,
   # if it was installed from Git.
   module Version
-    include Sass::Util
-
     # Returns a hash representing the version of Sass.
     # The `:major`, `:minor`, and `:teeny` keys have their respective numbers as Fixnums.
     # The `:name` key has the name of the version.
@@ -49,9 +47,9 @@ module Sass
     def version
       return @@version if defined?(@@version)
 
-      numbers = File.read(scope('VERSION')).strip.split('.').
+      numbers = File.read(Sass::Util.scope('VERSION')).strip.split('.').
         map {|n| n =~ /^[0-9]+$/ ? n.to_i : n}
-      name = File.read(scope('VERSION_NAME')).strip
+      name = File.read(Sass::Util.scope('VERSION_NAME')).strip
       @@version = {
         :major => numbers[0],
         :minor => numbers[1],
@@ -87,18 +85,18 @@ module Sass
     private
 
     def revision_number
-      if File.exists?(scope('REVISION'))
-        rev = File.read(scope('REVISION')).strip
+      if File.exists?(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?(scope('.git/HEAD'))
-      rev = File.read(scope('.git/HEAD')).strip
+      return unless File.exists?(Sass::Util.scope('.git/HEAD'))
+      rev = File.read(Sass::Util.scope('.git/HEAD')).strip
       return rev unless rev =~ /^ref: (.*)$/
 
       ref_name = $1
-      ref_file = scope(".git/#{ref_name}")
-      info_file = scope(".git/info/refs")
+      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)
       File.open(info_file) do |f|
@@ -112,8 +110,8 @@ module Sass
     end
 
     def version_date
-      return unless File.exists?(scope('VERSION_DATE'))
-      DateTime.parse(File.read(scope('VERSION_DATE')).strip)
+      return unless File.exists?(Sass::Util.scope('VERSION_DATE'))
+      DateTime.parse(File.read(Sass::Util.scope('VERSION_DATE')).strip)
     end
   end
 

data/test/sass/engine_test.rb

@@ -3329,6 +3329,43 @@ SASS
 
   end
 
+  def test_debug_inspects_sass_objects
+    assert_warning(<<END) {render("@debug (a: 1, b: 2)")}
+test_debug_inspects_sass_objects_inline.sass:1 DEBUG: (a: 1, b: 2)
+END
+    assert_warning(<<END) {render("$map: (a: 1, b: 2); @debug $map", :syntax => :scss)}
+test_debug_inspects_sass_objects_inline.scss:1 DEBUG: (a: 1, b: 2)
+END
+  end
+
+  def test_default_arg_before_splat
+    assert_equal <<CSS, render(<<SASS, :syntax => :scss)
+.foo-positional {
+  a: 1;
+  b: 2;
+  positional-arguments: 3, 4;
+  keyword-arguments: (); }
+
+.foo-keywords {
+  a: true;
+  positional-arguments: ();
+  keyword-arguments: (c: c, d: d); }
+CSS
+@mixin foo($a: true, $b: null, $arguments...) {
+  a: $a;
+  b: $b;
+  positional-arguments: inspect($arguments);
+  keyword-arguments: inspect(keywords($arguments));
+}
+.foo-positional {
+  @include foo(1, 2, 3, 4);
+}
+.foo-keywords {
+  @include foo($c: c, $d: d);
+}
+SASS
+  end
+
   private
 
   def assert_hash_has(hash, expected)

data/test/sass/functions_test.rb

@@ -817,8 +817,8 @@ class SassFunctionTest < Test::Unit::TestCase
 
   def test_grayscale
     assert_equal("#bbbbbb", evaluate("grayscale(#abc)"))
-    assert_equal("grey", evaluate("grayscale(#f00)"))
-    assert_equal("grey", evaluate("grayscale(#00f)"))
+    assert_equal("gray", evaluate("grayscale(#f00)"))
+    assert_equal("gray", evaluate("grayscale(#00f)"))
     assert_equal("white", evaluate("grayscale(white)"))
     assert_equal("black", evaluate("grayscale(black)"))
     assert_equal("black", evaluate("grayscale($color: black)"))
@@ -1567,6 +1567,13 @@ SCSS
     assert_error_message("2px is not a string for `variable-exists'", "variable-exists(2px)")
   end
 
+  def test_inspect
+    assert_equal "()", evaluate("inspect(())")
+    assert_equal "null", evaluate("inspect(null)")
+    assert_equal "1px null 3px", evaluate("inspect(1px null 3px)")
+    assert_equal "(a: 1, b: 2)", evaluate("inspect((a: 1, b: 2))")
+  end
+
 
   ## Regression Tests
 

data/test/sass/importer_test.rb

@@ -204,7 +204,7 @@ SCSS
     _, sourcemap = engine.render_with_sourcemap('sourcemap_uri')
     assert_equal <<JSON.strip, sourcemap.to_json(:css_uri => 'css_uri')
 {
-"version": "3",
+"version": 3,
 "mappings": "AAAA,QAAS;EACP,KAAK,EAAE,IAAI",
 "sources": ["http://orange.example.com/style.scss"],
 "file": "css_uri"
@@ -274,7 +274,7 @@ SCSS
     sourcemap_path = 'map/style.map'
     assert_equal <<JSON.strip, sourcemap.to_json(:css_uri => css_uri, :sourcemap_path => sourcemap_path)
 {
-"version": "3",
+"version": 3,
 "mappings": "AAAA,IAAK;EAAC,CAAC,EAAE,CAAC",
 "sources": ["../sass/style.scss"],
 "file": "css_uri"
@@ -299,7 +299,7 @@ SCSS
     sourcemap_path = 'map/style.map'
     assert_equal <<JSON.strip, sourcemap.to_json(:css_path => css_path, :sourcemap_path => sourcemap_path)
 {
-"version": "3",
+"version": 3,
 "mappings": "AAAA,IAAK;EAAC,CAAC,EAAE,CAAC",
 "sources": ["../sass/style.scss"],
 "file": "../static/style.css"

data/test/sass/script_test.rb

@@ -736,6 +736,18 @@ SCSS
     end
   end
 
+  def test_number_printing
+    assert_equal "1", resolve("1")
+    assert_equal "1", resolve("1.0")
+    assert_equal "1000000000", resolve("1000000000")
+    assert_equal "0.00001", resolve("0.00001")
+    assert_equal "1.12121", resolve("1.121214")
+    assert_equal "1.12122", resolve("1.121215")
+    assert_equal "Infinity", resolve("(1.0/0.0)")
+    assert_equal "-Infinity", resolve("(-1.0/0.0)")
+    assert_equal "NaN", resolve("(0.0/0.0)")
+  end
+
   private
 
   def resolve(str, opts = {}, environment = env)
@@ -783,16 +795,6 @@ SCSS
     parser.parse_selector
   end
 
-  def test_number_printing
-    assert_equal "1", eval("1")
-    assert_equal "1", eval("1.0")
-    assert_equal "1.121", eval("1.1214")
-    assert_equal "1.122", eval("1.1215")
-    assert_equal "Infinity", eval("1.0/0.0")
-    assert_equal "-Infinity", eval("-1.0/0.0")
-    assert_equal "NaN", eval("0.0/0.0")
-  end
-
   def test_null_is_a_singleton
     assert_same Sass::Script::Value::Null.new, Sass::Script::Value::Null.new
   end

data/test/sass/source_map_test.rb

@@ -27,7 +27,7 @@ a {
 /*# sourceMappingURL=test.css.map */
 CSS
 {
-"version": "3",
+"version": 3,
 "mappings": "AAAA,CAAE;EACA,GAAG,EAAE,GAAG;;EAER,SAAS,EAAE,IAAI",
 "sources": ["test_simple_mapping_scss_inline.scss"],
 "file": "test.css"
@@ -50,7 +50,7 @@ a {
 /*# sourceMappingURL=test.css.map */
 CSS
 {
-"version": "3",
+"version": 3,
 "mappings": "AAAA,CAAC;EACC,GAAG,EAAE,GAAG;;EAEP,SAAS,EAAC,IAAI",
 "sources": ["test_simple_mapping_sass_inline.sass"],
 "file": "test.css"
@@ -75,7 +75,7 @@ a {
 /*# sourceMappingURL=style.css.map */
 CSS
 {
-"version": "3",
+"version": 3,
 "mappings": "AAAA,CAAE;EACA,GAAG,EAAE,GAAG;;EAER,SAAS,EAAE,IAAI",
 "sources": ["../scss/style.scss"],
 "file": "style.css"
@@ -99,7 +99,7 @@ a {
 /*# sourceMappingURL=style.css.map */
 CSS
 {
-"version": "3",
+"version": 3,
 "mappings": "AAAA,CAAC;EACC,GAAG,EAAE,GAAG;;EAEP,SAAS,EAAC,IAAI",
 "sources": ["../sass/style.sass"],
 "file": "style.css"
@@ -121,7 +121,7 @@ a {
 /*# sourceMappingURL=test.css.map */
 CSS
 {
-"version": "3",
+"version": 3,
 "mappings": ";AAAA,CAAE;EACA,GAAG,EAAE,GAAG",
 "sources": ["test_simple_charset_mapping_scss_inline.scss"],
 "file": "test.css"
@@ -141,7 +141,7 @@ a {
 /*# sourceMappingURL=test.css.map */
 CSS
 {
-"version": "3",
+"version": 3,
 "mappings": ";AAAA,CAAC;EACC,GAAG,EAAE,GAAG",
 "sources": ["test_simple_charset_mapping_sass_inline.sass"],
 "file": "test.css"
@@ -163,7 +163,7 @@ f\x86\x86 {
 /*# sourceMappingURL=test.css.map */
 CSS
 {
-"version": "3",
+"version": 3,
 "mappings": ";AACA,GAAI;EACF,CAAC,EAAE,CAAC",
 "sources": ["test_different_charset_than_encoding_scss_inline.scss"],
 "file": "test.css"
@@ -184,7 +184,7 @@ f\x86\x86 {
 /*# sourceMappingURL=test.css.map */
 CSS
 {
-"version": "3",
+"version": 3,
 "mappings": ";AACA,GAAG;EACD,CAAC,EAAE,CAAC",
 "sources": ["test_different_charset_than_encoding_sass_inline.sass"],
 "file": "test.css"

data/test/sass/util/normalized_map_test.rb

@@ -3,6 +3,28 @@ require File.dirname(__FILE__) + '/../../test_helper'
 require 'sass/util/normalized_map'
 
 class NormalizedMapTest < Test::Unit::TestCase
+  extend PublicApiLinter
+
+  lint_api Hash, Sass::Util::NormalizedMap
+
+  def lint_instance
+    Sass::Util::NormalizedMap.new
+  end
+
+  def test_normalized_map_errors_unless_explicitly_implemented
+    assert Sass.tests_running
+    assert_raise_message(ArgumentError, "The method invert must be implemented explicitly") do
+      Sass::Util::NormalizedMap.new.invert
+    end
+  end
+
+  def test_normalized_map_does_not_error_when_released
+    Sass.tests_running = false
+    assert_equal({}, Sass::Util::NormalizedMap.new.invert)
+  ensure
+    Sass.tests_running = true
+  end
+
   def test_basic_lifecycle
     m = Sass::Util::NormalizedMap.new
     m["a-b"] = 1
@@ -26,5 +48,4 @@ class NormalizedMapTest < Test::Unit::TestCase
     assert !m.has_key?("a-b")
     assert m2.has_key?("a-b")
   end
-
 end

data/test/sass/util_test.rb

@@ -304,6 +304,15 @@ class UtilTest < Test::Unit::TestCase
     def foo
       Sass::Util.abstract(self)
     end
+    def old_method
+      Sass::Util.deprecated(self)
+    end
+    def old_method_with_custom_message
+      Sass::Util.deprecated(self, "Call FooBar#new_method instead.")
+    end
+    def self.another_old_method
+      Sass::Util.deprecated(self)
+    end
   end
 
   def test_abstract
@@ -311,6 +320,15 @@ class UtilTest < Test::Unit::TestCase
       "UtilTest::FooBar must implement #foo") {FooBar.new.foo}
   end
 
+  def test_deprecated
+    assert_warning("DEPRECATION WARNING: UtilTest::FooBar#old_method will be removed in a future version of Sass.") { FooBar.new.old_method }
+    assert_warning(<<WARNING) { FooBar.new.old_method_with_custom_message }
+DEPRECATION WARNING: UtilTest::FooBar#old_method_with_custom_message will be removed in a future version of Sass.
+Call FooBar#new_method instead.
+WARNING
+    assert_warning("DEPRECATION WARNING: UtilTest::FooBar.another_old_method will be removed in a future version of Sass.") { FooBar.another_old_method }
+  end
+
   def test_json_escape_string
     assert_json_string "", ""
     alphanum = (("0".."9").to_a).concat(("a".."z").to_a).concat(("A".."Z").to_a).join