sass 3.3.0.alpha.129 → 3.3.0.alpha.132

data/REVISION

@@ -1 +1 @@
-99f38d70e593c912cd570448280624a7feb6b7ab
+f9bcfe554e74c03d2f0846f8cdfb9b3ec8cebbb7

data/VERSION

@@ -1 +1 @@
-3.3.0.alpha.129
+3.3.0.alpha.132

data/VERSION_DATE

@@ -1 +1 @@
-20 April 2013 02:32:41 GMT
+18 April 2013 00:22:46 GMT

data/lib/sass/script/functions.rb

@@ -165,12 +165,6 @@ module Sass::Script
   # \{#append append($list1, $val, \[$separator\])}
   # : Appends a single value onto the end of a list.
   #
-  # \{#zip zip($list1, $list2, ...)}
-  # : Combines several lists into a single multidimensional list.
-  #
-  # \{#index index($list, $value)}
-  # : Returns the position of a value within a list, or false.
-  #
   # \{#list-separator list-separator(#list)}
   # : Returns the separator of a list.
   #
@@ -1564,8 +1558,8 @@ module Sass::Script
     declare :append, [:list, :val]
     declare :append, [:list, :val, :separator]
 
-    # Combines several lists into a single comma separated list, where the nth
-    # value is a space separated list of the source lists' nth values.
+    # Combines several lists into a single comma separated list
+    # space separated lists.
     #
     # The length of the resulting list is the length of the
     # shortest list.
@@ -1590,8 +1584,8 @@ module Sass::Script
     declare :zip, [], :var_args => true
 
 
-    # Returns the position of a value within a list. If not found, returns
-    # false.
+    # Returns the position of the given value within the given
+    # list. If not found, returns false.
     #
     # @example
     #   index(1px solid red, solid) => 2

data/lib/sass/tree/visitors/perform.rb

@@ -433,7 +433,7 @@ class Sass::Tree::Visitors::Perform < Sass::Tree::Visitors::Base
       end
     end
 
-    return unless mixins.include?(node.name)
+    return if mixins.empty?
     raise Sass::SyntaxError.new("#{msg} #{node.name} includes itself") if mixins.size == 1
 
     msg << "\n" << Sass::Util.enum_cons(mixins.reverse + [node.name], 2).map do |m1, m2|

data/test/sass/engine_test.rb

@@ -22,10 +22,6 @@ module Sass::Script::Functions::UserFunctions
   end
 end
 
-module Sass::Script::Functions
-  include Sass::Script::Functions::UserFunctions
-end
-
 class SassEngineTest < Test::Unit::TestCase
   FAKE_FILE_NAME = __FILE__.gsub(/rb$/,"sass")
   # A map of erroneous Sass documents to the error messages they should produce.
@@ -524,21 +520,6 @@ MESSAGE
     assert_hash_has(err.sass_backtrace[2], :mixin => "foo", :line => 2)
   end
 
-  def test_mixin_loop_with_content
-    render <<SASS
-=foo
-  @content
-=bar
-  +foo
-    +bar
-+bar
-SASS
-    assert(false, "Exception not raised")
-  rescue Sass::SyntaxError => err
-    assert_equal("An @include loop has been found: bar includes itself", err.message)
-    assert_hash_has(err.sass_backtrace[0], :mixin => "@content", :line => 5)
-  end
-
   def test_basic_import_loop_exception
     import = filename_for_test
     importer = MockImporter.new
@@ -2435,24 +2416,6 @@ SASS
 
   # Regression tests
 
-  def test_parent_mixin_in_content_nested
-    assert_equal(<<CSS, render(<<SASS))
-a {
-  b: c; }
-CSS
-=foo
-  @content
-
-=bar
-  +foo
-    +foo
-      a
-        b: c
-
-+bar
-SASS
-  end
-
   def test_supports_bubbles
     assert_equal <<CSS, render(<<SASS)
 parent {

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: sass
 version: !ruby/object:Gem::Version 
-  hash: 592302607
+  hash: 592302597
   prerelease: 6
   segments: 
   - 3
   - 3
   - 0
   - alpha
-  - 129
-  version: 3.3.0.alpha.129
+  - 132
+  version: 3.3.0.alpha.132
 platform: ruby
 authors: 
 - Nathan Weizenbaum
@@ -19,7 +19,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2013-04-19 00:00:00 -04:00
+date: 2013-04-17 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency