naturalsorter 0.3.5 → 0.3.6

data/README.markdown

@@ -14,6 +14,10 @@ Because the default sort method does not recognize the numbers in the string. Th
 
 `["init20", "init30", "init200"]`
 
+## Version Sorting
+This fork contains some special algorithms to sort version numbers in a natural order. This project is used at <https://www.versioneye.com> to show versions of selected open source projects. 
+
+
 ## API
 
 This GEM has 8 methods
@@ -49,7 +53,7 @@ Get newest.
 
 You should add this line to your Gemfile
 
-`gem 'naturalsorter', '0.3.5'`
+`gem 'naturalsorter', '0.3.6'`
 
 and run this command in your app root directory
 

data/lib/naturalsorter/version.rb

@@ -1,3 +1,3 @@
 module Naturalsorter
-  VERSION = "0.3.5"
+  VERSION = "0.3.6"
 end

data/naturalsorter.gemspec

@@ -5,9 +5,9 @@ require "naturalsorter/version"
 Gem::Specification.new do |s|
   s.name        = "naturalsorter"
   s.version     = Naturalsorter::VERSION
-  s.authors     = ["reiz"]
+  s.authors     = ["reiz", "versioneye"]
   s.email       = ["robert.reiz@gmx.com"]
-  s.homepage    = "https://github.com/reiz/naturalsorter"
+  s.homepage    = "https://github.com/versioneye/naturalsorter"
   s.summary     = %q{Sorting arrays in natural order}
   s.description = %q{This GEM is sorting Arrays in a natural order. a2 < a10}
 

metadata

@@ -1,19 +1,20 @@
 --- !ruby/object:Gem::Specification
 name: naturalsorter
 version: !ruby/object:Gem::Version
-  version: 0.3.5
+  version: 0.3.6
   prerelease: 
 platform: ruby
 authors:
 - reiz
+- versioneye
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-11 00:00:00.000000000 Z
+date: 2012-06-23 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &70123680874700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,12 +22,7 @@ dependencies:
         version: '2.6'
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '2.6'
+  version_requirements: *70123680874700
 description: This GEM is sorting Arrays in a natural order. a2 < a10
 email:
 - robert.reiz@gmx.com
@@ -38,7 +34,6 @@ files:
 - Gemfile
 - README.markdown
 - Rakefile
-- lib/#natcmp.rb#
 - lib/natcmp.rb
 - lib/naturalsorter.rb
 - lib/naturalsorter/version.rb
@@ -46,7 +41,7 @@ files:
 - naturalsorter.gemspec
 - spec/naturalsorter_spec.rb
 - spec/versioncmp_spec.rb
-homepage: https://github.com/reiz/naturalsorter
+homepage: https://github.com/versioneye/naturalsorter
 licenses: []
 post_install_message: 
 rdoc_options: []
@@ -66,7 +61,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: naturalsorter
-rubygems_version: 1.8.24
+rubygems_version: 1.8.17
 signing_key: 
 specification_version: 3
 summary: Sorting arrays in natural order

data/lib/#natcmp.rb#

@@ -1,76 +0,0 @@
-# natcmp.rb
-#
-# Natural order comparison of two strings
-# e.g. "my_prog_v1.1.0" < "my_prog_v1.2.0" < "my_prog_v1.10.0"
-# which does not follow alphabetically
-#
-# Based on Martin Pool's "Natural Order String Comparison" originally written in C
-# http://sourcefrog.net/projects/natsort/
-#
-# This implementation is Copyright (C) 2003 by Alan Davies
-# <cs96and_AT_yahoo_DOT_co_DOT_uk>
-#
-# This software is provided 'as-is', without any express or implied
-# warranty.  In no event will the authors be held liable for any damages
-# arising from the use of this software.
-#
-# Permission is granted to anyone to use this software for any purpose,
-# including commercial applications, and to alter it and redistribute it
-# freely, subject to the following restrictions:
-#
-# 1. The origin of this software must not be misrepresented; you must not
-#    claim that you wrote the original software. If you use this software
-#    in a product, an acknowledgment in the product documentation would be
-#    appreciated but is not required.
-# 2. Altered source versions must be plainly marked as such, and must not be
-#    misrepresented as being the original software.
-# 3. This notice may not be removed or altered from any source distribution.
-
-class Natcmp
-
-# 'Natural order' comparison of two strings
-def self.natcmp(str1, str2, caseInsensitive=false)
-	str1, str2 = str1.dup, str2.dup
-	compareExpression = /^(\D*)(\d*)(.*)$/
-
-	if caseInsensitive
-		str1.downcase!
-		str2.downcase!
-	end
-
-	# Remove all whitespace
-	str1.gsub!(/\s*/, '')
-	str2.gsub!(/\s*/, '')
-
-	while (str1.length > 0) or (str2.length > 0) do
-		# Extract non-digits, digits and rest of string
-		str1 =~ compareExpression
-		chars1, num1, str1 = $1.dup, $2.dup, $3.dup
-
-		str2 =~ compareExpression
-		chars2, num2, str2 = $1.dup, $2.dup, $3.dup
-
-		# Compare the non-digits
-		case (chars1 <=> chars2)
-			when 0 # Non-digits are the same, compare the digits...
-				# If either number begins with a zero, then compare alphabetically,
-				# otherwise compare numerically
-				if (num1[0] != 48) and (num2[0] != 48)
-					num1, num2 = num1.to_i, num2.to_i
-				end
-
-				case (num1 <=> num2)
-					when -1 then return -1
-					when 1 then return 1
-				end
-			when -1 then return -1
-			when 1 then return 1
-		end # case
-
-	end # while
-
-	# Strings are naturally equal
-	return 0
-end
-
-end