naturalsorter 0.3.4 → 0.3.5

data/README.markdown

@@ -49,7 +49,7 @@ Get newest.
 
 You should add this line to your Gemfile
 
-`gem 'naturalsorter', '0.3.1'`
+`gem 'naturalsorter', '0.3.5'`
 
 and run this command in your app root directory
 

data/lib/#natcmp.rb#

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

data/lib/naturalsorter/version.rb

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

data/lib/versioncmp.rb

@@ -28,6 +28,18 @@ class Versioncmp
   # 'Natural version order' comparison of two version strings
   def self.compare(a, b)
 
+    if (!a.nil? || a.eql?("") ) && b.nil?
+      return 1
+    end
+
+    if (!b.nil? || b.eql?("")) && a.nil?
+      return -1
+    end  
+
+    if a.nil? && b.nil? 
+      return -1
+    end
+
 	  offset1 = 0;
     offset2 = 0;
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: naturalsorter
 version: !ruby/object:Gem::Version
-  version: 0.3.4
+  version: 0.3.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-14 00:00:00.000000000Z
+date: 2012-06-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70353255258340 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,7 +21,12 @@ dependencies:
         version: '2.6'
   type: :development
   prerelease: false
-  version_requirements: *70353255258340
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '2.6'
 description: This GEM is sorting Arrays in a natural order. a2 < a10
 email:
 - robert.reiz@gmx.com
@@ -33,6 +38,7 @@ files:
 - Gemfile
 - README.markdown
 - Rakefile
+- lib/#natcmp.rb#
 - lib/natcmp.rb
 - lib/naturalsorter.rb
 - lib/naturalsorter/version.rb
@@ -60,7 +66,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: naturalsorter
-rubygems_version: 1.8.17
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Sorting arrays in natural order