naturalsort 1.1.1 → 1.2.0

data/lib/natural_sort/engine.rb

@@ -0,0 +1,85 @@
+# Internal: Singleton module which sorts elements in a natural,
+# human-friendly alphanumeric order.
+module NaturalSort::Engine
+
+  # Internal: Main Regexp used to in natural sorting
+  REGEXP = /(^|\D+)(\d+|(\D$))/
+
+  # Internal: A Regexp used to detect numeric substrings
+  NUMERIC = /(\d+)/
+
+  class << self
+
+    # Internal: Static method to sort.
+    #
+    # object - any object that is enumerable or has a #to_a method.
+    #
+    # Returns a sorted version of the object.
+    #
+    # Examples:
+    #
+    #   NaturalSort.sort ['a1', 'a12', 'a2']  #=> ['a1', 'a2', 'a12']
+    def sort(object)
+      Array(object).sort do |a,b|
+        self.comparator(a,b)
+      end
+    end
+
+    # Internal: Comparator function used for sorting, which can be
+    # used as a standalone.
+    #
+    # a - the left-hand side of the comparator
+    # b - the right-hand side of the comparator
+    #
+    # Returns 0, 1, or -1
+    #
+    # Examples
+    #
+    #   [person1, person2, person3].sort{|a,b| NaturalSort.comparator(a.name, b.name)}
+    def comparator(a, b)
+      sa, sb = a.to_s, b.to_s
+      if (sa.downcase <=> sb.downcase) == 0 then sa <=> sb
+      else
+        na, nb = check_regexp(sa, sb)
+        na <=> nb
+      end
+    end
+
+    private
+
+    def check_regexp(sa, sb)
+      ma, mb = multireg(REGEXP,sa), multireg(REGEXP,sb)
+      it = 0
+      equal = 0
+      ret = ['', '']
+      while (it < [ma.size,mb.size].min) and (equal==0)
+        if (ma[it] and mb[it]) and (ma[it][1] and mb[it][1]) and (NUMERIC.match ma[it][0] and NUMERIC.match mb[it][0])
+          l = [ma[it][2].size,mb[it][2].size].max
+          ret = [format(ma[it], l), format(mb[it], l)]
+        else
+          ret = [ma[it][0].downcase, mb[it][0].downcase]
+        end
+        equal = ret[0] <=> ret[1]
+        it+=1
+      end
+      return ret[0], ret[1]
+    end
+
+    # format([a, 1], 3) => a001
+    # add leading zero
+    def format(match_data, length)
+      match_data[1].gsub('_', '').downcase + ("%0#{length}d" % match_data[2].to_i)
+    end
+
+    # return an array with
+    # regexp matchdata on str
+    def multireg(regpexp, str)
+      result = []
+      while regpexp.match(str)
+        result.push regpexp.match(str)
+        str = regpexp.match(str).post_match
+      end
+      result
+    end
+  end
+end

data/lib/natural_sort/kernel.rb

@@ -0,0 +1,64 @@
+# Public: Adds #natural_sort instance method to Ruby Kernel enumerable objects.
+#
+# Examples
+#
+#   require 'natural_sort_kernel'
+#   defined?(NaturalSort::Kernel)      #=> true
+#   ['a', 'b', 'A', 'B'].natural_sort  #=> ['A', 'a', 'B', 'b']
+module NaturalSort::Kernel; end
+
+module Enumerable
+  # Add #natural_sort method to Enumerable module.
+  #
+  # Examples
+  #
+  #   require 'natural_sort_kernel'
+  #   ['a1', 'a12', 'a2'].natural_sort     #=> ['a1', 'a2', 'a12']
+  #   ['a', 'b', 'A', 'B'].natural_sort    #=> ['A', 'a', 'B', 'b']
+  include NaturalSort
+end
+
+class Array
+  # Add #natural_sort method to Array class.
+  #
+  # Examples
+  #
+  #   require 'natural_sort_kernel'
+  #   ['a1', 'a12', 'a2'].natural_sort     #=> ['a1', 'a2', 'a12']
+  #   ['a', 'b', 'A', 'B'].natural_sort    #=> ['A', 'a', 'B', 'b']
+  include NaturalSort
+end
+
+class Range
+  # Add #natural_sort method to Range class, which aliases #to_a
+  #
+  # Examples
+  #
+  #   require 'natural_sort_kernel'
+  #   (1..11).natural_sort    #=> [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11]
+  alias :natural_sort :to_a
+end
+
+if defined?(Set)
+  class Set
+    # Add #natural_sort method to Set class, if it has been initialized.
+    #
+    # Examples
+    #
+    #   require 'set'
+    #   require 'natural_sort_kernel'
+    #   Set.new(['a', 'b', 'c', 'd', 'A', 'B', 'C', 'D']).natural_sort  #=> ['A', 'a', 'B', 'b', 'C', 'c', 'D', 'd']
+    include NaturalSort
+  end
+end
+
+class Hash
+  # Add #natural_sort method to Hash class.
+  #
+  # Examples
+  #
+  #   require 'natural_sort_kernel'
+  #   { "a" => "value", "b" => "value", "A" => "value", "B" => "value" }.natural_sort  #=>
+  #     [["A", "value"], ["a", "value"], ["B", "value"], ["b", "value"]]
+  include NaturalSort
+end

data/lib/natural_sort/version.rb

@@ -0,0 +1,5 @@
+module NaturalSort
+  module Version
+    VERSION = '1.2.0'
+  end
+end

data/lib/natural_sort_kernel.rb

@@ -1,47 +1,3 @@
-# Add natural sorting method to default Kernel ruby objects.
-require File.dirname(__FILE__) + '/natural_sort.rb'
-require 'set'
 
-# Add NaturalSort methods.
-#     require 'natural_sort_kernel'
-#     
-#     ['a1', 'a12', 'a2'].alphanum_sort         #=> ['a1', 'a2', 'a12']
-#     ['a', 'b', 'A', 'B'].alphanum_sort        #=> ['A', 'a', 'B', 'b']
-module Enumerable
-  include NaturalSort
-end
-
-# Add NaturalSort methods.
-#     require 'natural_sort_kernel'
-#     
-#     ['a1', 'a12', 'a2'].alphanum_sort         #=> ['a1', 'a2', 'a12']
-#     ['a', 'b', 'A', 'B'].alphanum_sort        #=> ['A', 'a', 'B', 'b']
-class Array
-  include NaturalSort
-end
-
-# Add NaturalSort methods.
-#     require 'natural_sort_kernel'
-#     
-#     (1..21).alphanum_sort         #=> [1, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 2, 20, 21, 3, 4, 5, 6, 7, 8, 9]
-class Range
-  include NaturalSort
-end
-
-# Add NaturalSort methods.
-#     require 'set'
-#     require 'natural_sort_kernel'
-#     
-  #     Set.new(['a', 'b', 'c', 'd', 'A', 'B', 'C', 'D']).alphanum_sort         #=> ['A', 'a', 'B', 'b', 'C', 'c', 'D', 'd']
-class Set
-  include NaturalSort
-end
-
-# Add NaturalSort methods.
-#     require 'natural_sort_kernel'
-#     
-#     { "a" => "value", "b" => "value", "c" => "value", "d" => "value", "A" => "value", "B" => "value", "C" => "value", "D" => "value" }.alphanum_sort
-#     => [["A", "value"], ["a", "value"], ["B", "value"], ["b", "value"], ["C", "value"], ["c", "value"], ["D", "value"], ["d", "value"]]
-class Hash
-  include NaturalSort
-end
+require 'natural_sort'
+require 'natural_sort/kernel'

data/naturalsort.gemspec

@@ -0,0 +1,22 @@
+# coding: utf-8
+$:.push File.expand_path('../lib', __FILE__)
+require 'natural_sort/version'
+
+Gem::Specification.new do |spec|
+  spec.name          = 'naturalsort'
+  spec.version       = NaturalSort::Version::VERSION
+  spec.authors       = ['Benjamin Francisoud']
+  spec.email         = ['pub.cog@gmail.com']
+  spec.summary       = %q{NaturalSort is a simple library which implements a natural, human-friendly alphanumeric sort in Ruby}
+  spec.description   = %q{Example: %w(1 2a A1 a11 A12 a2 a21 x__2 X_1).natural_sort => %w(1 2a A1 a11 A12 a2 a21 x__2 X_1)}
+  spec.homepage      = 'http://rubyforge.org/projects/naturalsort/'
+  spec.license       = 'MIT'
+
+  spec.files         = `git ls-files`.split($/)
+  spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
+  spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
+  spec.require_paths = ['lib']
+
+  spec.add_development_dependency 'minitest'
+  spec.add_development_dependency 'rake'
+end

data/test/test_helper.rb

@@ -1,29 +1,36 @@
-require 'test/unit'
-
-module NaturalSort
-  Base = ['a', 'b', 'c', 'd', 'A', 'B', 'C', 'D']
-  BaseSorted = ['A', 'a', 'B', 'b', 'C', 'c', 'D', 'd']
-  
-  Complex = ['1000X Radonius Maximus', '10X Radonius', '200X Radonius', '20X Radonius', 
-    '20X Radonius Prime', '30X Radonius', '40X Radonius', 'Allegia 50 Clasteron', 
-    'Allegia 500 Clasteron', 'Allegia 51 Clasteron', 'Allegia 51B Clasteron', 'Allegia 52 Clasteron', 
-    'Allegia 60 Clasteron', 'Alpha 100', 'Alpha 2', 'Alpha 200', 'Alpha 2A', 'Alpha 2A-8000', 
-    'Alpha 2A-900', 'Callisto Morphamax', 'Callisto Morphamax 500', 'Callisto Morphamax 5000', 
-    'Callisto Morphamax 600', 'Callisto Morphamax 700', 'Callisto Morphamax 7000', 
-    'Callisto Morphamax 7000 SE', 'Callisto Morphamax 7000 SE2', 'QRS-60 Intrinsia Machine', 
-    'QRS-60F Intrinsia Machine', 'QRS-62 Intrinsia Machine', 'QRS-62F Intrinsia Machine', 
-    'Xiph Xlater 10000', 'Xiph Xlater 2000', 'Xiph Xlater 300', 'Xiph Xlater 40', 
-    'Xiph Xlater 5', 'Xiph Xlater 50', 'Xiph Xlater 500', 'Xiph Xlater 5000', 'Xiph Xlater 58']
-  
-  ComplexSorted = ['10X Radonius', '20X Radonius', '20X Radonius Prime', '30X Radonius', 
-    '40X Radonius', '200X Radonius', '1000X Radonius Maximus', 'Allegia 50 Clasteron', 
-    'Allegia 51 Clasteron', 'Allegia 51B Clasteron', 'Allegia 52 Clasteron', 
-    'Allegia 60 Clasteron', 'Allegia 500 Clasteron', 'Alpha 2', 'Alpha 2A', 'Alpha 2A-900', 
-    'Alpha 2A-8000', 'Alpha 100', 'Alpha 200', 'Callisto Morphamax', 'Callisto Morphamax 500',
-    'Callisto Morphamax 600', 'Callisto Morphamax 700', 'Callisto Morphamax 5000', 
-    'Callisto Morphamax 7000', 'Callisto Morphamax 7000 SE', 'Callisto Morphamax 7000 SE2',
-    'QRS-60 Intrinsia Machine', 'QRS-60F Intrinsia Machine', 'QRS-62 Intrinsia Machine', 
-    'QRS-62F Intrinsia Machine', 'Xiph Xlater 5', 'Xiph Xlater 40', 'Xiph Xlater 50',
-    'Xiph Xlater 58', 'Xiph Xlater 300', 'Xiph Xlater 500', 'Xiph Xlater 2000', 
-    'Xiph Xlater 5000', 'Xiph Xlater 10000']
-end
+gem 'minitest'
+require 'minitest/autorun'
+
+module TestHelper
+  SimpleUnsorted = %w(a b c d A B C D)
+  SimpleSorted   = %w(A a B b C c D d)
+  
+  ComplexUnsorted = ['1000X Radonius Maximus', '10X Radonius', '200X Radonius', '20X Radonius',
+    '20X Radonius Prime', '30X Radonius', '40X Radonius', 'Allegia 50 Clasteron', 
+    'Allegia 500 Clasteron', 'Allegia 51 Clasteron', 'Allegia 51B Clasteron', 'Allegia 52 Clasteron', 
+    'Allegia 60 Clasteron', 'Alpha 100', 'Alpha 2', 'Alpha 200', 'Alpha 2A', 'Alpha 2A-8000', 
+    'Alpha 2A-900', 'Callisto Morphamax', 'Callisto Morphamax 500', 'Callisto Morphamax 5000', 
+    'Callisto Morphamax 600', 'Callisto Morphamax 700', 'Callisto Morphamax 7000', 
+    'Callisto Morphamax 7000 SE', 'Callisto Morphamax 7000 SE2', 'QRS-60 Intrinsia Machine', 
+    'QRS-60F Intrinsia Machine', 'QRS-62 Intrinsia Machine', 'QRS-62F Intrinsia Machine', 
+    'Xiph Xlater 10000', 'Xiph Xlater 2000', 'Xiph Xlater 300', 'Xiph Xlater 40', 
+    'Xiph Xlater 5', 'Xiph Xlater 50', 'Xiph Xlater 500', 'Xiph Xlater 5000', 'Xiph Xlater 58']
+  
+  ComplexSorted = ['10X Radonius', '20X Radonius', '20X Radonius Prime', '30X Radonius', 
+    '40X Radonius', '200X Radonius', '1000X Radonius Maximus', 'Allegia 50 Clasteron', 
+    'Allegia 51 Clasteron', 'Allegia 51B Clasteron', 'Allegia 52 Clasteron', 
+    'Allegia 60 Clasteron', 'Allegia 500 Clasteron', 'Alpha 2', 'Alpha 2A', 'Alpha 2A-900', 
+    'Alpha 2A-8000', 'Alpha 100', 'Alpha 200', 'Callisto Morphamax', 'Callisto Morphamax 500',
+    'Callisto Morphamax 600', 'Callisto Morphamax 700', 'Callisto Morphamax 5000', 
+    'Callisto Morphamax 7000', 'Callisto Morphamax 7000 SE', 'Callisto Morphamax 7000 SE2',
+    'QRS-60 Intrinsia Machine', 'QRS-60F Intrinsia Machine', 'QRS-62 Intrinsia Machine', 
+    'QRS-62F Intrinsia Machine', 'Xiph Xlater 5', 'Xiph Xlater 40', 'Xiph Xlater 50',
+    'Xiph Xlater 58', 'Xiph Xlater 300', 'Xiph Xlater 500', 'Xiph Xlater 2000', 
+    'Xiph Xlater 5000', 'Xiph Xlater 10000']
+
+  # TODO: the AlphanumUnsorted initial order below yields a failing result
+  # %w(100 101 11 A2AA A10 A999 AA1 999A 9999 A1 A2 A2A A2A1 1 1A 2 2C 9 AA99 #AB1 AB1A AB99 B1 B1A 10 10X AA2 B2 B999 Z1 Z9999)
+
+  AlphanumUnsorted = %w(1 1A 2 2C 9 10 10X 11 100 101 999A 9999 A1 A2 A2A A2A1 A2AA A10 A999 AA1 AA2 AA99 AB1 AB1A AB99 B1 B1A B2 B999 Z1 Z9999)
+  AlphanumSorted = %w(1 1A 2 2C 9 10 10X 11 100 101 999A 9999 A1 A2 A2A A2A1 A2AA A10 A999 AA1 AA2 AA99 AB1 AB1A AB99 B1 B1A B2 B999 Z1 Z9999)
+end

data/test/test_natural_sort.rb

@@ -4,7 +4,7 @@ require File.dirname(__FILE__) + '/../lib/natural_sort.rb'
 class MyClass
   include NaturalSort
   
-  def initialize(array = Base)
+  def initialize(array = TestHelper::SimpleUnsorted)
     @array = array
   end
   
@@ -14,14 +14,14 @@ class MyClass
 end
 
 # Test without include
-class TestNaturalSortSelf < Test::Unit::TestCase
+class TestNaturalSortSelf < Minitest::Test
   def test_self
-    assert_equal NaturalSort::BaseSorted, NaturalSort::naturalsort(NaturalSort::Base)
+    assert_equal TestHelper::SimpleSorted, NaturalSort.sort(TestHelper::SimpleUnsorted)
   end
 end
 
 # Test using include
-class TestNaturalSort < Test::Unit::TestCase
+class TestNaturalSort < Minitest::Test
   include NaturalSort
   
   def setup
@@ -30,26 +30,26 @@ class TestNaturalSort < Test::Unit::TestCase
   
   def test_case_sensitive
     sorted = @obj.natural_sort
-    assert_equal BaseSorted, sorted
+    assert_equal TestHelper::SimpleSorted, sorted
   end
   
   def test_mixed
-    obj = MyClass.new ['a1', 'a12', 'A11', 'a2', 'a10', 'A3', 'a21', 'A29']
-    assert_equal ['a1', 'a2', 'A3', 'a10', 'A11', 'a12', 'a21', 'A29'], obj.natural_sort
+    obj = MyClass.new %w(a1 a12 A11 a2 a10 A3 a21 A29)
+    assert_equal %w(a1 a2 A3 a10 A11 a12 a21 A29), obj.natural_sort
   end
   
   def test_numbers
-    obj = MyClass.new ['a1', 'a12', 'a11', 'a2', 'a10', 'a3', 'a21', 'a29']
-    assert_equal ['a1', 'a2', 'a3', 'a10', 'a11', 'a12', 'a21', 'a29'], obj.natural_sort
+    obj = MyClass.new %w(a1 a12 a11 a2 a10 a3 a21 a29)
+    assert_equal %w(a1 a2 a3 a10 a11 a12 a21 a29), obj.natural_sort
   end
 
   def test_first_no_number
-    obj = MyClass.new ['aaa2', 'aaa3', 'aaa4', 'aaa']
-    assert_equal ['aaa', 'aaa2', 'aaa3', 'aaa4'], obj.natural_sort
+    obj = MyClass.new %w(aaa2 aaa3 aaa4 aaa)
+    assert_equal %w(aaa aaa2 aaa3 aaa4), obj.natural_sort
   end
 
   def test_number_leading_zero
-    obj = MyClass.new ["A001", "A08", "A007", "A003", "A011", "A20", "A200"]
-    assert_equal ["A001", "A003", "A007", "A08", "A011", "A20", "A200"], obj.natural_sort
+    obj = MyClass.new %w(A001 A08 A007 A003 A011 A20 A200)
+    assert_equal %w(A001 A003 A007 A08 A011 A20 A200), obj.natural_sort
   end
 end

data/test/test_natural_sort_alone.rb

@@ -2,8 +2,16 @@ require File.dirname(__FILE__) + '/test_helper.rb'
 require File.dirname(__FILE__) + '/../lib/natural_sort.rb'
 
 # Test without include
-class TestNaturalSortAlone < Test::Unit::TestCase
-  def test_alone
-    assert_equal NaturalSort::BaseSorted, NaturalSort::naturalsort(NaturalSort::Base)
+class TestNaturalSortAlone < Minitest::Test
+  def test_simple
+    assert_equal TestHelper::SimpleSorted, NaturalSort.sort(TestHelper::SimpleUnsorted)
+  end
+
+  def test_complex
+    assert_equal TestHelper::ComplexSorted, NaturalSort.sort(TestHelper::ComplexUnsorted)
+  end
+
+  def test_alphanum
+    assert_equal TestHelper::AlphanumSorted, NaturalSort.sort(TestHelper::AlphanumUnsorted)
   end
 end

data/test/test_natural_sort_kernel.rb

@@ -4,11 +4,11 @@ require File.dirname(__FILE__) + '/../lib/natural_sort_kernel.rb'
 class TestEnum
   include Enumerable
   def to_a
-    NaturalSort::Base
+    TestHelper::SimpleUnsorted
   end
 end
 
-class TestNaturalSortKernel < Test::Unit::TestCase
+class TestNaturalSortKernel < Minitest::Test
   
   def test_empty
     assert_equal(['', ''], ['', ''].natural_sort)
@@ -16,11 +16,11 @@ class TestNaturalSortKernel < Test::Unit::TestCase
   
   def test_enum
     enum = TestEnum.new
-    assert_equal NaturalSort::BaseSorted, enum.natural_sort
+    assert_equal TestHelper::SimpleSorted, enum.natural_sort
   end
   
   def test_array
-    assert_equal NaturalSort::BaseSorted, NaturalSort::Base.natural_sort
+    assert_equal TestHelper::SimpleSorted, TestHelper::SimpleUnsorted.natural_sort
   end
   
   def test_range
@@ -29,8 +29,8 @@ class TestNaturalSortKernel < Test::Unit::TestCase
   end
   
   def test_set
-    set = Set.new NaturalSort::Base
-    assert_equal NaturalSort::BaseSorted, set.natural_sort
+    set = Set.new TestHelper::SimpleUnsorted
+    assert_equal TestHelper::SimpleSorted, set.natural_sort
   end
   
   def test_hash
@@ -41,39 +41,39 @@ class TestNaturalSortKernel < Test::Unit::TestCase
   end
   
     def test_identical_simple
-      assert_equal(['x', 'x'], ['x', 'x'].natural_sort)
+      assert_equal(%w(x x), %w(x x).natural_sort)
     end
 
     def test_identical_two_groups
-      assert_equal(['x1', 'x1'], ['x1', 'x1'].natural_sort)
+      assert_equal(%w(x1 x1), %w(x1 x1).natural_sort)
     end
 
     def test_ordered_simple
-      assert_equal(['x', 'y'], ['x', 'y'].natural_sort)
+      assert_equal(%w(x y), %w(x y).natural_sort)
     end
 
     def test_ordered_simple_start_backwards
-      assert_equal(['x', 'y'], ['y', 'x'].natural_sort)
+      assert_equal(%w(x y), %w(y x).natural_sort)
     end
 
     def test_ordered_two_groups
-      assert_equal(['x1', 'x2'], ['x1', 'x2'].natural_sort)
+      assert_equal(%w(x1 x2), %w(x1 x2).natural_sort)
     end
 
     def test_ordered_two_groups_start_backwards
-      assert_equal(['x1', 'x2'], ['x2', 'x1'].natural_sort)
+      assert_equal(%w(x1 x2), %w(x2 x1).natural_sort)
     end
 
     def test_ordered_two_groups_separated
-      assert_equal(['x_1', 'x_2'], ['x_2', 'x_1'].natural_sort)
+      assert_equal(%w(x_1 x_2), %w(x_2 x_1).natural_sort)
     end
 
     def test_ordered_two_groups_separated_different_distances
-      assert_equal(['x_1', 'x__2'], ['x__2', 'x_1'].natural_sort)
+      assert_equal(%w(x_1 x__2), %w(x__2 x_1).natural_sort)
     end
 
     def test_ordered_two_groups_separated_different_distances_swapped
-      assert_equal(['x__1', 'x_2'], ['x_2', 'x__1'].natural_sort)
+      assert_equal(%w(x__1 x_2), %w(x_2 x__1).natural_sort)
     end
 
     def test_three_groups
@@ -82,7 +82,8 @@ class TestNaturalSortKernel < Test::Unit::TestCase
         ['hello world', 'hello world 2', 'hello 2 world'].natural_sort
       )
     end
-    
+
+    # TODO: fix test below
     def test_decimal
       # 1.001 < 1.002 < 1.010 < 1.02 < 1.1 < 1.3
       # assert_equal ['1.001', '1.002', '1.010', '1.02', '1.1', '1.3'], ['1.1', '1.001', '1.002', '1.010', '1.02', '1.3'].natural_sort, "FIXME this test doesn't pass and need to be fix"
@@ -90,20 +91,20 @@ class TestNaturalSortKernel < Test::Unit::TestCase
     
     def test_multiple_string_number
       # x2-g8 < x2-y7 < x2-y08 < x8-y8
-      assert_equal ['x2-g8', 'x2-y7', 'x2-y08', 'x8-y8'], ['x2-y08', 'x8-y8', 'x2-y7', 'x2-g8'].natural_sort
+      assert_equal %w(x2-g8 x2-y7 x2-y08 x8-y8), %w(x2-y08 x8-y8 x2-y7 x2-g8).natural_sort
     end
     
     # same as test_multiple_string_number but first number has (sometimes) leading zero
     def test_multiple_string_number_2
       # x2-g8 < x2-y7 < x2-y08 < x8-y8
-      assert_equal ['x02-g8', 'x2-y7', 'x02-y08', 'x8-y8'], ['x02-y08', 'x8-y8', 'x2-y7', 'x02-g8'].natural_sort
+      assert_equal %w(x02-g8 x2-y7 x02-y08 x8-y8), %w(x02-y08 x8-y8 x2-y7 x02-g8).natural_sort
     end
     
     def test_filename
-      assert_equal ["img1.png", "img2.png", "img10.png", "img12.png"], ["img12.png", "img10.png", "img2.png", "img1.png"].natural_sort
+      assert_equal %w(img1.png img2.png img10.png img12.png), %w(img12.png img10.png img2.png img1.png).natural_sort
     end
     
     def test_complex
-      assert_equal NaturalSort::ComplexSorted, NaturalSort::Complex.natural_sort
+      assert_equal TestHelper::ComplexSorted, TestHelper::ComplexUnsorted.natural_sort
     end
 end