naturalsort 1.0.1 → 1.1.0

data/History.txt

@@ -1,3 +1,14 @@
+== 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
+
 == 1.0.1 / 2007-12-18
 
 * Fix problem using as a static method

data/README.txt

@@ -1,10 +1,15 @@
 NaturalSort
-  http://rubyforge.org/projects/naturalsort
-  by Benjamin Francisoud http://benjamin.francisoud.googlepages.com
+  by Benjamin Francisoud
+  http://benjamin.francisoud.googlepages.com
 
 == Description:
   
 NaturalSort is a small and simple library to implements a natural or human alphabetical sort in ruby.
+It's sometimes call: 
+* natural sort
+* alpha sort
+* alphabetical sort
+* alphanum sort
 
 Examples: 
   ['a1', 'a11', 'a12', 'a2', 'a21'] => ['a1', 'a2', 'a11', 'a12','a21']
@@ -17,6 +22,10 @@ Examples:
 * sort filename matching pattern "abc1", "abc12", "abc2" in the correct order
 * sort underscore insensitive
 
+== Install:
+
+* sudo gem install naturalsort
+
 == Synopsis:
 
 === Usage N�1 - Add to your ruby default objects
@@ -24,12 +33,8 @@ Add natural sort methods to ruby default object (Array, Hash, etc...)
 
   require 'natural_sort_kernel'
   
-  sorted = ['a', 'b', 'c', 'd', 'A', 'B', 'C', 'D'].alphanum_sort
-  sorted = ['a', 'b', 'c', 'd', 'A', 'B', 'C', 'D'].alpha_sort
   sorted = ['a', 'b', 'c', 'd', 'A', 'B', 'C', 'D'].natural_sort
-  sorted = ['a', 'b', 'c', 'd', 'A', 'B', 'C', 'D'].sort_natural
   ...
-Pick your favorite method name: NaturalSort
 
 === Usage N�2  - Use only one method
 
@@ -37,9 +42,10 @@ Pick your favorite method name: NaturalSort
   
   sorted = NaturalSort::naturalsort ['a', 'b', 'c', 'd', 'A', 'B', 'C', 'D']
 
-== Install:
+== About
 
-* sudo gem install naturalsort
+* Rubyforge project page http://rubyforge.org/projects/naturalsort
+* Author: Benjamin Francisoud http://benjamin.francisoud.googlepages.com
 
 == Related Links
 

data/Rakefile

@@ -18,13 +18,11 @@ 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

data/lib/natural_sort.rb

@@ -7,7 +7,7 @@
 #     
 #     ['a', 'b', 'A', 'B'].natural_sort              #=> ['A', 'a', 'B', 'b']
 module NaturalSort
-  VERSION = '1.0.1'
+  VERSION = '1.1.0'
   
   # call-seq:
   #    NaturalSort::naturalsort(object)                     => array
@@ -56,14 +56,6 @@ module NaturalSort
     end
   end
   
-  alias sort_natural natural_sort
-  alias sort_alpha natural_sort
-  alias alpha_sort natural_sort
-  alias sort_alphabetical natural_sort
-  alias alphabetical_sort natural_sort
-  alias sort_alphanum natural_sort
-  alias alphanum_sort natural_sort
-  
   private
   
   def self.check_regexp(sa, sb)
@@ -90,4 +82,4 @@ module NaturalSort
   def format(match_data, length)
     NaturalSort::format(match_data, length)
   end
-end
+end

data/test/test_natural_sort.rb

@@ -28,14 +28,6 @@ class TestNaturalSort < Test::Unit::TestCase
     @obj = MyClass.new
   end
   
-  def test_alias
-    assert_equal BaseSorted, (@obj.sort_natural)
-    assert_equal BaseSorted, (@obj.sort_alpha)
-    assert_equal BaseSorted, (@obj.alpha_sort)
-    assert_equal BaseSorted, (@obj.sort_alphabetical)
-    assert_equal BaseSorted, (@obj.alphabetical_sort)
-  end
-  
   def test_case_sensitive
     sorted = @obj.natural_sort
     assert_equal BaseSorted, sorted

data/test/test_natural_sort_kernel.rb

@@ -16,30 +16,28 @@ class TestNaturalSortKernel < Test::Unit::TestCase
   
   def test_enum
     enum = TestEnum.new
-    assert_equal NaturalSort::BaseSorted, enum.alphanum_sort
+    assert_equal NaturalSort::BaseSorted, enum.natural_sort
   end
   
   def test_array
-    assert_equal NaturalSort::BaseSorted, NaturalSort::Base.alphanum_sort
-    assert_equal NaturalSort::BaseSorted, NaturalSort::Base.alpha_sort
-    assert_equal NaturalSort::BaseSorted, NaturalSort::Base.sort_natural
+    assert_equal NaturalSort::BaseSorted, NaturalSort::Base.natural_sort
   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]
-    assert_equal expected, (1..21).alphanum_sort
+    assert_equal expected, (1..21).natural_sort
   end
   
   def test_set
     set = Set.new NaturalSort::Base
-    assert_equal NaturalSort::BaseSorted, set.alphanum_sort
+    assert_equal NaturalSort::BaseSorted, 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.alphanum_sort
+    assert_equal expected, hash.natural_sort
   end
   
     def test_identical_simple

metadata

@@ -3,15 +3,15 @@ rubygems_version: 0.9.4
 specification_version: 1
 name: naturalsort
 version: !ruby/object:Gem::Version 
-  version: 1.0.1
-date: 2007-12-18 00:00:00 +01:00
+  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: "  http://rubyforge.org/projects/naturalsort"
+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  == Synopsis:  === Usage N\xB01 - Add to your ruby default objects Add natural sort methods to ruby default object (Array, Hash, etc...)"
+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