sass 3.3.0 → 3.4.0

data/vendor/listen/spec/support/adapter_helper.rb

@@ -4,13 +4,24 @@
 # @param [String] path the path to watch
 #
 def watch(listener, expected_changes, *paths)
-  callback = lambda { |changed_dirs, options| @called = true; listener.on_change(changed_dirs) }
-  @adapter = Listen::Adapter.select_and_initialize(paths, { :report_changes => false, :latency => test_latency }, &callback)
+  sleep 0.05 # allow file/creation to be done (!)
+
+  callback = lambda do |changed_directories, options|
+    @called = true
+    listener.on_change(changed_directories)
+  end
+  @adapter = Listen::Adapter.select_and_initialize(paths, { :latency => test_latency }, &callback)
+  @adapter.stub(:start_poller) { nil }
 
   forced_stop = false
-  prevent_deadlock = Proc.new { sleep(10); puts "Forcing stop"; @adapter.stop; forced_stop = true }
+  prevent_deadlock = lambda do
+    sleep(10)
+    puts 'Forcing stop'
+    @adapter.stop
+    forced_stop = true
+  end
 
-  @adapter.start(false)
+  @adapter.start
 
   yield
 
@@ -32,25 +43,51 @@ shared_examples_for 'a filesystem adapter' do
   subject { described_class.new(File.dirname(__FILE__), &Proc.new {}) }
 
   describe '#start' do
+    before { Kernel.stub(:warn) }
     after { subject.stop }
 
-    context 'with the blocking param set to true' do
-      it 'blocks the current thread after starting the workers' do
+    it 'do not block the current thread after starting the workers' do
+      @called = false
+      t = Thread.new { subject.start; @called = true }
+      sleep(test_latency * 3)
+      Thread.kill(t) if t
+      @called.should be_true
+    end
+
+    context 'with the blocking hash option set to false' do
+      subject { described_class.new(File.dirname(__FILE__), { :blocking => false }, &Proc.new {}) }
+
+      it 'does not block the current thread after starting the workers' do
         @called = false
-        t = Thread.new { subject.start(true); @called = true }
+        t = Thread.new { subject.start; @called = true }
         sleep(test_latency * 3)
         Thread.kill(t) if t
-        @called.should be_false
+        @called.should be_true
       end
     end
+  end
 
-    context 'with the blocking param set to false' do
-      it 'does not block the current thread after starting the workers' do
+  describe '#start!' do
+    before { Kernel.stub(:warn) }
+    after { subject.stop }
+
+    it 'blocks the current thread after starting the workers' do
+      @called = false
+      t = Thread.new { subject.start!; @called = true }
+      sleep(test_latency * 3)
+      Thread.kill(t) if t
+      @called.should be_false
+    end
+
+    context 'with the blocking hash option set to false' do
+      subject { described_class.new(File.dirname(__FILE__), { :blocking => true }, &Proc.new {}) }
+
+      it 'blocks the current thread after starting the workers' do
         @called = false
-        t = Thread.new { subject.start(false); @called = true }
+        t = Thread.new { subject.start!; @called = true }
         sleep(test_latency * 3)
         Thread.kill(t) if t
-        @called.should be_true
+        @called.should be_false
       end
     end
   end
@@ -63,7 +100,7 @@ shared_examples_for 'a filesystem adapter' do
     end
 
     context 'with a stopped adapter' do
-      before { subject.start(false); subject.stop }
+      before { subject.start; subject.stop }
 
       it 'returns false' do
         subject.should_not be_started
@@ -71,7 +108,7 @@ shared_examples_for 'a filesystem adapter' do
     end
 
     context 'with a started adapter' do
-      before { subject.start(false) }
+      before { subject.start }
       after  { subject.stop }
 
       it 'returns true' do
@@ -83,7 +120,7 @@ end
 
 shared_examples_for 'an adapter that call properly listener#on_change' do |*args|
   options = (args.first && args.first.is_a?(Hash)) ? args.first : {}
-  let(:listener) { mock(Listen::Listener) }
+  let(:listener) { double(Listen::Listener) }
   before { described_class.stub(:works?) { true } }
 
   context 'single file operations' do

data/vendor/listen/spec/support/directory_record_helper.rb

@@ -24,7 +24,7 @@ def changes(root_path, options = {})
   paths = options.delete(:paths) || [root_path]
   options[:recursive] = true if options[:recursive].nil?
 
-  changes = @record.fetch_changes(paths, {:relative_paths => true}.merge(options))
+  changes = @record.fetch_changes(paths, { :relative_paths => true }.merge(options))
 
   [changes[:modified], changes[:added], changes[:removed]]
 end
@@ -32,14 +32,15 @@ end
 # Generates a small time difference before performing a time sensitive
 # task (like comparing mtimes of files).
 #
-# @note Modification time for files only includes the milliseconds on Linux with MRI > 1.9.2,
+# @note Modification time for files only includes the milliseconds on Linux with MRI > 1.9.2
+#   and platform that support it (OS X 10.8 not included),
 #   that's why we generate a difference that's greater than 1 second.
 #
 def small_time_difference
   t = Time.now
   diff = t.to_f - t.to_i
 
-  sleep( 1.5 - (diff < 0.5 ? diff : 0.4) )
+  sleep(1.05 - diff)
 end
 
 # Ensures that the test runs at almost the same second at which
@@ -49,7 +50,8 @@ def ensure_same_second
   t = Time.now
   diff = t.to_f - t.to_i
 
-  if diff > 0.1 # We are not at the beginning of a second
-    sleep 1.1 - diff # 1.1 is used instead of 1 to account for the processing time (estimated at 0.1 sec)
+  # We are not at the end of a second
+  if diff >= (1 - Listen::Adapter::DEFAULT_LATENCY)
+    sleep(1.05 - diff)
   end
 end

data/vendor/listen/spec/support/listeners_helper.rb

@@ -9,14 +9,37 @@ shared_examples_for 'a listener to changes on a file-system' do
       subject.start
     end
 
-    context 'with the blocking param set to false' do
-      it 'passes the blocking param to the adapter' do
-        adapter.should_receive(:start).with(false)
+    context 'with the blocking deprecated param set to true' do
+      it 'displays a deprecation notice' do
+        Kernel.should_receive(:warn).with(/#{Listen::Listener::BLOCKING_PARAMETER_DEPRECATION_MESSAGE}/)
+        subject.start(true)
+      end
+    end
+
+    context 'with the blocking deprecated param set to false' do
+      it 'displays a deprecation notice' do
+        Kernel.should_receive(:warn).with(/#{Listen::Listener::BLOCKING_PARAMETER_DEPRECATION_MESSAGE}/)
         subject.start(false)
       end
     end
   end
 
+  describe '#start!' do
+    before do
+      subject.stub(:initialize_adapter) { adapter }
+    end
+
+    it 'starts the adapter' do
+      adapter.should_receive(:start!)
+      subject.start!
+    end
+
+    it 'passes the blocking param to the adapter' do
+      adapter.should_receive(:start!)
+      subject.start!
+    end
+  end
+
   context 'with a started listener' do
     before do
       subject.start
@@ -31,7 +54,7 @@ shared_examples_for 'a listener to changes on a file-system' do
 
     describe '#pause' do
       it 'sets adapter.paused to true' do
-        adapter.should_receive(:paused=).with(true)
+        adapter.should_receive(:pause)
         subject.pause
       end
 
@@ -42,7 +65,7 @@ shared_examples_for 'a listener to changes on a file-system' do
 
     describe '#unpause' do
       it 'sets adapter.paused to false' do
-        adapter.should_receive(:paused=).with(false)
+        adapter.should_receive(:unpause)
         subject.unpause
       end
 
@@ -58,12 +81,12 @@ shared_examples_for 'a listener to changes on a file-system' do
       end
 
       it 'returns true when adapter is paused' do
-        adapter.should_receive(:paused) { true }
+        adapter.should_receive(:paused?) { true }
         subject.should be_paused
       end
 
       it 'returns false when adapter is not paused' do
-        adapter.should_receive(:paused) { false }
+        adapter.should_receive(:paused?) { false }
         subject.should_not be_paused
       end
     end

metadata

@@ -1,59 +1,59 @@
 --- !ruby/object:Gem::Specification
 name: sass
 version: !ruby/object:Gem::Version
-  version: 3.3.0
+  version: 3.4.0
 platform: ruby
 authors:
-- Nathan Weizenbaum
+- Natalie Weizenbaum
 - Chris Eppstein
 - Hampton Catlin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-08 00:00:00.000000000 Z
+date: 2014-08-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: yard
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
+        version: 0.5.3
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.5.3
 - !ruby/object:Gem::Dependency
-  name: yard
+  name: maruku
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: 0.5.3
+        version: 0.5.9
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: 0.5.3
+        version: 0.5.9
 - !ruby/object:Gem::Dependency
-  name: maruku
+  name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: 0.5.9
+        version: '5'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: 0.5.9
+        version: '5'
 description: |2
         Sass makes CSS fun again. Sass is an extension of CSS3, adding
         nested rules, variables, mixins, selector inheritance, and more.
@@ -64,8 +64,7 @@ executables:
 - sass
 - sass-convert
 - scss
-extensions:
-- ext/mkrf_conf.rb
+extensions: []
 extra_rdoc_files: []
 files:
 - rails/init.rb
@@ -94,6 +93,7 @@ files:
 - lib/sass/tree/trace_node.rb
 - lib/sass/tree/return_node.rb
 - lib/sass/tree/root_node.rb
+- lib/sass/tree/keyframe_rule_node.rb
 - lib/sass/tree/if_node.rb
 - lib/sass/tree/charset_node.rb
 - lib/sass/tree/css_import_node.rb
@@ -107,6 +107,7 @@ files:
 - lib/sass/tree/at_root_node.rb
 - lib/sass/tree/node.rb
 - lib/sass/tree/mixin_node.rb
+- lib/sass/tree/error_node.rb
 - lib/sass/tree/extend_node.rb
 - lib/sass/tree/mixin_def_node.rb
 - lib/sass/tree/supports_node.rb
@@ -126,6 +127,9 @@ files:
 - lib/sass/tree/prop_node.rb
 - lib/sass/tree/variable_node.rb
 - lib/sass/engine.rb
+- lib/sass/exec/sass_scss.rb
+- lib/sass/exec/base.rb
+- lib/sass/exec/sass_convert.rb
 - lib/sass/plugin.rb
 - lib/sass/root.rb
 - lib/sass/features.rb
@@ -153,7 +157,6 @@ files:
 - lib/sass/script.rb
 - lib/sass/util.rb
 - lib/sass/importers/filesystem.rb
-- lib/sass/importers/deprecated_path.rb
 - lib/sass/importers/base.rb
 - lib/sass/script/parser.rb
 - lib/sass/script/functions.rb
@@ -166,6 +169,7 @@ files:
 - lib/sass/script/tree/list_literal.rb
 - lib/sass/script/tree/node.rb
 - lib/sass/script/tree/unary_operation.rb
+- lib/sass/script/tree/selector.rb
 - lib/sass/script/tree/map_literal.rb
 - lib/sass/script/tree.rb
 - lib/sass/script/lexer.rb
@@ -174,7 +178,6 @@ files:
 - lib/sass/script/value/color.rb
 - lib/sass/script/value/number.rb
 - lib/sass/script/value/map.rb
-- lib/sass/script/value/deprecated_false.rb
 - lib/sass/script/value/arg_list.rb
 - lib/sass/script/value/bool.rb
 - lib/sass/script/value/list.rb
@@ -186,6 +189,7 @@ files:
 - lib/sass/selector.rb
 - lib/sass/callbacks.rb
 - lib/sass/selector/simple.rb
+- lib/sass/selector/pseudo.rb
 - lib/sass/selector/sequence.rb
 - lib/sass/selector/abstract_sequence.rb
 - lib/sass/selector/comma_sequence.rb
@@ -200,8 +204,6 @@ files:
 - vendor/listen/lib/listen/turnstile.rb
 - vendor/listen/lib/listen/directory_record.rb
 - vendor/listen/lib/listen/version.rb
-- vendor/listen/lib/listen/dependency_manager.rb
-- vendor/listen/lib/listen/multi_listener.rb
 - vendor/listen/lib/listen/listener.rb
 - vendor/listen/lib/listen/adapters/polling.rb
 - vendor/listen/lib/listen/adapters/darwin.rb
@@ -215,7 +217,6 @@ files:
 - vendor/listen/LICENSE
 - vendor/listen/listen.gemspec
 - vendor/listen/Vagrantfile
-- vendor/listen/spec/listen/dependency_manager_spec.rb
 - vendor/listen/spec/listen/directory_record_spec.rb
 - vendor/listen/spec/listen/adapters/linux_spec.rb
 - vendor/listen/spec/listen/adapters/darwin_spec.rb
@@ -225,7 +226,6 @@ files:
 - vendor/listen/spec/listen/turnstile_spec.rb
 - vendor/listen/spec/listen/adapter_spec.rb
 - vendor/listen/spec/listen/listener_spec.rb
-- vendor/listen/spec/listen/multi_listener_spec.rb
 - vendor/listen/spec/listen_spec.rb
 - vendor/listen/spec/spec_helper.rb
 - vendor/listen/spec/support/directory_record_helper.rb
@@ -351,6 +351,8 @@ files:
 - test/sass/more_templates/more_import.sass
 - test/sass/more_templates/more1.sass
 - test/sass/script_conversion_test.rb
+- test/sass/superselector_test.rb
+- test/sass/encoding_test.rb
 - test/sass/more_results/more1.css
 - test/sass/more_results/more1_with_line_comments.css
 - test/sass/more_results/more_import.css
@@ -369,7 +371,6 @@ files:
 - MIT-LICENSE
 - VERSION
 - CONTRIBUTING
-- ext/mkrf_conf.rb
 homepage: http://sass-lang.com/
 licenses:
 - MIT
@@ -415,6 +416,8 @@ test_files:
 - test/sass/scss/rx_test.rb
 - test/sass/util_test.rb
 - test/sass/script_conversion_test.rb
+- test/sass/superselector_test.rb
+- test/sass/encoding_test.rb
 - test/sass/cache_test.rb
 - test/sass/source_map_test.rb
 - test/sass/plugin_test.rb

data/ext/mkrf_conf.rb

@@ -1,27 +0,0 @@
-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/importers/deprecated_path.rb

@@ -1,51 +0,0 @@
-module Sass
-  module Importers
-    # This importer emits a deprecation warning the first time it is used to
-    # 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
-        @warning_given = false
-        super
-      end
-
-      # @see Sass::Importers::Base#find
-      def find(*args)
-        found = super
-        if found && !@warning_given
-          @warning_given = true
-          Sass::Util.sass_warn deprecation_warning
-        end
-        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)"
-      end
-
-      protected
-
-      # @return [String] The deprecation warning that will be printed the first
-      #   time an import occurs.
-      def deprecation_warning
-        path = @specified_root == "." ? "the current working directory" : @specified_root
-        <<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 `SASS_PATH=#{@specified_root}`, by using the -I command
-line option, or by changing your Sass configuration options.
-WARNING
-      end
-    end
-  end
-end

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

@@ -1,55 +0,0 @@
-module Sass::Script::Value
-  # A SassScript object representing a `false` value that came from a call to
-  # `index()`. It will print deprecation warnings if it's used with `==`.
-  class DeprecatedFalse < Bool
-    def self.new(environment)
-      obj = allocate
-      obj.send(:initialize, environment)
-      obj
-    end
-
-    def initialize(environment)
-      @value = false
-      @global_env = environment.global_env
-      if (frame = environment.stack.frames.last)
-        @filename = frame.filename
-        @line = frame.line
-      end
-    end
-
-    def eq(other)
-      if other.value == false && !warned?
-        self.warned = true
-        Sass::Util.sass_warn <<WARNING + @global_env.stack.to_s.gsub(/^/, '        ')
-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(...)".
-WARNING
-      end
-      Bool.new(other.value == false)
-    end
-
-    def neq(other)
-      if other.value.nil? && !warned?
-        self.warned = true
-        Sass::Util.sass_warn <<WARNING + @global_env.stack.to_s.gsub(/^/, '        ')
-DEPRECATION WARNING: The return value of index() will change from "false" to
-"null" in future versions of Sass. For compatibility, avoid using "!= null" on
-the return value.
-WARNING
-      end
-      Bool.new(other.value != false)
-    end
-
-    private
-
-    def warned?
-      @global_env.deprecated_false_warning_given.include?([@filename, @line])
-    end
-
-    def warned=(value)
-      @global_env.deprecated_false_warning_given << [@filename, @line]
-    end
-  end
-end

data/vendor/listen/lib/listen/dependency_manager.rb

@@ -1,126 +0,0 @@
-require 'set'
-
-module Listen
-
-  # The dependency-manager offers a simple DSL which allows
-  # classes to declare their gem dependencies and load them when
-  # needed.
-  # It raises a user-friendly exception when the dependencies
-  # can't be loaded which has the install command in the message.
-  #
-  module DependencyManager
-
-    GEM_LOAD_MESSAGE = <<-EOS.gsub(/^ {6}/, '')
-      Missing dependency '%s' (version '%s')!
-    EOS
-
-    GEM_INSTALL_COMMAND = <<-EOS.gsub(/^ {6}/, '')
-      Please run the following to satisfy the dependency:
-        gem install --version '%s' %s
-    EOS
-
-    BUNDLER_DECLARE_GEM = <<-EOS.gsub(/^ {6}/, '')
-      Please add the following to your Gemfile to satisfy the dependency:
-        gem '%s', '%s'
-    EOS
-
-    Dependency = Struct.new(:name, :version)
-
-    # The error raised when a dependency can't be loaded.
-    class Error < StandardError; end
-
-    # A list of all loaded dependencies in the dependency manager.
-    @_loaded_dependencies = Set.new
-
-    # class methods
-    class << self
-
-      # Initializes the extended class.
-      #
-      # @param [Class] the class for which some dependencies must be managed
-      #
-      def extended(base)
-        base.class_eval do
-          @_dependencies = Set.new
-        end
-      end
-
-      # Adds a loaded dependency to a list so that it doesn't have
-      # to be loaded again by another classes.
-      #
-      # @param [Dependency] dependency
-      #
-      def add_loaded(dependency)
-        @_loaded_dependencies << dependency
-      end
-
-      # Returns whether the dependency is alread loaded or not.
-      #
-      # @param [Dependency] dependency
-      # @return [Boolean]
-      #
-      def already_loaded?(dependency)
-        @_loaded_dependencies.include?(dependency)
-      end
-
-      # Clears the list of loaded dependencies.
-      #
-      def clear_loaded
-        @_loaded_dependencies.clear
-      end
-    end
-
-    # Registers a new dependency.
-    #
-    # @param [String] name the name of the gem
-    # @param [String] version the version of the gem
-    #
-    def dependency(name, version)
-      @_dependencies << Dependency.new(name, version)
-    end
-
-    # Loads the registered dependencies.
-    #
-    # @raise DependencyManager::Error if the dependency can't be loaded.
-    #
-    def load_depenencies
-      @_dependencies.each do |dependency|
-        begin
-          next if DependencyManager.already_loaded?(dependency)
-          gem(dependency.name, dependency.version)
-          require(dependency.name)
-          DependencyManager.add_loaded(dependency)
-          @_dependencies.delete(dependency)
-        rescue Gem::LoadError
-          args = [dependency.name, dependency.version]
-          command = if running_under_bundler?
-            BUNDLER_DECLARE_GEM % args
-          else
-            GEM_INSTALL_COMMAND % args.reverse
-          end
-          message = GEM_LOAD_MESSAGE % args
-
-          raise Error.new(message + command)
-        end
-      end
-    end
-
-    # Returns whether all the dependencies has been loaded or not.
-    #
-    # @return [Boolean]
-    #
-    def dependencies_loaded?
-      @_dependencies.empty?
-    end
-
-    private
-
-    # Returns whether we are running under bundler or not
-    #
-    # @return [Boolean]
-    #
-    def running_under_bundler?
-      !!(File.exists?('Gemfile') && ENV['BUNDLE_GEMFILE'])
-    end
-  end
-end