haml 3.1.8 → 3.2.0.alpha.2

data/vendor/sass/test/sass/functions_test.rb

@@ -965,19 +965,6 @@ MSG
     assert_error_message("Separator name must be space, comma, or auto for `append'", "append(1, 2, baboon)")
   end
 
-  def test_zip
-    assert_equal("1 3 5, 2 4 6", evaluate("zip(1 2, 3 4, 5 6)"))
-    assert_equal("1 4 7, 2 5 8", evaluate("zip(1 2 3, 4 5 6, 7 8)"))
-  end
-
-  def test_index
-    assert_equal("1", evaluate("index(1px solid blue, 1px)"))
-    assert_equal("2", evaluate("index(1px solid blue, solid)"))
-    assert_equal("3", evaluate("index(1px solid blue, #00f)"))
-    assert_equal("false", evaluate("index(1px solid blue, 1em)"))
-    assert_equal("false", evaluate("index(1px solid blue, notfound)"))
-  end
-
   def test_if
     assert_equal("1px", evaluate("if(true, 1px, 2px)"))
     assert_equal("2px", evaluate("if(false, 1px, 2px)"))

data/vendor/sass/test/sass/importer_test.rb

@@ -2,8 +2,6 @@
 require File.dirname(__FILE__) + '/../test_helper'
 require File.dirname(__FILE__) + '/test_helper'
 
-require 'sass/plugin'
-
 class ImporterTest < Test::Unit::TestCase
   
   class FruitImporter < Sass::Importers::Base
@@ -40,72 +38,6 @@ class ImporterTest < Test::Unit::TestCase
     end
   end
 
-  # This importer maps one import to another import
-  # based on the mappings passed to importer's constructor.
-  class IndirectImporter < Sass::Importers::Base
-    def initialize(mappings, mtimes)
-      @mappings = mappings
-      @mtimes = mtimes
-    end
-    def find_relative(uri, base, options)
-      nil
-    end
-    def find(name, options)
-      if @mappings.has_key?(name)
-        Sass::Engine.new(
-          %Q[@import "#{@mappings[name]}";],
-          options.merge(
-            :filename => name,
-            :syntax => :scss,
-            :importer => self
-          )
-        )
-      end
-    end
-    def mtime(uri, options)
-      @mtimes.fetch(uri, @mtimes.has_key?(uri) ? Time.now : nil)
-    end
-    def key(uri, options)
-      [self.class.name, uri]
-    end
-    def to_s
-      "IndirectImporter(#{@mappings.keys.join(", ")})"
-    end
-  end
-
-  # This importer maps the import to single class
-  # based on the mappings passed to importer's constructor.
-  class ClassImporter < Sass::Importers::Base
-    def initialize(mappings, mtimes)
-      @mappings = mappings
-      @mtimes = mtimes
-    end
-    def find_relative(uri, base, options)
-      nil
-    end
-    def find(name, options)
-      if @mappings.has_key?(name)
-        Sass::Engine.new(
-          %Q[.#{name}{#{@mappings[name]}}],
-          options.merge(
-            :filename => name,
-            :syntax => :scss,
-            :importer => self
-          )
-        )
-      end
-    end
-    def mtime(uri, options)
-      @mtimes.fetch(uri, @mtimes.has_key?(uri) ? Time.now : nil)
-    end
-    def key(uri, options)
-      [self.class.name, uri]
-    end
-    def to_s
-      "ClassImporter(#{@mappings.keys.join(", ")})"
-    end
-  end
-
   def test_can_resolve_generated_imports
     scss_file = %Q{
       $pear-color: green;
@@ -147,46 +79,4 @@ CSS
   ensure
     FileUtils.rm_rf(absolutize("tmp"))
   end
-
-  def test_staleness_check_across_importers
-    file_system_importer = Sass::Importers::Filesystem.new(fixture_dir)
-    # Make sure the first import is older
-    indirect_importer = IndirectImporter.new({"apple" => "pear"}, {"apple" => Time.now - 1})
-    # Make css file is newer so the dependencies are the only way for the css file to be out of date.
-    FileUtils.touch(fixture_file("test_staleness_check_across_importers.css"))
-    # Make sure the first import is older
-    class_importer = ClassImporter.new({"pear" => %Q{color: green;}}, {"pear" => Time.now + 1})
-
-    options = {
-      :style => :compact,
-      :filename => fixture_file("test_staleness_check_across_importers.scss"),
-      :importer => file_system_importer,
-      :load_paths => [file_system_importer, indirect_importer, class_importer],
-      :syntax => :scss
-    }
-
-    assert_equal File.read(fixture_file("test_staleness_check_across_importers.css")),
-                 Sass::Engine.new(File.read(fixture_file("test_staleness_check_across_importers.scss")), options).render
-
-    checker = Sass::Plugin::StalenessChecker.new(options)
-
-    assert checker.stylesheet_needs_update?(
-      fixture_file("test_staleness_check_across_importers.css"),
-      fixture_file("test_staleness_check_across_importers.scss"),
-      file_system_importer
-    )
-  end
-
-  def fixture_dir
-    File.join(File.dirname(__FILE__), "fixtures")
-  end
-
-  def fixture_file(path)
-    File.join(fixture_dir, path)
-  end
-
-  def test_absolute_files_across_template_locations
-    importer = Sass::Importers::Filesystem.new(absolutize 'templates')
-    assert_not_nil importer.mtime(absolutize('more_templates/more1.sass'), {})
-  end
 end

data/vendor/sass/test/sass/plugin_test.rb

@@ -183,7 +183,6 @@ CSS
 
   def test_updating_stylesheets_callback
     # Should run even when there's nothing to update
-    Sass::Plugin.options[:template_location] = nil
     assert_callback :updating_stylesheets, []
   end
 
@@ -197,25 +196,25 @@ CSS
     assert_no_callback :updating_stylesheets
   end
 
-  def test_updated_stylesheet_callback_for_updated_template
+  def test_updating_stylesheet_callback_for_updated_template
     Sass::Plugin.options[:always_update] = false
     touch 'basic'
-    assert_no_callback :updated_stylesheet, template_loc("complex"), tempfile_loc("complex") do
+    assert_no_callback :updating_stylesheet, template_loc("complex"), tempfile_loc("complex") do
       assert_callbacks(
-        [:updated_stylesheet, template_loc("basic"), tempfile_loc("basic")],
-        [:updated_stylesheet, template_loc("import"), tempfile_loc("import")])
+        [:updating_stylesheet, template_loc("basic"), tempfile_loc("basic")],
+        [:updating_stylesheet, template_loc("import"), tempfile_loc("import")])
     end
   end
 
-  def test_updated_stylesheet_callback_for_fresh_template
+  def test_updating_stylesheet_callback_for_fresh_template
     Sass::Plugin.options[:always_update] = false
-    assert_no_callback :updated_stylesheet
+    assert_no_callback :updating_stylesheet
   end
 
-  def test_updated_stylesheet_callback_for_error_template
+  def test_updating_stylesheet_callback_for_error_template
     Sass::Plugin.options[:always_update] = false
     touch 'bork1'
-    assert_no_callback :updated_stylesheet
+    assert_no_callback :updating_stylesheet
   end
 
   def test_not_updating_stylesheet_callback_for_fresh_template
@@ -227,8 +226,8 @@ CSS
     Sass::Plugin.options[:always_update] = false
     assert_callback :not_updating_stylesheet, template_loc("complex"), tempfile_loc("complex") do
       assert_no_callbacks(
-        [:updated_stylesheet, template_loc("basic"), tempfile_loc("basic")],
-        [:updated_stylesheet, template_loc("import"), tempfile_loc("import")])
+        [:updating_stylesheet, template_loc("basic"), tempfile_loc("basic")],
+        [:updating_stylesheet, template_loc("import"), tempfile_loc("import")])
     end
   end
 
@@ -348,11 +347,9 @@ CSS
 
   def assert_callback(name, *expected_args)
     run = false
-    received_args = nil
     Sass::Plugin.send("on_#{name}") do |*args|
-      received_args = args
-      run ||= expected_args.zip(received_args).all? do |ea, ra|
-        ea.respond_to?(:call) ? ea.call(ra) : ea == ra
+      run ||= expected_args.zip(args).all? do |ea, a|
+        ea.respond_to?(:call) ? ea.call(a) : ea == a
       end
     end
 
@@ -362,7 +359,7 @@ CSS
       check_for_updates!
     end
 
-    assert run, "Expected #{name} callback to be run with arguments:\n  #{expected_args.inspect}\nHowever, it got:\n  #{received_args.inspect}"
+    assert run, "Expected #{name} callback to be run with arguments:\n  #{expected_args.inspect}"
   end
 
   def assert_no_callback(name, *unexpected_args)

data/vendor/sass/test/sass/script_conversion_test.rb

@@ -223,8 +223,6 @@ RUBY
     assert_renders '#{1 + 2}, #{3 + 4}'
     assert_renders '#{1 + 2} ,#{3 + 4}'
     assert_renders '#{1 + 2},#{3 + 4}'
-    assert_renders '#{1 + 2}, #{3 + 4}, #{5 + 6}'
-    assert_renders '3, #{3 + 4}, 11'
 
     assert_renders '3 / #{3 + 4}'
     assert_renders '3 /#{3 + 4}'

data/vendor/sass/test/sass/script_test.rb

@@ -7,14 +7,6 @@ module Sass::Script::Functions::UserFunctions
     val.options[:foo]
     Sass::Script::String.new("Options defined!")
   end
-
-  def arg_error
-    assert_options
-  end
-end
-
-module Sass::Script::Functions
-  include Sass::Script::Functions::UserFunctions
 end
 
 class SassScriptTest < Test::Unit::TestCase
@@ -138,8 +130,6 @@ class SassScriptTest < Test::Unit::TestCase
     assert_equal '3, 7', resolve('#{1 + 2}, #{3 + 4}')
     assert_equal '3 ,7', resolve('#{1 + 2} ,#{3 + 4}')
     assert_equal '3,7', resolve('#{1 + 2},#{3 + 4}')
-    assert_equal '3, 7, 11', resolve('#{1 + 2}, #{3 + 4}, #{5 + 6}')
-    assert_equal '3, 7, 11', resolve('3, #{3 + 4}, 11')
 
     assert_equal '3 / 7', resolve('3 / #{3 + 4}')
     assert_equal '3 /7', resolve('3 /#{3 + 4}')
@@ -424,14 +414,6 @@ SASS
     assert_raise_message(Sass::SyntaxError, "() isn't a valid CSS value.") {resolve("nth(append((), ()), 1)")}
   end
 
-  def test_deep_argument_error_not_unwrapped
-    assert_raise_message(ArgumentError, 'wrong number of arguments (0 for 1)') {resolve("arg-error()")}
-  end
-
-  def test_shallow_argument_error_unwrapped
-    assert_raise_message(Sass::SyntaxError, "wrong number of arguments (1 for 0) for `arg-error'") {resolve("arg-error(1)")}
-  end
-
   # Regression Tests
 
   def test_funcall_has_higher_precedence_than_color_name

data/vendor/sass/test/sass/scss/css_test.rb

@@ -800,12 +800,6 @@ SCSS
     assert_selector_parses('E*:hover')
   end
 
-  def test_spaceless_combo_selectors
-    assert_equal "E > F {\n  a: b; }\n", render("E>F { a: b;} ")
-    assert_equal "E ~ F {\n  a: b; }\n", render("E~F { a: b;} ")
-    assert_equal "E + F {\n  a: b; }\n", render("E+F { a: b;} ")
-  end
-
   ## Errors
 
   def test_invalid_directives
@@ -915,7 +909,7 @@ SCSS
   end
 
   def render(scss, options = {})
-    tree = Sass::SCSS::CssParser.new(scss, options[:filename]).parse
+    tree = Sass::SCSS::CssParser.new(scss).parse
     tree.options = Sass::Engine::DEFAULT_OPTIONS.merge(options)
     tree.render
   end

data/vendor/sass/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)
@@ -892,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
@@ -1030,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}
@@ -1042,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}
@@ -1054,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}
@@ -1095,24 +1097,6 @@ SCSS
 
   # Regression
 
-  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 {
@@ -1260,14 +1244,6 @@ foo {
   a: $var1;
   b: $var2;
   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
 end

data/vendor/sass/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/vendor/sass/test/sass/util_test.rb

@@ -208,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/vendor/sass/vendor/fssm/LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2011 Travis Tilley
+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/sass/vendor/fssm/README.markdown

@@ -1,5 +1,3 @@
-# FSSM ![project status](http://stillmaintained.com/ttilley/fssm.png) #
-
 Monitor API
 ===========
 
@@ -14,70 +12,44 @@ 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
+	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
+	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
-
-Monitoring directories
-----------------------
-
-By default, FSSM monitors changes in files only. To enable monitoring of files and directories, pass option `directories => true` in a hash to the monitor. Please note that this may not work as expected in all backends. For example:
-
-    FSSM::Monitor.new(:directories => true)
-    FSSM.monitor(dir, file_glob, :directories => true)
-
-When directories are monitored, there's an additional third argument to the callbacks. Instead of
-
-    FSSM.monitor('/some/directory/', '**/*') do
-      update {|base, relative|}
-      delete {|base, relative|}
-      create {|base, relative|}
-    end
-
-you get this:
+	monitor = FSSM::Monitor.new
 
-    FSSM.monitor('/some/directory/', '**/*', :directories => true) do
-      update {|base, relative, type|}
-      delete {|base, relative, type|}
-      create {|base, relative, type|}
-    end
+	monitor.path '/some/directory/' do
+	  update {|base, relative|}
+	  delete {|base, relative|}
+	  create {|base, relative|}
+	end
 
-The value of `type` argument is either `:file` or `:directory`.
+	monitor.run