sass 3.2.0.alpha.86 → 3.2.0.alpha.88

data/REVISION

@@ -1 +1 @@
-ae11bf8dda8a43441bc10ade16787d16edf940b8
+40099dad35612c37c3197699a46a469af180c046

data/VERSION

@@ -1 +1 @@
-3.2.0.alpha.86
+3.2.0.alpha.88

data/lib/sass/css.rb

@@ -278,7 +278,7 @@ module Sass
         if first_simple_sel(child).is_a?(Sass::Selector::Parent)
           rule.parsed_rules = child.parsed_rules.resolve_parent_refs(rule.parsed_rules)
         else
-          rule.parsed_rules = make_seq(first_sseq(rule), *first_seq(child).members)
+          rule.parsed_rules = make_seq(*(first_seq(rule).members + first_seq(child).members))
         end
 
         rule.children = child.children

data/lib/sass/script/functions.rb

@@ -127,6 +127,12 @@ module Sass::Script
   # \{#abs abs($value)}
   # : Returns the absolute value of a number.
   #
+  # \{#min min($x1, $x2, ...)\}
+  # : Finds the minimum of several values.
+  #
+  # \{#max max($x1, $x2, ...)\}
+  # : Finds the maximum of several values.
+  #
   # ## List Functions {#list-functions}
   #
   # \{#length length($list)}
@@ -1216,6 +1222,37 @@ module Sass::Script
     end
     declare :abs, [:value]
 
+    # Finds the minimum of several values. This function takes any number of
+    # arguments.
+    #
+    # @example
+    #   min(1px, 4px) => 1px
+    #   min(5em, 3em, 4em) => 3em
+    # @param values [[Number]] The numbers
+    # @return [Number] The minimum value
+    # @raise [ArgumentError] if any argument isn't a number, or if not all of
+    #   the arguments have comparable units
+    def min(*values)
+      values.each {|v| assert_type v, :Number}
+      values.inject {|min, val| min.lt(val).to_bool ? min : val}
+    end
+    declare :min, [], :var_args => :true
+
+    # Finds the maximum of several values. This function takes any number of
+    # arguments.
+    #
+    # @example
+    #   max(1px, 4px) => 1px
+    #   max(5em, 3em, 4em) => 3em
+    # @return [Number] The maximum value
+    # @raise [ArgumentError] if any argument isn't a number, or if not all of
+    #   the arguments have comparable units
+    def max(*values)
+      values.each {|v| assert_type v, :Number}
+      values.inject {|max, val| max.gt(val).to_bool ? max : val}
+    end
+    declare :max, [], :var_args => :true
+
     # Return the length of a list.
     #
     # @example

data/test/sass/css2sass_test.rb

@@ -301,6 +301,22 @@ SASS
 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

data/test/sass/functions_test.rb

@@ -154,6 +154,26 @@ class SassFunctionTest < Test::Unit::TestCase
     assert_error_message("#aaaaaa is not a number for `abs'", "abs(#aaa)")
   end
 
+  def test_min
+    #assert_equal("1", evaluate("min(1, 2, 3)"))
+    assert_equal("1", evaluate("min(3px, 2px, 1)"))
+    assert_equal("4em", evaluate("min(4em)"))
+    assert_equal("10cm", evaluate("min(10cm, 6in)"))
+
+    assert_error_message("#aaaaaa is not a number for `min'", "min(#aaa)")
+    assert_error_message("Incompatible units: 'px' and 'em'.", "min(3em, 4em, 1px)")
+  end
+
+  def test_max
+    assert_equal("3", evaluate("max(1, 2, 3)"))
+    assert_equal("3", evaluate("max(3, 2px, 1px)"))
+    assert_equal("4em", evaluate("max(4em)"))
+    assert_equal("6in", evaluate("max(10cm, 6in)"))
+
+    assert_error_message("#aaaaaa is not a number for `max'", "max(#aaa)")
+    assert_error_message("Incompatible units: 'px' and 'em'.", "max(3em, 4em, 1px)")
+  end
+
   def test_rgb
     assert_equal("#123456", evaluate("rgb(18, 52, 86)"))
     assert_equal("#beaded", evaluate("rgb(190, 173, 237)"))

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: sass
 version: !ruby/object:Gem::Version 
-  hash: 592303025
+  hash: 592303021
   prerelease: 6
   segments: 
   - 3
   - 2
   - 0
   - alpha
-  - 86
-  version: 3.2.0.alpha.86
+  - 88
+  version: 3.2.0.alpha.88
 platform: ruby
 authors: 
 - Nathan Weizenbaum
@@ -19,7 +19,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-02-29 00:00:00 -05:00
+date: 2012-03-01 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -133,24 +133,23 @@ files:
 - lib/sass/shared.rb
 - lib/sass/tree/charset_node.rb
 - lib/sass/tree/comment_node.rb
+- lib/sass/tree/directive_node.rb
 - lib/sass/tree/media_node.rb
 - lib/sass/tree/debug_node.rb
-- lib/sass/tree/directive_node.rb
+- lib/sass/tree/mixin_def_node.rb
 - lib/sass/tree/each_node.rb
 - lib/sass/tree/extend_node.rb
 - lib/sass/tree/for_node.rb
 - lib/sass/tree/function_node.rb
 - lib/sass/tree/if_node.rb
 - lib/sass/tree/import_node.rb
-- lib/sass/tree/mixin_def_node.rb
 - lib/sass/tree/node.rb
+- lib/sass/tree/rule_node.rb
 - lib/sass/tree/mixin_node.rb
 - lib/sass/tree/prop_node.rb
 - lib/sass/tree/return_node.rb
 - lib/sass/tree/root_node.rb
-- lib/sass/tree/rule_node.rb
 - lib/sass/tree/content_node.rb
-- lib/sass/tree/trace_node.rb
 - lib/sass/tree/variable_node.rb
 - lib/sass/tree/visitors/base.rb
 - lib/sass/tree/visitors/check_nesting.rb
@@ -163,6 +162,7 @@ files:
 - lib/sass/tree/warn_node.rb
 - lib/sass/tree/while_node.rb
 - lib/sass/tree/css_import_node.rb
+- lib/sass/tree/trace_node.rb
 - lib/sass/media.rb
 - lib/sass/util/multibyte_string_scanner.rb
 - lib/sass/util/subset_map.rb