sass 3.3.0.rc.2 → 3.3.0.rc.3

checksums.yaml

@@ -0,0 +1,15 @@
+---
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    MDU0OWFlNWFmNTQ3YzkyMzA1ZTQyYmRkNzk0ZDM5MGM4MGEyMzdmMQ==
+  data.tar.gz: !binary |-
+    Yzg5MzQ5NDBhNmZkMWJiMGQ0NzYxNmY4MmFmMWU4MTIzNGQ1OGRmNw==
+SHA512:
+  metadata.gz: !binary |-
+    ZDQwYWRlNWYwODlmMzhiOTJiNmUyOWFhOTExZmU2NmRhZTVhYTdkMTNlOTUy
+    MjAxMDQyMTQyN2Y3ZTIwOGM0ZTVjNjJkN2Q1YWU2ZjNjMWI4ZTRjZmQ4YjM0
+    NjE4ZDUyZjQ1NTNlODBiMGM2YzYzYzExYjQ4N2MwODNiNDBhNGI=
+  data.tar.gz: !binary |-
+    YjhjMzNhMDU2ZDdlNmJiNmExNjYyMTAyMzg3NjhhZWJjNzFmMGFjMzU3Y2Zk
+    NzE5MzA3YTY5ZWJkNGQyNTc0ZmVmODliYzRkYWQ4MDAwZjQyMmFlMWIwMjE2
+    MzBlZjE5YmU5OWFjZjdhODQ4N2E4Mjg1YjY0YmZhYjQxZDE4Zjk=

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/README.md

@@ -57,7 +57,7 @@ Then any Sass files in `public/stylesheets/sass`
 will be compiled into CSS files in `public/stylesheets` on every request.
 
 To use Sass programmatically,
-check out the [YARD documentation](http://sass-lang.com/docs/yardoc/).
+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
 

data/Rakefile

@@ -1,3 +1,5 @@
+require 'rubygems/package'
+
 # ----- Utility Functions -----
 
 def scope(path)
@@ -21,7 +23,7 @@ end
 
 # ----- Code Style Enforcement -----
 
-if RUBY_VERSION !~ /^(1\.8|2\.1)/ && (ENV.has_key?("RUBOCOP") && ENV["RUBOCOP"] == "true" || !(ENV.has_key?("RUBOCOP") || ENV.has_key?("TEST")))
+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/**/*"]
@@ -47,7 +49,7 @@ 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}"

data/VERSION

@@ -1 +1 @@
-3.3.0.rc.2
+3.3.0.rc.3

data/VERSION_DATE

@@ -1 +1 @@
-23 November 2013 02:13:52 UTC
+07 February 2014 23:53:37 UTC

data/bin/sass

@@ -2,7 +2,11 @@
 # The command line Sass parser.
 
 THIS_FILE = File.symlink?(__FILE__) ? File.readlink(__FILE__) : __FILE__
-require File.dirname(THIS_FILE) + '/../lib/sass'
+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,7 +1,11 @@
 #!/usr/bin/env ruby
 
 THIS_FILE = File.symlink?(__FILE__) ? File.readlink(__FILE__) : __FILE__
-require File.dirname(THIS_FILE) + '/../lib/sass'
+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

@@ -2,7 +2,11 @@
 # The command line Sass parser.
 
 THIS_FILE = File.symlink?(__FILE__) ? File.readlink(__FILE__) : __FILE__
-require File.dirname(THIS_FILE) + '/../lib/sass'
+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,23 @@
+require 'rubygems'
+require 'rubygems/command.rb'
+require 'rubygems/dependency_installer.rb' 
+
+# 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.
+
+Gem::Command.build_args = ARGV
+inst = Gem::DependencyInstaller.new
+if RUBY_VERSION < "1.9"
+  puts "Installing listen ~> 1.1.0"
+  inst.install "listen", "~> 1.1.0"
+else
+  puts "Installing listen >= 1.1.0, < 2.5"
+  inst.install "listen", Gem::Requirement.new(">= 1.1.0", "< 2.5")
+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/css.rb

@@ -293,7 +293,7 @@ module Sass
     def bubble_subject(root)
       root.children.each do |child|
         bubble_subject(child) if child.is_a?(Tree::RuleNode) || child.is_a?(Tree::DirectiveNode)
-        next unless child.is_a?(Tree::RuleNode)
+        next unless child.is_a?(Tree::RuleNode) && !child.children.empty?
         next unless child.children.all? do |c|
           next unless c.is_a?(Tree::RuleNode)
           first_simple_sel(c).is_a?(Sass::Selector::Parent) && first_sseq(c).subject?

data/lib/sass/engine.rb

@@ -51,7 +51,6 @@ require 'sass/media'
 require 'sass/supports'
 
 module Sass
-
   # A Sass mixin or function.
   #
   # `name`: `String`
@@ -346,16 +345,24 @@ module Sass
     private
 
     def _render_with_sourcemap(sourcemap_uri)
-      if @options[:filename].nil?
+      filename = @options[:filename]
+      importer = @options[:importer]
+      sourcemap_dir = @options[:sourcemap_filename] &&
+        File.dirname(File.expand_path(@options[:sourcemap_filename]))
+      if filename.nil?
         raise Sass::SyntaxError.new(<<ERR)
 Error generating source map: couldn't determine public URL for the source stylesheet.
   No filename is available so there's nothing for the source map to link to.
 ERR
-      elsif @options[:importer].nil? ||
-        !(@options[:importer].public_url(@options[:filename]) ||
-          @options[:importer].is_a?(Sass::Importers::Filesystem))
+      elsif importer.nil?
+        raise Sass::SyntaxError.new(<<ERR)
+Error generating source map: couldn't determine public URL for "#{filename}".
+  Without a public URL, there's nothing for the source map to link to.
+  An importer was not set for this file.
+ERR
+      elsif Sass::Util.silence_warnings {importer.public_url(filename, sourcemap_dir).nil?}
         raise Sass::SyntaxError.new(<<ERR)
-Error generating source map: couldn't determine public URL for "#{@options[:filename]}".
+Error generating source map: couldn't determine public URL for "#{filename}".
   Without a public URL, there's nothing for the source map to link to.
   Custom importers should define the #public_url method.
 ERR
@@ -367,7 +374,7 @@ ERR
       rendered << "\n" unless compressed
       rendered << "/*# sourceMappingURL="
       rendered << Sass::Util.escape_uri(sourcemap_uri)
-      rendered << " */"
+      rendered << " */\n"
       rendered = encode_and_set_charset(rendered)
       return rendered, sourcemap
     end
@@ -575,6 +582,8 @@ MSG
           if continued_comment &&
               child.line == continued_comment.line +
               continued_comment.lines + 1
+            continued_comment.value.last.sub!(/ \*\/\Z/, '')
+            child.value.first.gsub!(/\A\/\*/, ' *')
             continued_comment.value += ["\n"] + child.value
             next
           end
@@ -789,6 +798,7 @@ WARNING
     #   rubocop:disable MethodLength
     def parse_directive(parent, line, root)
       directive, whitespace, value = line.text[1..-1].split(/(\s+)/, 2)
+      raise SyntaxError.new("Invalid directive: '@'.") unless directive
       offset = directive.size + whitespace.size + 1 if whitespace
 
       directive_name = directive.gsub('-', '_').to_sym
@@ -1127,12 +1137,12 @@ WARNING
         content.shift
       end
 
-      return silent ? "//" : "/* */" if content.empty?
+      return "/* */" if content.empty?
       content.last.gsub!(/ ?\*\/ *$/, '')
       content.map! {|l| l.gsub!(/^\*( ?)/, '\1') || (l.empty? ? "" : " ") + l}
       content.first.gsub!(/^ /, '') unless removed_first
       if silent
-        "//" + content.join("\n//")
+        "/*" + content.join("\n *") + " */"
       else
         # The #gsub fixes the case of a trailing */
         "/*" + content.join("\n *").gsub(/ \*\Z/, '') + " */"

data/lib/sass/environment.rb

@@ -76,6 +76,13 @@ module Sass
     # Sass::Callable
     inherited_hash_reader :function
 
+    # Whether a warning has been emitted for assigning to the given
+    # global variable. This is a set of tuples containing the name of
+    # the variable, its filename, and its line number.
+    #
+    # @return [Set<[String, String, int]>]
+    attr_reader :global_warning_given
+
     # @param options [{Symbol => Object}] The options hash. See
     #   {file:SASS_REFERENCE.md#sass_options the Sass options documentation}.
     # @param parent [Environment] See \{#parent}
@@ -83,6 +90,7 @@ module Sass
       @parent = parent
       @options = options || (parent && parent.options) || {}
       @stack = Sass::Stack.new if @parent.nil?
+      @global_warning_given = Set.new
     end
 
     # The environment of the caller of this environment's mixin or function.

data/lib/sass/exec.rb

@@ -316,7 +316,7 @@ END
                         else
                           'Specify the default encoding for Sass files.'
                         end
-        opts.on('-E encoding', encoding_desc) do |encoding|
+        opts.on('-E', '--default-encoding ENCODING', encoding_desc) do |encoding|
           if ::Sass::Util.ruby1_8?
             $stderr.puts "Specifying the encoding is not supported in ruby 1.8."
             exit 1
@@ -347,6 +347,7 @@ END
         super
         @options[:for_engine][:filename] = @options[:filename]
         @options[:for_engine][:css_filename] = @options[:output] if @options[:output].is_a?(String)
+        @options[:for_engine][:sourcemap_filename] = @options[:sourcemap_filename]
 
         begin
           input = @options[:input]
@@ -535,15 +536,14 @@ MSG
       end
 
       def default_sass_path
-        if ENV['SASSPATH']
+        if ENV['SASS_PATH']
           # The select here prevents errors when the environment's
           # load paths specified do not exist.
-          ENV['SASSPATH'].split(File::PATH_SEPARATOR).select {|d| File.directory?(d)}
+          ENV['SASS_PATH'].split(File::PATH_SEPARATOR).select {|d| File.directory?(d)}
         else
           [::Sass::Importers::DeprecatedPath.new(".")]
         end
       end
-
     end
 
     class Scss < Sass

data/lib/sass/features.rb

@@ -3,7 +3,6 @@ module Sass
   # Provides `Sass.has_feature?` which allows for simple feature detection
   # by providing a feature name.
   module Features
-
     # This is the set of features that can be detected.
     KNOWN_FEATURES = Set[*%w{
     }]

data/lib/sass/importers/base.rb

@@ -15,13 +15,9 @@ module Sass
     # They should also implement the \{#find\_relative} method.
     #
     # Importers should be serializable via `Marshal.dump`.
-    # In addition to the standard `_dump` and `_load` methods,
-    # importers can define `_before_dump`, `_after_dump`, `_around_dump`,
-    # and `_after_load` methods as per {Sass::Util#dump} and {Sass::Util#load}.
     #
     # @abstract
     class Base
-
       # Find a Sass file relative to another file.
       # Importers without a notion of "relative paths"
       # should just return nil here.
@@ -129,8 +125,19 @@ module Sass
       # from this importer.
       #
       # @param uri [String] A URI known to be valid for this importer.
-      # @return [String?] The publicly-visible URL for this file.
-      def public_url(uri)
+      # @param sourcemap_directory [String, NilClass] The absolute path to a
+      #   directory on disk where the sourcemap will be saved. If uri refers to
+      #   a file on disk that's accessible relative to sourcemap_directory, this
+      #   may return a relative URL. This may be `nil` if the sourcemap's
+      #   eventual location is unknown.
+      # @return [String?] The publicly-visible URL for this file, or `nil`
+      #   indicating that no publicly-visible URL exists.
+      def public_url(uri, sourcemap_directory = nil)
+        return if @public_url_warning_issued
+        @public_url_warning_issued = true
+        Sass::Util.sass_warn <<WARNING
+WARNING: #{self.class.name} should define the #public_url method.
+WARNING
         nil
       end
 

data/lib/sass/importers/deprecated_path.rb

@@ -4,7 +4,6 @@ module Sass
     # import a file. It is used to deprecate the current working
     # directory from the list of automatic sass load paths.
     class DeprecatedPath < Filesystem
-
       # @param root [String] The absolute, expanded path to the folder that is deprecated.
       def initialize(root)
         @specified_root = root
@@ -22,6 +21,13 @@ module Sass
         found
       end
 
+      # @see Base#directories_to_watch
+      def directories_to_watch
+        # The current working directory was not watched in Sass 3.2,
+        # so we continue not to watch it while it's deprecated.
+        []
+      end
+
       # @see Sass::Importers::Base#to_s
       def to_s
         "#{@root} (DEPRECATED)"
@@ -36,7 +42,7 @@ module Sass
         <<WARNING
 DEPRECATION WARNING: Importing from #{path} will not be
 automatic in future versions of Sass.  To avoid future errors, you can add it
-to your environment explicitly by setting `SASSPATH=#{@specified_root}`, by using the -I command
+to your environment explicitly by setting `SASS_PATH=#{@specified_root}`, by using the -I command
 line option, or by changing your Sass configuration options.
 WARNING
       end

data/lib/sass/importers/filesystem.rb

@@ -6,7 +6,6 @@ module Sass
     # The default importer, used for any strings found in the load path.
     # Simply loads Sass files from the filesystem using the default logic.
     class Filesystem < Base
-
       attr_accessor :root
 
       # Creates a new filesystem importer that imports files relative to a given path.
@@ -66,6 +65,21 @@ module Sass
           filename.start_with?(root + File::SEPARATOR)
       end
 
+      def public_url(name, sourcemap_directory = nil)
+        if sourcemap_directory.nil?
+          warn_about_public_url(name)
+        else
+          file_pathname = Pathname.new(Sass::Util.absolute_path(name, @root)).cleanpath
+          sourcemap_pathname = Pathname.new(sourcemap_directory).cleanpath
+          begin
+            file_pathname.relative_path_from(sourcemap_pathname).to_s
+          rescue ArgumentError # when a relative path cannot be constructed
+            warn_about_public_url(name)
+            nil
+          end
+        end
+      end
+
       protected
 
       # If a full uri is passed, this removes the root from it
@@ -130,10 +144,10 @@ module Sass
         dir = dir.gsub(File::ALT_SEPARATOR, File::SEPARATOR) unless File::ALT_SEPARATOR.nil?
 
         found = possible_files(remove_root(name)).map do |f, s|
-          path = dir == "." || Pathname.new(f).absolute? ? f : "#{dir}/#{f}"
+          path = dir == "." || Pathname.new(f).absolute? ? f : "#{escape_glob_characters(dir)}/#{f}"
           Dir[path].map do |full_path|
             full_path.gsub!(REDUNDANT_DIRECTORY, File::SEPARATOR)
-            [full_path, s]
+            [Pathname.new(full_path).cleanpath.to_s, s]
           end
         end
         found = Sass::Util.flatten(found, 1)
@@ -181,6 +195,22 @@ WARNING
         [dirname, basename, extension]
       end
 
+      # Issues a warning about being unable to determine a public url.
+      #
+      # @param uri [String] A URI known to be valid for this importer.
+      # @return [NilClass] nil
+      def warn_about_public_url(uri)
+        @warnings_issued ||= Set.new
+        unless @warnings_issued.include?(uri)
+          Sass::Util.sass_warn <<WARNING
+WARNING: Couldn't determine public URL for "#{uri}" while generating sourcemap.
+  Without a public URL, there's nothing for the source map to link to.
+WARNING
+          @warnings_issued << uri
+        end
+        nil
+      end
+
       private
 
       def _find(dir, name, options)
@@ -192,10 +222,6 @@ WARNING
         options[:importer] = self
         Sass::Engine.new(File.read(full_filename), options)
       end
-
-      def join(base, path)
-        Pathname.new(base).join(path).to_s
-      end
     end
   end
 end