naturalsorter 0.2.0 → 0.2.1

data/README.markdown

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

data/lib/naturalsorter/version.rb

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

data/lib/versioncmp.rb

@@ -32,37 +32,28 @@ class Versioncmp
     offset2 = 0;
 
     for i in 0..100
-      if offset1 >= a.length() || offset2 >= b.length() 
-        break
-      end
+      break if offset1 >= a.length() || offset2 >= b.length() 
 
       part1 = Versioncmp.getAPiece(offset1, a);
       part2 = Versioncmp.getAPiece(offset2, b);
+      
+      
       offset1 += part1.length() + 1;
       offset2 += part2.length() + 1;
 
       if ( part1.match(/^[0-9]+$/) != nil && part2.match(/^[0-9]+$/) != nil )
-        ai = part1;
-        bi = part2;
+        ai = part1.to_i;
+        bi = part2.to_i;
         result = Versioncmp.compareInt(ai, bi);
-        if result != 0
-          return result;
-        else
-          next 
-        end
+        return result if result != 0
+        next 
       elsif ( part1.match(/^[0-9]+$/) == nil && part2.match(/^[0-9]+$/) == nil )
         result = Versioncmp.compareString(part1, part2)
-        if (result != 0)
-          return result
-        else
-          next
-        end
+        return result if (result != 0)
+        next
       else
-        if (part1.match(/^[0-9]+$/) != nil && part2.match(/^[0-9]+$/) == nil)
-          return 1;
-        else
-          return -1;
-        end
+        return 1 if (part1.match(/^[0-9]+$/) != nil && part2.match(/^[0-9]+$/) == nil)
+        return -1;
       end
 	  end
 	  result = Versioncmp.checkForRC(a, b) 
@@ -122,9 +113,7 @@ class Versioncmp
   def self.getAPiece(offset, cake)
     for z in 0..100
       offsetz = offset + z
-      if offsetz > cake.length() 
-        break
-      end
+      break if offsetz > cake.length() 
       p = cake[offset..offset + z]
       if ( p.match(/^[0-9]+$/) == nil )
         break

data/spec/naturalsorter_spec.rb

@@ -107,6 +107,10 @@ describe Naturalsorter::Sorter do
     it "returns 1.0" do
       Naturalsorter::Sorter.get_newest_version("1.0", "1.0").should eql("1.0")
     end
+    it "returns 1.10" do
+      Naturalsorter::Sorter.get_newest_version("1.10", "1.8").should eql("1.10")
+    end
+    
   
   end
   

metadata

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