sass 3.1.0 → 3.3.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 93af5ba687645339e994ee22f0322a8da0cd8921
+  data.tar.gz: 585b6cdaf03b5bad3ba5efcac0c2245d8b438768
+SHA512:
+  metadata.gz: 6ee387ccbac66719ae087dd483a5e39746a8998f33e2f8b76194c1cb3bf32c2346a52b651eb0b45527b2e13abc03819f6a7923134f94c154530d19ae35a35120
+  data.tar.gz: 654f947e96a308f21a82be0534ec7a17f6a3d84bdf5bab1228357cc411a7b8d5db7b52aff449026a6e172ea1b52f5c25c28a8a4ee1f597fab8cf9bb8c5753395

data/CONTRIBUTING

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

data/MIT-LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2006-2009 Hampton Catlin, Nathan Weizenbaum, and Chris Eppstein
+Copyright (c) 2006-2013 Hampton Catlin, Nathan Weizenbaum, and Chris Eppstein
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the
@@ -17,4 +17,4 @@ MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
 NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
 LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
 OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/README.md

@@ -1,4 +1,4 @@
-# Sass
+# Sass [![Gem Version](https://badge.fury.io/rb/sass.png)](http://badge.fury.io/rb/sass)
 
 **Sass makes CSS fun again**. Sass is an extension of CSS3,
 adding nested rules, variables, mixins, selector inheritance, and more.
@@ -54,10 +54,10 @@ To do so, just add
 
 to `config.ru`.
 Then any Sass files in `public/stylesheets/sass`
-will be compiled CSS files in `public/stylesheets` on every request.
+will be compiled into CSS files in `public/stylesheets` on every request.
 
-To use Sass programatically,
-check out the [YARD documentation](http://sass-lang.com/docs/yardoc/).
+To use Sass programmatically,
+check out the [YARD documentation](http://sass-lang.com/documentation/file.SASS_REFERENCE.html#using_sass).
 
 ## Formatting
 
@@ -71,10 +71,10 @@ and get small stylesheets up and running quickly,
 particularly with the help of
 [the Compass style library](http://compass-style.org).
 
-[vars]:    http://beta.sass-lang.com/docs/yardoc/file.SASS_REFERENCE.html#variables_
-[nested]:  http://beta.sass-lang.com/docs/yardoc/file.SASS_REFERENCE.html#nested_rules_
-[mixins]:  http://beta.sass-lang.com/docs/yardoc/file.SASS_REFERENCE.html#mixins
-[imports]: http://beta.sass-lang.com/docs/yardoc/file.SASS_REFERENCE.html#import
+[vars]:    http://sass-lang.com/documentation/file.SASS_REFERENCE.html#variables_
+[nested]:  http://sass-lang.com/documentation/file.SASS_REFERENCE.html#nested_rules
+[mixins]:  http://sass-lang.com/documentation/file.SASS_REFERENCE.html#mixins
+[imports]: http://sass-lang.com/documentation/file.SASS_REFERENCE.html#import
 
 Sass has two syntaxes.
 The one presented here, known as "SCSS" (for "Sassy CSS"),
@@ -83,7 +83,7 @@ The other (older) syntax, known as the indented syntax or just "Sass",
 is whitespace-sensitive and indentation-based.
 For more information, see the [reference documentation][syntax].
 
-[syntax]: http://beta.sass-lang.com/docs/yardoc/file.SASS_REFERENCE.html#syntax
+[syntax]: http://sass-lang.com/documentation/file.SASS_REFERENCE.html#syntax
 
 To run the following examples and see the CSS they produce,
 put them in a file called `test.scss` and run `sass test.scss`.
@@ -152,7 +152,7 @@ You can even give them arguments.
     }
 
 A comprehensive list of features is available
-in the [Sass reference](http://beta.sass-lang.com/docs/yardoc/file.SASS_REFERENCE.html).
+in the [Sass reference](http://sass-lang.com/documentation/file.SASS_REFERENCE.html).
 
 ## Executables
 
@@ -171,20 +171,32 @@ When converting from CSS to Sass or SCSS,
 nesting is applied where appropriate.
 See `sass-convert --help` for further information and options.
 
+### Running locally
+
+To run the Sass executables from a source checkout instead of from rubygems:
+
+```
+$ cd <SASS_CHECKOUT_DIRECTORY>
+$ bundle
+$ bundle exec sass ...
+$ bundle exec scss ...
+$ bundle exec sass-convert ...
+```
+
 ## Authors
 
-Sass was envisioned by [Hampton Catlin](http://hamptoncatlin.com) (hcatlin).
-However, Hampton doesn't even know his way around the code anymore and now
-occasionally consults on the language issues. Hampton lives in Jacksonville,
-Florida and is the lead mobile developer for Wikimedia.
+Sass was envisioned by [Hampton Catlin](http://www.hamptoncatlin.com)
+(@hcatlin). However, Hampton doesn't even know his way around the code anymore
+and now occasionally consults on the language issues. Hampton lives in San
+Francisco, California and works as VP of Technology
+at [Moovweb](http://www.moovweb.com/).
 
 [Nathan Weizenbaum](http://nex-3.com) is the primary developer and architect of
 Sass. His hard work has kept the project alive by endlessly answering forum
 posts, fixing bugs, refactoring, finding speed improvements, writing
 documentation, implementing new features, and getting Hampton coffee (a fitting
-task for a boy-genius). Nathan lives in Seattle, Washington and while not being
-a student at the University of Washington or working at an internship, he
-consults for Unspace Interactive.
+task for a boy-genius). Nathan lives in Seattle, Washington and works on
+[Dart](http://dartlang.org) application libraries at Google.
 
 [Chris Eppstein](http://acts-as-architect.blogspot.com) is a core contributor to
 Sass and the creator of Compass, the first Sass-based framework. Chris focuses

data/Rakefile

@@ -1,3 +1,5 @@
+require 'rubygems/package'
+
 # ----- Utility Functions -----
 
 def scope(path)
@@ -19,16 +21,35 @@ Rake::TestTask.new do |t|
   t.verbose = true
 end
 
+# ----- Code Style Enforcement -----
+
+if RUBY_VERSION !~ /^(1\.8)/ && (ENV.has_key?("RUBOCOP") && ENV["RUBOCOP"] == "true" || !(ENV.has_key?("RUBOCOP") || ENV.has_key?("TEST")))
+  require 'rubocop/rake_task'
+  Rubocop::RakeTask.new do |t|
+    t.patterns = FileList["lib/**/*"]
+  end
+else
+  task :rubocop do
+    puts "Skipping rubocop style check."
+    if !ENV.has_key?("RUBOCOP")
+      puts "Passing this check is required in order for your patch to be accepted."
+      puts "Use ruby 1.9 or greater and then run the style check with: rake rubocop"
+    end
+  end
+end
+
+task :test => :rubocop
+
 # ----- Packaging -----
 
 # Don't use Rake::GemPackageTast because we want prerequisites to run
 # before we load the gemspec.
 desc "Build all the packages."
-task :package => [:revision_file, :submodules, :permissions] do
+task :package => [:revision_file, :date_file, :submodules, :permissions] do
   version = get_version
   File.open(scope('VERSION'), 'w') {|f| f.puts(version)}
   load scope('sass.gemspec')
-  Gem::Builder.new(SASS_GEMSPEC).build
+  Gem::Package.build(SASS_GEMSPEC)
   sh %{git checkout VERSION}
 
   pkg = "#{SASS_GEMSPEC.name}-#{SASS_GEMSPEC.version}"
@@ -51,7 +72,7 @@ task :permissions do
 end
 
 task :revision_file do
-  require 'lib/sass'
+  require scope('lib/sass')
 
   release = Rake.application.top_level_tasks.include?('release') || File.exist?(scope('EDGE_GEM_VERSION'))
   if Sass.version[:rev] && !release
@@ -63,8 +84,17 @@ task :revision_file do
   end
 end
 
+task :date_file do
+  File.open(scope('VERSION_DATE'), 'w') do |f|
+    f.puts Time.now.utc.strftime('%d %B %Y %T %Z')
+  end
+end
+
 # We also need to get rid of this file after packaging.
-at_exit { File.delete(scope('REVISION')) rescue nil }
+at_exit do
+  File.delete(scope('REVISION')) rescue nil
+  File.delete(scope('VERSION_DATE')) rescue nil
+end
 
 desc "Install Sass as a gem. Use SUDO=1 to install with sudo."
 task :install => [:package] do
@@ -115,9 +145,9 @@ task :submodules do
   if File.exist?(File.dirname(__FILE__) + "/.git")
     sh %{git submodule sync}
     sh %{git submodule update --init}
-  elsif !File.exist?(File.dirname(__FILE__) + "/vendor/fssm/lib")
+  elsif !File.exist?(File.dirname(__FILE__) + "/vendor/listen/lib")
     warn <<WARN
-WARNING: vendor/fssm doesn't exist, and this isn't a git repository so
+WARNING: vendor/listen doesn't exist, and this isn't a git repository so
 I can't get it automatically!
 WARN
   end
@@ -131,6 +161,11 @@ task :release_edge do
     sh %{git reset --hard origin/master}
     sh %{rake package}
     version = get_version
+    if version.include?('.rc.')
+      puts "#{'=' * 20} Not releasing edge gem for RC version"
+      next
+    end
+
     sh %{rubyforge add_release sass sass "Bleeding Edge (v#{version})" pkg/sass-#{version}.gem}
     sh %{gem push pkg/sass-#{version}.gem}
   end
@@ -147,7 +182,7 @@ def get_version
   version.map! {|n| n =~ /^[0-9]+$/ ? n.to_i : n}
   return written_version unless version.size == 5 && version[3] == "alpha" # prerelease
 
-  return written_version if (commit_count = `git log --pretty=oneline --first-parent stable.. | wc -l`).empty?
+  return written_version if (commit_count = `git log --pretty=oneline HEAD ^stable | wc -l`).empty?
   version[4] = commit_count.strip
   version.join('.')
 end
@@ -182,7 +217,7 @@ begin
     task :undocumented do
       opts = ENV["YARD_OPTS"] || ""
       ENV["YARD_OPTS"] = opts.dup + <<OPTS
- --list --query "
+ --list --tag comment --hide-tag comment --query "
   object.docstring.blank? &&
   !(object.type == :method && object.is_alias?)"
 OPTS
@@ -194,7 +229,6 @@ OPTS
     t.files = FileList.new(scope('lib/**/*.rb')) do |list|
       list.exclude('lib/sass/plugin/merb.rb')
       list.exclude('lib/sass/plugin/rails.rb')
-      list.exclude('lib/sass/less.rb')
     end.to_a
     t.options << '--incremental' if Rake.application.top_level_tasks.include?('redoc')
     t.options += FileList.new(scope('yard/*.rb')).to_a.map {|f| ['-e', f]}.flatten

data/VERSION

@@ -1 +1 @@
-3.1.0
+3.3.0

data/VERSION_DATE

@@ -0,0 +1 @@
+08 March 2014 02:21:08 UTC

data/VERSION_NAME

@@ -1 +1 @@
-Brainy Betty
+Maptastic Maple

data/bin/sass

@@ -1,7 +1,12 @@
 #!/usr/bin/env ruby
 # The command line Sass parser.
 
-require File.dirname(__FILE__) + '/../lib/sass'
+THIS_FILE = File.symlink?(__FILE__) ? File.readlink(__FILE__) : __FILE__
+begin
+  require File.dirname(THIS_FILE) + '/../lib/sass'
+rescue LoadError
+  require 'sass'
+end
 require 'sass/exec'
 
 opts = Sass::Exec::Sass.new(ARGV)

data/bin/sass-convert

@@ -1,6 +1,11 @@
 #!/usr/bin/env ruby
 
-require File.dirname(__FILE__) + '/../lib/sass'
+THIS_FILE = File.symlink?(__FILE__) ? File.readlink(__FILE__) : __FILE__
+begin
+  require File.dirname(THIS_FILE) + '/../lib/sass'
+rescue LoadError
+  require 'sass'
+end
 require 'sass/exec'
 
 opts = Sass::Exec::SassConvert.new(ARGV)

data/bin/scss

@@ -1,7 +1,12 @@
 #!/usr/bin/env ruby
 # The command line Sass parser.
 
-require File.dirname(__FILE__) + '/../lib/sass'
+THIS_FILE = File.symlink?(__FILE__) ? File.readlink(__FILE__) : __FILE__
+begin
+  require File.dirname(THIS_FILE) + '/../lib/sass'
+rescue LoadError
+  require 'sass'
+end
 require 'sass/exec'
 
 opts = Sass::Exec::Scss.new(ARGV)

data/ext/mkrf_conf.rb

@@ -0,0 +1,27 @@
+require 'rubygems'
+require 'rubygems/command.rb'
+require 'rubygems/dependency_installer.rb'
+
+require '../lib/sass'
+
+# This script installs the correct version of listen. Listen versions
+# beyond 1.1 don't support Ruby 1.8, any RubyGems isn't clever enough
+# to install the most recent version that works, so we have to do it
+# manually.
+
+puts "Ensuring you have the right version of listen installed."
+
+Gem::Command.build_args = ARGV
+inst = Gem::DependencyInstaller.new
+if Sass::Util.version_geq(RUBY_VERSION, "1.9.3")
+  puts "Installing listen >= 1.1.0, < 3.0.0"
+  inst.install "listen", Gem::Requirement.new(">= 1.1.0", "< 3.0.0")
+else
+  puts "Installing listen ~> 1.1.0"
+  inst.install "listen", "~> 1.1.0"
+end
+
+# Create a dummy rakefile to indicate success.
+f = File.open(File.join(File.dirname(__FILE__), "Rakefile"), "w")
+f.write("task :default\n")
+f.close

data/lib/sass/cache_stores/base.rb

@@ -27,7 +27,7 @@ module Sass
 
       # Retrieved cached contents.
       # Must be implemented by all subclasses.
-      # 
+      #
       # Note: if the key exists but the sha or version have changed,
       # then the key may be deleted by the cache store, if it wants to do so.
       #
@@ -46,9 +46,12 @@ module Sass
       #
       # @param key [String] The key to store it under.
       # @param sha [String] The checksum for the contents that are being stored.
-      # @param obj [Object] The object to cache.
+      # @param root [Object] The root node to cache.
       def store(key, sha, root)
         _store(key, Sass::VERSION, sha, Marshal.dump(root))
+      rescue TypeError, LoadError => e
+        Sass::Util.sass_warn "Warning. Error encountered while saving cache #{path_to(key)}: #{e}"
+        nil
       end
 
       # Retrieve a {Sass::Tree::RootNode}.
@@ -59,8 +62,9 @@ module Sass
       def retrieve(key, sha)
         contents = _retrieve(key, Sass::VERSION, sha)
         Marshal.load(contents) if contents
-      rescue EOFError, TypeError, ArgumentError => e
+      rescue EOFError, TypeError, ArgumentError, LoadError => e
         Sass::Util.sass_warn "Warning. Error encountered while reading cache #{path_to(key)}: #{e}"
+        nil
       end
 
       # Return the key for the sass file.

data/lib/sass/cache_stores/chain.rb

@@ -22,8 +22,9 @@ module Sass
       # @see Base#retrieve
       def retrieve(key, sha)
         @caches.each_with_index do |c, i|
-          next unless obj = c.retrieve(key, sha)
-          @caches[0...i].each {|c| c.store(key, sha, obj)}
+          obj = c.retrieve(key, sha)
+          next unless obj
+          @caches[0...i].each {|prev| prev.store(key, sha, obj)}
           return obj
         end
         nil

data/lib/sass/cache_stores/filesystem.rb

@@ -1,3 +1,5 @@
+require 'fileutils'
+
 module Sass
   module CacheStores
     # A backend for the Sass cache using the filesystem.
@@ -15,7 +17,6 @@ module Sass
       # @see Base#\_retrieve
       def _retrieve(key, version, sha)
         return unless File.readable?(path_to(key))
-        contents = nil
         File.open(path_to(key), "rb") do |f|
           if f.readline("\n").strip == version && f.readline("\n").strip == sha
             return f.read
@@ -29,19 +30,15 @@ module Sass
 
       # @see Base#\_store
       def _store(key, version, sha, contents)
-        # return unless File.writable?(File.dirname(@cache_location))
-        # return if File.exists?(@cache_location) && !File.writable?(@cache_location)
         compiled_filename = path_to(key)
-        # return if File.exists?(File.dirname(compiled_filename)) && !File.writable?(File.dirname(compiled_filename))
-        # return if File.exists?(compiled_filename) && !File.writable?(compiled_filename)
         FileUtils.mkdir_p(File.dirname(compiled_filename))
-        File.open(compiled_filename, "wb") do |f|
+        Sass::Util.atomic_create_and_write_file(compiled_filename) do |f|
           f.puts(version)
           f.puts(sha)
           f.write(contents)
         end
       rescue Errno::EACCES
-        #pass
+        # pass
       end
 
       private
@@ -51,6 +48,7 @@ module Sass
       # @param key [String]
       # @return [String] The path to the cache file.
       def path_to(key)
+        key = key.gsub(/[<>:\\|?*%]/) {|c| "%%%03d" % Sass::Util.ord(c)}
         File.join(cache_location, key)
       end
     end

data/lib/sass/cache_stores/memory.rb

@@ -37,7 +37,7 @@ module Sass
       def store(key, sha, obj)
         @contents[key] = {:sha => sha, :obj => obj}
       end
-      
+
       # Destructively clear the cache.
       def reset!
         @contents = {}

data/lib/sass/cache_stores/null.rb

@@ -12,11 +12,11 @@ module Sass
       def _retrieve(key, version, sha)
         nil
       end
-      
+
       def _store(key, version, sha, contents)
         @keys[key] = true
       end
-      
+
       def was_set?(key)
         @keys[key]
       end

data/lib/sass/callbacks.rb

@@ -30,6 +30,7 @@ module Sass
     def self.extended(base)
       base.send(:include, InstanceMethods)
     end
+
     protected
 
     module InstanceMethods
@@ -48,7 +49,7 @@ module Sass
     # @param name [Symbol] The name of the callback
     # @return [void]
     def define_callback(name)
-      class_eval <<RUBY
+      class_eval <<RUBY, __FILE__, __LINE__ + 1
 def on_#{name}(&block)
   @_sass_callbacks ||= {}
   (@_sass_callbacks[#{name.inspect}] ||= []) << block