RubyGems - sass - Versions diffs - 3.6.0 → 3.7.0 - Mend

sass 3.6.0 → 3.7.0

Files changed (138) hide show

checksums.yaml +5 -5
data/CONTRIBUTING.md +1 -1
data/README.md +10 -0
data/VERSION +1 -1
data/VERSION_DATE +1 -1
data/lib/sass/script/css_parser.rb +4 -1
data/lib/sass/script/functions.rb +15 -25
data/lib/sass/script/lexer.rb +45 -7
data/lib/sass/script/parser.rb +259 -93
data/lib/sass/scss/parser.rb +43 -16
data/lib/sass/scss/static_parser.rb +15 -15
data/lib/sass/util.rb +31 -0
metadata +8 -156
data/Rakefile +0 -364
data/test/sass-spec.yml +0 -3
data/test/sass/cache_test.rb +0 -130
data/test/sass/callbacks_test.rb +0 -60
data/test/sass/compiler_test.rb +0 -225
data/test/sass/conversion_test.rb +0 -2138
data/test/sass/css2sass_test.rb +0 -523
data/test/sass/css_variable_test.rb +0 -237
data/test/sass/data/hsl-rgb.txt +0 -319
data/test/sass/encoding_test.rb +0 -188
data/test/sass/engine_test.rb +0 -3499
data/test/sass/exec_test.rb +0 -95
data/test/sass/extend_test.rb +0 -1679
data/test/sass/fixtures/test_staleness_check_across_importers.css +0 -1
data/test/sass/fixtures/test_staleness_check_across_importers.scss +0 -1
data/test/sass/functions_test.rb +0 -2021
data/test/sass/importer_test.rb +0 -420
data/test/sass/logger_test.rb +0 -57
data/test/sass/mock_importer.rb +0 -49
data/test/sass/more_results/more1.css +0 -9
data/test/sass/more_results/more1_with_line_comments.css +0 -26
data/test/sass/more_results/more_import.css +0 -29
data/test/sass/more_templates/_more_partial.sass +0 -2
data/test/sass/more_templates/more1.sass +0 -23
data/test/sass/more_templates/more_import.sass +0 -11
data/test/sass/plugin_test.rb +0 -552
data/test/sass/results/alt.css +0 -4
data/test/sass/results/basic.css +0 -9
data/test/sass/results/cached_import_option.css +0 -3
data/test/sass/results/compact.css +0 -5
data/test/sass/results/complex.css +0 -86
data/test/sass/results/compressed.css +0 -1
data/test/sass/results/expanded.css +0 -19
data/test/sass/results/filename_fn.css +0 -3
data/test/sass/results/if.css +0 -3
data/test/sass/results/import.css +0 -31
data/test/sass/results/import_charset.css +0 -5
data/test/sass/results/import_charset_ibm866.css +0 -5
data/test/sass/results/import_content.css +0 -1
data/test/sass/results/line_numbers.css +0 -49
data/test/sass/results/mixins.css +0 -95
data/test/sass/results/multiline.css +0 -24
data/test/sass/results/nested.css +0 -22
data/test/sass/results/options.css +0 -1
data/test/sass/results/parent_ref.css +0 -13
data/test/sass/results/script.css +0 -16
data/test/sass/results/scss_import.css +0 -31
data/test/sass/results/scss_importee.css +0 -2
data/test/sass/results/subdir/nested_subdir/nested_subdir.css +0 -1
data/test/sass/results/subdir/subdir.css +0 -3
data/test/sass/results/units.css +0 -11
data/test/sass/results/warn.css +0 -0
data/test/sass/results/warn_imported.css +0 -0
data/test/sass/script_conversion_test.rb +0 -365
data/test/sass/script_test.rb +0 -1427
data/test/sass/scss/css_test.rb +0 -1266
data/test/sass/scss/rx_test.rb +0 -159
data/test/sass/scss/scss_test.rb +0 -4238
data/test/sass/scss/test_helper.rb +0 -37
data/test/sass/source_map_test.rb +0 -1063
data/test/sass/superselector_test.rb +0 -209
data/test/sass/templates/_cached_import_option_partial.scss +0 -1
data/test/sass/templates/_double_import_loop2.sass +0 -1
data/test/sass/templates/_filename_fn_import.scss +0 -11
data/test/sass/templates/_imported_charset_ibm866.sass +0 -4
data/test/sass/templates/_imported_charset_utf8.sass +0 -4
data/test/sass/templates/_imported_content.sass +0 -3
data/test/sass/templates/_partial.sass +0 -2
data/test/sass/templates/_same_name_different_partiality.scss +0 -1
data/test/sass/templates/alt.sass +0 -16
data/test/sass/templates/basic.sass +0 -23
data/test/sass/templates/bork1.sass +0 -2
data/test/sass/templates/bork2.sass +0 -2
data/test/sass/templates/bork3.sass +0 -2
data/test/sass/templates/bork4.sass +0 -2
data/test/sass/templates/bork5.sass +0 -3
data/test/sass/templates/cached_import_option.scss +0 -3
data/test/sass/templates/compact.sass +0 -17
data/test/sass/templates/complex.sass +0 -305
data/test/sass/templates/compressed.sass +0 -15
data/test/sass/templates/double_import_loop1.sass +0 -1
data/test/sass/templates/expanded.sass +0 -17
data/test/sass/templates/filename_fn.scss +0 -18
data/test/sass/templates/if.sass +0 -11
data/test/sass/templates/import.sass +0 -12
data/test/sass/templates/import_charset.sass +0 -9
data/test/sass/templates/import_charset_ibm866.sass +0 -11
data/test/sass/templates/import_content.sass +0 -4
data/test/sass/templates/importee.less +0 -2
data/test/sass/templates/importee.sass +0 -19
data/test/sass/templates/line_numbers.sass +0 -13
data/test/sass/templates/mixin_bork.sass +0 -5
data/test/sass/templates/mixins.sass +0 -76
data/test/sass/templates/multiline.sass +0 -20
data/test/sass/templates/nested.sass +0 -25
data/test/sass/templates/nested_bork1.sass +0 -2
data/test/sass/templates/nested_bork2.sass +0 -2
data/test/sass/templates/nested_bork3.sass +0 -2
data/test/sass/templates/nested_bork4.sass +0 -2
data/test/sass/templates/nested_import.sass +0 -2
data/test/sass/templates/nested_mixin_bork.sass +0 -6
data/test/sass/templates/options.sass +0 -2
data/test/sass/templates/parent_ref.sass +0 -25
data/test/sass/templates/same_name_different_ext.sass +0 -2
data/test/sass/templates/same_name_different_ext.scss +0 -1
data/test/sass/templates/same_name_different_partiality.scss +0 -1
data/test/sass/templates/script.sass +0 -101
data/test/sass/templates/scss_import.scss +0 -12
data/test/sass/templates/scss_importee.scss +0 -1
data/test/sass/templates/single_import_loop.sass +0 -1
data/test/sass/templates/subdir/import_up1.scss +0 -1
data/test/sass/templates/subdir/import_up2.scss +0 -1
data/test/sass/templates/subdir/nested_subdir/_nested_partial.sass +0 -2
data/test/sass/templates/subdir/nested_subdir/nested_subdir.sass +0 -3
data/test/sass/templates/subdir/subdir.sass +0 -6
data/test/sass/templates/units.sass +0 -11
data/test/sass/templates/warn.sass +0 -3
data/test/sass/templates/warn_imported.sass +0 -4
data/test/sass/test_helper.rb +0 -8
data/test/sass/util/multibyte_string_scanner_test.rb +0 -152
data/test/sass/util/normalized_map_test.rb +0 -50
data/test/sass/util/subset_map_test.rb +0 -90
data/test/sass/util_test.rb +0 -393
data/test/sass/value_helpers_test.rb +0 -178
data/test/test_helper.rb +0 -149

data/test/sass/css_variable_test.rb DELETED

@@ -1,237 +0,0 @@
-require File.dirname(__FILE__) + '/../test_helper'
-require 'sass/engine'
-# Most CSS variable tests are in sass-spec, but a few relate to formatting or
-# conversion and so belong here.
-class CssVariableTest < MiniTest::Test
-  def test_folded_inline_whitespace
-    assert_variable_value "foo bar baz", "foo    bar        baz"
-    assert_variable_value "foo bar", "foo \t   bar"
-  end
-  def test_folded_multiline_whitespace
-    # We don't want to reformat newlines in nested and expanded mode, so we just
-    # remove trailing whitespace before them.
-    assert_equal <<CSS, render(<<SCSS)
-.foo {
-  --multiline: foo
-    bar; }
-CSS
-.foo {
-  --multiline: foo\s
-    bar;
-}
-SCSS
-    assert_equal <<CSS, render(<<SCSS)
-.foo {
-  --multiline: foo
-    bar; }
-CSS
-.foo {
-  --multiline: foo\s
-    bar;
-}
-SCSS
-    assert_equal <<CSS, render(<<SCSS, style: :expanded)
-.foo {
-  --multiline: foo
-    bar;
-}
-CSS
-.foo {
-  --multiline: foo\s
-    bar;
-}
-SCSS
-    assert_equal <<CSS, render(<<SCSS, style: :expanded)
-.foo {
-  --multiline: foo
-    bar;
-}
-CSS
-.foo {
-  --multiline: foo\s
-    bar;
-}
-SCSS
-    # In compact and compressed mode, we fold all whitespace around newlines
-    # together.
-    assert_equal <<CSS, render(<<SCSS, style: :compact)
-.foo { --multiline: foo bar; }
-CSS
-.foo {
-  --multiline: foo\s
-    bar;
-}
-SCSS
-    assert_equal <<CSS, render(<<SCSS, style: :compact)
-.foo { --multiline: foo bar; }
-CSS
-.foo {
-  --multiline: foo\s
-    bar;
-}
-SCSS
-    assert_equal <<CSS, render(<<SCSS, style: :compressed)
-.foo{--multiline: foo bar}
-CSS
-.foo {
-  --multiline: foo\s
-    bar;
-}
-SCSS
-    assert_equal <<CSS, render(<<SCSS, style: :compressed)
-.foo{--multiline: foo bar}
-CSS
-.foo {
-  --multiline: foo\s
-    bar;
-}
-SCSS
-  end
-  # Conversion.
-  def test_static_values_convert
-    assert_converts <<SASS, <<SCSS
-.foo
-  --bar: baz
-SASS
-.foo {
-  --bar: baz;
-}
-SCSS
-    assert_converts <<SASS, <<SCSS
-.foo
-  --bar: [({{([!;])}})]
-SASS
-.foo {
-  --bar: [({{([!;])}})];
-}
-SCSS
-    assert_converts <<SASS, <<SCSS
-.foo
-  --bar: {a: b; c: d}
-SASS
-.foo {
-  --bar: {a: b; c: d};
-}
-SCSS
-  end
-  def test_dynamic_values_convert
-    assert_converts <<SASS, <<SCSS
-.foo
-  --bar: baz \#{bang} qux
-SASS
-.foo {
-  --bar: baz \#{bang} qux;
-}
-SCSS
-    assert_converts <<SASS, <<SCSS
-.foo
-  --bar: "baz \#{bang} qux"
-SASS
-.foo {
-  --bar: "baz \#{bang} qux";
-}
-SCSS
-  end
-  def test_multiline_value_converts
-    assert_scss_to_scss <<SCSS
-.foo {
-  --bar: {
-    a: b;
-    c: d;
-  };
-}
-SCSS
-    assert_scss_to_sass <<SASS, <<SCSS
-.foo
-  --bar: {     a: b;     c: d;   }
-SASS
-.foo {
-  --bar: {
-    a: b;
-    c: d;
-  };
-}
-SCSS
-  end
-  private
-  def assert_variable_value(expected, source)
-    expected = <<CSS
-x {
-  --variable: #{expected}; }
-CSS
-    assert_equal expected, render_variable(source)
-    assert_equal expected, render_variable(source, syntax: :sass)
-  end
-  def render_variable(source, syntax: :scss)
-    render(syntax == :scss ? <<SCSS : <<SASS, :syntax => syntax)
-x {
-  --variable: #{source};
-}
-SCSS
-x
-  --variable: #{source}
-SASS
-  end
-  def render(sass, options = {})
-    options[:syntax] ||= :scss
-    options[:cache] = false
-    munge_filename options
-    Sass::Engine.new(sass, options).render
-  end
-  def resolve(str, opts = {}, environment = env)
-    munge_filename opts
-    val = eval(str, opts, environment)
-    assert_kind_of Sass::Script::Value::Base, val
-    val.options = opts
-    val.is_a?(Sass::Script::Value::String) ? val.value : val.to_s
-  end
-  def eval(str, opts = {}, environment = env)
-    munge_filename opts
-    Sass::Script.parse(str, opts.delete(:line) || 1,
-      opts.delete(:offset) || 0, opts).
-      perform(Sass::Environment.new(environment, opts))
-  end
-  def env(hash = {})
-    env = Sass::Environment.new
-    hash.each {|k, v| env.set_var(k, v)}
-    env
-  end
-end

data/test/sass/data/hsl-rgb.txt DELETED

@@ -1,319 +0,0 @@
-hsl(0, 100%, 50%)
-hsl(60, 100%, 50%)
-hsl(120, 100%, 50%)
-hsl(180, 100%, 50%)
-hsl(240, 100%, 50%)
-hsl(300, 100%, 50%)
-====
-rgb(255, 0, 0)
-rgb(255, 255, 0)
-rgb(0, 255, 0)
-rgb(0, 255, 255)
-rgb(0, 0, 255)
-rgb(255, 0, 255)
-hsl(-360, 100%, 50%)
-hsl(-300, 100%, 50%)
-hsl(-240, 100%, 50%)
-hsl(-180, 100%, 50%)
-hsl(-120, 100%, 50%)
-hsl(-60, 100%, 50%)
-====
-rgb(255, 0, 0)
-rgb(255, 255, 0)
-rgb(0, 255, 0)
-rgb(0, 255, 255)
-rgb(0, 0, 255)
-rgb(255, 0, 255)
-hsl(360, 100%, 50%)
-hsl(420, 100%, 50%)
-hsl(480, 100%, 50%)
-hsl(540, 100%, 50%)
-hsl(600, 100%, 50%)
-hsl(660, 100%, 50%)
-====
-rgb(255, 0, 0)
-rgb(255, 255, 0)
-rgb(0, 255, 0)
-rgb(0, 255, 255)
-rgb(0, 0, 255)
-rgb(255, 0, 255)
-hsl(6120, 100%, 50%)
-hsl(-9660, 100%, 50%)
-hsl(99840, 100%, 50%)
-hsl(-900, 100%, 50%)
-hsl(-104880, 100%, 50%)
-hsl(2820, 100%, 50%)
-====
-rgb(255, 0, 0)
-rgb(255, 255, 0)
-rgb(0, 255, 0)
-rgb(0, 255, 255)
-rgb(0, 0, 255)
-rgb(255, 0, 255)
-hsl(0, 100%, 50%)
-hsl(12, 100%, 50%)
-hsl(24, 100%, 50%)
-hsl(36, 100%, 50%)
-hsl(48, 100%, 50%)
-hsl(60, 100%, 50%)
-hsl(72, 100%, 50%)
-hsl(84, 100%, 50%)
-hsl(96, 100%, 50%)
-hsl(108, 100%, 50%)
-hsl(120, 100%, 50%)
-====
-rgb(255, 0, 0)
-rgb(255, 51, 0)
-rgb(255, 102, 0)
-rgb(255, 153, 0)
-rgb(255, 204, 0)
-rgb(255, 255, 0)
-rgb(204, 255, 0)
-rgb(153, 255, 0)
-rgb(102, 255, 0)
-rgb(51, 255, 0)
-rgb(0, 255, 0)
-hsl(120, 100%, 50%)
-hsl(132, 100%, 50%)
-hsl(144, 100%, 50%)
-hsl(156, 100%, 50%)
-hsl(168, 100%, 50%)
-hsl(180, 100%, 50%)
-hsl(192, 100%, 50%)
-hsl(204, 100%, 50%)
-hsl(216, 100%, 50%)
-hsl(228, 100%, 50%)
-hsl(240, 100%, 50%)
-====
-rgb(0, 255, 0)
-rgb(0, 255, 51)
-rgb(0, 255, 102)
-rgb(0, 255, 153)
-rgb(0, 255, 204)
-rgb(0, 255, 255)
-rgb(0, 204, 255)
-rgb(0, 153, 255)
-rgb(0, 102, 255)
-rgb(0, 51, 255)
-rgb(0, 0, 255)
-hsl(240, 100%, 50%)
-hsl(252, 100%, 50%)
-hsl(264, 100%, 50%)
-hsl(276, 100%, 50%)
-hsl(288, 100%, 50%)
-hsl(300, 100%, 50%)
-hsl(312, 100%, 50%)
-hsl(324, 100%, 50%)
-hsl(336, 100%, 50%)
-hsl(348, 100%, 50%)
-hsl(360, 100%, 50%)
-====
-rgb(0, 0, 255)
-rgb(51, 0, 255)
-rgb(102, 0, 255)
-rgb(153, 0, 255)
-rgb(204, 0, 255)
-rgb(255, 0, 255)
-rgb(255, 0, 204)
-rgb(255, 0, 153)
-rgb(255, 0, 102)
-rgb(255, 0, 51)
-rgb(255, 0, 0)
-hsl(0, 20%, 50%)
-hsl(0, 60%, 50%)
-hsl(0, 100%, 50%)
-====
-rgb(153, 102, 102)
-rgb(204, 51, 51)
-rgb(255, 0, 0)
-hsl(60, 20%, 50%)
-hsl(60, 60%, 50%)
-hsl(60, 100%, 50%)
-====
-rgb(153, 153, 102)
-rgb(204, 204, 51)
-rgb(255, 255, 0)
-hsl(120, 20%, 50%)
-hsl(120, 60%, 50%)
-hsl(120, 100%, 50%)
-====
-rgb(102, 153, 102)
-rgb(51, 204, 51)
-rgb(0, 255, 0)
-hsl(180, 20%, 50%)
-hsl(180, 60%, 50%)
-hsl(180, 100%, 50%)
-====
-rgb(102, 153, 153)
-rgb(51, 204, 204)
-rgb(0, 255, 255)
-hsl(240, 20%, 50%)
-hsl(240, 60%, 50%)
-hsl(240, 100%, 50%)
-====
-rgb(102, 102, 153)
-rgb(51, 51, 204)
-rgb(0, 0, 255)
-hsl(300, 20%, 50%)
-hsl(300, 60%, 50%)
-hsl(300, 100%, 50%)
-====
-rgb(153, 102, 153)
-rgb(204, 51, 204)
-rgb(255, 0, 255)
-hsl(0, 100%, 0%)
-hsl(0, 100%, 10%)
-hsl(0, 100%, 20%)
-hsl(0, 100%, 30%)
-hsl(0, 100%, 40%)
-hsl(0, 100%, 50%)
-hsl(0, 100%, 60%)
-hsl(0, 100%, 70%)
-hsl(0, 100%, 80%)
-hsl(0, 100%, 90%)
-hsl(0, 100%, 100%)
-====
-rgb(0, 0, 0)
-rgb(51, 0, 0)
-rgb(102, 0, 0)
-rgb(153, 0, 0)
-rgb(204, 0, 0)
-rgb(255, 0, 0)
-rgb(255, 51, 51)
-rgb(255, 102, 102)
-rgb(255, 153, 153)
-rgb(255, 204, 204)
-rgb(255, 255, 255)
-hsl(60, 100%, 0%)
-hsl(60, 100%, 10%)
-hsl(60, 100%, 20%)
-hsl(60, 100%, 30%)
-hsl(60, 100%, 40%)
-hsl(60, 100%, 50%)
-hsl(60, 100%, 60%)
-hsl(60, 100%, 70%)
-hsl(60, 100%, 80%)
-hsl(60, 100%, 90%)
-hsl(60, 100%, 100%)
-====
-rgb(0, 0, 0)
-rgb(51, 51, 0)
-rgb(102, 102, 0)
-rgb(153, 153, 0)
-rgb(204, 204, 0)
-rgb(255, 255, 0)
-rgb(255, 255, 51)
-rgb(255, 255, 102)
-rgb(255, 255, 153)
-rgb(255, 255, 204)
-rgb(255, 255, 255)
-hsl(120, 100%, 0%)
-hsl(120, 100%, 10%)
-hsl(120, 100%, 20%)
-hsl(120, 100%, 30%)
-hsl(120, 100%, 40%)
-hsl(120, 100%, 50%)
-hsl(120, 100%, 60%)
-hsl(120, 100%, 70%)
-hsl(120, 100%, 80%)
-hsl(120, 100%, 90%)
-hsl(120, 100%, 100%)
-====
-rgb(0, 0, 0)
-rgb(0, 51, 0)
-rgb(0, 102, 0)
-rgb(0, 153, 0)
-rgb(0, 204, 0)
-rgb(0, 255, 0)
-rgb(51, 255, 51)
-rgb(102, 255, 102)
-rgb(153, 255, 153)
-rgb(204, 255, 204)
-rgb(255, 255, 255)
-hsl(180, 100%, 0%)
-hsl(180, 100%, 10%)
-hsl(180, 100%, 20%)
-hsl(180, 100%, 30%)
-hsl(180, 100%, 40%)
-hsl(180, 100%, 50%)
-hsl(180, 100%, 60%)
-hsl(180, 100%, 70%)
-hsl(180, 100%, 80%)
-hsl(180, 100%, 90%)
-hsl(180, 100%, 100%)
-====
-rgb(0, 0, 0)
-rgb(0, 51, 51)
-rgb(0, 102, 102)
-rgb(0, 153, 153)
-rgb(0, 204, 204)
-rgb(0, 255, 255)
-rgb(51, 255, 255)
-rgb(102, 255, 255)
-rgb(153, 255, 255)
-rgb(204, 255, 255)
-rgb(255, 255, 255)
-hsl(240, 100%, 0%)
-hsl(240, 100%, 10%)
-hsl(240, 100%, 20%)
-hsl(240, 100%, 30%)
-hsl(240, 100%, 40%)
-hsl(240, 100%, 50%)
-hsl(240, 100%, 60%)
-hsl(240, 100%, 70%)
-hsl(240, 100%, 80%)
-hsl(240, 100%, 90%)
-hsl(240, 100%, 100%)
-====
-rgb(0, 0, 0)
-rgb(0, 0, 51)
-rgb(0, 0, 102)
-rgb(0, 0, 153)
-rgb(0, 0, 204)
-rgb(0, 0, 255)
-rgb(51, 51, 255)
-rgb(102, 102, 255)
-rgb(153, 153, 255)
-rgb(204, 204, 255)
-rgb(255, 255, 255)
-hsl(300, 100%, 0%)
-hsl(300, 100%, 10%)
-hsl(300, 100%, 20%)
-hsl(300, 100%, 30%)
-hsl(300, 100%, 40%)
-hsl(300, 100%, 50%)
-hsl(300, 100%, 60%)
-hsl(300, 100%, 70%)
-hsl(300, 100%, 80%)
-hsl(300, 100%, 90%)
-hsl(300, 100%, 100%)
-====
-rgb(0, 0, 0)
-rgb(51, 0, 51)
-rgb(102, 0, 102)
-rgb(153, 0, 153)
-rgb(204, 0, 204)
-rgb(255, 0, 255)
-rgb(255, 51, 255)
-rgb(255, 102, 255)
-rgb(255, 153, 255)
-rgb(255, 204, 255)
-rgb(255, 255, 255)