sass 3.3.8 → 3.3.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0bf6310b2324741eab4f6267b1999e90b522b0d7
-  data.tar.gz: df120388678de1053e5f8a22d1b4e972d0ab536c
+  metadata.gz: 6f9d9c10c02b2d9ca11da7bdec51903de916be8c
+  data.tar.gz: 4dc07a5b37490d62d115fe63bff1d2008c18ab71
 SHA512:
-  metadata.gz: 2138eb4290f33ed4058020bdf52e238802a11b5be8d2ad1eed798691005cf6ce02f765cbd6db48ee90e5b7b23c1c6825db0e4711ebc69e9ee9e5dbe788c75879
-  data.tar.gz: 81538da0a25f9c024f7bfd20bbc38e53873c8f2f72b4f822dc950d04f8990274a8cb37483fa1603bf101941bb022244a455c84e496fb152a46d427b03959660f
+  metadata.gz: a141a1b9194aa86b15d752855f1ce5321509b12992837d111ffd2183ba98bb59b0cb7f2254ab977617bfd32deca1b80dbee81131e4e8c70ef03f5baa1869c4bc
+  data.tar.gz: dfb009a5f9716c38da33dd4ecb67d9644bfdf07c4f60a3901e1ce0bc2b3be8d49b9a7d328df6824693aba190352198baec7faba722b3a73430432ebc19a13605

data/README.md

@@ -49,8 +49,10 @@ see [the Sass reference](http://sass-lang.com/docs/yardoc/file.SASS_REFERENCE.ht
 Sass can also be used with any Rack-enabled web framework.
 To do so, just add
 
-    require 'sass/plugin/rack'
-    use Sass::Plugin::Rack
+```ruby
+require 'sass/plugin/rack'
+use Sass::Plugin::Rack
+```
 
 to `config.ru`.
 Then any Sass files in `public/stylesheets/sass`
@@ -93,18 +95,20 @@ put them in a file called `test.scss` and run `sass test.scss`.
 Sass avoids repetition by nesting selectors within one another.
 The same thing works for properties.
 
-    table.hl {
-      margin: 2em 0;
-      td.ln { text-align: right; }
-    }
-
-    li {
-      font: {
-        family: serif;
-        weight: bold;
-        size: 1.2em;
-      }
-    }
+```scss
+table.hl {
+  margin: 2em 0;
+  td.ln { text-align: right; }
+}
+
+li {
+  font: {
+    family: serif;
+    weight: bold;
+    size: 1.2em;
+  }
+}
+```
 
 ### Variables
 
@@ -112,19 +116,21 @@ Use the same color all over the place?
 Need to do some math with height and width and text size?
 Sass supports variables, math operations, and many useful functions.
 
-    $blue: #3bbfce;
-    $margin: 16px;
+```scss
+$blue: #3bbfce;
+$margin: 16px;
 
-    .content_navigation {
-      border-color: $blue;
-      color: darken($blue, 10%);
-    }
+.content_navigation {
+  border-color: $blue;
+  color: darken($blue, 10%);
+}
 
-    .border {
-      padding: $margin / 2;
-      margin: $margin / 2;
-      border-color: $blue;
-    }
+.border {
+  padding: $margin / 2;
+  margin: $margin / 2;
+  border-color: $blue;
+}
+```
 
 ### Mixins
 
@@ -133,23 +139,25 @@ mixins allow you to re-use whole chunks of CSS,
 properties or selectors.
 You can even give them arguments. 
 
-    @mixin table-scaffolding {
-      th {
-        text-align: center;
-        font-weight: bold;
-      }
-      td, th { padding: 2px; }
-    }
-
-    @mixin left($dist) {
-      float: left;
-      margin-left: $dist;
-    }
-
-    #data {
-      @include left(10px);
-      @include table-scaffolding;
-    }
+```scss
+@mixin table-scaffolding {
+  th {
+    text-align: center;
+    font-weight: bold;
+  }
+  td, th { padding: 2px; }
+}
+
+@mixin left($dist) {
+  float: left;
+  margin-left: $dist;
+}
+
+#data {
+  @include left(10px);
+  @include table-scaffolding;
+}
+```
 
 A comprehensive list of features is available
 in the [Sass reference](http://sass-lang.com/documentation/file.SASS_REFERENCE.html).
@@ -202,9 +210,9 @@ task for a boy-genius). Nathan lives in Seattle, Washington and works on
 Sass and the creator of Compass, the first Sass-based framework. Chris focuses
 on making Sass more powerful, easy to use, and on ways to speed its adoption
 through the web development community. Chris lives in San Jose, California with
-his wife and daughter. He is the Software Architect for
-[Caring.com](http://caring.com), a website devoted to the 34 Million caregivers
-whose parents are sick or elderly, that uses Haml and Sass.
+his wife and daughter. He is an Engineer for
+[LinkedIn.com](http://linkedin.com), where one of his responsibilities is to
+maintain Sass & Compass.
 
 If you use this software, you must pay Hampton a compliment. And
 buy Nathan some jelly beans. Maybe pet a kitten. Yeah. Pet that kitty.

data/Rakefile

@@ -102,12 +102,10 @@ task :install => [:package] do
   sh %{#{'sudo ' if ENV["SUDO"]}#{gem} install --no-ri pkg/sass-#{get_version}}
 end
 
-desc "Release a new Sass package to Rubyforge."
+desc "Release a new Sass package to RubyGems.org."
 task :release => [:check_release, :package] do
   name = File.read(scope("VERSION_NAME")).strip
   version = File.read(scope("VERSION")).strip
-  sh %{rubyforge add_release sass sass "#{name} (v#{version})" pkg/sass-#{version}.gem}
-  sh %{rubyforge add_file    sass sass "#{name} (v#{version})" pkg/sass-#{version}.tar.gz}
   sh %{gem push pkg/sass-#{version}.gem}
 end
 
@@ -166,7 +164,6 @@ task :release_edge do
       next
     end
 
-    sh %{rubyforge add_release sass sass "Bleeding Edge (v#{version})" pkg/sass-#{version}.gem}
     sh %{gem push pkg/sass-#{version}.gem}
   end
 end

data/VERSION

@@ -1 +1 @@
-3.3.8
+3.3.9

data/VERSION_DATE

@@ -1 +1 @@
-31 May 2014 00:35:27 UTC
+28 June 2014 00:25:14 UTC

data/lib/sass/exec.rb

@@ -682,7 +682,7 @@ END
         unless File.directory?(@options[:input])
           raise "Error: '#{@options[:input]}' is not a directory"
         end
-        if @options[:output] && File.exists?(@options[:output]) &&
+        if @options[:output] && File.exist?(@options[:output]) &&
           !File.directory?(@options[:output])
           raise "Error: '#{@options[:output]}' is not a directory"
         end
@@ -711,7 +711,7 @@ END
             FileUtils.mkdir_p(File.dirname(output))
           end
           puts_action :convert, :green, f
-          if File.exists?(output)
+          if File.exist?(output)
             puts_action :overwrite, :yellow, output
           else
             puts_action :create, :green, output

data/lib/sass/plugin/compiler.rb

@@ -353,14 +353,14 @@ module Sass::Plugin
       if recompile_required
         # In case a file we're watching is removed and then recreated we
         # prune out the non-existant files here.
-        watched_files_remaining = individual_files.select {|(source, _, _)| File.exists?(source)}
+        watched_files_remaining = individual_files.select {|(source, _, _)| File.exist?(source)}
         update_stylesheets(watched_files_remaining)
       end
     end
 
     def update_stylesheet(filename, css, sourcemap)
       dir = File.dirname(css)
-      unless File.exists?(dir)
+      unless File.exist?(dir)
         run_creating_directory dir
         FileUtils.mkdir_p dir
       end
@@ -400,12 +400,12 @@ module Sass::Plugin
     end
 
     def try_delete_css(css)
-      if File.exists?(css)
+      if File.exist?(css)
         run_deleting_css css
         File.delete css
       end
       map = Sass::Util.sourcemap_name(css)
-      if File.exists?(map)
+      if File.exist?(map)
         run_deleting_sourcemap map
         File.delete map
       end

data/lib/sass/tree/function_node.rb

@@ -29,6 +29,10 @@ module Sass
         @args = args
         @splat = splat
         super()
+
+        if %w[and or not].include?(name)
+          raise Sass::SyntaxError.new("Invalid function name \"#{name}\".")
+        end
       end
     end
   end

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

@@ -23,17 +23,34 @@ class Sass::Tree::Visitors::CheckNesting < Sass::Tree::Visitors::Base
   SCRIPT_NODES = [Sass::Tree::ImportNode] + CONTROL_NODES
   def visit_children(parent)
     old_parent = @parent
-    unless is_any_of?(parent, SCRIPT_NODES) ||
-        (parent.bubbles? &&
-        !old_parent.is_a?(Sass::Tree::RootNode) &&
-        !old_parent.is_a?(Sass::Tree::AtRootNode))
+
+    # When checking a static tree, resolve at-roots to be sure they won't send
+    # nodes where they don't belong.
+    if parent.is_a?(Sass::Tree::AtRootNode) && parent.resolved_value
+      old_parents = @parents
+      @parents = @parents.reject {|p| parent.exclude_node?(p)}
+      @parent = Sass::Util.enum_with_index(@parents.reverse).
+        find {|p, i| !transparent_parent?(p, @parents[-i - 2])}.first
+
+      begin
+        return super
+      ensure
+        @parents = old_parents
+        @parent = old_parent
+      end
+    end
+
+    unless transparent_parent?(parent, old_parent)
       @parent = parent
     end
+
     @parents.push parent
-    super
-  ensure
-    @parent = old_parent
-    @parents.pop
+    begin
+      super
+    ensure
+      @parent = old_parent
+      @parents.pop
+    end
   end
 
   def visit_root(node)
@@ -139,6 +156,14 @@ class Sass::Tree::Visitors::CheckNesting < Sass::Tree::Visitors::Base
 
   private
 
+  # Whether `parent` should be assigned to `@parent`.
+  def transparent_parent?(parent, grandparent)
+    is_any_of?(parent, SCRIPT_NODES) ||
+      (parent.bubbles? &&
+       !grandparent.is_a?(Sass::Tree::RootNode) &&
+       !grandparent.is_a?(Sass::Tree::AtRootNode))
+  end
+
   def is_any_of?(val, classes)
     classes.each do |c|
       return true if val.is_a?(c)

data/lib/sass/util.rb

@@ -1199,7 +1199,12 @@ MSG
       result = yield tmpfile
       tmpfile.close
       ATOMIC_WRITE_MUTEX.synchronize do
-        File.chmod(perms & ~File.umask, tmpfile.path)
+        begin
+          File.chmod(perms & ~File.umask, tmpfile.path)
+        rescue Errno::EPERM
+          # If we don't have permissions to chmod the file, don't let that crash
+          # the compilation. See issue 1215.
+        end
         File.rename tmpfile.path, filename
       end
       result
@@ -1237,7 +1242,7 @@ MSG
         rescue LoadError => e
           dir = scope("vendor/listen/lib")
           if $LOAD_PATH.include?(dir)
-            raise e unless File.exists?(scope(".git"))
+            raise e unless File.exist?(scope(".git"))
             e.message << "\n" <<
               'Run "git submodule update --init" to get the bundled version.'
           else

data/lib/sass/version.rb

@@ -85,20 +85,20 @@ module Sass
     private
 
     def revision_number
-      if File.exists?(Sass::Util.scope('REVISION'))
+      if File.exist?(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?(Sass::Util.scope('.git/HEAD'))
+      return unless File.exist?(Sass::Util.scope('.git/HEAD'))
       rev = File.read(Sass::Util.scope('.git/HEAD')).strip
       return rev unless rev =~ /^ref: (.*)$/
 
       ref_name = $1
       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)
+      return File.read(ref_file).strip if File.exist?(ref_file)
+      return unless File.exist?(info_file)
       File.open(info_file) do |f|
         f.each do |l|
           sha, ref = l.strip.split("\t", 2)
@@ -110,7 +110,7 @@ module Sass
     end
 
     def version_date
-      return unless File.exists?(Sass::Util.scope('VERSION_DATE'))
+      return unless File.exist?(Sass::Util.scope('VERSION_DATE'))
       DateTime.parse(File.read(Sass::Util.scope('VERSION_DATE')).strip)
     end
   end

data/test/sass/cache_test.rb

@@ -18,42 +18,42 @@ class CacheTest < Test::Unit::TestCase
   def test_file_cache_writes_a_file
     file_store = Sass::CacheStores::Filesystem.new(@@cache_dir)
     file_store.store("asdf/foo.scssc", "fakesha1", root_node)
-    assert File.exists?("#{@@cache_dir}/asdf/foo.scssc")
+    assert File.exist?("#{@@cache_dir}/asdf/foo.scssc")
   end
 
   def test_file_cache_reads_a_file
     file_store = Sass::CacheStores::Filesystem.new(@@cache_dir)
-    assert !File.exists?("#{@@cache_dir}/asdf/foo.scssc")
+    assert !File.exist?("#{@@cache_dir}/asdf/foo.scssc")
     file_store.store("asdf/foo.scssc", "fakesha1", root_node)
-    assert File.exists?("#{@@cache_dir}/asdf/foo.scssc")
+    assert File.exist?("#{@@cache_dir}/asdf/foo.scssc")
     assert_kind_of Sass::Tree::RootNode, file_store.retrieve("asdf/foo.scssc", "fakesha1")
   end
 
   def test_file_cache_miss_returns_nil
     file_store = Sass::CacheStores::Filesystem.new(@@cache_dir)
-    assert !File.exists?("#{@@cache_dir}/asdf/foo.scssc")
+    assert !File.exist?("#{@@cache_dir}/asdf/foo.scssc")
     assert_nil file_store.retrieve("asdf/foo.scssc", "fakesha1")
   end
 
   def test_sha_change_invalidates_cache_and_cleans_up
     file_store = Sass::CacheStores::Filesystem.new(@@cache_dir)
-    assert !File.exists?("#{@@cache_dir}/asdf/foo.scssc")
+    assert !File.exist?("#{@@cache_dir}/asdf/foo.scssc")
     file_store.store("asdf/foo.scssc", "fakesha1", root_node)
-    assert File.exists?("#{@@cache_dir}/asdf/foo.scssc")
+    assert File.exist?("#{@@cache_dir}/asdf/foo.scssc")
     assert_nil file_store.retrieve("asdf/foo.scssc", "differentsha1")
-    assert !File.exists?("#{@@cache_dir}/asdf/foo.scssc")
+    assert !File.exist?("#{@@cache_dir}/asdf/foo.scssc")
   end
 
   def test_version_change_invalidates_cache_and_cleans_up
     file_store = Sass::CacheStores::Filesystem.new(@@cache_dir)
-    assert !File.exists?("#{@@cache_dir}/asdf/foo.scssc")
+    assert !File.exist?("#{@@cache_dir}/asdf/foo.scssc")
     file_store.store("asdf/foo.scssc", "fakesha1", root_node)
-    assert File.exists?("#{@@cache_dir}/asdf/foo.scssc")
+    assert File.exist?("#{@@cache_dir}/asdf/foo.scssc")
     real_version = Sass::VERSION
     begin
       Sass::VERSION.replace("a different version")
       assert_nil file_store.retrieve("asdf/foo.scssc", "fakesha1")
-      assert !File.exists?("#{@@cache_dir}/asdf/foo.scssc")
+      assert !File.exist?("#{@@cache_dir}/asdf/foo.scssc")
     ensure
       Sass::VERSION.replace(real_version)
     end

data/test/sass/engine_test.rb

@@ -648,18 +648,18 @@ SASS
 
   def test_sass_import
     sassc_file = sassc_path("importee")
-    assert !File.exists?(sassc_file)
+    assert !File.exist?(sassc_file)
     renders_correctly "import", { :style => :compact, :load_paths => [File.dirname(__FILE__) + "/templates"] }
-    assert File.exists?(sassc_file)
+    assert File.exist?(sassc_file)
   end
 
   def test_sass_pathname_import
     sassc_file = sassc_path("importee")
-    assert !File.exists?(sassc_file)
+    assert !File.exist?(sassc_file)
     renders_correctly("import",
       :style => :compact,
       :load_paths => [Pathname.new(File.dirname(__FILE__) + "/templates")])
-    assert File.exists?(sassc_file)
+    assert File.exist?(sassc_file)
   end
 
   def test_import_from_global_load_paths
@@ -691,12 +691,12 @@ ERR
   end
 
   def test_no_cache
-    assert !File.exists?(sassc_path("importee"))
+    assert !File.exist?(sassc_path("importee"))
     renders_correctly("import", {
         :style => :compact, :cache => false,
         :load_paths => [File.dirname(__FILE__) + "/templates"],
       })
-    assert !File.exists?(sassc_path("importee"))
+    assert !File.exist?(sassc_path("importee"))
   end
 
   def test_import_in_rule

data/test/sass/plugin_test.rb

@@ -209,7 +209,7 @@ CSS
   end
 
   def test_doesnt_render_partials
-    assert !File.exists?(tempfile_loc('_partial'))
+    assert !File.exist?(tempfile_loc('_partial'))
   end
 
   def test_template_location_array
@@ -507,7 +507,7 @@ WARNING
   def template_loc(name = nil, prefix = nil)
     if name
       scss = absolutize "#{prefix}templates/#{name}.scss"
-      File.exists?(scss) ? scss : absolutize("#{prefix}templates/#{name}.sass")
+      File.exist?(scss) ? scss : absolutize("#{prefix}templates/#{name}.sass")
     else
       absolutize "#{prefix}templates"
     end

data/test/sass/script_test.rb

@@ -741,6 +741,17 @@ end
     assert_equal "teal\\+bang(12)", resolve("teal\\+bang(12)")
   end
 
+  def test_and_or_not_disallowed_as_function_names
+    %w[and or not].each do |name|
+      assert_raise_message(Sass::SyntaxError, "Invalid function name \"#{name}\".") do
+        render(<<SASS)
+@function #{name}()
+  @return null
+SASS
+      end
+    end
+  end
+
   def test_interpolation_after_hash
     assert_equal "#2", resolve('"##{1 + 1}"')
   end

data/test/sass/scss/css_test.rb

@@ -653,6 +653,32 @@ CSS
 SCSS
   end
 
+  def test_keyframes
+    assert_equal <<CSS, render(<<SCSS)
+@keyframes identifier {
+  0% {
+    top: 0;
+    left: 0; }
+
+  30% {
+    top: 50px; }
+
+  68%, 72% {
+    left: 50px; }
+
+  100% {
+    top: 100px;
+    left: 100%; } }
+CSS
+@keyframes identifier {
+  0% {top: 0; left: 0}
+  30% {top: 50px}
+  68%, 72% {left: 50px}
+  100% {top: 100px; left: 100%}
+}
+SCSS
+  end
+
   ## Selectors
 
   # Taken from http://dev.w3.org/csswg/selectors4/#overview

data/test/sass/scss/scss_test.rb

@@ -903,6 +903,36 @@ CSS
 SCSS
   end
 
+  def test_keyframes_rules_in_content
+    assert_equal <<CSS, render(<<SCSS)
+@keyframes identifier {
+  0% {
+    top: 0;
+    left: 0; }
+
+  30% {
+    top: 50px; }
+
+  68%, 72% {
+    left: 50px; }
+
+  100% {
+    top: 100px;
+    left: 100%; } }
+CSS
+@mixin keyframes {
+  @keyframes identifier { @content }
+}
+
+@include keyframes {
+  0% {top: 0; left: 0}
+  30% {top: 50px}
+  68%, 72% {left: 50px}
+  100% {top: 100px; left: 100%}
+}
+SCSS
+  end
+
   ## Functions
 
   def test_basic_function
@@ -2848,6 +2878,22 @@ CSS
 SCSS
   end
 
+  # See https://github.com/sass/sass/issues/1294
+  def test_extend_top_leveled_by_at_root
+    render(<<SCSS)
+.span-10 {
+  @at-root (without: all) {
+    @extend %column;
+  }
+}
+SCSS
+
+    assert(false, "Expected syntax error")
+  rescue Sass::SyntaxError => e
+    assert_equal "Extend directives may only be used within rules.", e.message
+    assert_equal 3, e.sass_line
+  end
+
   def test_at_root_doesnt_always_break_blocks
     assert_equal <<CSS, render(<<SCSS)
 .foo {

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sass
 version: !ruby/object:Gem::Version
-  version: 3.3.8
+  version: 3.3.9
 platform: ruby
 authors:
 - Nathan Weizenbaum
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-31 00:00:00.000000000 Z
+date: 2014-06-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: yard