sass 3.4.8 → 3.4.9

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    OTMwOWU4MTI1ZGY3NGJkZmRhNGQ1Yjc3YWM0NGZhZTBhNDhkYTI1MQ==
-  data.tar.gz: !binary |-
-    MDVmYTBlMDc2MTE4M2U2NmEwNDFjYjlmMTQzMTUzYzk5MjA3NGEwZg==
+SHA1:
+  metadata.gz: 586156255d3623fed22e16cc8ddf44c6f50931af
+  data.tar.gz: 4660667253de7af141d348bb68e400801a8c167a
 SHA512:
-  metadata.gz: !binary |-
-    MzlmZDNjMjg0NTJlMjZmOTk4YTU3Y2YwNjlhMTk0Njc0OGEwM2RhYjdjYTZh
-    MzdhMjg5OTg1ZjVmZmY2OGY2OWVlN2E5MjcwZmU3OGQxMmU0ZWIwZjE0NDhk
-    MGQ1OWUwNGQ2NDU1OTIzMDA0YjAzZjhiMGNmM2JjZTZlMzUyYzU=
-  data.tar.gz: !binary |-
-    ZjNmNDJmYTBkOWUxMmU3ZDQzMDc0NzRhMWU1ZWZiMWY1MjM1YmEwZDkwMGZi
-    Nzg5MDFiZWY3NTFmMmU4M2ViY2M2NjUwZGQxNGZkZGI3ODlhNjRlYWE5NTRh
-    MjAwMzYzODkzZDA0NmIyM2EzMjVmNzA5M2Y5YzFkZTg1YTY4ZmM=
+  metadata.gz: b23a97f2c8142ddd09e624e8363fb69901a92e092ca1c645768b407c0be27e6fa74ed4d47a1b175fedcda42fed3e7ea0f15c54161b9e737f2bb39b1d4e71cc77
+  data.tar.gz: c2b58e2b9be2c58d95310a960d4d27d4834fe2d18f33eebbdafae9e348c35e6550dce359f4d608b571861b0ef0bba827b0017406fb79935e224b5be6d0c03b88

data/VERSION

@@ -1 +1 @@
-3.4.8
+3.4.9

data/VERSION_DATE

@@ -1 +1 @@
-15 November 2014 00:58:58 UTC
+25 November 2014 01:40:45 UTC

data/lib/sass/plugin/compiler.rb

@@ -399,7 +399,8 @@ module Sass::Plugin
 
     def listen_to(listener)
       if Sass::Util.listen_geq_2?
-        listener.map {|l| l.start}.each {|thread| thread.join}
+        listener.map {|l| l.start}
+        sleep
       else
         listener.start!
       end

data/lib/sass/script/parser.rb

@@ -498,7 +498,8 @@ RUBY
         return paren unless first
         str = literal_node(first.value, first.source_range)
         return str unless try_tok(:string_interpolation)
-        mid = parse_interpolated
+        mid = assert_expr :expr
+        assert_tok :end_interpolation
         last = assert_expr(:special_fun)
         node(Tree::Interpolation.new(str, mid, last, false, false),
             first.source_range.start_pos)

data/lib/sass/scss/parser.rb

@@ -808,6 +808,8 @@ module Sass
       def almost_any_value_token
         tok(%r{
           (
+            \\.
+          |
             (?!url\()
             [^"'/\#!;\{\}] # "
           |

data/lib/sass/tree/visitors/convert.rb

@@ -113,8 +113,8 @@ class Sass::Tree::Visitors::Convert < Sass::Tree::Visitors::Base
   end
 
   def visit_extend(node)
-    "#{tab_str}@extend #{selector_to_src(node.selector).lstrip}#{semi}" +
-      "#{" !optional" if node.optional?}\n"
+    "#{tab_str}@extend #{selector_to_src(node.selector).lstrip}" +
+      "#{" !optional" if node.optional?}#{semi}\n"
   end
 
   def visit_for(node)
@@ -274,7 +274,7 @@ class Sass::Tree::Visitors::Convert < Sass::Tree::Visitors::Base
       "#{tab_str}@at-root #{query_interp_to_src(node.query)}#{yield}"
     elsif node.children.length == 1 && node.children.first.is_a?(Sass::Tree::RuleNode)
       rule = node.children.first
-      "#{tab_str}@at-root #{selector_to_src(rule.rule)}#{visit_children(rule)}"
+      "#{tab_str}@at-root #{selector_to_src(rule.rule).lstrip}#{visit_children(rule)}"
     else
       "#{tab_str}@at-root#{yield}"
     end

data/test/sass/compiler_test.rb

@@ -47,7 +47,11 @@ class CompilerTest < MiniTest::Test
 
     # 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

data/test/sass/conversion_test.rb

@@ -30,8 +30,7 @@ SCSS
   end
 
   def test_empty_directive
-    assert_scss_to_sass "@media screen", "@media screen {}"
-    assert_scss_to_scss "@media screen {}"
+    assert_renders "@media screen", "@media screen {}"
   end
 
   def test_empty_control_directive
@@ -287,24 +286,24 @@ foo bar {
 }
 SCSS
 
-    assert_sass_to_scss <<SCSS, <<SASS
+    assert_renders <<SASS, <<SCSS
 // foo
 // bar
 //   baz
 // bang
 
-foo bar {
-  a: b;
-}
-SCSS
+foo bar
+  a: b
+SASS
 // foo
 // bar
 //   baz
 // bang
 
-foo bar
-  a: b
-SASS
+foo bar {
+  a: b;
+}
+SCSS
   end
 
   def test_nested_silent_comments
@@ -1275,26 +1274,7 @@ SCSS
   end
 
   def test_media_with_expressions
-    assert_sass_to_scss <<SCSS, <<SASS
-$media1: screen;
-$media2: print;
-$var: -webkit-min-device-pixel-ratio;
-$val: 20;
-
-@media \#{$media1} and ($var + "-foo": $val + 5), only \#{$media2} {
-  a: b;
-}
-SCSS
-$media1: screen
-$media2: print
-$var: -webkit-min-device-pixel-ratio
-$val: 20
-
-@media \#{$media1} and ($var + "-foo": $val + 5), only \#{$media2}
-  a: b
-SASS
-
-    assert_scss_to_sass <<SASS, <<SCSS
+    assert_renders <<SASS, <<SCSS
 $media1: screen
 $media2: print
 $var: -webkit-min-device-pixel-ratio
@@ -1315,14 +1295,14 @@ SCSS
   end
 
   def test_media_with_feature
-    assert_sass_to_scss <<SCSS, <<SASS
+    assert_renders <<SASS, <<SCSS
+@media screen and (-webkit-transform-3d)
+  a: b
+SASS
 @media screen and (-webkit-transform-3d) {
   a: b;
 }
 SCSS
-@media screen and (-webkit-transform-3d)
-  a: b
-SASS
   end
 
   def test_supports_with_expressions
@@ -1678,7 +1658,7 @@ SCSS
   end
 
   def test_extend_with_optional
-    assert_scss_to_sass <<SASS, <<SCSS
+    assert_renders <<SASS, <<SCSS
 foo
   @extend .bar !optional
 SASS
@@ -1689,7 +1669,7 @@ SCSS
   end
 
   def test_mixin_var_args
-    assert_scss_to_sass <<SASS, <<SCSS
+    assert_renders <<SASS, <<SCSS
 =foo($args...)
   a: b
 
@@ -1716,7 +1696,7 @@ SCSS
   end
 
   def test_mixin_var_kwargs
-    assert_scss_to_sass <<SASS, <<SCSS
+    assert_renders <<SASS, <<SCSS
 =foo($a: b, $c: d)
   a: $a
   c: $c
@@ -1738,7 +1718,7 @@ SCSS
   end
 
   def test_function_var_args
-    assert_scss_to_sass <<SASS, <<SCSS
+    assert_renders <<SASS, <<SCSS
 @function foo($args...)
   @return foo
 
@@ -1765,7 +1745,7 @@ SCSS
   end
 
   def test_function_var_kwargs
-    assert_scss_to_sass <<SASS, <<SCSS
+    assert_renders <<SASS, <<SCSS
 @function foo($a: b, $c: d)
   @return foo
 
@@ -1785,7 +1765,7 @@ SCSS
   end
 
   def test_at_root
-    assert_scss_to_sass <<SASS, <<SCSS
+    assert_renders <<SASS, <<SCSS
 .foo
   @at-root
     .bar
@@ -1807,7 +1787,7 @@ SCSS
   end
 
   def test_at_root_with_selector
-    assert_scss_to_sass <<SASS, <<SCSS
+    assert_renders <<SASS, <<SCSS
 .foo
   @at-root .bar
     a: b
@@ -1821,7 +1801,7 @@ SCSS
   end
 
   def test_at_root_without
-    assert_scss_to_sass <<SASS, <<SCSS
+    assert_renders <<SASS, <<SCSS
 .foo
   @at-root (without: media rule)
     a: b
@@ -1835,7 +1815,7 @@ SCSS
   end
 
   def test_at_root_with
-    assert_scss_to_sass <<SASS, <<SCSS
+    assert_renders <<SASS, <<SCSS
 .foo
   @at-root (with: media rule)
     a: b
@@ -1849,7 +1829,7 @@ SCSS
   end
 
   def test_function_var_kwargs_with_list
-    assert_scss_to_sass <<SASS, <<SCSS
+    assert_renders <<SASS, <<SCSS
 @function foo($a: b, $c: d)
   @return $a, $c
 
@@ -1918,12 +1898,13 @@ SCSS
   end
 
   def test_media_query_with_expr
-    assert_scss_to_sass <<SASS, <<SCSS
+    assert_renders <<SASS, <<SCSS
 @media foo and (bar: baz)
   a: b
 SASS
 @media foo and (bar: baz) {
-  a: b; }
+  a: b;
+}
 SCSS
   end
 

data/test/sass/script_conversion_test.rb

@@ -261,6 +261,11 @@ RUBY
     assert_renders 'flabnabbit($foo #{1 + "foo"}#{2 + "bar"} $baz)'
   end
 
+  def test_interpolation_in_string_function
+    assert_renders 'calc(#{1 + "foo"})'
+    assert_renders 'calc(foo#{1 + "foo"}baz)'
+  end
+
   def test_interpolation_near_operators
     assert_renders '#{1 + 2} , #{3 + 4}'
     assert_renders '#{1 + 2}, #{3 + 4}'

data/test/sass/scss/css_test.rb

@@ -1013,6 +1013,12 @@ SCSS
     assert_equal "E + F {\n  a: b; }\n", render("E+F { a: b;} ")
   end
 
+  def test_escapes_in_selectors
+    assert_selector_parses('.\!foo')
+    assert_selector_parses('.\66 foo')
+    assert_selector_parses('.\21 foo')
+  end
+
   def test_subject_selector_deprecation
     assert_warning(<<WARNING) {render(".foo .bar! .baz {a: b}")}
 DEPRECATION WARNING on line 1, column 1:

data/test/sass/scss/scss_test.rb

@@ -3570,6 +3570,13 @@ SCSS
 
   # Regression
 
+  def test_escape_in_selector
+    assert_equal(<<CSS, render(".\\!foo {a: b}"))
+.\\!foo {
+  a: b; }
+CSS
+  end
+
   def test_for_directive_with_float_bounds
     assert_equal(<<CSS, render(<<SCSS))
 .a {

data/test/sass/source_map_test.rb

@@ -801,12 +801,12 @@ SCSS
     interpolated = engine.to_tree.children.
       first.children.
       first.value.children[1]
-    assert_equal interpolated.to_sass, "\#{123}"
+    assert_equal "123", interpolated.to_sass
     range = interpolated.source_range
     assert_equal 3, range.start_pos.line
-    assert_equal 12, range.start_pos.offset
+    assert_equal 14, range.start_pos.offset
     assert_equal 3, range.end_pos.line
-    assert_equal 18, range.end_pos.offset
+    assert_equal 17, range.end_pos.offset
   end
 
   def test_sources_array_is_uri_escaped

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sass
 version: !ruby/object:Gem::Version
-  version: 3.4.8
+  version: 3.4.9
 platform: ruby
 authors:
 - Natalie Weizenbaum
@@ -10,54 +10,55 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-15 00:00:00.000000000 Z
+date: 2014-11-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 0.5.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 0.5.3
 - !ruby/object:Gem::Dependency
   name: maruku
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 0.5.9
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 0.5.9
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '5'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '5'
-description: ! "      Sass makes CSS fun again. Sass is an extension of CSS3, adding\n
-  \     nested rules, variables, mixins, selector inheritance, and more.\n      It's
-  translated to well-formatted, standard CSS using the\n      command line tool or
-  a web-framework plugin.\n"
+description: |2
+        Sass makes CSS fun again. Sass is an extension of CSS3, adding
+        nested rules, variables, mixins, selector inheritance, and more.
+        It's translated to well-formatted, standard CSS using the
+        command line tool or a web-framework plugin.
 email: sass-lang@googlegroups.com
 executables:
 - sass
@@ -210,7 +211,6 @@ files:
 - lib/sass/util/test.rb
 - lib/sass/version.rb
 - rails/init.rb
-- test/foo.scss
 - test/sass/cache_test.rb
 - test/sass/callbacks_test.rb
 - test/sass/compiler_test.rb
@@ -381,43 +381,43 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: 1.8.7
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: sass
-rubygems_version: 2.4.3
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: A powerful but elegant CSS compiler that makes CSS fun again.
 test_files:
-- test/sass/engine_test.rb
-- test/sass/functions_test.rb
 - test/sass/value_helpers_test.rb
-- test/sass/extend_test.rb
-- test/sass/logger_test.rb
-- test/sass/compiler_test.rb
-- test/sass/css2sass_test.rb
 - test/sass/conversion_test.rb
+- test/sass/cache_test.rb
 - test/sass/script_test.rb
-- test/sass/exec_test.rb
-- test/sass/util/subset_map_test.rb
-- test/sass/util/multibyte_string_scanner_test.rb
-- test/sass/util/normalized_map_test.rb
+- test/sass/superselector_test.rb
 - test/sass/callbacks_test.rb
-- test/sass/importer_test.rb
+- test/sass/source_map_test.rb
+- test/sass/script_conversion_test.rb
+- test/sass/util_test.rb
+- test/sass/plugin_test.rb
+- test/sass/extend_test.rb
+- test/sass/scss/rx_test.rb
 - test/sass/scss/css_test.rb
 - test/sass/scss/scss_test.rb
-- test/sass/scss/rx_test.rb
-- test/sass/util_test.rb
-- test/sass/script_conversion_test.rb
-- test/sass/superselector_test.rb
+- test/sass/logger_test.rb
+- test/sass/importer_test.rb
 - test/sass/encoding_test.rb
-- test/sass/cache_test.rb
-- test/sass/source_map_test.rb
-- test/sass/plugin_test.rb
+- test/sass/engine_test.rb
+- test/sass/exec_test.rb
+- test/sass/util/normalized_map_test.rb
+- test/sass/util/subset_map_test.rb
+- test/sass/util/multibyte_string_scanner_test.rb
+- test/sass/functions_test.rb
+- test/sass/compiler_test.rb
+- test/sass/css2sass_test.rb

data/test/foo.scss

@@ -1 +0,0 @@
-foo {a: x}