sass 3.4.11 → 3.4.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5b356808a261bfc58ed1ea2a65e975f5b64d8048
-  data.tar.gz: c2f0bc6dbd4e8332eed0e0f6e60dad6a79d47797
+  metadata.gz: f4b73da7dd6f9103e68b1edcb10a59411db18295
+  data.tar.gz: ac1d03b3da377814ef33bc5ef9e8f58f318571f9
 SHA512:
-  metadata.gz: c0631122d887b7d410c5fd38dcedd9487ae78e1d22e2f7a5a4be4557d9c1ad40ab55643e590eff2b23a3b3dfecac61057086cfe926015d09e60ee8d1e7abbadb
-  data.tar.gz: 8208ef88dc5a7a6b13493c8a00542587419525fdf980fcd616ff19ec83b39388e1322c5f21f61147eb9f2cd059f5659acf3476ae552abcc5d290cc9563d6caf3
+  metadata.gz: 4da9bdb240ed324d5e7ffd69c3f84d78d811060f19949c4c1d534bf71fbce21b87b96e976f80c6f21fe5636d31e2472f9132fc12b9cb82370bd251e1c3f3e8ec
+  data.tar.gz: 6adddaf3a218472b3eaf4f8a23c6a909dab474f8265088aedee06cbdc6505d948a50d6f29aca9464f9d6786c7f6db3f6f89eaa435a329cddf1bec407a516027f

data/CONTRIBUTING.md

@@ -0,0 +1,3 @@
+Contributions are welcomed. Please see the following sites for guidelines:
+
+[http://sass-lang.com/community#Contribute](http://sass-lang.com/community#Contribute)

data/VERSION

@@ -1 +1 @@
-3.4.11
+3.4.12

data/VERSION_DATE

@@ -1 +1 @@
-31 January 2015 02:49:50 UTC
+14 February 2015 01:18:18 UTC

data/lib/sass/script/functions.rb

@@ -1471,10 +1471,10 @@ MESSAGE
       assert_type insert, :String, :insert
       assert_integer index, :index
       assert_unit index, nil, :index
-      insertion_point = if index.value > 0
-                          [index.value - 1, original.value.size].min
+      insertion_point = if index.to_i > 0
+                          [index.to_i - 1, original.value.size].min
                         else
-                          [index.value, -original.value.size - 1].max
+                          [index.to_i, -original.value.size - 1].max
                         end
       result = original.value.dup.insert(insertion_point, insert.value)
       Sass::Script::Value::String.new(result, original.type)
@@ -2325,10 +2325,10 @@ MESSAGE
       generator = Sass::Script::Functions.random_number_generator
       if limit
         assert_integer limit, "limit"
-        if limit.value < 1
+        if limit.to_i < 1
           raise ArgumentError.new("$limit #{limit} must be greater than or equal to 1")
         end
-        number(1 + generator.rand(limit.value))
+        number(1 + generator.rand(limit.to_i))
       else
         number(generator.rand)
       end

data/lib/sass/script/lexer.rb

@@ -198,7 +198,8 @@ module Sass
 
       # @return [Boolean] Whether or not there's more source text to lex.
       def done?
-        whitespace unless after_interpolation? && @interpolation_stack.last
+        return if @next_tok
+        whitespace unless after_interpolation? && !@interpolation_stack.empty?
         @scanner.eos? && @tok.nil?
       end
 
@@ -235,6 +236,11 @@ module Sass
       private
 
       def read_token
+        if (tok = @next_tok)
+          @next_tok = nil
+          return tok
+        end
+
         return if done?
         start_pos = source_position
         value = token
@@ -293,9 +299,9 @@ MESSAGE
         end
 
         if @scanner[2] == '#{' # '
-          @scanner.pos -= 2 # Don't actually consume the #{
-          @offset -= 2
           @interpolation_stack << [:string, re]
+          start_pos = Sass::Source::Position.new(@line, @offset - 2)
+          @next_tok = Token.new(:string_interpolation, range(start_pos), @scanner.pos - 2)
         end
         str =
           if re == :uri
@@ -392,9 +398,9 @@ MESSAGE
           else
             raise "[BUG] Unreachable" unless @scanner[1] == '#{' # '
             str.slice!(-2..-1)
-            @scanner.pos -= 2 # Don't actually consume the #{
-            @offset -= 2
             @interpolation_stack << [:special_fun, parens]
+            start_pos = Sass::Source::Position.new(@line, @offset - 2)
+            @next_tok = Token.new(:string_interpolation, range(start_pos), @scanner.pos - 2)
           end
 
           return [:special_fun, Sass::Script::Value::String.new(str)]
@@ -419,11 +425,8 @@ MESSAGE
         op = scan(REGULAR_EXPRESSIONS[:op])
         return unless op
         name = OPERATORS[op]
-        if name == :begin_interpolation && !@interpolation_stack.empty?
-          [:string_interpolation]
-        else
-          [name]
-        end
+        @interpolation_stack << nil if name == :begin_interpolation
+        [name]
       end
 
       def raw(rx)

data/test/sass/functions_test.rb

@@ -1664,6 +1664,14 @@ SCSS
     assert_error_message("Expected $limit to be an integer but got 1.5 for `random'", "random(1.5)")
   end
 
+  # Regression test for #1638.
+  def test_random_with_float_integer_limit
+    result = perform("random(1.0)")
+    assert_kind_of Sass::Script::Number, result
+    assert result.value >= 0, "Random number was below 0"
+    assert result.value <= 1, "Random number was above 1"
+  end
+
   # This could *possibly* fail, but exceedingly unlikely
   def test_random_is_semi_unique
     if Sass::Script::Functions.instance_variable_defined?("@random_number_generator")

data/test/sass/script_test.rb

@@ -206,6 +206,13 @@ class SassScriptTest < MiniTest::Test
     assert_equal "foo1bar5baz4bang", resolve('\'foo#{1 + "bar#{2 + 3}baz" + 4}bang\'')
   end
 
+  def test_interpolation_in_interpolation
+    assert_equal 'foo', resolve('#{#{foo}}')
+    assert_equal 'foo', resolve('"#{#{foo}}"')
+    assert_equal 'foo', resolve('#{"#{foo}"}')
+    assert_equal 'foo', resolve('"#{"#{foo}"}"')
+  end
+
   def test_interpolation_with_newline
     assert_equal "\nbang", resolve('"#{"\a "}bang"')
     assert_equal "\n\nbang", resolve('"#{"\a "}\a bang"')

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sass
 version: !ruby/object:Gem::Version
-  version: 3.4.11
+  version: 3.4.12
 platform: ruby
 authors:
 - Natalie Weizenbaum
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-31 00:00:00.000000000 Z
+date: 2015-02-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: yard
@@ -68,7 +68,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - .yardopts
-- CONTRIBUTING
+- CONTRIBUTING.md
 - MIT-LICENSE
 - README.md
 - REVISION

data/CONTRIBUTING

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