sass 3.3.3 → 3.3.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3b1f65147a1c8475b358cc3769c042b4e61b3973
-  data.tar.gz: 8bef79f9df38193e0891505f82f1d523d6229383
+  metadata.gz: e01f4f4c3ddb4b26467c0ba857d8472415830997
+  data.tar.gz: d0ac7a66e45fba34fe08aff86472371b816a8928
 SHA512:
-  metadata.gz: fbb1fa87bbd19535fcf56757318b75946833c85b1bf17caced90dddbad38ae0e6738c0e9b8d5480942f8a0e8a8014f9f40b4814a47fac6312ddc8b361da4b3db
-  data.tar.gz: 21b79150a581f91e5d92161cb41a85b85ae35ee45e3750034c23a85ae046f6c50d5d8b084eafa68d328588ebcdb2e1253878bbfcb7fa74f9367e5bbc6c190b5a
+  metadata.gz: aa0e2df2d14eac32d04038eeb293cc98b60daaf1b0de4d6132c4284c90d212fd7d2c29b5a66c5d13ab33aaf65238bb1b4930f01e7bff04c160c2ac19fa7fa088
+  data.tar.gz: c455f23cd577a8b7f5464bfb8eead044184bf2402218bec37fdfd3a7e05cf4e4b564fb69c6c4288ae09b8a3fae1815cb5c85fe98ef1e0c492c910f63df5c1a3f

data/VERSION

@@ -1 +1 @@
-3.3.3
+3.3.4

data/VERSION_DATE

@@ -1 +1 @@
-14 March 2014 23:31:57 UTC
+21 March 2014 23:43:07 UTC

data/lib/sass/cache_stores/filesystem.rb

@@ -22,7 +22,11 @@ module Sass
             return f.read
           end
         end
-        File.unlink path_to(key)
+        begin
+          File.unlink path_to(key)
+        rescue Errno::ENOENT
+          # Already deleted. Race condition?
+        end
         nil
       rescue EOFError, TypeError, ArgumentError => e
         Sass::Util.sass_warn "Warning. Error encountered while reading cache #{path_to(key)}: #{e}"
@@ -32,7 +36,7 @@ module Sass
       def _store(key, version, sha, contents)
         compiled_filename = path_to(key)
         FileUtils.mkdir_p(File.dirname(compiled_filename))
-        Sass::Util.atomic_create_and_write_file(compiled_filename) do |f|
+        Sass::Util.atomic_create_and_write_file(compiled_filename, 0600) do |f|
           f.puts(version)
           f.puts(sha)
           f.write(contents)

data/lib/sass/importers/filesystem.rb

@@ -139,8 +139,9 @@ module Sass
       # @param name [String] The filename to search for.
       # @return [(String, Symbol)] A filename-syntax pair.
       def find_real_file(dir, name, options)
-        # on windows 'dir' can be in native File::ALT_SEPARATOR form
+        # On windows 'dir' or 'name' can be in native File::ALT_SEPARATOR form.
         dir = dir.gsub(File::ALT_SEPARATOR, File::SEPARATOR) unless File::ALT_SEPARATOR.nil?
+        name = name.gsub(File::ALT_SEPARATOR, File::SEPARATOR) unless File::ALT_SEPARATOR.nil?
 
         found = possible_files(remove_root(name)).map do |f, s|
           path = (dir == "." || Sass::Util.pathname(f).absolute?) ? f :

data/lib/sass/plugin/staleness_checker.rb

@@ -46,7 +46,7 @@ module Sass
         @actively_checking = Set.new
 
         # Entries in the following instance-level caches are never explicitly expired.
-        # Instead they are supposed to automaticaly go out of scope when a series of staleness
+        # Instead they are supposed to automatically go out of scope when a series of staleness
         # checks (this instance of StalenessChecker was created for) is finished.
         @mtimes, @dependencies_stale, @parse_trees = {}, {}, {}
         @options = Sass::Engine.normalize_options(options)

data/lib/sass/script/functions.rb

@@ -922,7 +922,7 @@ module Sass::Script
     #   darken(#800, 20%) => #200
     # @overload darken($color, $amount)
     #   @param $color [Sass::Script::Value::Color]
-    #   @param $amount [Sass::Script::Value::Number] The amount to dencrease the
+    #   @param $amount [Sass::Script::Value::Number] The amount to decrease the
     #     lightness by, between `0%` and `100%`
     # @return [Sass::Script::Value::Color]
     # @raise [ArgumentError] if `$amount` is out of bounds, or either parameter
@@ -980,7 +980,7 @@ module Sass::Script
     #
     # @example
     #   adjust-hue(hsl(120, 30%, 90%), 60deg) => hsl(180, 30%, 90%)
-    #   adjust-hue(hsl(120, 30%, 90%), 060deg) => hsl(60, 30%, 90%)
+    #   adjust-hue(hsl(120, 30%, 90%), -60deg) => hsl(60, 30%, 90%)
     #   adjust-hue(#811, 45deg) => #886a11
     # @overload adjust_hue($color, $degrees)
     #   @param $color [Sass::Script::Value::Color]
@@ -1411,8 +1411,8 @@ module Sass::Script
     end
     declare :str_insert, [:string, :insert, :index]
 
-    # Returns the index of the first occurance of `$substring` in `$string`. If
-    # there is no such occurance, returns `null`.
+    # Returns the index of the first occurrence of `$substring` in `$string`. If
+    # there is no such occurrence, returns `null`.
     #
     # Note that unlike some languages, the first character in a Sass string is
     # number 1, the second number 2, and so forth.
@@ -1885,7 +1885,7 @@ module Sass::Script
     # @example
     #   index(1px solid red, solid) => 2
     #   index(1px solid red, dashed) => null
-    #   index((width: 10px, height: 20px), (height, 20px)) => 2
+    #   index((width: 10px, height: 20px), (height 20px)) => 2
     # @overload index($list, $value)
     #   @param $list [Sass::Script::Value::Base]
     #   @param $value [Sass::Script::Value::Base]
@@ -2212,7 +2212,7 @@ module Sass::Script
     # Return a string containing the value as its Sass representation.
     #
     # @param value [Sass::Script::Value::Base] The value to inspect.
-    # @return [Sass::Script::Value::String] A respresentation of the value as
+    # @return [Sass::Script::Value::String] A representation of the value as
     #   it would be written in Sass.
     def inspect(value)
       unquoted_string(value.to_sass)

data/lib/sass/script/value/base.rb

@@ -20,7 +20,7 @@ module Sass::Script::Value
     #
     # @param value [Object] The object for \{#value}
     def initialize(value = nil)
-      @value = value.freeze
+      @value = value.freeze unless value.nil?
     end
 
     # Sets the options hash for this node,

data/lib/sass/script/value/deprecated_false.rb

@@ -24,7 +24,7 @@ module Sass::Script::Value
 DEPRECATION WARNING: The return value of index() will change from "false" to
 "null" in future versions of Sass. For compatibility, avoid using "== false" on
 the return value. For example, instead of "@if index(...) == false", just write
-"@if index(...)".
+"@if not index(...)".
 WARNING
       end
       Bool.new(other.value == false)

data/lib/sass/selector.rb

@@ -7,7 +7,7 @@ require 'sass/selector/simple_sequence'
 module Sass
   # A namespace for nodes in the parse tree for selectors.
   #
-  # {CommaSequence} is the toplevel seelctor,
+  # {CommaSequence} is the toplevel selector,
   # representing a comma-separated sequence of {Sequence}s,
   # such as `foo bar, baz bang`.
   # {Sequence} is the next level,

data/lib/sass/selector/simple_sequence.rb

@@ -128,7 +128,7 @@ module Sass
         end)
       end
 
-      # Non-destrucively extends this selector with the extensions specified in a hash
+      # Non-destructively extends this selector with the extensions specified in a hash
       # (which should come from {Sass::Tree::Visitors::Cssize}).
       #
       # @overload do_extend(extends, parent_directives)

data/lib/sass/tree/charset_node.rb

@@ -1,5 +1,5 @@
 module Sass::Tree
-  # A static node representing an unproccessed Sass `@charset` directive.
+  # A static node representing an unprocessed Sass `@charset` directive.
   #
   # @see Sass::Tree
   class CharsetNode < Node

data/lib/sass/tree/directive_node.rb

@@ -1,5 +1,5 @@
 module Sass::Tree
-  # A static node representing an unproccessed Sass `@`-directive.
+  # A static node representing an unprocessed Sass `@`-directive.
   # Directives known to Sass, like `@for` and `@debug`,
   # are handled by their own nodes;
   # only CSS directives like `@media` and `@font-face` become {DirectiveNode}s.

data/lib/sass/tree/extend_node.rb

@@ -1,7 +1,7 @@
 require 'sass/tree/node'
 
 module Sass::Tree
-  # A static node reprenting an `@extend` directive.
+  # A static node representing an `@extend` directive.
   #
   # @see Sass::Tree
   class ExtendNode < Node

data/lib/sass/tree/rule_node.rb

@@ -1,7 +1,7 @@
 require 'pathname'
 
 module Sass::Tree
-  # A static node reprenting a CSS rule.
+  # A static node representing a CSS rule.
   #
   # @see Sass::Tree
   class RuleNode < Node

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

@@ -23,8 +23,12 @@ class Sass::Tree::Visitors::CheckNesting < Sass::Tree::Visitors::Base
   SCRIPT_NODES = [Sass::Tree::ImportNode] + CONTROL_NODES
   def visit_children(parent)
     old_parent = @parent
-    @parent = parent unless is_any_of?(parent, SCRIPT_NODES) ||
-      (parent.bubbles? && !old_parent.is_a?(Sass::Tree::RootNode))
+    unless is_any_of?(parent, SCRIPT_NODES) ||
+        (parent.bubbles? &&
+        !old_parent.is_a?(Sass::Tree::RootNode) &&
+        !old_parent.is_a?(Sass::Tree::AtRootNode))
+      @parent = parent
+    end
     @parents.push parent
     super
   ensure

data/lib/sass/util.rb

@@ -1149,15 +1149,20 @@ MSG
     # rename operation.
     #
     # @param filename [String] The file to write to.
+    # @param perms [Integer] The permissions used for creating this file.
+    #   Will be masked by the process umask. Defaults to readable/writeable
+    #   by all users however the umask usually changes this to only be writable
+    #   by the process's user.
     # @yieldparam tmpfile [Tempfile] The temp file that can be written to.
     # @return The value returned by the block.
-    def atomic_create_and_write_file(filename)
+    def atomic_create_and_write_file(filename, perms = 0666)
       require 'tempfile'
       tmpfile = Tempfile.new(File.basename(filename), File.dirname(filename))
       tmpfile.binmode if tmpfile.respond_to?(:binmode)
       result = yield tmpfile
       tmpfile.close
       ATOMIC_WRITE_MUTEX.synchronize do
+        File.chmod(perms & ~File.umask, tmpfile.path)
         File.rename tmpfile.path, filename
       end
       result

data/lib/sass/util/subset_map.rb

@@ -59,7 +59,7 @@ module Sass
       #
       # In the worst case, this runs in `O(m*max(n, log m))` time,
       # where `n` is the size of `set`
-      # and `m` is the number of assocations in the map.
+      # and `m` is the number of associations in the map.
       # However, unless many keys in the map overlap with `set`,
       # `m` will typically be much smaller.
       #

data/test/sass/compiler_test.rb

@@ -18,7 +18,7 @@ class CompilerTest < Test::Unit::TestCase
       @start_called = false
       reset_events!
     end
-    
+
     def fire_events!(*args)
       @on_filesystem_event.call(@modified, @added, @removed)
       reset_events!

data/test/sass/css2sass_test.rb

@@ -62,7 +62,7 @@ div .debug
 SASS
 div .warning {
   color: #d21a19; }
-span .debug { 
+span .debug {
   cursor: crosshair;}
 div .debug {
   cursor: default; }

data/test/sass/extend_test.rb

@@ -145,8 +145,8 @@ SCSS
   end
 
   def test_class_unification
-    assert_unification '.foo.bar', '.baz {@extend .foo}', '.foo.bar, .bar.baz' 
-    assert_unification '.foo.baz', '.baz {@extend .foo}', '.baz' 
+    assert_unification '.foo.bar', '.baz {@extend .foo}', '.foo.bar, .bar.baz'
+    assert_unification '.foo.baz', '.baz {@extend .foo}', '.baz'
   end
 
   def test_id_unification

data/test/sass/functions_test.rb

@@ -1274,7 +1274,7 @@ WARNING
 DEPRECATION WARNING: The return value of index() will change from "false" to
 "null" in future versions of Sass. For compatibility, avoid using "== false" on
 the return value. For example, instead of "@if index(...) == false", just write
-"@if index(...)".
+"@if not index(...)".
 WARNING
       assert_equal("true", evaluate("index(1, 2 3 4) == false"))
     end
@@ -1291,7 +1291,7 @@ WARNING
 DEPRECATION WARNING: The return value of index() will change from "false" to
 "null" in future versions of Sass. For compatibility, avoid using "== false" on
 the return value. For example, instead of "@if index(...) == false", just write
-"@if index(...)".
+"@if not index(...)".
 WARNING
       assert_equal("true", evaluate("false == index(1, 2 3 4)"))
     end
@@ -1310,12 +1310,12 @@ WARNING
 DEPRECATION WARNING: The return value of index() will change from "false" to
 "null" in future versions of Sass. For compatibility, avoid using "== false" on
 the return value. For example, instead of "@if index(...) == false", just write
-"@if index(...)".
+"@if not index(...)".
         on line 3 of test_index_deprecation_warning_is_only_emitted_once_per_call_inline.scss
 DEPRECATION WARNING: The return value of index() will change from "false" to
 "null" in future versions of Sass. For compatibility, avoid using "== false" on
 the return value. For example, instead of "@if index(...) == false", just write
-"@if index(...)".
+"@if not index(...)".
         on line 6 of test_index_deprecation_warning_is_only_emitted_once_per_call_inline.scss
 WARNING
       render(<<SCSS)

data/test/sass/script_conversion_test.rb

@@ -113,7 +113,7 @@ class SassScriptConversionTest < Test::Unit::TestCase
     op_outer = Sass::Script::Lexer::OPERATORS_REVERSE[outer]
     op_inner = Sass::Script::Lexer::OPERATORS_REVERSE[inner]
     class_eval <<RUBY
-      def test_precedence_#{outer}_#{inner} 
+      def test_precedence_#{outer}_#{inner}
         assert_renders "$foo #{op_outer} $bar #{op_inner} $baz"
         assert_renders "$foo #{op_inner} $bar #{op_outer} $baz"
 
@@ -132,7 +132,7 @@ RUBY
     op = separator_for(op_name)
     sibling = separator_for(sibling_name)
     class_eval <<RUBY
-      def test_associative_#{op_name}_#{sibling_name} 
+      def test_associative_#{op_name}_#{sibling_name}
         assert_renders "$foo#{op}$bar#{op}$baz"
 
         assert_equal "$foo#{op}$bar#{op}$baz",
@@ -160,7 +160,7 @@ RUBY
     op = Sass::Script::Lexer::OPERATORS_REVERSE[op_name]
     sibling = Sass::Script::Lexer::OPERATORS_REVERSE[sibling_name]
     class_eval <<RUBY
-      def test_non_associative_#{op_name}_#{sibling_name} 
+      def test_non_associative_#{op_name}_#{sibling_name}
         assert_renders "$foo #{op} $bar #{op} $baz"
 
         assert_renders "$foo #{op} ($bar #{op} $baz)"

data/test/sass/scss/css_test.rb

@@ -94,7 +94,7 @@ foo {a /*: b; c */: d}
 SCSS
   end
 
-  def test_crazy_comments 
+  def test_crazy_comments
     # http://www.w3.org/Style/CSS/Test/CSS2.1/current/xhtml1/t040109-c17-comments-00-b.xht
     assert_equal <<CSS, render(<<SCSS)
 /* This is a CSS comment. */
@@ -836,7 +836,7 @@ SCSS
 
   def assert_selector_can_contain_selectors(sel)
     try = lambda {|subsel| assert_selector_parses(sel.gsub('<sel>', subsel))}
-    
+
     try['foo|bar']
     try['*|bar']
 

data/test/sass/scss/scss_test.rb

@@ -3099,7 +3099,18 @@ SCSS
   end
 
   # Regression
- 
+
+  def test_top_level_unknown_directive_in_at_root
+    assert_equal(<<CSS, render(<<SCSS))
+@fblthp {
+  a: b; }
+CSS
+@at-root {
+  @fblthp {a: b}
+}
+SCSS
+  end
+
   def test_parent_ref_with_newline
     assert_equal(<<CSS, render(<<SCSS))
 a.c
@@ -3422,10 +3433,10 @@ SCSS
 }
 .aaa .aaa .aaa {
   background-color: black;
-}   
+}
 .bbb {
   @extend .aaa;
-} 
+}
 .xxx {
   @extend .bbb;
 }

data/test/sass/util_test.rb

@@ -419,6 +419,27 @@ WARNING
     end
   end
 
+  def test_atomic_write_permissions
+    atomic_filename = File.join(Dir.tmpdir, "test_atomic_perms.atomic")
+    normal_filename = File.join(Dir.tmpdir, "test_atomic_perms.normal")
+    atomic_create_and_write_file(atomic_filename) {|f| f.write("whatever\n") }
+    open(normal_filename, "wb") {|f| f.write("whatever\n") }
+    assert_equal File.stat(normal_filename).mode.to_s(8), File.stat(atomic_filename).mode.to_s(8)
+  ensure
+    File.unlink(atomic_filename) rescue nil
+    File.unlink(normal_filename) rescue nil
+  end
+
+  def test_atomic_writes_respect_umask
+    atomic_filename = File.join(Dir.tmpdir, "test_atomic_perms.atomic")
+    atomic_create_and_write_file(atomic_filename) do |f|
+      f.write("whatever\n")
+    end
+    assert_equal 0, File.stat(atomic_filename).mode & File.umask
+  ensure
+    File.unlink(atomic_filename)
+  end
+
   class FakeError < RuntimeError; end
 
   def test_atomic_writes_handles_exceptions

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sass
 version: !ruby/object:Gem::Version
-  version: 3.3.3
+  version: 3.3.4
 platform: ruby
 authors:
 - Nathan Weizenbaum
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-14 00:00:00.000000000 Z
+date: 2014-03-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: yard