naturalsorter 3.0.8 → 3.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2493a58a3718f52a619b22998d7cc68c43d21538
-  data.tar.gz: 4800f0e8937b93116189ff66abda5fbd3ff9bb1b
+  metadata.gz: 26c550b34ce0dc4469c49e3e961b1b1c73821ddf
+  data.tar.gz: 941b2e7359ecedbe4d701eb29b9b5ecbd05164c2
 SHA512:
-  metadata.gz: 59744980620cdd08dcf917e02644ff0ea0d996ec4cc67610e0c892fe411c1707b5f937f26bb319b551083ec40ba3592d52f342d638cccacf8a3c93fd9117eceb
-  data.tar.gz: ffa9e83d9cbbc9bce05e3e8f8babe317302296d92ca3575be36de463389cf29b2cca586939cb572cde1665697ccbc87c506d072311d6e803250369249368366c
+  metadata.gz: 3def80a792398c9db5da56d468bd9558f861cb720143aee5441188a305e3eda19879a412e5e3ee995950e558826fe1effcb6f5835fee1ce321c6eee0e4dd633a
+  data.tar.gz: ede6284471e7032e9930d59243a3d3b304f8a323d2eb0a9e9f04613c7e469cf5b5f8b9c658a6bddff6881ecb3d18d38d523f4c6e3d21905b63dbaef7789bf759

data/lib/naturalsorter/version.rb

@@ -1,3 +1,3 @@
 module Naturalsorter
-  VERSION = "3.0.8"
+  VERSION = "3.0.9"
 end

data/lib/versioncmp.rb

@@ -74,7 +74,7 @@ class Versioncmp
     elsif ( !part1.match(/^[0-9]+$/) && !part2.match(/^[0-9]+$/) )
       return self.compare_strings ab[0], ab[1], part1, part2
     else
-      return self.compare_specia_cases part1, part2
+      return self.compare_special_cases part1, part2
     end
   end
 
@@ -97,9 +97,9 @@ class Versioncmp
   end
 
 
-  def self.compare_specia_cases part1, part2
+  def self.compare_special_cases part1, part2
     result = Versioncmp.check_jquery_versioning(part1, part2)
-    return result if result != nil
+    return result if !result.to_s.strip.empty?
     
     digit = part1 if part1.match(/\d/)
     return -1 if ( part1.match(/\d/) && part2.match(/#{digit}\S*patch\S*/) )
@@ -110,19 +110,44 @@ class Versioncmp
     if ( part1.match(/#\S*patch\S*/) && part2.match(/\S*patch\S*/) ) 
       return compare_string(part1, part2)
     end
-    
+
     return  1 if ( part1.eql?("0") && part2.match(/^[a-zA-Z]+/) )
     return -1 if ( part2.eql?("0") && part1.match(/^[a-zA-Z]+/) )
     return -1 if ( part1.eql?("0") && part2.match(/^[1-9]+[-_a-zA-Z]+/) )
     return  1 if ( part2.eql?("0") && part1.match(/^[1-9]+[-_a-zA-Z]+/) )
-    return  1 if ( part1.match(/^[0-9]+$/) && !part2.match(/^[0-9]+$/) )
+
+    pm1 = part1.match(/\A[0-9]+\z/)
+    pm2 = part2.match(/\A(\d+)(\w+)\z/i)
+    return  1 if ( pm1 && pm2 && pm2[1].eql?(part1) &&  VersionTagRecognizer.stable?(pm2[2]) )
+    return -1 if ( pm1 && pm2 && pm2[1].eql?(part1) && !VersionTagRecognizer.stable?(pm2[2]) )
+
+    pm1 = part1.match(/\A(\d+)-(\w+)\z/i)
+    pm2 = part2.match(/\A\d+\z/i)
+    return 1 if try_to_i_bigger( pm1, pm2, part2 )
+    return 1 if pm2 && pm1 && pm1[1].eql?(part2) && VersionTagRecognizer.stable?(pm1[2]) 
+
+    pm1 = part1.match(/\A\d+\z/i)
+    pm2 = part2.match(/\A(\d+)-(\w+)\z/i)
+    return  1 if try_to_i_bigger( pm1, pm2, part2 )
+    return -1 if pm1 && pm2 && pm2[1].eql?(part1) && VersionTagRecognizer.stable?(pm2[2]) 
+
+    return  1 if ( part1.match(/\A[0-9]+\z/) && !part2.match(/\A[0-9]+\z/) )
+
     return -1;
   rescue => e 
     p e.message 
+    p e.backtrace.join("\n")
     return -1 
   end
 
 
+  def self.try_to_i_bigger pm1, pm2, part2 
+    pm2 && pm1 && pm1[1].to_i > part2.to_i 
+  rescue => e 
+    false 
+  end
+
+
   # Tags are RC, alpha, beta, dev and so on.
   #
   def self.check_for_tags(a, b)

data/spec/versioncmp_spec.rb

@@ -34,6 +34,26 @@ describe Versioncmp do
     Versioncmp.compare("2.2.x-dev", "2.2.1").should eql(1)
   end
 
+  it "3.5.5-1 is bigger than 3.5.5" do
+    Versioncmp.compare("3.5.5-1", "3.5.5").should eql(1)
+  end
+
+  it "3.5.5 is smaller than 3.5.5-1 " do
+    Versioncmp.compare("3.5.5", "3.5.5-1").should eql(-1)
+  end
+  
+  it "2.3.1-b01 is bigger than 2.3.1" do
+    Versioncmp.compare("2.3.1-b01", "2.3.1").should eql(1)
+  end
+
+  it "2.3.2-b01 is bigger than 2.3.1" do
+    Versioncmp.compare("2.3.2-b01", "2.3.1").should eql(1)
+  end
+
+  it "2.3.d-b01 is smaller than 2.3.1" do
+    Versioncmp.compare("2.3.d-b01", "2.3.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
@@ -155,7 +175,7 @@ describe Versioncmp do
   end
 
   it "1.7b is bigger than 1.7a" do
-    Versioncmp.compare("1.7", "1.7b").should eql(1)
+    Versioncmp.compare("1.7b", "1.7a").should eql(1)
   end
 
   it "1.7.1rc1 is smaller than 1.7.2" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: naturalsorter
 version: !ruby/object:Gem::Version
-  version: 3.0.8
+  version: 3.0.9
 platform: ruby
 authors:
 - reiz
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-03 00:00:00.000000000 Z
+date: 2015-07-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -70,7 +70,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: naturalsorter
-rubygems_version: 2.4.7
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: Sorting arrays in natural order