naturalsort 1.1.0 → 1.1.1

data/History.txt

@@ -1,13 +1,18 @@
+== 1.1.1 / 2010-07-21
+* Fix typo error in some unit test
+* Remove copy/paste between naturalsort and natural_sort methods
+* Added samples in rdoc
+* Adding contribution from Sobe http://pastie.caboo.se/139803 (thanks mate)
+* Sort complex text list (see test_natural_sort_kernel.rb:107))
+* Fix more complex [string][number] pattern like:
+* ["x2-y08", "x2-g8", "x2-y7", "x8-y8"].natural_sort => ["x2-g8", "x2-y7", "x2-y08", "x8-y8"]
+* ["x02-y08", "x02-g8", "x2-y7", "x8-y8"].natural_sort => ["x02-g8", "x2-y7", "x02-y08", "x8-y8"]
+* Fix bug in Range ordering:
+* (1..21).natural_sort => [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21]
+
 == 1.1.0 / 2008-01-08
 * Improve documentation to get better google results
-* Remove alias methods: 
-** sort_natural
-** sort_alpha
-** alpha_sort
-** sort_alphabetical
-** alphabetical_sort
-** sort_alphanum
-** alphanum_sort
+* Remove alias methods: <tt>sort_natural, sort_alpha, alpha_sort, sort_alphabetical, alphabetical_sort, sort_alphanum, alphanum_sort</tt>
 
 == 1.0.1 / 2007-12-18
 

data/README.txt

@@ -1,6 +1,5 @@
 NaturalSort
-  by Benjamin Francisoud
-  http://benjamin.francisoud.googlepages.com
+http://naturalsort.rubyforge.org/
 
 == Description:
   
@@ -12,14 +11,17 @@ It's sometimes call:
 * alphanum sort
 
 Examples: 
-  ['a1', 'a11', 'a12', 'a2', 'a21'] => ['a1', 'a2', 'a11', 'a12','a21']
-  ['a', 'b', 'c', 'A', 'B', 'C']    => ['A', 'a', 'B', 'b', 'C', 'c']
-  ['x__2', 'x_1']                   => ['x_1', 'x__2']
+  ['a1', 'a11', 'a12', 'a2', 'a21']       => ['a1', 'a2', 'a11', 'a12','a21']
+  ['a', 'b', 'c', 'A', 'B', 'C']          => ['A', 'a', 'B', 'b', 'C', 'c']
+  ['x__2', 'x_1']                         => ['x_1', 'x__2']
+  ['x2-y08', 'x2-g8', 'x2-y7', 'x8-y8']   => ['x2-g8', 'x2-y7', 'x2-y08', 'x8-y8']
+* ['x02-y08', 'x02-g8', 'x2-y7', 'x8-y8'] => ['x02-g8', 'x2-y7', 'x02-y08', 'x8-y8']
 
 == Features:
   
 * sort case insensitive
 * sort filename matching pattern "abc1", "abc12", "abc2" in the correct order
+* sort filename matching pattern "a1b2"
 * sort underscore insensitive
 
 == Install:
@@ -45,7 +47,7 @@ Add natural sort methods to ruby default object (Array, Hash, etc...)
 == About
 
 * Rubyforge project page http://rubyforge.org/projects/naturalsort
-* Author: Benjamin Francisoud http://benjamin.francisoud.googlepages.com
+* Author: Benjamin Francisoud http://www.google.com/profiles/benjamin.francisoud
 
 == Related Links
 

data/lib/natural_sort.rb

@@ -7,7 +7,7 @@
 #     
 #     ['a', 'b', 'A', 'B'].natural_sort              #=> ['A', 'a', 'B', 'b']
 module NaturalSort
-  VERSION = '1.1.0'
+  VERSION = '1.1.1'
   
   # call-seq:
   #    NaturalSort::naturalsort(object)                     => array
@@ -19,7 +19,6 @@ module NaturalSort
   # 
   # <tt>object</tt> can by any object that has to_a method.
   def self.naturalsort(object)
-    # FIXME avoid copy/paste between naturalsort and natural_sort methods 
     sorted = object.to_a.sort do |a,b|
       sa, sb = a.to_s, b.to_s
       if ((sa.downcase <=> sb.downcase) == 0) then sa <=> sb
@@ -46,27 +45,30 @@ module NaturalSort
   # See <tt>natural_sort_kernel.rb</tt> to add natural sort methods to default ruby objects.
   # Enumerable , Array, Range, Set, Hash
   def natural_sort
-    sorted = to_a.sort do |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
+    NaturalSort::naturalsort(to_a)
   end
   
   private
   
   def self.check_regexp(sa, sb)
-    regexp = /(\D+)(\d+)/
-    ma, mb = regexp.match(sa), regexp.match(sb)
-    if (ma and mb)
-      l = [sa.size,sb.size].max
-      return format(ma, l), format(mb, l)
-    else 
-      return sa.downcase, sb.downcase
+    regexp = /(^|\D+)(\d+|(\D$))/
+    ma, mb = multireg(regexp,sa), multireg(regexp,sb)
+    it = 0
+    equal = 0
+    ret = ["",""]
+    numeric = /(\d+)/
+    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
   
   def check_regexp(sa, sb)
@@ -76,10 +78,25 @@ module NaturalSort
   # format([a, 1], 3) => a001
   # add leading zero
   def self.format(match_data, length)
-    match_data[1].gsub("_", "").downcase + ("%0#{length}d" % match_data[2])
+    match_data[1].gsub("_", "").downcase + ("%0#{length}d" % match_data[2].to_i)
   end
   
   def format(match_data, length)
     NaturalSort::format(match_data, length)
   end
+  
+  # return an array with
+  # rgpx  matchdata on str
+  def self.multireg rgpx, str
+    result = []
+    while rgpx.match str
+        result.push rgpx.match(str)
+        str = rgpx.match(str).post_match
+    end
+    result
+  end
+    
+  def multireg rgpx, str
+    NaturalSort::multireg(rgpx, str)
+  end
 end

data/test/test_natural_sort.rb

@@ -42,4 +42,14 @@ class TestNaturalSort < Test::Unit::TestCase
     obj = MyClass.new ['a1', 'a12', 'a11', 'a2', 'a10', 'a3', 'a21', 'a29']
     assert_equal ['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
+  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
+  end
 end

data/test/test_natural_sort_kernel.rb

@@ -24,7 +24,7 @@ class TestNaturalSortKernel < Test::Unit::TestCase
   end
   
   def test_range
-    expected = [1, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 2, 20, 21, 3, 4, 5, 6, 7, 8, 9]
+    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
   
@@ -85,18 +85,18 @@ class TestNaturalSortKernel < Test::Unit::TestCase
     
     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"
+      # 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 ['x2-g8', 'x2-y7', 'x2-y08', 'x8-y8'], ['x2-y08', 'x8-y8', 'x2-y7', 'x2-g8'].natural_sort, "TODO Not implemented"
+      assert_equal ['x2-g8', 'x2-y7', 'x2-y08', 'x8-y8'], ['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, "TODO Not implemented"
+      assert_equal ['x02-g8', 'x2-y7', 'x02-y08', 'x8-y8'], ['x02-y08', 'x8-y8', 'x2-y7', 'x02-g8'].natural_sort
     end
     
     def test_filename
@@ -104,6 +104,6 @@ class TestNaturalSortKernel < Test::Unit::TestCase
     end
     
     def test_complex
-      assert_equal NaturalSort::ComplexSorted, NaturalSort::Complex.natural_sort, "TODO Not implemented"
+      assert_equal NaturalSort::ComplexSorted, NaturalSort::Complex.natural_sort
     end
-end
+end

metadata

@@ -1,33 +1,77 @@
 --- !ruby/object:Gem::Specification 
-rubygems_version: 0.9.4
-specification_version: 1
 name: naturalsort
 version: !ruby/object:Gem::Version 
-  version: 1.1.0
-date: 2008-01-08 00:00:00 +01:00
-summary: NaturalSort is a small and simple library to implements a natural or human friendly alphabetical sort in ruby.
-require_paths: 
-- lib
-email: pub.cog@gmail.com
-homepage: "  by Benjamin Francisoud"
-rubyforge_project: naturalsort
-description: "Examples:  ['a1', 'a11', 'a12', 'a2', 'a21'] => ['a1', 'a2', 'a11', 'a12','a21'] ['a', 'b', 'c', 'A', 'B', 'C']    => ['A', 'a', 'B', 'b', 'C', 'c'] ['x__2', 'x_1']                   => ['x_1', 'x__2']  == Features:  * sort case insensitive * sort filename matching pattern \"abc1\", \"abc12\", \"abc2\" in the correct order * sort underscore insensitive  == Install:  * sudo gem install naturalsort"
-autorequire: 
-default_executable: 
-bindir: bin
-has_rdoc: true
-required_ruby_version: !ruby/object:Gem::Version::Requirement 
-  requirements: 
-  - - ">"
-    - !ruby/object:Gem::Version 
-      version: 0.0.0
-  version: 
+  prerelease: false
+  segments: 
+  - 1
+  - 1
+  - 1
+  version: 1.1.1
 platform: ruby
-signing_key: 
-cert_chain: 
-post_install_message: 
 authors: 
 - Benjamin Francisoud
+autorequire: 
+bindir: bin
+cert_chain: []
+
+date: 2010-07-21 00:00:00 +02:00
+default_executable: 
+dependencies: 
+- !ruby/object:Gem::Dependency 
+  name: rubyforge
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 2
+        - 0
+        - 4
+        version: 2.0.4
+  type: :development
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
+  name: hoe
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 2
+        - 6
+        - 0
+        version: 2.6.0
+  type: :development
+  version_requirements: *id002
+description: |-
+  Examples: 
+    ['a1', 'a11', 'a12', 'a2', 'a21']       => ['a1', 'a2', 'a11', 'a12','a21']
+    ['a', 'b', 'c', 'A', 'B', 'C']          => ['A', 'a', 'B', 'b', 'C', 'c']
+    ['x__2', 'x_1']                         => ['x_1', 'x__2']
+    ['x2-y08', 'x2-g8', 'x2-y7', 'x8-y8']   => ['x2-g8', 'x2-y7', 'x2-y08', 'x8-y8']
+  * ['x02-y08', 'x02-g8', 'x2-y7', 'x8-y8'] => ['x02-g8', 'x2-y7', 'x02-y08', 'x8-y8']
+  
+  == Features:
+    
+  * sort case insensitive
+  * sort filename matching pattern "abc1", "abc12", "abc2" in the correct order
+  * sort filename matching pattern "a1b2"
+  * sort underscore insensitive
+  
+  == Install:
+  
+  * sudo gem install naturalsort
+email: pub.cog@gmail.com
+executables: []
+
+extensions: []
+
+extra_rdoc_files: 
+- History.txt
+- Manifest.txt
+- README.txt
 files: 
 - History.txt
 - Manifest.txt
@@ -39,31 +83,39 @@ files:
 - test/test_natural_sort.rb
 - test/test_natural_sort_alone.rb
 - test/test_natural_sort_kernel.rb
-test_files: 
-- test/test_natural_sort_alone.rb
-- test/test_helper.rb
-- test/test_natural_sort.rb
-- test/test_natural_sort_kernel.rb
+has_rdoc: true
+homepage: http://naturalsort.rubyforge.org/
+licenses: []
+
+post_install_message: 
 rdoc_options: 
 - --main
 - README.txt
-extra_rdoc_files: 
-- History.txt
-- Manifest.txt
-- README.txt
-executables: []
-
-extensions: []
-
+require_paths: 
+- lib
+required_ruby_version: !ruby/object:Gem::Requirement 
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      segments: 
+      - 0
+      version: "0"
+required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      segments: 
+      - 0
+      version: "0"
 requirements: []
 
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  name: hoe
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Version::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: 1.3.0
-    version: 
+rubyforge_project: naturalsort
+rubygems_version: 1.3.6
+signing_key: 
+specification_version: 3
+summary: NaturalSort is a small and simple library to implements a natural or human friendly alphabetical sort in ruby.
+test_files: 
+- test/test_natural_sort_alone.rb
+- test/test_helper.rb
+- test/test_natural_sort_kernel.rb
+- test/test_natural_sort.rb