naturalsorter 0.2.2 → 0.2.3

data/lib/naturalsorter/version.rb

@@ -1,3 +1,3 @@
 module Naturalsorter
-  VERSION = "0.2.2"
+  VERSION = "0.2.3"
 end

data/lib/versioncmp.rb

@@ -37,10 +37,21 @@ class Versioncmp
       part1 = Versioncmp.getAPiece(offset1, a);
       part2 = Versioncmp.getAPiece(offset2, b);  
       
+      if part1.length() == 8 && part1.match(/^[0-9]+$/) != nil && part2.length() < 8
+        return -1
+      end
+      if part2.length() == 8 && part2.match(/^[0-9]+$/) != nil && part1.length() < 8
+        return 1
+      end
+      
       offset1 += part1.length() + 1;
       offset2 += part2.length() + 1;
 
       if ( part1.match(/^[0-9]+$/) != nil && part2.match(/^[0-9]+$/) != nil )
+        
+        
+        
+        
         ai = part1.to_i;
         bi = part2.to_i;
         result = Versioncmp.compareInt(ai, bi);

data/spec/naturalsorter_spec.rb

@@ -64,6 +64,10 @@ describe Naturalsorter::Sorter do
     it "1.2, 1.1 is 1.1, 1.2" do
       Naturalsorter::Sorter.sort_version_desc(["0.4", "0.1", "1.1", "1.1.1", "1.2", "1.2.1", "1.0", "1.0.RC1"]).should eql(["1.2.1", "1.2", "1.1.1", "1.1", "1.0", "1.0.RC1", "0.4", "0.1"])
     end
+    
+    it "sorts this to the end 20040121.140929" do
+      Naturalsorter::Sorter.sort_version_desc(["0.4", "0.1", "20040121.140929", "1.1.1", "1.2", "1.2.1", "1.0", "1.0.RC1"]).should eql(["1.2.1", "1.2", "1.1.1", "1.0", "1.0.RC1", "0.4", "0.1", "20040121.140929"])
+    end
 
     it "1.2, 1.1 is 1.1, 1.2" do
       Naturalsorter::Sorter.sort_version(["1.1", "1.2", "1.0"]).should eql(["1.0", "1.1", "1.2"])

data/spec/versioncmp_spec.rb

@@ -45,5 +45,13 @@ describe Versioncmp do
   it "bigger RC than 1.0" do
     Versioncmp.compare("1.1.RC1", "1.1").should eql(-1)
   end
+  
+  it "20040121.140929 is smaller than 1.1" do 
+    Versioncmp.compare("20040121.140929", "1.1").should eql(-1)
+  end
+  
+  it "1.1 is bigger than 20040121.140929" do 
+    Versioncmp.compare("1.1", "20040121.140929").should eql(1)
+  end
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: naturalsorter
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.3
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2012-04-06 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70101287446020 !ruby/object:Gem::Requirement
+  requirement: &70338427796540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,7 +21,7 @@ dependencies:
         version: '2.6'
   type: :development
   prerelease: false
-  version_requirements: *70101287446020
+  version_requirements: *70338427796540
 description: This GEM is sorting Arrays in a natural order. a2 < a10
 email:
 - robert.reiz@gmx.com