haml-edge 2.3.244 → 2.3.245

data/EDGE_GEM_VERSION

@@ -1 +1 @@
-2.3.244
+2.3.245

data/VERSION

@@ -1 +1 @@
-2.3.244
+2.3.245

data/lib/haml/util.rb

@@ -193,6 +193,30 @@ module Haml
       end
     end
 
+    # Computes a single longest common subsequence for `x` and `y`.
+    # If there are more than one longest common subsequences,
+    # the one returned is that which starts first in `x`.
+    #
+    # @param x [Array]
+    # @param y [Array]
+    # @return [Array] The LCS
+    def lcs(x, y)
+      x = [nil, *x]
+      y = [nil, *y]
+      lcs_backtrace(lcs_table(x, y), x, y, x.size-1, y.size-1)
+    end
+
+    # Computes all single longest common subsequences for `x` and `y`.
+    #
+    # @param x [Array]
+    # @param y [Array]
+    # @return [Set<Array>] The LCSes
+    def lcs_all(x, y)
+      x = [nil, *x]
+      y = [nil, *y]
+      lcs_backtrace_all(lcs_table(x, y), x, y, x.size-1, y.size-1)
+    end
+
     # Returns information about the caller of the previous method.
     #
     # @param entry [String] An entry in the `#caller` list, or a similarly formatted string
@@ -564,5 +588,46 @@ METHOD
     def static_method_name(name, *vars)
       "#{name}_#{vars.map {|v| !!v}.join('_')}"
     end
+
+    private
+
+    # Calculates the memoization table for the Least Common Subsequence algorithm.
+    # Algorithm from [Wikipedia](http://en.wikipedia.org/wiki/Longest_common_subsequence_problem#Computing_the_length_of_the_LCS)
+    def lcs_table(x, y)
+      c = Array.new(x.size) {[]}
+      x.size.times {|i| c[i][0] = 0}
+      y.size.times {|j| c[0][j] = 0}
+      (1...x.size).each do |i|
+        (1...y.size).each do |j|
+          c[i][j] =
+            if x[i] == y[j]
+              c[i-1][j-1] + 1
+            else
+              [c[i][j-1], c[i-1][j]].max
+            end
+        end
+      end
+      return c
+    end
+
+    # Computes a single longest common subsequence for arrays x and y.
+    # Algorithm from [Wikipedia](http://en.wikipedia.org/wiki/Longest_common_subsequence_problem#Reading_out_an_LCS)
+    def lcs_backtrace(c, x, y, i, j)
+      return [] if i == 0 || j == 0
+      return lcs_backtrace(c, x, y, i-1, j-1) << x[i] if x[i] == y[j]
+      return lcs_backtrace(c, x, y, i, j-1) if c[i][j-1] > c[i-1][j]
+      return lcs_backtrace(c, x, y, i-1, j)
+    end
+
+    # Computes all longest common subsequences for arrays x and y.
+    # Algorithm from [Wikipedia](http://en.wikipedia.org/wiki/Longest_common_subsequence_problem#Reading_out_all_LCSs)
+    def lcs_backtrace_all(c, x, y, i, j)
+      return Set[[]] if i == 0 || j == 0
+      return lcs_backtrace_all(c, x, y, i-1, j-1).map {|z| z << x[i]}.to_set if x[i] == y[j]
+      r = Set.new
+      r.merge(lcs_backtrace_all(c, x, y, i, j-1)) if c[i][j-1] >= c[i-1][j]
+      r.merge(lcs_backtrace_all(c, x, y, i-1, j)) if c[i-1][j] >= c[i][j-1]
+      r
+    end
   end
 end

data/lib/sass/selector/abstract_sequence.rb

@@ -35,6 +35,28 @@ module Sass
         members.each {|m| m.filename = filename}
         @filename = filename
       end
+
+      # Returns a hash code for this sequence.
+      #
+      # Subclasses should define `#_hash` rather than overriding this method,
+      # which automatically handles memoizing the result.
+      #
+      # @return [Fixnum]
+      def hash
+        @_hash ||= _hash
+      end
+
+      # Checks equality between this and another object.
+      #
+      # Subclasses should define `#_eql?` rather than overriding this method,
+      # which handles checking class equality and hash equality.
+      #
+      # @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.hash == self.hash && _eql?(other)
+      end
+      alias_method :==, :eql?
     end
   end
 end

data/lib/sass/selector/comma_sequence.rb

@@ -61,18 +61,13 @@ module Sass
         members.map {|m| m.inspect}.join(", ")
       end
 
-      # Returns a hash code for this sequence.
-      #
-      # @return [Fixnum]
-      def hash
+      private
+
+      def _hash
         members.hash
       end
 
-      # Checks equality between this and another object.
-      #
-      # @param other [Object] The object to test equality against
-      # @return [Boolean] Whether or not this is equal to `other`
-      def eql?(other)
+      def _eql?(other)
         other.class == self.class && other.members.eql?(self.members)
       end
     end

data/lib/sass/selector/sequence.rb

@@ -118,22 +118,6 @@ module Sass
         members.map {|m| m.inspect}.join(" ")
       end
 
-      # Returns a hash code for this sequence.
-      #
-      # @return [Fixnum]
-      def hash
-        members.reject {|m| m == "\n"}.hash
-      end
-
-      # Checks equality between this and another object.
-      #
-      # @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.members.reject {|m| m == "\n"}.eql?(self.members.reject {|m| m == "\n"})
-      end
-
       private
 
       # Conceptually, this expands "parenthesized selectors".
@@ -176,31 +160,45 @@ module Sass
       def subweave(seq1, seq2, cache = {})
         return [seq2] if seq1.empty?
         return [seq1] if seq2.empty?
-        cache[[seq1, seq2]] ||=
-          begin
-            sseq1, rest1 = seq_split(seq1)
-            sseq2, rest2 = seq_split(seq2)
-
-            if sseq1.eql?(sseq2)
-              subweave(rest1, rest2, cache).map {|subseq| sseq1 + subseq}
-            else
-              unified = unify_heads(sseq1, sseq2) || unify_heads(sseq2, sseq1)
-              res = []
-              subweave(rest1, seq2, cache).each {|subseq| res << sseq1 + subseq}
-              subweave(rest1, rest2, cache).each {|subseq| res << unified + subseq} if unified
-              subweave(seq1, rest2, cache).each {|subseq| res << sseq2 + subseq}
-              res
-            end
-          end
+
+        seq1 = group_selectors(seq1)
+        seq2 = group_selectors(seq2)
+        lcs = Haml::Util.lcs(seq2, seq1)
+
+        diff = []
+        until lcs.empty?
+          diff << chunks(seq1, seq2) {|s| s.first == lcs.first} << [lcs.shift]
+          seq1.shift
+          seq2.shift
+        end
+        diff << chunks(seq1, seq2) {|s| s.empty?}
+        diff.reject! {|c| c.empty?}
+
+        Haml::Util.paths(diff).map {|p| p.flatten}
+      end
+
+      def chunks(seq1, seq2)
+        chunk1 = []
+        chunk1 << seq1.shift until yield seq1
+        chunk2 = []
+        chunk2 << seq2.shift until yield seq2
+        return [] if chunk1.empty? && chunk2.empty?
+        return [chunk2] if chunk1.empty?
+        return [chunk1] if chunk2.empty?
+        [chunk1 + chunk2, chunk2 + chunk1]
       end
 
-      def seq_split(seq)
+      def group_selectors(seq)
+        newseq = []
         tail = seq.dup
-        head = []
-        begin
-          head << tail.shift
-        end while !tail.empty? && head.last.is_a?(String) || tail.first.is_a?(String)
-        return head, tail
+        until tail.empty?
+          head = []
+          begin
+            head << tail.shift
+          end while !tail.empty? && head.last.is_a?(String) || tail.first.is_a?(String)
+          newseq << head
+        end
+        return newseq
       end
 
       def unify_heads(sseq1, sseq2)
@@ -208,6 +206,14 @@ module Sass
         unified = sseq1.last.unify(sseq2.last.members) unless sseq1.last.is_a?(String) || sseq2.last.is_a?(String)
         sseq1[0...-1] << unified if unified
       end
+
+      def _hash
+        members.reject {|m| m == "\n"}.hash
+      end
+
+      def _eql?(other)
+        other.members.reject {|m| m == "\n"}.eql?(self.members.reject {|m| m == "\n"})
+      end
     end
   end
 end

data/lib/sass/selector/simple.rb

@@ -41,7 +41,7 @@ module Sass
       #
       # @return [Fixnum]
       def hash
-        to_a.hash
+        @_hash ||= to_a.hash
       end
 
       # Checks equality between this and another object.
@@ -53,8 +53,9 @@ 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.to_a.eql?(to_a)
+        other.class == self.class && other.hash == self.hash && other.to_a.eql?(to_a)
       end
+      alias_method :==, :eql?
 
       # Unifies this selector with a {SimpleSequence}'s {SimpleSequence#members members array},
       # returning another `SimpleSequence` members array

data/lib/sass/selector/simple_sequence.rb

@@ -122,20 +122,14 @@ module Sass
         members.map {|m| m.inspect}.join
       end
 
-      # Returns a hash code for this sequence.
-      #
-      # @return [Fixnum]
-      def hash
+      private
+
+      def _hash
         [base, Haml::Util.set_hash(rest)].hash
       end
 
-      # Checks equality between this and another object.
-      #
-      # @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) &&
-          Haml::Util.set_eql?(other.rest, self.rest)
+      def _eql?(other)
+        other.base.eql?(self.base) && Haml::Util.set_eql?(other.rest, self.rest)
       end
     end
   end

data/test/haml/util_test.rb

@@ -100,6 +100,26 @@ class UtilTest < Test::Unit::TestCase
     assert_equal([[1, 2, 3]], paths([[1], [2], [3]]))
   end
 
+  def test_lcs
+    assert_equal([1, 2, 3], lcs([1, 2, 3], [1, 2, 3]))
+    assert_equal([], lcs([], [1, 2, 3]))
+    assert_equal([], lcs([1, 2, 3], []))
+    assert_equal([1, 2, 3], lcs([5, 1, 4, 2, 3, 17], [0, 0, 1, 2, 6, 3]))
+
+    assert_equal([1], lcs([1, 2, 3, 4], [4, 3, 2, 1]))
+    assert_equal([1, 2], lcs([1, 2, 3, 4], [3, 4, 1, 2]))
+  end
+
+  def test_lcs_all
+    assert_equal(Set[[1, 2, 3]], lcs_all([1, 2, 3], [1, 2, 3]))
+    assert_equal(Set[[]], lcs_all([], [1, 2, 3]))
+    assert_equal(Set[[]], lcs_all([1, 2, 3], []))
+    assert_equal(Set[[1, 2, 3]], lcs_all([5, 1, 4, 2, 3, 17], [0, 0, 1, 2, 6, 3]))
+
+    assert_equal(Set[[1], [2], [3], [4]], lcs_all([1, 2, 3, 4], [4, 3, 2, 1]))
+    assert_equal(Set[[1, 2], [3, 4]], lcs_all([1, 2, 3, 4], [3, 4, 1, 2]))
+  end
+
   def test_silence_warnings
     old_stderr, $stderr = $stderr, StringIO.new
     warn "Out"

data/test/sass/extend_test.rb

@@ -974,34 +974,53 @@ foo bar {@extend .foo}
 SCSS
   end
 
-  def test_nested_extender_interleaves_parents_with_unification
+  def test_nested_extender_alternates_parents
     assert_equal <<CSS, render(<<SCSS)
-.baz .foo, .baz foo bar, foo.baz bar, foo .baz bar {
+.baz .bip .foo, .baz .bip foo .grank bar, foo .grank .baz .bip bar {
   a: b; }
 CSS
-.baz .foo {a: b}
-foo bar {@extend .foo}
+.baz .bip .foo {a: b}
+foo .grank bar {@extend .foo}
 SCSS
   end
 
-  def test_nested_extender_interleaves_parents_with_aborted_unification
+  def test_nested_extender_unifies_identical_parents
     assert_equal <<CSS, render(<<SCSS)
-baz .foo, baz foo bar, foo baz bar {
+.baz .bip .foo, .baz .bip bar {
   a: b; }
 CSS
-baz .foo {a: b}
-foo bar {@extend .foo}
+.baz .bip .foo {a: b}
+.baz .bip bar {@extend .foo}
+SCSS
+  end
+
+  def test_nested_extender_unifies_common_substring
+    assert_equal <<CSS, render(<<SCSS)
+.baz .bip .bap .bink .foo, .baz .brat .bip .bap .bink bar, .brat .baz .bip .bap .bink bar {
+  a: b; }
+CSS
+.baz .bip .bap .bink .foo {a: b}
+.brat .bip .bap bar {@extend .foo}
+SCSS
+  end
+
+  def test_nested_extender_unifies_common_subseq
+    assert_equal <<CSS, render(<<SCSS)
+.a .x .b .y .foo, .a .x .n .b .y .m bar, .a .n .x .b .y .m bar, .a .x .n .b .m .y bar, .a .n .x .b .m .y bar {
+  a: b; }
+CSS
+.a .x .b .y .foo {a: b}
+.a .n .b .m bar {@extend .foo}
 SCSS
   end
 
-  def test_nested_extender_with_lots_of_interleaving
-    # Please, never ever do this in a real stylesheet
+  def test_nested_extender_chooses_first_subseq
     assert_equal <<CSS, render(<<SCSS)
-.foo .bar .baz .bang, .foo .bar .baz .foo2 .bar2 .baz2 .bang2, .foo .bar .foo2.baz .bar2 .baz2 .bang2, .foo .bar .foo2 .baz .bar2 .baz2 .bang2, .foo .bar .foo2 .bar2.baz .baz2 .bang2, .foo .bar .foo2 .bar2 .baz .baz2 .bang2, .foo .bar .foo2 .bar2 .baz2.baz .bang2, .foo .bar .foo2 .bar2 .baz2 .baz .bang2, .foo .foo2.bar .baz .bar2 .baz2 .bang2, .foo .foo2.bar .bar2.baz .baz2 .bang2, .foo .foo2.bar .bar2 .baz .baz2 .bang2, .foo .foo2.bar .bar2 .baz2.baz .bang2, .foo .foo2.bar .bar2 .baz2 .baz .bang2, .foo .foo2 .bar .baz .bar2 .baz2 .bang2, .foo .foo2 .bar .bar2.baz .baz2 .bang2, .foo .foo2 .bar .bar2 .baz .baz2 .bang2, .foo .foo2 .bar .bar2 .baz2.baz .bang2, .foo .foo2 .bar .bar2 .baz2 .baz .bang2, .foo .foo2 .bar2.bar .baz .baz2 .bang2, .foo .foo2 .bar2.bar .baz2.baz .bang2, .foo .foo2 .bar2.bar .baz2 .baz .bang2, .foo .foo2 .bar2 .bar .baz .baz2 .bang2, .foo .foo2 .bar2 .bar .baz2.baz .bang2, .foo .foo2 .bar2 .bar .baz2 .baz .bang2, .foo .foo2 .bar2 .baz2.bar .baz .bang2, .foo .foo2 .bar2 .baz2 .bar .baz .bang2, .foo2.foo .bar .baz .bar2 .baz2 .bang2, .foo2.foo .bar .bar2.baz .baz2 .bang2, .foo2.foo .bar .bar2 .baz .baz2 .bang2, .foo2.foo .bar .bar2 .baz2.baz .bang2, .foo2.foo .bar .bar2 .baz2 .baz .bang2, .foo2.foo .bar2.bar .baz .baz2 .bang2, .foo2.foo .bar2.bar .baz2.baz .bang2, .foo2.foo .bar2.bar .baz2 .baz .bang2, .foo2.foo .bar2 .bar .baz .baz2 .bang2, .foo2.foo .bar2 .bar .baz2.baz .bang2, .foo2.foo .bar2 .bar .baz2 .baz .bang2, .foo2.foo .bar2 .baz2.bar .baz .bang2, .foo2.foo .bar2 .baz2 .bar .baz .bang2, .foo2 .foo .bar .baz .bar2 .baz2 .bang2, .foo2 .foo .bar .bar2.baz .baz2 .bang2, .foo2 .foo .bar .bar2 .baz .baz2 .bang2, .foo2 .foo .bar .bar2 .baz2.baz .bang2, .foo2 .foo .bar .bar2 .baz2 .baz .bang2, .foo2 .foo .bar2.bar .baz .baz2 .bang2, .foo2 .foo .bar2.bar .baz2.baz .bang2, .foo2 .foo .bar2.bar .baz2 .baz .bang2, .foo2 .foo .bar2 .bar .baz .baz2 .bang2, .foo2 .foo .bar2 .bar .baz2.baz .bang2, .foo2 .foo .bar2 .bar .baz2 .baz .bang2, .foo2 .foo .bar2 .baz2.bar .baz .bang2, .foo2 .foo .bar2 .baz2 .bar .baz .bang2, .foo2 .bar2.foo .bar .baz .baz2 .bang2, .foo2 .bar2.foo .bar .baz2.baz .bang2, .foo2 .bar2.foo .bar .baz2 .baz .bang2, .foo2 .bar2.foo .baz2.bar .baz .bang2, .foo2 .bar2.foo .baz2 .bar .baz .bang2, .foo2 .bar2 .foo .bar .baz .baz2 .bang2, .foo2 .bar2 .foo .bar .baz2.baz .bang2, .foo2 .bar2 .foo .bar .baz2 .baz .bang2, .foo2 .bar2 .foo .baz2.bar .baz .bang2, .foo2 .bar2 .foo .baz2 .bar .baz .bang2, .foo2 .bar2 .baz2.foo .bar .baz .bang2, .foo2 .bar2 .baz2 .foo .bar .baz .bang2 {
+.a .b .c .d .foo, .a .b .c .d .a .b .bar {
   a: b; }
 CSS
-.foo .bar .baz .bang {a: b}
-.foo2 .bar2 .baz2 .bang2 {@extend .bang}
+.a .b .c .d .foo {a: b}
+.c .d .a .b .bar {@extend .foo}
 SCSS
   end
 
@@ -1015,33 +1034,31 @@ foo > bar {@extend .foo}
 SCSS
   end
 
-  def test_nested_extender_with_descendant_and_child_selector
+  def test_nested_extender_with_early_child_selectors_doesnt_subseq_them
     assert_equal <<CSS, render(<<SCSS)
-.baz .foo, .baz bang foo > bar, bang.baz foo > bar, bang .baz foo > bar {
+.bip > .bap .foo, .bip > .bap .grip > .bap .bar, .grip > .bap .bip > .bap .bar {
   a: b; }
 CSS
-.baz .foo {a: b}
-bang foo > bar {@extend .foo}
+.bip > .bap .foo {a: b}
+.grip > .bap .bar {@extend .foo}
 SCSS
-  end
 
-  def test_nested_extender_with_child_selector_unifies
     assert_equal <<CSS, render(<<SCSS)
-.baz.foo, foo > bar.baz {
+.bap > .bip .foo, .bap > .bip .bap > .grip .bar, .bap > .grip .bap > .bip .bar {
   a: b; }
 CSS
-.baz.foo {a: b}
-foo > bar {@extend .foo}
+.bap > .bip .foo {a: b}
+.bap > .grip .bar {@extend .foo}
 SCSS
   end
 
-  def test_nested_extender_with_child_selector_and_more
+  def test_nested_extender_with_child_selector_unifies
     assert_equal <<CSS, render(<<SCSS)
-.foo .bar, .foo foo > bar baz, foo > bar.foo baz, foo > bar .foo baz {
+.baz.foo, foo > bar.baz {
   a: b; }
 CSS
-.foo .bar {a: b}
-foo > bar baz {@extend .bar}
+.baz.foo {a: b}
+foo > bar {@extend .foo}
 SCSS
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: haml-edge
 version: !ruby/object:Gem::Version 
-  version: 2.3.244
+  version: 2.3.245
 platform: ruby
 authors: 
 - Nathan Weizenbaum
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-05-05 00:00:00 -04:00
+date: 2010-05-07 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -84,11 +84,12 @@ files:
 - lib/sass/files.rb
 - lib/sass/plugin.rb
 - lib/sass/repl.rb
+- lib/sass/script.rb
 - lib/sass/plugin/merb.rb
 - lib/sass/plugin/rack.rb
 - lib/sass/plugin/rails.rb
 - lib/sass/plugin/staleness_checker.rb
-- lib/sass/script.rb
+- lib/sass/callbacks.rb
 - lib/sass/less.rb
 - lib/sass/script/bool.rb
 - lib/sass/script/color.rb
@@ -107,7 +108,6 @@ files:
 - lib/sass/script/css_parser.rb
 - lib/sass/script/interpolation.rb
 - lib/sass/script/string_interpolation.rb
-- lib/sass/callbacks.rb
 - lib/sass/scss.rb
 - lib/sass/scss/css_parser.rb
 - lib/sass/scss/parser.rb
@@ -116,6 +116,7 @@ files:
 - lib/sass/scss/script_lexer.rb
 - lib/sass/scss/script_parser.rb
 - lib/sass/scss/static_parser.rb
+- lib/sass/selector.rb
 - lib/sass/selector/abstract_sequence.rb
 - lib/sass/selector/comma_sequence.rb
 - lib/sass/selector/sequence.rb
@@ -137,7 +138,6 @@ files:
 - lib/sass/tree/extend_node.rb
 - lib/sass/tree/root_node.rb
 - lib/sass/tree/warn_node.rb
-- lib/sass/selector.rb
 - vendor/fssm/LICENSE
 - vendor/fssm/README.markdown
 - vendor/fssm/Rakefile
@@ -248,6 +248,7 @@ files:
 - test/sass/plugin_test.rb
 - test/sass/script_test.rb
 - test/sass/callbacks_test.rb
+- test/sass/conversion_test.rb
 - test/sass/data/hsl-rgb.txt
 - test/sass/more_results/more1.css
 - test/sass/more_results/more1_with_line_comments.css
@@ -277,12 +278,8 @@ files:
 - test/sass/results/units.css
 - test/sass/results/warn.css
 - test/sass/results/warn_imported.css
-- test/sass/conversion_test.rb
 - test/sass/less_conversion_test.rb
-- test/sass/scss/css_test.rb
-- test/sass/scss/rx_test.rb
-- test/sass/scss/scss_test.rb
-- test/sass/scss/test_helper.rb
+- test/sass/script_conversion_test.rb
 - test/sass/templates/_partial.sass
 - test/sass/templates/alt.sass
 - test/sass/templates/basic.sass
@@ -299,9 +296,9 @@ files:
 - test/sass/templates/parent_ref.sass
 - test/sass/templates/script.sass
 - test/sass/templates/units.sass
+- test/sass/templates/bork3.sass
 - test/sass/templates/multiline.sass
 - test/sass/templates/nested.sass
-- test/sass/templates/bork3.sass
 - test/sass/templates/bork4.sass
 - test/sass/templates/importee.less
 - test/sass/templates/mixin_bork.sass
@@ -311,14 +308,17 @@ files:
 - test/sass/templates/nested_bork4.sass
 - test/sass/templates/nested_mixin_bork.sass
 - test/sass/templates/options.sass
+- test/sass/templates/scss_import.scss
 - test/sass/templates/subdir/nested_subdir/_nested_partial.sass
 - test/sass/templates/subdir/nested_subdir/nested_subdir.sass
 - test/sass/templates/subdir/subdir.sass
-- test/sass/templates/scss_import.scss
 - test/sass/templates/scss_importee.scss
 - test/sass/templates/warn.sass
 - test/sass/templates/warn_imported.sass
-- test/sass/script_conversion_test.rb
+- test/sass/scss/css_test.rb
+- test/sass/scss/rx_test.rb
+- test/sass/scss/scss_test.rb
+- test/sass/scss/test_helper.rb
 - test/test_helper.rb
 - extra/haml-mode.el
 - extra/sass-mode.el
@@ -383,10 +383,10 @@ test_files:
 - test/sass/plugin_test.rb
 - test/sass/script_test.rb
 - test/sass/callbacks_test.rb
-- test/sass/extend_test.rb
 - test/sass/conversion_test.rb
+- test/sass/extend_test.rb
 - test/sass/less_conversion_test.rb
+- test/sass/script_conversion_test.rb
 - test/sass/scss/css_test.rb
 - test/sass/scss/rx_test.rb
 - test/sass/scss/scss_test.rb
-- test/sass/script_conversion_test.rb