naturalsort 1.2.0 → 1.3.0

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    YzVkY2U1YzA2YjJkMDNjNGNmNGZlMjM4NTBkZGU0MjY0OWMxMzE5OA==
-  data.tar.gz: !binary |-
-    NWQzNzM1ODExZmQ5MDkzYzVkODZlZWQ5N2FiNjhmNDU5N2I2Yjc3Yg==
+SHA256:
+  metadata.gz: 587a1c0cf0b42077845643ce2ad013bead1f21bb57418446bf222195385dab37
+  data.tar.gz: 9cc750189f4fc09d05e2c660fa1e6cfc25a4c098d5c9517880766e72e3e9b1a3
 SHA512:
-  metadata.gz: !binary |-
-    MDNhMTkyNWRiMGY0MGUwMzA2MDc5Yjg0ZjRmZTUzZWRiMzEzMjcyYmNmYzQ3
-    YWI0MGU1ODYzNDhmOTIzMDc0N2E3YWFlNDZiNDIxMmYyYjI0MTc2YmNjMWU0
-    ZWQzMDMzMjA5YzkxOGI1NmI1YjY4ZTExZDQ3MDg1Mzg4MjU3NzI=
-  data.tar.gz: !binary |-
-    MWFmMmNhZmIxZjY2ZGNhODVkOTZiMzU2Y2I4NGM4NmVmNjM4ZGM5OTQ0ZDY3
-    Zjg1YTZlZmIxMWJjNjM3YTBhMTkxYWUwMzMxOGIzZTg3ZjJjNTdjNzAxYjUy
-    ZWY1MWM4OTExNzFiOTJlMzJhOWQyZDQ3ZTIzYmMwNTgzZTQzZjY=
+  metadata.gz: c24a24d6dac5e791157df9c868aebcfd1b8134480b197bd66a14536c9d14a2ae5174d22852346ab1c2c8c5938ace451913fc5c37d7c7af4b5ed613db1f740292
+  data.tar.gz: 0fb932df47946a2799e3defaeae455ffcf72dcc08b66f6589dbcb62c0b656b6990c822b4d05f0014853f0d2a642f31469172d506951053ec8b030570230ec604

data/CHANGELOG.md

@@ -1,5 +1,12 @@
 # Changelog
 
+## 1.3.0 - 2024-10-20
+
+* Remove `NaturalSort::Kernel` module.
+* Drop support for Ruby 2.7 and prior.
+* Add Github Actions and remove Travis CI.
+* Fixes issue where blank string breaks sorting.
+
 ## 1.2.0 - 2013-10-10
 
 * DEPRECATION: deprecate `NaturalSort.naturalsort` and replace with `NaturalSort.sort`

data/README.md

@@ -1,24 +1,15 @@
 # NaturalSort
 
-[![Build Status](https://secure.travis-ci.org/johnnyshields/naturalsort.png?branch=master)](http://travis-ci.org/johnnyshields/naturalsort)
-[![Code Climate](https://codeclimate.com/github/johnnyshields/naturalsort.png)](https://codeclimate.com/github/johnnyshields/naturalsort)
-
 NaturalSort is a simple library which implements a natural, human-friendly alphanumeric sort in Ruby.
 
-#### Fork from RubyForge-hosted NaturalSort gem
-
-This Github repo `johnyshields/naturalsort` is an update of the Benjamin Francisoud's original NaturalSort gem,
-hosted on RubyForge at http://rubyforge.org/projects/naturalsort. It has been forked from version 1.1.1
-which was released on 2010-07-21. The first new release from this Github repo is version 1.2.0.
-
 ## Examples
 
 ```ruby
-   %w(a1 a11 a12 a2 a21).natural_sort  #=>  %w(a1 a2 a11 a12 a21)
-   %w(a b c A B C).natural_sort        #=>  %w(A a B b C c)
-   %w(x__2 x_1).natural_sort           #=>  %w(x_1 x__2)
-   %w(x2-y08 x2-g8 x2-y7 x8-y8).natural_sort    #=>  %w(x2-g8 x2-y7 x2-y08 x8-y8)
-   %w(x02-y08 x02-g8 x2-y7 x8-y8).natural_sort  #=>  %w(x02-g8 x2-y7 x02-y08 x8-y8)
+   %w[a1 a11 a12 a2 a21].natural_sort #=> %w[a1 a2 a11 a12 a21]
+   %w[a b c A B C].natural_sort       #=> %w[A a B b C c]
+   %w[x__2 x_1].natural_sort          #=> %w[x_1 x__2]
+   %w[x2-y08 x2-g8 x2-y7 x8-y8].natural_sort   #=> %w[x2-g8 x2-y7 x2-y08 x8-y8]
+   %w[x02-y08 x02-g8 x2-y7 x8-y8].natural_sort #=> %w[x02-g8 x2-y7 x02-y08 x8-y8]
 ```
 
 ## Features
@@ -41,7 +32,7 @@ gem 'naturalsort'
 or to optionally extend Ruby native objects:
 
 ```ruby
-gem 'naturalsort', :require => 'natural_sort_kernel'
+gem 'naturalsort', require: 'natural_sort_kernel'
 ```
 
 #### From Command Line
@@ -59,7 +50,7 @@ $ gem install naturalsort
 ```ruby
    require 'natural_sort_kernel'
 
-   sorted = %w(a b c A B C).natural_sort
+   %w[a b c A B C].natural_sort
 ```
 
 #### Use as a module function
@@ -67,7 +58,7 @@ $ gem install naturalsort
 ```ruby
    require 'natural_sort'  # unless using Bundler
 
-   sorted = NaturalSort.sort %w(a b c d A B C D)
+   NaturalSort.sort %w[a b c d A B C D]
 ```
 
 #### Use comparator function as a standalone
@@ -81,7 +72,7 @@ Adds `natural_sort` methods to Ruby native enumerable objects (Array, Hash, etc.
 
    [person_1, person_2, person_3].sort{|a,b| NaturalSort.comparator(a.name, b.name)}  #=> [person_3, person_2, person_1]
 
-   sorted = %w(a b c A B C).natural_sort
+   %w[a b c A B C].natural_sort
 ```
 
 #### Include into your own objects
@@ -98,7 +89,7 @@ Can be used to add `#natural_sort` method to on any enumerable object or any obj
    todo_list << 'Water plants'
    todo_list << 'Feed dog'
 
-   todo_list.natural_sort  #=> ['Feed dog', 'Wash car', 'Water plants']
+   todo_list.natural_sort #=> ['Feed dog', 'Wash car', 'Water plants']
 ```
 
 ## Authors

data/lib/natural_sort/base.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Public: The public interface for NaturalSort module
 # For method descriptions refer to NaturalSort::Engine
 #

data/lib/natural_sort/engine.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Internal: Singleton module which sorts elements in a natural,
 # human-friendly alphanumeric order.
 module NaturalSort::Engine
@@ -51,7 +53,7 @@ module NaturalSort::Engine
       ma, mb = multireg(REGEXP,sa), multireg(REGEXP,sb)
       it = 0
       equal = 0
-      ret = ['', '']
+      ret = [sa, sb]
       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

data/lib/natural_sort/kernel.rb

@@ -1,11 +1,4 @@
-# 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
+# frozen_string_literal: true
 
 module Enumerable
   # Add #natural_sort method to Enumerable module.

data/lib/natural_sort/version.rb

@@ -1,5 +1,7 @@
+# frozen_string_literal: true
+
 module NaturalSort
   module Version
-    VERSION = '1.2.0'
+    VERSION = '1.3.0'
   end
 end

data/lib/natural_sort.rb

@@ -1,4 +1,6 @@
+# frozen_string_literal: true
 
+require 'forwardable'
 require 'natural_sort/version'
 require 'natural_sort/engine'
 require 'natural_sort/base'

data/lib/natural_sort_kernel.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 
 require 'natural_sort'
 require 'natural_sort/kernel'

metadata

@@ -1,96 +1,81 @@
 --- !ruby/object:Gem::Specification
 name: naturalsort
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.3.0
 platform: ruby
 authors:
-- Benjamin Francisoud
-autorequire: 
+- Johnny Shields
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2015-01-26 00:00:00.000000000 Z
+date: 2024-10-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: ! '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)'
-email:
-- pub.cog@gmail.com
+description: '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]'
+email: info@tablecheck.com
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .travis.yml
 - CHANGELOG.md
-- Gemfile
 - LICENSE
 - README.md
-- Rakefile
 - lib/natural_sort.rb
 - lib/natural_sort/base.rb
 - lib/natural_sort/engine.rb
 - lib/natural_sort/kernel.rb
 - lib/natural_sort/version.rb
 - lib/natural_sort_kernel.rb
-- naturalsort.gemspec
-- test/test_helper.rb
-- test/test_natural_sort.rb
-- test/test_natural_sort_alone.rb
-- test/test_natural_sort_kernel.rb
-homepage: http://rubyforge.org/projects/naturalsort/
+homepage: https://github.com/johnnyshields/naturalsort
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.4.5
-signing_key: 
+rubygems_version: 3.5.11
+signing_key:
 specification_version: 4
 summary: NaturalSort is a simple library which implements a natural, human-friendly
   alphanumeric sort in Ruby
-test_files:
-- test/test_helper.rb
-- test/test_natural_sort.rb
-- test/test_natural_sort_alone.rb
-- test/test_natural_sort_kernel.rb
+test_files: []

data/.gitignore

@@ -1,18 +0,0 @@
-Gemfile.lock
-*.gem
-*.rbc
-.bundle
-.config
-.yardoc
-InstalledFiles
-_yardoc
-coverage
-doc/
-lib/bundler/man
-pkg
-rdoc
-spec/reports
-test/tmp
-test/version_tmp
-tmp
-.idea

data/.travis.yml

@@ -1,8 +0,0 @@
-language: ruby
-rvm:
-  - 1.8.7
-  - 1.9.2
-  - 1.9.3
-  - 2.0.0
-  - ruby-head
-  - rbx-19mode

data/Gemfile

@@ -1,3 +0,0 @@
-source 'https://rubygems.org'
-
-gemspec

data/Rakefile

@@ -1,13 +0,0 @@
-#!/usr/bin/env rake
-# -*- mode: ruby -*-
-
-require 'rubygems'
-require './lib/natural_sort.rb'
-require 'rake/testtask'
-
-task :default => :test
-
-Rake::TestTask.new do |t|
-  t.libs << 'test'
-  t.test_files = FileList['test/**/test_*.rb']
-end

data/naturalsort.gemspec

@@ -1,22 +0,0 @@
-# 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,36 +0,0 @@
-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

@@ -1,55 +0,0 @@
-require File.dirname(__FILE__) + '/test_helper.rb'
-require File.dirname(__FILE__) + '/../lib/natural_sort.rb'
-
-class MyClass
-  include NaturalSort
-  
-  def initialize(array = TestHelper::SimpleUnsorted)
-    @array = array
-  end
-  
-  def to_a
-    @array
-  end
-end
-
-# Test without include
-class TestNaturalSortSelf < Minitest::Test
-  def test_self
-    assert_equal TestHelper::SimpleSorted, NaturalSort.sort(TestHelper::SimpleUnsorted)
-  end
-end
-
-# Test using include
-class TestNaturalSort < Minitest::Test
-  include NaturalSort
-  
-  def setup
-    @obj = MyClass.new
-  end
-  
-  def test_case_sensitive
-    sorted = @obj.natural_sort
-    assert_equal TestHelper::SimpleSorted, sorted
-  end
-  
-  def test_mixed
-    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 %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 %w(aaa2 aaa3 aaa4 aaa)
-    assert_equal %w(aaa aaa2 aaa3 aaa4), obj.natural_sort
-  end
-
-  def test_number_leading_zero
-    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

@@ -1,17 +0,0 @@
-require File.dirname(__FILE__) + '/test_helper.rb'
-require File.dirname(__FILE__) + '/../lib/natural_sort.rb'
-
-# Test without include
-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

@@ -1,110 +0,0 @@
-require File.dirname(__FILE__) + '/test_helper.rb'
-require File.dirname(__FILE__) + '/../lib/natural_sort_kernel.rb'
-
-class TestEnum
-  include Enumerable
-  def to_a
-    TestHelper::SimpleUnsorted
-  end
-end
-
-class TestNaturalSortKernel < Minitest::Test
-  
-  def test_empty
-    assert_equal(['', ''], ['', ''].natural_sort)
-  end
-  
-  def test_enum
-    enum = TestEnum.new
-    assert_equal TestHelper::SimpleSorted, enum.natural_sort
-  end
-  
-  def test_array
-    assert_equal TestHelper::SimpleSorted, TestHelper::SimpleUnsorted.natural_sort
-  end
-  
-  def test_range
-    expected = [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21]
-    assert_equal expected, (1..21).natural_sort
-  end
-  
-  def test_set
-    set = Set.new TestHelper::SimpleUnsorted
-    assert_equal TestHelper::SimpleSorted, set.natural_sort
-  end
-  
-  def test_hash
-    expected = [["A", "value"], ["a", "value"], ["B", "value"], ["b", "value"],
-                ["C", "value"], ["c", "value"], ["D", "value"], ["d", "value"]]
-    hash = { "a" => "value", "b" => "value", "c" => "value", "d" => "value", "A" => "value", "B" => "value", "C" => "value", "D" => "value" }
-    assert_equal expected, hash.natural_sort
-  end
-  
-    def test_identical_simple
-      assert_equal(%w(x x), %w(x x).natural_sort)
-    end
-
-    def test_identical_two_groups
-      assert_equal(%w(x1 x1), %w(x1 x1).natural_sort)
-    end
-
-    def test_ordered_simple
-      assert_equal(%w(x y), %w(x y).natural_sort)
-    end
-
-    def test_ordered_simple_start_backwards
-      assert_equal(%w(x y), %w(y x).natural_sort)
-    end
-
-    def test_ordered_two_groups
-      assert_equal(%w(x1 x2), %w(x1 x2).natural_sort)
-    end
-
-    def test_ordered_two_groups_start_backwards
-      assert_equal(%w(x1 x2), %w(x2 x1).natural_sort)
-    end
-
-    def test_ordered_two_groups_separated
-      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(%w(x_1 x__2), %w(x__2 x_1).natural_sort)
-    end
-
-    def test_ordered_two_groups_separated_different_distances_swapped
-      assert_equal(%w(x__1 x_2), %w(x_2 x__1).natural_sort)
-    end
-
-    def test_three_groups
-      assert_equal(
-        ['hello 2 world', 'hello world', 'hello world 2'],
-        ['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"
-    end
-    
-    def test_multiple_string_number
-      # x2-g8 < x2-y7 < x2-y08 < x8-y8
-      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 %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 %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 TestHelper::ComplexSorted, TestHelper::ComplexUnsorted.natural_sort
-    end
-end