naturalsort 1.0.0 → 1.0.1

data/History.txt

@@ -1,3 +1,8 @@
+== 1.0.1 / 2007-12-18
+
+* Fix problem using as a static method
+* Refactoring code
+
 == 1.0.0 / 2007-12-14
 
 * Project creation

data/Manifest.txt

@@ -6,4 +6,5 @@ lib/natural_sort.rb
 lib/natural_sort_kernel.rb
 test/test_helper.rb
 test/test_natural_sort.rb
+test/test_natural_sort_alone.rb
 test/test_natural_sort_kernel.rb

data/README.txt

@@ -1,6 +1,6 @@
 NaturalSort
-* Rubyforge Project http://rubyforge.org/projects/naturalsort
-* by Benjamin Francisoud http://benjamin.francisoud.googlepages.com
+  http://rubyforge.org/projects/naturalsort
+  by Benjamin Francisoud http://benjamin.francisoud.googlepages.com
 
 == Description:
   
@@ -39,7 +39,7 @@ Pick your favorite method name: NaturalSort
 
 == Install:
 
-* sudo gem install natural_sort
+* sudo gem install naturalsort
 
 == Related Links
 
@@ -51,7 +51,7 @@ Links related to the alphabetical sorting problem:
 * http://www.davekoelle.com/alphanum.html
 * http://rikkus.info/arch/sensible_sort.rb
 * http://weblog.masukomi.org/2007/12/10/alphabetical-asciibetical
-* http://nedbatchelder.com/blog/200712.html
+* http://nedbatchelder.com/blog/200712.html#e20071211T054956
 
 == License:
 

data/Rakefile

@@ -16,4 +16,17 @@ Hoe.new('naturalsort', NaturalSort::VERSION) do |p|
   p.need_zip = true
 end
 
+SVN = 'svn+ssh://cogito@rubyforge.org/var/svn/naturalsort'
+
+# FIXME
+task :svn_branch => [:clean] do
+  `svn delete #{SVN}/branches/1.X -m "cleanup branch"`
+  `svn copy #{SVN}/trunk #{SVN}/branches/1.X -m "create branch"`
+end
+
+# FIXME
+task :svn_tag do
+  `svn copy #{SVN}/trunk #{SVN}/tags/#{NaturalSort::VERSION} -m "create tag"`
+end
+
 # vim: syntax=Ruby

data/lib/natural_sort.rb

@@ -7,7 +7,7 @@
 #     
 #     ['a', 'b', 'A', 'B'].natural_sort              #=> ['A', 'a', 'B', 'b']
 module NaturalSort
-  VERSION = '1.0.0'
+  VERSION = '1.0.1'
   
   # call-seq:
   #    NaturalSort::naturalsort(object)                     => array
@@ -15,11 +15,19 @@ module NaturalSort
   # Static method to sort.
   # 
   # *Usage*
-  #     naturalsort ['a1', 'a12', 'a2']         #=> ['a1', 'a2', 'a12']
+  #     NaturalSort::naturalsort ['a1', 'a12', 'a2']     #=> ['a1', 'a2', 'a12']
   # 
-  # <tt>object</tt> can by any object that has to_a and sort methods.
+  # <tt>object</tt> can by any object that has to_a method.
   def self.naturalsort(object)
-    object.natural_sort
+    # 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
+      else
+        na, nb = check_regexp(sa, sb)
+        na <=> nb
+      end
+    end
   end
   
   # call-seq:
@@ -40,18 +48,10 @@ module NaturalSort
   def natural_sort
     sorted = to_a.sort do |a,b|
       sa, sb = a.to_s, b.to_s
-      if ((sa.downcase <=> sb.downcase) == 0)
-        sa <=> sb
+      if ((sa.downcase <=> sb.downcase) == 0) then sa <=> sb
       else
-        regexp = /(\D+)(\d+)/
-        ma, mb = regexp.match(sa), regexp.match(sb)
-        if (ma and mb)
-          l = [sa.size,sb.size].max
-          na, nb = format(ma, l), format(mb, l)
-          na <=> nb
-        else
-          sa.downcase <=> sb.downcase
-        end
+        na, nb = check_regexp(sa, sb)
+        na <=> nb
       end
     end
   end
@@ -65,9 +65,29 @@ module NaturalSort
   alias alphanum_sort natural_sort
   
   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
+    end
+  end
+  
+  def check_regexp(sa, sb)
+    NaturalSort::check_regexp(sa, sb)
+  end
+  
   # format([a, 1], 3) => a001
   # add leading zero
-  def format(match_data, length)
+  def self.format(match_data, length)
     match_data[1].gsub("_", "").downcase + ("%0#{length}d" % match_data[2])
   end
+  
+  def format(match_data, length)
+    NaturalSort::format(match_data, length)
+  end
 end

data/test/test_helper.rb

@@ -3,4 +3,27 @@ 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

data/test/test_natural_sort_alone.rb

@@ -0,0 +1,9 @@
+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)
+  end
+end

data/test/test_natural_sort_kernel.rb

@@ -84,4 +84,28 @@ class TestNaturalSortKernel < Test::Unit::TestCase
         ['hello world', 'hello world 2', 'hello 2 world'].natural_sort
       )
     end
+    
+    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"
+    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"
+    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"
+    end
+    
+    def test_filename
+      assert_equal ["img1.png", "img2.png", "img10.png", "img12.png"], ["img12.png", "img10.png", "img2.png", "img1.png"].natural_sort
+    end
+    
+    def test_complex
+      assert_equal NaturalSort::ComplexSorted, NaturalSort::Complex.natural_sort, "TODO Not implemented"
+    end
 end

metadata

@@ -3,13 +3,13 @@ rubygems_version: 0.9.4
 specification_version: 1
 name: naturalsort
 version: !ruby/object:Gem::Version 
-  version: 1.0.0
-date: 2007-12-17 00:00:00 +01:00
+  version: 1.0.1
+date: 2007-12-18 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: "* Rubyforge Project http://rubyforge.org/projects/naturalsort"
+homepage: "  http://rubyforge.org/projects/naturalsort"
 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  == Synopsis:  === Usage N\xB01 - Add to your ruby default objects Add natural sort methods to ruby default object (Array, Hash, etc...)"
 autorequire: 
@@ -37,8 +37,10 @@ files:
 - lib/natural_sort_kernel.rb
 - test/test_helper.rb
 - 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