sass 3.2.0.alpha.60 → 3.2.0.alpha.61

data/test/sass/more_results/more_import.css

@@ -1,3 +1,5 @@
+@import url(basic.css);
+@import url(../results/complex.css);
 imported { otherconst: hello; myconst: goodbye; pre-mixin: here; }
 
 body { font: Arial; background: blue; }
@@ -22,8 +24,6 @@ body { font: Arial; background: blue; }
 #content.user.show #container.top #column.right { width: 600px; }
 #content.user.show #container.bottom { background: brown; }
 
-@import url(basic.css);
-@import url(../results/complex.css);
 #foo { background-color: #bbaaff; }
 
 nonimported { myconst: hello; otherconst: goodbye; post-mixin: here; }

data/test/sass/results/import.css

@@ -1,3 +1,5 @@
+@import url(basic.css);
+@import url(../results/complex.css);
 imported { otherconst: hello; myconst: goodbye; pre-mixin: here; }
 
 body { font: Arial; background: blue; }
@@ -24,8 +26,6 @@ body { font: Arial; background: blue; }
 #content.user.show #container.top #column.right { width: 600px; }
 #content.user.show #container.bottom { background: brown; }
 
-@import url(basic.css);
-@import url(../results/complex.css);
 #foo { background-color: #bbaaff; }
 
 nonimported { myconst: hello; otherconst: goodbye; post-mixin: here; }

data/test/sass/results/import_charset.css

@@ -1,4 +1,5 @@
 @charset "UTF-8";
+@import url(foo.css);
 .foo { a: b; }
 
 .bar { a: щ; }

data/test/sass/results/import_charset_1_8.css

@@ -1,4 +1,5 @@
 @charset "IBM866";
+@import url(foo.css);
 .foo { a: b; }
 
 .bar { a: �; }

data/test/sass/results/import_charset_ibm866.css

@@ -1,4 +1,5 @@
 @charset "IBM866";
+@import url(foo.css);
 .foo { a: b; }
 
 .bar { a: �; }

data/test/sass/results/scss_import.css

@@ -1,3 +1,5 @@
+@import url(basic.css);
+@import url(../results/complex.css);
 imported { otherconst: hello; myconst: goodbye; pre-mixin: here; }
 
 body { font: Arial; background: blue; }
@@ -24,8 +26,6 @@ body { font: Arial; background: blue; }
 #content.user.show #container.top #column.right { width: 600px; }
 #content.user.show #container.bottom { background: brown; }
 
-@import url(basic.css);
-@import url(../results/complex.css);
 #foo { background-color: #bbaaff; }
 
 nonimported { myconst: hello; otherconst: goodbye; post-mixin: here; }

data/test/sass/script_test.rb

@@ -432,6 +432,11 @@ SASS
     assert_raise_message(Sass::SyntaxError, "wrong number of arguments (1 for 0) for `arg-error'") {resolve("arg-error(1)")}
   end
 
+  def test_boolean_ops_short_circuit
+    assert_equal "false", resolve("$ie and $ie <= 7", {}, env('ie' => Sass::Script::Bool.new(false)))
+    assert_equal "true", resolve("$ie or $undef", {}, env('ie' => Sass::Script::Bool.new(true)))
+  end
+
   # Regression Tests
 
   def test_funcall_has_higher_precedence_than_color_name

data/test/sass/scss/scss_test.rb

@@ -1245,11 +1245,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;
   }

data/test/sass/templates/import_charset.sass

@@ -1,6 +1,8 @@
 .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,4 +1,6 @@
 .foo
   a: b
 
+@import "foo.css"
+
 @import "imported_charset_ibm866"

data/test/sass/templates/import_charset_ibm866.sass

@@ -3,6 +3,8 @@
 .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/util_test.rb

@@ -159,6 +159,12 @@ 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"))

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: sass
 version: !ruby/object:Gem::Version 
-  hash: 592302949
+  hash: 592302951
   prerelease: 6
   segments: 
   - 3
   - 2
   - 0
   - alpha
-  - 60
-  version: 3.2.0.alpha.60
+  - 61
+  version: 3.2.0.alpha.61
 platform: ruby
 authors: 
 - Nathan Weizenbaum
@@ -19,7 +19,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-01-19 00:00:00 -05:00
+date: 2012-02-03 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -86,6 +86,7 @@ files:
 - lib/sass/logger.rb
 - lib/sass/logger/base.rb
 - lib/sass/logger/log_level.rb
+- lib/sass/util.rb
 - lib/sass/plugin.rb
 - lib/sass/plugin/compiler.rb
 - lib/sass/plugin/configuration.rb
@@ -133,7 +134,7 @@ files:
 - lib/sass/shared.rb
 - lib/sass/tree/charset_node.rb
 - lib/sass/tree/comment_node.rb
-- lib/sass/tree/node.rb
+- lib/sass/tree/media_node.rb
 - lib/sass/tree/debug_node.rb
 - lib/sass/tree/directive_node.rb
 - lib/sass/tree/each_node.rb
@@ -142,8 +143,8 @@ files:
 - lib/sass/tree/function_node.rb
 - lib/sass/tree/if_node.rb
 - lib/sass/tree/import_node.rb
-- lib/sass/tree/media_node.rb
 - lib/sass/tree/mixin_def_node.rb
+- lib/sass/tree/node.rb
 - lib/sass/tree/mixin_node.rb
 - lib/sass/tree/prop_node.rb
 - lib/sass/tree/return_node.rb
@@ -162,11 +163,10 @@ files:
 - lib/sass/tree/warn_node.rb
 - lib/sass/tree/while_node.rb
 - lib/sass/tree/trace_node.rb
-- lib/sass/util.rb
+- lib/sass/media.rb
 - lib/sass/util/multibyte_string_scanner.rb
 - lib/sass/util/subset_map.rb
 - lib/sass/version.rb
-- lib/sass/media.rb
 - vendor/fssm/Gemfile
 - vendor/fssm/LICENSE
 - vendor/fssm/README.markdown
@@ -239,7 +239,7 @@ files:
 - test/sass/results/import_charset.css
 - test/sass/results/import_charset_1_8.css
 - test/sass/results/import_charset_ibm866.css
-- test/sass/results/import_content.css
+- test/sass/results/scss_import.css
 - test/sass/results/line_numbers.css
 - test/sass/results/mixins.css
 - test/sass/results/multiline.css
@@ -247,13 +247,13 @@ files:
 - test/sass/results/options.css
 - test/sass/results/parent_ref.css
 - test/sass/results/script.css
-- test/sass/results/scss_import.css
 - test/sass/results/scss_importee.css
 - test/sass/results/subdir/nested_subdir/nested_subdir.css
 - test/sass/results/subdir/subdir.css
 - test/sass/results/units.css
 - test/sass/results/warn.css
 - test/sass/results/warn_imported.css
+- test/sass/results/import_content.css
 - test/sass/script_conversion_test.rb
 - test/sass/script_test.rb
 - test/sass/scss/css_test.rb
@@ -262,7 +262,7 @@ files:
 - test/sass/scss/test_helper.rb
 - test/sass/templates/_imported_charset_ibm866.sass
 - test/sass/templates/_imported_charset_utf8.sass
-- test/sass/templates/_imported_content.sass
+- test/sass/templates/import_charset.sass
 - test/sass/templates/_partial.sass
 - test/sass/templates/alt.sass
 - test/sass/templates/basic.sass
@@ -277,10 +277,9 @@ files:
 - test/sass/templates/expanded.sass
 - test/sass/templates/if.sass
 - test/sass/templates/import.sass
-- test/sass/templates/import_charset.sass
 - test/sass/templates/import_charset_1_8.sass
 - test/sass/templates/import_charset_ibm866.sass
-- test/sass/templates/import_content.sass
+- test/sass/templates/_imported_content.sass
 - test/sass/templates/importee.less
 - test/sass/templates/importee.sass
 - test/sass/templates/line_numbers.sass
@@ -306,6 +305,7 @@ files:
 - test/sass/templates/units.sass
 - test/sass/templates/warn.sass
 - test/sass/templates/warn_imported.sass
+- test/sass/templates/import_content.sass
 - test/sass/test_helper.rb
 - test/sass/util/multibyte_string_scanner_test.rb
 - test/sass/util/subset_map_test.rb