sass 3.1.21 → 3.2.0.alpha.3

data/test/sass/scss/scss_test.rb

@@ -118,11 +118,11 @@ SCSS
   def test_warn_directive
     expected_warning = <<EXPECTATION
 WARNING: this is a warning
-         on line 2 of test_warn_directive_inline.scss
+        on line 2 of test_warn_directive_inline.scss
 
 WARNING: this is a mixin
-         on line 1 of test_warn_directive_inline.scss, in `foo'
-         from line 3 of test_warn_directive_inline.scss
+        on line 1 of test_warn_directive_inline.scss, in `foo'
+        from line 3 of test_warn_directive_inline.scss
 EXPECTATION
     assert_warning expected_warning do
       assert_equal <<CSS, render(<<SCSS)
@@ -830,16 +830,6 @@ $zzz: zzz;
 SCSS
   end
 
-  def test_selector_interpolation_at_attr_end
-    assert_equal <<CSS, render(<<SCSS)
-[foo=zzz] {
-  a: b; }
-CSS
-$zzz: zzz;
-[foo=\#{$zzz}] { a: b; }
-SCSS
-  end
-
   def test_selector_interpolation_at_dashes
     assert_equal <<CSS, render(<<SCSS)
 div {
@@ -902,8 +892,7 @@ SCSS
   end
 
   def test_uses_property_exception_with_star_hack
-    # Silence the "beginning of selector" warning
-    Sass::Util.silence_warnings {render <<SCSS}
+    render <<SCSS
 foo {
   *bar:baz [fail]; }
 SCSS
@@ -1040,10 +1029,11 @@ SCSS
   end
 
   def test_parent_in_mid_selector_error
-    assert_raise_message(Sass::SyntaxError, <<MESSAGE.rstrip) {render <<SCSS}
+    assert_raise_message(Sass::SyntaxError, <<MESSAGE) {render <<SCSS}
 Invalid CSS after ".foo": expected "{", was "&.bar"
 
-"&" may only be used at the beginning of a selector.
+In Sass 3, the parent selector & can only be used where element names are valid,
+since it could potentially be replaced by an element name.
 MESSAGE
 flim {
   .foo&.bar {a: b}
@@ -1052,10 +1042,11 @@ SCSS
   end
 
   def test_parent_in_mid_selector_error
-    assert_raise_message(Sass::SyntaxError, <<MESSAGE.rstrip) {render <<SCSS}
+    assert_raise_message(Sass::SyntaxError, <<MESSAGE) {render <<SCSS}
 Invalid CSS after "  .foo.bar": expected "{", was "& {a: b}"
 
-"&" may only be used at the beginning of a selector.
+In Sass 3, the parent selector & can only be used where element names are valid,
+since it could potentially be replaced by an element name.
 MESSAGE
 flim {
   .foo.bar& {a: b}
@@ -1064,10 +1055,11 @@ SCSS
   end
 
   def test_double_parent_selector_error
-    assert_raise_message(Sass::SyntaxError, <<MESSAGE.rstrip) {render <<SCSS}
+    assert_raise_message(Sass::SyntaxError, <<MESSAGE) {render <<SCSS}
 Invalid CSS after "  &": expected "{", was "& {a: b}"
 
-"&" may only be used at the beginning of a selector.
+In Sass 3, the parent selector & can only be used where element names are valid,
+since it could potentially be replaced by an element name.
 MESSAGE
 flim {
   && {a: b}
@@ -1105,45 +1097,6 @@ SCSS
 
   # Regression
 
-  def test_newline_selector_rendered_multiple_times
-    assert_equal <<CSS, render(<<SCSS)
-form input,
-form select {
-  color: white; }
-
-form input,
-form select {
-  color: white; }
-CSS
-@for $i from 1 through 2 {
-  form {
-    input,
-    select {
-      color: white;
-    }
-  }
-}
-SCSS
-  end
-
-  def test_prop_name_interpolation_after_hyphen
-    assert_equal <<CSS, render(<<SCSS)
-a {
-  -foo-bar: b; }
-CSS
-a { -\#{"foo"}-bar: b; }
-SCSS
-  end
-
-  def test_star_plus_and_parent
-    assert_equal <<CSS, render(<<SCSS)
-* + html foo {
-  a: b; }
-CSS
-foo {*+html & {a: b}}
-SCSS
-  end
-
   def test_weird_added_space
     assert_equal <<CSS, render(<<SCSS)
 foo {
@@ -1255,11 +1208,11 @@ SCSS
 
 
   def test_newlines_removed_from_selectors_when_compressed
-    assert_equal <<CSS, render(<<SCSS, :style => :compressed)
+    assert_equal <<CSS, render(<<SCSS, :style=>:compressed)
 z a,z b{display:block}
 CSS
-a
-, b {
+a,
+b {
   z & {
     display: block;
   }
@@ -1293,37 +1246,4 @@ foo {
   c: $var3; }
 SCSS
   end
-
-  def test_options_passed_to_script
-    assert_equal <<CSS, render(<<SCSS, :style => :compressed)
-foo{color:#000}
-CSS
-foo {color: darken(black, 10%)}
-SCSS
-  end
-
-  # ref: https://github.com/nex3/sass/issues/104
-  def test_no_buffer_overflow
-    template = render <<SCSS
-.aaa {
-  background-color: white;
-}
-.aaa .aaa .aaa {
-  background-color: black;
-}   
-.bbb {
-  @extend .aaa;
-} 
-.xxx {
-  @extend .bbb;
-}
-.yyy {
-  @extend .bbb;
-}
-.zzz {
-  @extend .bbb;
-}
-SCSS
-    Sass::SCSS::Parser.new(template, "test.scss").parse
-  end
 end

data/test/sass/templates/import_charset.sass

@@ -1,8 +1,6 @@
 .foo
   a: b
 
-@import "foo.css"
-
 // Even though the imported file is in IBM866,
 // since the root file is in UTF-8/ASCII
 // the output will end up being UTF-8.

data/test/sass/templates/import_charset_1_8.sass

@@ -1,6 +1,4 @@
 .foo
   a: b
 
-@import "foo.css"
-
 @import "imported_charset_ibm866"

data/test/sass/templates/import_charset_ibm866.sass

@@ -3,8 +3,6 @@
 .foo
   a: b
 
-@import "foo.css"
-
 // Even though the imported file is in UTF-8,
 // since the root file is in IBM866
 // the output will end up being IBM866.

data/test/sass/test_helper.rb

@@ -3,6 +3,6 @@ $:.unshift test_dir unless $:.include?(test_dir)
 
 class Test::Unit::TestCase
   def absolutize(file)
-    File.expand_path("#{File.dirname(__FILE__)}/#{file}")
+    "#{File.dirname(__FILE__)}/#{file}"
   end
 end

data/test/sass/util_test.rb

@@ -120,16 +120,6 @@ class UtilTest < Test::Unit::TestCase
       lcs([-5, 3, 2, 8], [-4, 1, 8]) {|a, b| (a - b).abs <= 1 && [a, b].max})
   end
 
-  def test_subsequence
-    assert(subsequence?([1, 2, 3], [1, 2, 3]))
-    assert(subsequence?([1, 2, 3], [1, :a, 2, :b, 3]))
-    assert(subsequence?([1, 2, 3], [:a, 1, :b, :c, 2, :d, 3, :e, :f]))
-
-    assert(!subsequence?([1, 2, 3], [1, 2]))
-    assert(!subsequence?([1, 2, 3], [1, 3, 2]))
-    assert(!subsequence?([1, 2, 3], [3, 2, 1]))
-  end
-
   def test_silence_warnings
     old_stderr, $stderr = $stderr, StringIO.new
     warn "Out"
@@ -169,12 +159,6 @@ class UtilTest < Test::Unit::TestCase
       enum_cons(%w[foo bar baz], 2).map {|s1, s2| "#{s1}#{s2}"})
   end
 
-  def test_extract
-    arr = [1, 2, 3, 4, 5]
-    assert_equal([1, 3, 5], extract!(arr) {|e| e % 2 == 1})
-    assert_equal([2, 4], arr)
-  end
-
   def test_ord
     assert_equal(102, ord("f"))
     assert_equal(98, ord("bar"))
@@ -224,18 +208,6 @@ class UtilTest < Test::Unit::TestCase
     assert(set_eql?(s1, s2))
   end
 
-  def test_extract_and_inject_values
-    test = lambda {|arr| assert_equal(arr, with_extracted_values(arr) {|str| str})}
-
-    test[['foo bar']]
-    test[['foo {12} bar']]
-    test[['foo {{12} bar']]
-    test[['foo {{1', 12, '2} bar']]
-    test[['foo 1', 2, '{3', 4, 5, 6, '{7}', 8]]
-    test[['foo 1', [2, 3, 4], ' bar']]
-    test[['foo ', 1, "\n bar\n", [2, 3, 4], "\n baz"]]
-  end
-
   def test_caller_info
     assert_equal(["/tmp/foo.rb", 12, "fizzle"], caller_info("/tmp/foo.rb:12: in `fizzle'"))
     assert_equal(["/tmp/foo.rb", 12, nil], caller_info("/tmp/foo.rb:12"))

data/test/test_helper.rb

@@ -4,10 +4,8 @@ require 'test/unit'
 require 'fileutils'
 $:.unshift lib_dir unless $:.include?(lib_dir)
 require 'sass'
-require 'mathn' if ENV['MATHN'] == 'true'
 
 Sass::RAILS_LOADED = true unless defined?(Sass::RAILS_LOADED)
-Encoding.default_external = 'UTF-8' if defined?(Encoding)
 
 module Sass::Script::Functions
   def option(name)

data/vendor/{listen → fssm}/LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2012 Thibaud Guillaume-Gentil
+Copyright (c) 2009 Travis Tilley
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/vendor/fssm/README.markdown

@@ -0,0 +1,55 @@
+Monitor API
+===========
+
+There are three ways you can run the monitor.
+
+1. call monitor with a path parameter, and define callbacks in a block
+2. call monitor with a block to configure multiple paths and callbacks
+3. create a monitor object and run each step manually
+
+Monitor with path
+-----------------
+
+This form watches one path, and enters the run loop automatically. The first parameter is the path to watch, and the second parameter is an optional glob pattern or array of glob patterns that a file must match in order to trigger a callback. The default glob, if ommitted, is `'**/*'`.
+
+	FSSM.monitor('/some/directory/', '**/*') do
+	  update {|base, relative|}
+	  delete {|base, relative|}
+	  create {|base, relative|}
+	end
+
+Monitor with block
+------------------
+
+This form watches one or more paths, and enters the run loop automatically. The glob configuration call can be ommitted, and defaults to `'**/*'`.
+
+	FSSM.monitor do
+	  path '/some/directory/' do
+	    glob '**/*.yml'
+   
+	    update {|base, relative|}
+	    delete {|base, relative|}
+	    create {|base, relative|}
+	  end
+ 
+	  path '/some/other/directory/' do
+	    update {|base, relative|}
+	    delete {|base, relative|}
+	    create {|base, relative|}
+	  end
+	end
+
+Monitor object
+--------------
+
+This form doesn't enter the run loop automatically.
+
+	monitor = FSSM::Monitor.new
+
+	monitor.path '/some/directory/' do
+	  update {|base, relative|}
+	  delete {|base, relative|}
+	  create {|base, relative|}
+	end
+
+	monitor.run

data/vendor/fssm/Rakefile

@@ -0,0 +1,59 @@
+require 'rubygems'
+require 'rake'
+
+begin
+  require 'jeweler'
+  Jeweler::Tasks.new do |gem|
+    gem.name = "fssm"
+    gem.summary = %Q{file system state monitor}
+    gem.description = %Q{file system state monitor}
+    gem.email = "ttilley@gmail.com"
+    gem.homepage = "http://github.com/ttilley/fssm"
+    gem.authors = ["Travis Tilley"]
+    gem.add_development_dependency "rspec"
+    # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
+  end
+rescue LoadError
+  puts "Jeweler (or a dependency) not available. Install it with: sudo gem install jeweler"
+end
+
+require 'spec/rake/spectask'
+Spec::Rake::SpecTask.new(:spec) do |spec|
+  spec.libs << 'lib' << 'spec'
+  spec.spec_files = FileList['spec/**/*_spec.rb']
+end
+
+Spec::Rake::SpecTask.new(:rcov) do |spec|
+  spec.libs << 'lib' << 'spec'
+  spec.pattern = 'spec/**/*_spec.rb'
+  spec.rcov = true
+end
+
+task :spec => :check_dependencies
+
+begin
+  require 'reek/rake_task'
+  Reek::RakeTask.new do |t|
+    t.fail_on_error = true
+    t.verbose = false
+    t.source_files = 'lib/**/*.rb'
+  end
+rescue LoadError
+  task :reek do
+    abort "Reek is not available. In order to run reek, you must: sudo gem install reek"
+  end
+end
+
+begin
+  require 'roodi'
+  require 'roodi_task'
+  RoodiTask.new do |t|
+    t.verbose = false
+  end
+rescue LoadError
+  task :roodi do
+    abort "Roodi is not available. In order to run roodi, you must: sudo gem install roodi"
+  end
+end
+
+task :default => :spec

data/vendor/fssm/VERSION.yml

@@ -0,0 +1,5 @@
+--- 
+:major: 0
+:minor: 1
+:patch: 4
+:build: 

data/vendor/fssm/example.rb

@@ -0,0 +1,9 @@
+$:.unshift(File.join(File.dirname(__FILE__), 'lib'))
+
+require 'fssm'
+
+FSSM.monitor('.', '**/*') do
+  update {|b, r| puts "Update in #{b} to #{r}"}
+  delete {|b, r| puts "Delete in #{b} to #{r}"}
+  create {|b, r| puts "Create in #{b} to #{r}"}
+end

data/vendor/fssm/fssm.gemspec

@@ -0,0 +1,77 @@
+# Generated by jeweler
+# DO NOT EDIT THIS FILE DIRECTLY
+# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
+# -*- encoding: utf-8 -*-
+
+Gem::Specification.new do |s|
+  s.name = %q{fssm}
+  s.version = "0.1.4"
+
+  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.authors = ["Travis Tilley"]
+  s.date = %q{2010-03-10}
+  s.description = %q{file system state monitor}
+  s.email = %q{ttilley@gmail.com}
+  s.extra_rdoc_files = [
+    "LICENSE",
+     "README.markdown"
+  ]
+  s.files = [
+    ".document",
+     ".gitignore",
+     "LICENSE",
+     "README.markdown",
+     "Rakefile",
+     "VERSION.yml",
+     "example.rb",
+     "fssm.gemspec",
+     "lib/fssm.rb",
+     "lib/fssm/backends/fsevents.rb",
+     "lib/fssm/backends/inotify.rb",
+     "lib/fssm/backends/polling.rb",
+     "lib/fssm/backends/rubycocoa/fsevents.rb",
+     "lib/fssm/monitor.rb",
+     "lib/fssm/path.rb",
+     "lib/fssm/pathname.rb",
+     "lib/fssm/state/directory.rb",
+     "lib/fssm/state/file.rb",
+     "lib/fssm/support.rb",
+     "lib/fssm/tree.rb",
+     "profile/prof-cache.rb",
+     "profile/prof-fssm-pathname.html",
+     "profile/prof-pathname.rb",
+     "profile/prof-plain-pathname.html",
+     "profile/prof.html",
+     "spec/path_spec.rb",
+     "spec/root/duck/quack.txt",
+     "spec/root/file.css",
+     "spec/root/file.rb",
+     "spec/root/file.yml",
+     "spec/root/moo/cow.txt",
+     "spec/spec_helper.rb"
+  ]
+  s.homepage = %q{http://github.com/ttilley/fssm}
+  s.rdoc_options = ["--charset=UTF-8"]
+  s.require_paths = ["lib"]
+  s.rubygems_version = %q{1.3.6}
+  s.summary = %q{file system state monitor}
+  s.test_files = [
+    "spec/path_spec.rb",
+     "spec/spec_helper.rb",
+     "spec/root/file.rb"
+  ]
+
+  if s.respond_to? :specification_version then
+    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
+    s.specification_version = 3
+
+    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
+      s.add_development_dependency(%q<rspec>, [">= 0"])
+    else
+      s.add_dependency(%q<rspec>, [">= 0"])
+    end
+  else
+    s.add_dependency(%q<rspec>, [">= 0"])
+  end
+end
+