naturalsorter 0.2.1 → 0.2.2

data/README.markdown

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

data/lib/naturalsorter/version.rb

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

data/lib/versioncmp.rb

@@ -35,8 +35,7 @@ class Versioncmp
       break if offset1 >= a.length() || offset2 >= b.length() 
 
       part1 = Versioncmp.getAPiece(offset1, a);
-      part2 = Versioncmp.getAPiece(offset2, b);
-      
+      part2 = Versioncmp.getAPiece(offset2, b);  
       
       offset1 += part1.length() + 1;
       offset2 += part2.length() + 1;
@@ -95,7 +94,9 @@ class Versioncmp
         return Versioncmp.getRcValue(a, b)
       end
     end
-    return Versioncmp.compareString(big, small);
+    return 1 if a.length > b.length
+    return -1 if a.length < b.length
+    return 0
   end
   
   def self.isRc(a)

data/spec/naturalsorter_spec.rb

@@ -60,6 +60,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.2", "1.0", "1.0.RC1"]).should eql(["1.2", "1.1", "1.0", "1.0.RC1", "0.4", "0.1"])
     end
+    
+    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 "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

@@ -10,6 +10,14 @@ describe Versioncmp do
     Versioncmp.compare("1.1", "1.0").should eql(1)
   end
   
+  it "1.1.1 is bigger than 1.1" do
+    Versioncmp.compare("1.1.1", "1.1").should eql(1)
+  end
+  
+  it "1.1 is smaller than 1.1.1" do
+    Versioncmp.compare("1.1", "1.1.1").should eql(-1)
+  end
+  
   it "equal" do
     Versioncmp.compare("1.1", "1.1").should eql(0)
   end

metadata

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