naturalsorter 3.0.9 → 3.0.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 26c550b34ce0dc4469c49e3e961b1b1c73821ddf
-  data.tar.gz: 941b2e7359ecedbe4d701eb29b9b5ecbd05164c2
+  metadata.gz: f77ff5a0c7843443a170d17863591648994e8d4e
+  data.tar.gz: 70345fa0e81a99dc9ac2ebb055a8a3ea08704694
 SHA512:
-  metadata.gz: 3def80a792398c9db5da56d468bd9558f861cb720143aee5441188a305e3eda19879a412e5e3ee995950e558826fe1effcb6f5835fee1ce321c6eee0e4dd633a
-  data.tar.gz: ede6284471e7032e9930d59243a3d3b304f8a323d2eb0a9e9f04613c7e469cf5b5f8b9c658a6bddff6881ecb3d18d38d523f4c6e3d21905b63dbaef7789bf759
+  metadata.gz: 802d8e6f34de0cd67ef29f176e3c47337c141a9d5945f99bfaf3b69c09307c893f4e52679727240d4dc94628a053a7e825bb1e55430dbfe162e81c2e9eb06b0c
+  data.tar.gz: c1e51ac23f8fcc923b106d4549dc1b505468491d6ac8c64ad0ea343099a457f42a7fe9847ddb6e7e5a96f43bf73b824309575a1ae5b756e6570fee2a00b81e30

data/README.markdown

@@ -26,7 +26,7 @@ Because the default sort method does not recognize the numbers in the string. Th
 
 You should add this line to your Gemfile
 
-`gem 'naturalsorter', '3.0.8'`
+`gem 'naturalsorter', '3.0.10'`
 
 and run this command in your app root directory
 

data/lib/naturalsorter/version.rb

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

data/lib/versioncmp.rb

@@ -40,6 +40,14 @@ class Versioncmp
     a = pre_process a_val
     b = pre_process b_val
 
+    am = a.match(/\A(\d+\.\d+)\.\d+\z/i)
+    bm = b.match(/\A(\d+\.\d+)-\w+\z/i)
+    return  1 if am && bm && am[1].eql?(bm[1])
+
+    am = a.match(/\A(\d+\.\d+)-\w+\z/i)
+    bm = b.match(/\A(\d+\.\d+)\.\d+\z/i)
+    return -1 if am && bm && am[1].eql?(bm[1])
+
     ab = [a, b]
     offsets = [0, 0]
 

data/spec/versioncmp_spec.rb

@@ -54,6 +54,16 @@ describe Versioncmp do
     Versioncmp.compare("2.3.d-b01", "2.3.1").should eql(-1)
   end
 
+    
+  it "2.18.1 is bigger than 2.18-20141019" do
+    Versioncmp.compare("2.18.1", "2.18-20141019").should eql(1)
+  end
+
+  it "2.18-20141019 is smaller than 2.18.1" do
+    Versioncmp.compare("2.18-20141019", "2.18.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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: naturalsorter
 version: !ruby/object:Gem::Version
-  version: 3.0.9
+  version: 3.0.10
 platform: ruby
 authors:
 - reiz