RubyGems - sass - Versions diffs - 3.1.0 → 3.3.0 - Mend

sass 3.1.0 → 3.3.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (260) hide show

checksums.yaml +7 -0
data/CONTRIBUTING +1 -1
data/MIT-LICENSE +2 -2
data/README.md +29 -17
data/Rakefile +43 -9
data/VERSION +1 -1
data/VERSION_DATE +1 -0
data/VERSION_NAME +1 -1
data/bin/sass +6 -1
data/bin/sass-convert +6 -1
data/bin/scss +6 -1
data/ext/mkrf_conf.rb +27 -0
data/lib/sass/cache_stores/base.rb +7 -3
data/lib/sass/cache_stores/chain.rb +3 -2
data/lib/sass/cache_stores/filesystem.rb +5 -7
data/lib/sass/cache_stores/memory.rb +1 -1
data/lib/sass/cache_stores/null.rb +2 -2
data/lib/sass/callbacks.rb +2 -1
data/lib/sass/css.rb +168 -53
data/lib/sass/engine.rb +502 -174
data/lib/sass/environment.rb +151 -111
data/lib/sass/error.rb +7 -7
data/lib/sass/exec.rb +176 -60
data/lib/sass/features.rb +40 -0
data/lib/sass/importers/base.rb +46 -7
data/lib/sass/importers/deprecated_path.rb +51 -0
data/lib/sass/importers/filesystem.rb +113 -30
data/lib/sass/importers.rb +1 -0
data/lib/sass/logger/base.rb +30 -0
data/lib/sass/logger/log_level.rb +45 -0
data/lib/sass/logger.rb +12 -0
data/lib/sass/media.rb +213 -0
data/lib/sass/plugin/compiler.rb +194 -104
data/lib/sass/plugin/configuration.rb +18 -25
data/lib/sass/plugin/merb.rb +1 -1
data/lib/sass/plugin/staleness_checker.rb +37 -11
data/lib/sass/plugin.rb +10 -13
data/lib/sass/railtie.rb +2 -1
data/lib/sass/repl.rb +5 -6
data/lib/sass/script/css_lexer.rb +8 -4
data/lib/sass/script/css_parser.rb +5 -2
data/lib/sass/script/functions.rb +1547 -618
data/lib/sass/script/lexer.rb +122 -72
data/lib/sass/script/parser.rb +304 -135
data/lib/sass/script/tree/funcall.rb +306 -0
data/lib/sass/script/{interpolation.rb → tree/interpolation.rb} +43 -13
data/lib/sass/script/tree/list_literal.rb +77 -0
data/lib/sass/script/tree/literal.rb +45 -0
data/lib/sass/script/tree/map_literal.rb +64 -0
data/lib/sass/script/{node.rb → tree/node.rb} +30 -12
data/lib/sass/script/{operation.rb → tree/operation.rb} +33 -21
data/lib/sass/script/{string_interpolation.rb → tree/string_interpolation.rb} +14 -4
data/lib/sass/script/{unary_operation.rb → tree/unary_operation.rb} +21 -9
data/lib/sass/script/tree/variable.rb +57 -0
data/lib/sass/script/tree.rb +15 -0
data/lib/sass/script/value/arg_list.rb +36 -0
data/lib/sass/script/value/base.rb +238 -0
data/lib/sass/script/value/bool.rb +40 -0
data/lib/sass/script/{color.rb → value/color.rb} +256 -74
data/lib/sass/script/value/deprecated_false.rb +55 -0
data/lib/sass/script/value/helpers.rb +155 -0
data/lib/sass/script/value/list.rb +128 -0
data/lib/sass/script/value/map.rb +70 -0
data/lib/sass/script/value/null.rb +49 -0
data/lib/sass/script/{number.rb → value/number.rb} +115 -62
data/lib/sass/script/{string.rb → value/string.rb} +9 -11
data/lib/sass/script/value.rb +12 -0
data/lib/sass/script.rb +35 -9
data/lib/sass/scss/css_parser.rb +2 -12
data/lib/sass/scss/parser.rb +657 -230
data/lib/sass/scss/rx.rb +17 -12
data/lib/sass/scss/static_parser.rb +37 -6
data/lib/sass/scss.rb +0 -1
data/lib/sass/selector/abstract_sequence.rb +35 -3
data/lib/sass/selector/comma_sequence.rb +29 -14
data/lib/sass/selector/sequence.rb +371 -74
data/lib/sass/selector/simple.rb +28 -13
data/lib/sass/selector/simple_sequence.rb +163 -36
data/lib/sass/selector.rb +138 -36
data/lib/sass/shared.rb +3 -5
data/lib/sass/source/map.rb +196 -0
data/lib/sass/source/position.rb +39 -0
data/lib/sass/source/range.rb +41 -0
data/lib/sass/stack.rb +126 -0
data/lib/sass/supports.rb +228 -0
data/lib/sass/tree/at_root_node.rb +82 -0
data/lib/sass/tree/comment_node.rb +34 -29
data/lib/sass/tree/content_node.rb +9 -0
data/lib/sass/tree/css_import_node.rb +60 -0
data/lib/sass/tree/debug_node.rb +3 -3
data/lib/sass/tree/directive_node.rb +33 -3
data/lib/sass/tree/each_node.rb +9 -9
data/lib/sass/tree/extend_node.rb +20 -6
data/lib/sass/tree/for_node.rb +6 -6
data/lib/sass/tree/function_node.rb +12 -4
data/lib/sass/tree/if_node.rb +2 -15
data/lib/sass/tree/import_node.rb +11 -5
data/lib/sass/tree/media_node.rb +27 -11
data/lib/sass/tree/mixin_def_node.rb +15 -4
data/lib/sass/tree/mixin_node.rb +27 -7
data/lib/sass/tree/node.rb +69 -35
data/lib/sass/tree/prop_node.rb +47 -31
data/lib/sass/tree/return_node.rb +4 -3
data/lib/sass/tree/root_node.rb +20 -4
data/lib/sass/tree/rule_node.rb +37 -26
data/lib/sass/tree/supports_node.rb +38 -0
data/lib/sass/tree/trace_node.rb +33 -0
data/lib/sass/tree/variable_node.rb +10 -4
data/lib/sass/tree/visitors/base.rb +5 -8
data/lib/sass/tree/visitors/check_nesting.rb +67 -52
data/lib/sass/tree/visitors/convert.rb +134 -53
data/lib/sass/tree/visitors/cssize.rb +245 -51
data/lib/sass/tree/visitors/deep_copy.rb +102 -0
data/lib/sass/tree/visitors/extend.rb +68 -0
data/lib/sass/tree/visitors/perform.rb +331 -105
data/lib/sass/tree/visitors/set_options.rb +125 -0
data/lib/sass/tree/visitors/to_css.rb +259 -95
data/lib/sass/tree/warn_node.rb +3 -3
data/lib/sass/tree/while_node.rb +3 -3
data/lib/sass/util/cross_platform_random.rb +19 -0
data/lib/sass/util/multibyte_string_scanner.rb +157 -0
data/lib/sass/util/normalized_map.rb +130 -0
data/lib/sass/util/ordered_hash.rb +192 -0
data/lib/sass/util/subset_map.rb +11 -2
data/lib/sass/util/test.rb +9 -0
data/lib/sass/util.rb +565 -39
data/lib/sass/version.rb +27 -15
data/lib/sass.rb +39 -4
data/test/sass/cache_test.rb +15 -0
data/test/sass/compiler_test.rb +223 -0
data/test/sass/conversion_test.rb +901 -107
data/test/sass/css2sass_test.rb +94 -0
data/test/sass/engine_test.rb +1059 -164
data/test/sass/exec_test.rb +86 -0
data/test/sass/extend_test.rb +933 -837
data/test/sass/fixtures/test_staleness_check_across_importers.css +1 -0
data/test/sass/fixtures/test_staleness_check_across_importers.scss +1 -0
data/test/sass/functions_test.rb +995 -136
data/test/sass/importer_test.rb +338 -18
data/test/sass/logger_test.rb +58 -0
data/test/sass/more_results/more_import.css +2 -2
data/test/sass/plugin_test.rb +114 -30
data/test/sass/results/cached_import_option.css +3 -0
data/test/sass/results/filename_fn.css +3 -0
data/test/sass/results/import.css +2 -2
data/test/sass/results/import_charset.css +1 -0
data/test/sass/results/import_charset_1_8.css +1 -0
data/test/sass/results/import_charset_ibm866.css +1 -0
data/test/sass/results/import_content.css +1 -0
data/test/sass/results/script.css +1 -1
data/test/sass/results/scss_import.css +2 -2
data/test/sass/results/units.css +2 -2
data/test/sass/script_conversion_test.rb +43 -1
data/test/sass/script_test.rb +380 -36
data/test/sass/scss/css_test.rb +257 -75
data/test/sass/scss/scss_test.rb +2322 -110
data/test/sass/source_map_test.rb +887 -0
data/test/sass/templates/_cached_import_option_partial.scss +1 -0
data/test/sass/templates/_double_import_loop2.sass +1 -0
data/test/sass/templates/_filename_fn_import.scss +11 -0
data/test/sass/templates/_imported_content.sass +3 -0
data/test/sass/templates/_same_name_different_partiality.scss +1 -0
data/test/sass/templates/bork5.sass +3 -0
data/test/sass/templates/cached_import_option.scss +3 -0
data/test/sass/templates/double_import_loop1.sass +1 -0
data/test/sass/templates/filename_fn.scss +18 -0
data/test/sass/templates/import_charset.sass +2 -0
data/test/sass/templates/import_charset_1_8.sass +2 -0
data/test/sass/templates/import_charset_ibm866.sass +2 -0
data/test/sass/templates/import_content.sass +4 -0
data/test/sass/templates/same_name_different_ext.sass +2 -0
data/test/sass/templates/same_name_different_ext.scss +1 -0
data/test/sass/templates/same_name_different_partiality.scss +1 -0
data/test/sass/templates/single_import_loop.sass +1 -0
data/test/sass/templates/subdir/import_up1.scss +1 -0
data/test/sass/templates/subdir/import_up2.scss +1 -0
data/test/sass/test_helper.rb +1 -1
data/test/sass/util/multibyte_string_scanner_test.rb +147 -0
data/test/sass/util/normalized_map_test.rb +51 -0
data/test/sass/util_test.rb +183 -0
data/test/sass/value_helpers_test.rb +181 -0
data/test/test_helper.rb +45 -5
data/vendor/listen/CHANGELOG.md +228 -0
data/vendor/listen/CONTRIBUTING.md +38 -0
data/vendor/listen/Gemfile +30 -0
data/vendor/listen/Guardfile +8 -0
data/vendor/{fssm → listen}/LICENSE +1 -1
data/vendor/listen/README.md +315 -0
data/vendor/listen/Rakefile +47 -0
data/vendor/listen/Vagrantfile +96 -0
data/vendor/listen/lib/listen/adapter.rb +214 -0
data/vendor/listen/lib/listen/adapters/bsd.rb +112 -0
data/vendor/listen/lib/listen/adapters/darwin.rb +85 -0
data/vendor/listen/lib/listen/adapters/linux.rb +113 -0
data/vendor/listen/lib/listen/adapters/polling.rb +67 -0
data/vendor/listen/lib/listen/adapters/windows.rb +87 -0
data/vendor/listen/lib/listen/dependency_manager.rb +126 -0
data/vendor/listen/lib/listen/directory_record.rb +371 -0
data/vendor/listen/lib/listen/listener.rb +225 -0
data/vendor/listen/lib/listen/multi_listener.rb +143 -0
data/vendor/listen/lib/listen/turnstile.rb +28 -0
data/vendor/listen/lib/listen/version.rb +3 -0
data/vendor/listen/lib/listen.rb +40 -0
data/vendor/listen/listen.gemspec +22 -0
data/vendor/listen/spec/listen/adapter_spec.rb +183 -0
data/vendor/listen/spec/listen/adapters/bsd_spec.rb +36 -0
data/vendor/listen/spec/listen/adapters/darwin_spec.rb +37 -0
data/vendor/listen/spec/listen/adapters/linux_spec.rb +47 -0
data/vendor/listen/spec/listen/adapters/polling_spec.rb +68 -0
data/vendor/listen/spec/listen/adapters/windows_spec.rb +30 -0
data/vendor/listen/spec/listen/dependency_manager_spec.rb +107 -0
data/vendor/listen/spec/listen/directory_record_spec.rb +1225 -0
data/vendor/listen/spec/listen/listener_spec.rb +169 -0
data/vendor/listen/spec/listen/multi_listener_spec.rb +174 -0
data/vendor/listen/spec/listen/turnstile_spec.rb +56 -0
data/vendor/listen/spec/listen_spec.rb +73 -0
data/vendor/listen/spec/spec_helper.rb +21 -0
data/vendor/listen/spec/support/adapter_helper.rb +629 -0
data/vendor/listen/spec/support/directory_record_helper.rb +55 -0
data/vendor/listen/spec/support/fixtures_helper.rb +29 -0
data/vendor/listen/spec/support/listeners_helper.rb +156 -0
data/vendor/listen/spec/support/platform_helper.rb +15 -0
metadata +344 -271
data/lib/sass/less.rb +0 -382
data/lib/sass/script/bool.rb +0 -18
data/lib/sass/script/funcall.rb +0 -162
data/lib/sass/script/list.rb +0 -76
data/lib/sass/script/literal.rb +0 -245
data/lib/sass/script/variable.rb +0 -54
data/lib/sass/scss/sass_parser.rb +0 -11
data/test/sass/less_conversion_test.rb +0 -653
data/vendor/fssm/README.markdown +0 -55
data/vendor/fssm/Rakefile +0 -59
data/vendor/fssm/VERSION.yml +0 -5
data/vendor/fssm/example.rb +0 -9
data/vendor/fssm/fssm.gemspec +0 -77
data/vendor/fssm/lib/fssm/backends/fsevents.rb +0 -36
data/vendor/fssm/lib/fssm/backends/inotify.rb +0 -26
data/vendor/fssm/lib/fssm/backends/polling.rb +0 -25
data/vendor/fssm/lib/fssm/backends/rubycocoa/fsevents.rb +0 -131
data/vendor/fssm/lib/fssm/monitor.rb +0 -26
data/vendor/fssm/lib/fssm/path.rb +0 -91
data/vendor/fssm/lib/fssm/pathname.rb +0 -502
data/vendor/fssm/lib/fssm/state/directory.rb +0 -57
data/vendor/fssm/lib/fssm/state/file.rb +0 -24
data/vendor/fssm/lib/fssm/support.rb +0 -63
data/vendor/fssm/lib/fssm/tree.rb +0 -176
data/vendor/fssm/lib/fssm.rb +0 -33
data/vendor/fssm/profile/prof-cache.rb +0 -40
data/vendor/fssm/profile/prof-fssm-pathname.html +0 -1231
data/vendor/fssm/profile/prof-pathname.rb +0 -68
data/vendor/fssm/profile/prof-plain-pathname.html +0 -988
data/vendor/fssm/profile/prof.html +0 -2379
data/vendor/fssm/spec/path_spec.rb +0 -75
data/vendor/fssm/spec/root/duck/quack.txt +0 -0
data/vendor/fssm/spec/root/file.css +0 -0
data/vendor/fssm/spec/root/file.rb +0 -0
data/vendor/fssm/spec/root/file.yml +0 -0
data/vendor/fssm/spec/root/moo/cow.txt +0 -0
data/vendor/fssm/spec/spec_helper.rb +0 -14

data/test/sass/css2sass_test.rb CHANGED Viewed

@@ -237,8 +237,53 @@ SASS
 CSS
   end
+  def test_subject
+    assert_equal(<<SASS, css2sass(<<CSS))
+.foo
+  .bar!
+    .baz
+      a: b
+    .bip
+      c: d
+  .bar .bonk
+    e: f
+.flip!
+  &.bar
+    a: b
+  &.baz
+    c: d
+SASS
+.foo .bar! .baz {a: b;}
+.foo .bar! .bip {c: d;}
+.foo .bar .bonk {e: f;}
+.flip.bar! {a: b;}
+.flip.baz! {c: d;}
+CSS
+  end
   # Regressions
+  def test_empty_rule
+    assert_equal(<<SASS, css2sass(<<CSS))
+a
+SASS
+a {}
+CSS
+  end
+  def test_empty_rule_with_selector_combinator
+    assert_equal(<<SASS, css2sass(<<CSS))
+a
+  color: red
+  > b
+SASS
+a {color: red}
+a > b {}
+CSS
+  end
   def test_nesting_within_media
     assert_equal(<<SASS, css2sass(<<CSS))
 @media all
@@ -268,6 +313,55 @@ SASS
 CSS
   end
+  def test_double_comma
+    assert_equal(<<SASS, css2sass(<<CSS))
+foo, bar
+  a: b
+SASS
+foo, , bar { a: b }
+CSS
+  end
+  def test_selector_splitting
+    assert_equal(<<SASS, css2sass(<<CSS))
+.foo >
+  .bar
+    a: b
+  .baz
+    c: d
+SASS
+.foo>.bar {a: b}
+.foo>.baz {c: d}
+CSS
+    assert_equal(<<SASS, css2sass(<<CSS))
+.foo
+  &::bar
+    a: b
+  &::baz
+    c: d
+SASS
+.foo::bar {a: b}
+.foo::baz {c: d}
+CSS
+  end
+  def test_triple_nesting
+    assert_equal(<<SASS, css2sass(<<CSS))
+.foo .bar .baz
+  a: b
+SASS
+.foo .bar .baz {a: b}
+CSS
+    assert_equal(<<SASS, css2sass(<<CSS))
+.bar > .baz
+  c: d
+SASS
+.bar > .baz {c: d}
+CSS
+  end
   # Error reporting
   def test_error_reporting