haml-edge 2.3.215 → 2.3.216

data/EDGE_GEM_VERSION

@@ -1 +1 @@
-2.3.215
+2.3.216

data/VERSION

@@ -1 +1 @@
-2.3.215
+2.3.216

data/lib/haml/util/subset_map.rb

@@ -78,7 +78,7 @@ module Haml
             [index, subenum]
           end
         end
-        res.flatten!(1)
+        res = Haml::Util.flatten(res, 1)
         res.compact!
         res.uniq!
         res.sort!

data/lib/haml/util.rb

@@ -189,7 +189,7 @@ module Haml
     #   #  [2, 4, 5]]
     def paths(arrs)
       arrs.inject([[]]) do |paths, arr|
-        arr.map {|e| paths.map {|path| path + [e]}}.flatten(1)
+        flatten(arr.map {|e| paths.map {|path| path + [e]}}, 1)
       end
     end
 
@@ -370,6 +370,14 @@ module Haml
       Haml::Util::RUBY_VERSION[0] == 1 && Haml::Util::RUBY_VERSION[1] < 9
     end
 
+    # Whether or not this is running under Ruby 1.8.6 or lower.
+    # Note that lower versions are not officially supported.
+    #
+    # @return [Boolean]
+    def ruby1_8_6?
+      ruby1_8? && Haml::Util::RUBY_VERSION[2] < 7
+    end
+
     # Checks that the encoding of a string is valid in Ruby 1.9
     # and cleans up potential encoding gotchas like the UTF-8 BOM.
     # If it's not, yields an error string describing the invalid character
@@ -458,6 +466,38 @@ MSG
       ruby1_8? ? c[0] : c.ord
     end
 
+    # Flattens the first `n` nested arrays in a cross-version manner.
+    #
+    # @param arr [Array] The array to flatten
+    # @param n [Fixnum] The number of levels to flatten
+    # @return [Array] The flattened array
+    def flatten(arr, n)
+      return arr.flatten(n) unless ruby1_8_6?
+      return arr if n == 0
+      arr.inject([]) {|res, e| e.is_a?(Array) ? res.concat(flatten(e, n - 1)) : res << e}
+    end
+
+    # Returns the hash code for a set in a cross-version manner.
+    # Aggravatingly, this is order-dependent in Ruby 1.8.6.
+    #
+    # @param set [Set]
+    # @return [Fixnum] The order-independent hashcode of `set`
+    def set_hash(set)
+      return set.hash unless ruby1_8_6?
+      set.map {|e| e.hash}.uniq.sort.hash
+    end
+
+    # Tests the hash-equality of two sets in a cross-version manner.
+    # Aggravatingly, this is order-dependent in Ruby 1.8.6.
+    #
+    # @param set1 [Set]
+    # @param set2 [Set]
+    # @return [Boolean] Whether or not the sets are hashcode equal
+    def set_eql?(set1, set2)
+      return set1.eql?(set2) unless ruby1_8_6?
+      set1.to_a.uniq.sort_by {|e| e.hash}.eql?(set2.to_a.uniq.sort_by {|e| e.hash})
+    end
+
     ## Static Method Stuff
 
     # The context in which the ERB for \{#def\_static\_method} will be run.

data/lib/sass/selector/sequence.rb

@@ -77,10 +77,11 @@ module Sass
       #   These correspond to a {CommaSequence}'s {CommaSequence#members members array}.
       # @see CommaSequence#do_extend
       def do_extend(extends, supers = [])
-        Haml::Util.paths(members.map do |sseq_or_op|
+        paths = Haml::Util.paths(members.map do |sseq_or_op|
             next [[sseq_or_op]] unless sseq_or_op.is_a?(SimpleSequence)
             [[sseq_or_op], *sseq_or_op.do_extend(extends, supers).map {|seq| seq.members}]
-          end).map {|path| weave(path)}.flatten(1).map {|p| Sequence.new(p)}
+          end)
+        Haml::Util.flatten(paths.map {|path| weave(path)}, 1).map {|p| Sequence.new(p)}
       end
 
       # @see Simple#to_a
@@ -134,9 +135,9 @@ module Sass
           while !current.empty? && last_current.first.is_a?(String) || current.last.is_a?(String)
             last_current.unshift(current.pop)
           end
-          befores = befores.map do |before|
-            subweave(before, current).map {|seqs| seqs + last_current}
-          end.flatten(1)
+          befores = Haml::Util.flatten(befores.map do |before|
+              subweave(before, current).map {|seqs| seqs + last_current}
+            end, 1)
           return befores if afters.empty?
         end
       end

data/lib/sass/selector/simple_sequence.rb

@@ -119,7 +119,7 @@ module Sass
       #
       # @return [Fixnum]
       def hash
-        [base, rest].hash
+        [base, Haml::Util.set_hash(rest)].hash
       end
 
       # Checks equality between this and another object.
@@ -127,7 +127,8 @@ module Sass
       # @param other [Object] The object to test equality against
       # @return [Boolean] Whether or not this is equal to `other`
       def eql?(other)
-        other.class == self.class && other.base.eql?(self.base) && other.rest.eql?(self.rest)
+        other.class == self.class && other.base.eql?(self.base) &&
+          Haml::Util.set_eql?(other.rest, self.rest)
       end
 
       private

data/test/haml/util_test.rb

@@ -144,6 +144,50 @@ class UtilTest < Test::Unit::TestCase
     assert_equal(98, ord("bar"))
   end
 
+  def test_flatten
+    assert_equal([1, 2, 3], flatten([1, 2, 3], 0))
+    assert_equal([1, 2, 3], flatten([1, 2, 3], 1))
+    assert_equal([1, 2, 3], flatten([1, 2, 3], 2))
+
+    assert_equal([[1, 2], 3], flatten([[1, 2], 3], 0))
+    assert_equal([1, 2, 3], flatten([[1, 2], 3], 1))
+    assert_equal([1, 2, 3], flatten([[1, 2], 3], 2))
+
+    assert_equal([[[1], 2], [3], 4], flatten([[[1], 2], [3], 4], 0))
+    assert_equal([[1], 2, 3, 4], flatten([[[1], 2], [3], 4], 1))
+    assert_equal([1, 2, 3, 4], flatten([[[1], 2], [3], 4], 2))
+  end
+
+  def test_set_hash
+    assert(set_hash(Set[1, 2, 3]) == set_hash(Set[3, 2, 1]))
+    assert(set_hash(Set[1, 2, 3]) == set_hash(Set[1, 2, 3]))
+
+    s1 = Set[]
+    s1 << 1
+    s1 << 2
+    s1 << 3
+    s2 = Set[]
+    s2 << 3
+    s2 << 2
+    s2 << 1
+    assert(set_hash(s1) == set_hash(s2))
+  end
+
+  def test_set_eql
+    assert(set_eql?(Set[1, 2, 3], Set[3, 2, 1]))
+    assert(set_eql?(Set[1, 2, 3], Set[1, 2, 3]))
+
+    s1 = Set[]
+    s1 << 1
+    s1 << 2
+    s1 << 3
+    s2 = Set[]
+    s2 << 3
+    s2 << 2
+    s2 << 1
+    assert(set_eql?(s1, s2))
+  end
+
   def test_caller_info
     assert_equal(["/tmp/foo.rb", 12, "fizzle"], caller_info("/tmp/foo.rb:12: in `fizzle'"))
     assert_equal(["/tmp/foo.rb", 12, nil], caller_info("/tmp/foo.rb:12"))

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: haml-edge
 version: !ruby/object:Gem::Version 
-  version: 2.3.215
+  version: 2.3.216
 platform: ruby
 authors: 
 - Nathan Weizenbaum