naturalsorter 0.3.2 → 0.3.3

data/lib/naturalsorter/version.rb

@@ -1,3 +1,3 @@
 module Naturalsorter
-  VERSION = "0.3.2"
+  VERSION = "0.3.3"
 end

data/lib/versioncmp.rb

@@ -58,14 +58,10 @@ class Versioncmp
         return result if (result != 0)
         next
       else
-        # --- START ---- special case for awesome jquery shitty verison numbers 
-        if ( part1.match(/^[0-9]+[a-zA-Z]+[0-9]+$/) != nil && part2.match(/^[0-9]+$/) != nil )
-          return -1
+        result = Versioncmp.check_jquery_versioning(part1, part2)
+        if result != nil
+          return result
         end
-        if ( part2.match(/^[0-9]+[a-zA-Z]+[0-9]+$/) != nil && part1.match(/^[0-9]+$/) != nil )
-          return 1
-        end
-        # --- END ---- special case for awesome jquery shitty verison numbers 
         return 1 if (part1.match(/^[0-9]+$/) != nil && part2.match(/^[0-9]+$/) == nil)
         return -1;
       end
@@ -85,6 +81,30 @@ class Versioncmp
     return -1 if a < b
     return 1
   end
+
+  def self.check_jquery_versioning(part1, part2)
+    # --- START ---- special case for awesome jquery shitty verison numbers 
+    if ( part1.match(/^[0-9]+[a-zA-Z]+[0-9]+$/) != nil && part2.match(/^[0-9]+$/) != nil )
+      part1_1 = part1.match(/^[0-9]+/)
+      result = Versioncmp.compareInt(part1_1[0], part2)
+      if result != 0
+        return result
+      end
+      return -1
+    end
+
+    if ( part2.match(/^[0-9]+[a-zA-Z]+[0-9]+$/) != nil && part1.match(/^[0-9]+$/) != nil )
+      part2_1 = part2.match(/^[0-9]+/)
+      result = Versioncmp.compareInt(part2_1[0], part1)
+      if result != 0
+        return result
+      end
+      return 1
+    end
+
+    return nil
+    # --- END ---- special case for awesome jquery shitty verison numbers 
+  end
   
   def self.checkForRC(a, b)
     big = String.new(a)

data/spec/versioncmp_spec.rb

@@ -94,4 +94,28 @@ describe Versioncmp do
     Versioncmp.compare("1.7b2", "1.7").should eql(-1)
   end
 
+  it "1.7 is bigger than 1.7b2" do 
+    Versioncmp.compare("1.7", "1.7b2").should eql(1)
+  end
+
+  it "1.7 is bigger than 1.7rc2" do 
+    Versioncmp.compare("1.7", "1.7rc2").should eql(1)
+  end
+
+  it "1.7 is bigger than 1.7RC2" do 
+    Versioncmp.compare("1.7", "1.7RC2").should eql(1)
+  end
+
+  it "1.7 is bigger than 1.7a" do 
+    Versioncmp.compare("1.7", "1.7a").should eql(1)
+  end
+
+  it "1.7 is bigger than 1.7b" do 
+    Versioncmp.compare("1.7", "1.7b").should eql(1)
+  end
+
+  it "1.7b is bigger than 1.7a" do 
+    Versioncmp.compare("1.7", "1.7b").should eql(1)
+  end
+
 end

metadata

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