naturalsorter 3.0.14 → 3.0.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 99cf7219e287435ad7d1f71da79bd53727a1017e
-  data.tar.gz: 5d72f5b05da3d87fa50d7e15182421120189e77b
+  metadata.gz: 2cb49c41dd12e92691683fc4e40b8f84de78fb98
+  data.tar.gz: 3de2f502f7f3e2492a4f98d7fbf8af5bdce2dfeb
 SHA512:
-  metadata.gz: 2f1e54e6f62b500f482c98e07ad523f2aabe929f9458b974a224ae876d9e17bf6f6a296282d13032cc2900bed6a624f6730d592f943a8a23197a8fbcee3150b2
-  data.tar.gz: b59d4a2c2487a80e0cc383e15c623652d4b6b305ec4d2a7363e068c516fcc88e0a99ed702d7ece1dc4552d5ac01fbd5c113d11f109eedaeb0098fed4f1c57375
+  metadata.gz: 6f626bf945ab9052d8bbcfa1f6f40ae44414428187ca746a6b1d6d8d1685b563be6a6174f77b0e1f20d968a1be03271ffb22afba2a611aea2dfcae25f5597a82
+  data.tar.gz: 6f28c830de880e7d717afac609e2d5d323f2114a8174907bd847ee2a8b0fe27f602de40669f9b4b41e594ea5ef0af02df40208c30615c2c9811998d5b520d353

data/README.markdown

@@ -27,7 +27,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.14'`
+`gem 'naturalsorter', '3.0.15'`
 
 and run this command in your app root directory
 

data/lib/naturalsorter.rb

@@ -45,6 +45,7 @@ module Naturalsorter
 
     def self.sort_version(array, asc = true)
       return array if (array.nil? || array.empty? || array.length == 1)
+      return array if (array[0].nil? || array[1].nil?)
       return array.sort { |a,b| Versioncmp.compare( a, b ) } if asc
       return array.sort { |a,b| Versioncmp.compare( b, a ) }
     end

data/lib/naturalsorter/version.rb

@@ -1,3 +1,3 @@
 module Naturalsorter
-  VERSION = "3.0.14"
+  VERSION = "3.0.15"
 end

data/lib/versioncmp.rb

@@ -49,6 +49,9 @@ class Versioncmp
     return  1 if b_val.length > a_val.length && b_val.match(/\A#{a_val}-rc.*/i)
     return -1 if a_val.length > b_val.length && a_val.match(/\A#{a_val}-rc.*/i)
 
+    return -1 if b_val.length > a_val.length && b_val.match(/\A#{a_val}u\d/i)
+    return  1 if a_val.length > b_val.length && a_val.match(/\A#{b_val}u\d/i)
+
     a = pre_process a_val
     b = pre_process b_val
 

data/spec/naturalsorter/naturalsorter_spec.rb

@@ -123,6 +123,10 @@ describe Naturalsorter::Sorter do
       expect( Naturalsorter::Sorter.sort_version(["1.5.2", "1.4.4", "1.5.2-patch"])).to eql(["1.4.4", "1.5.2", "1.5.2-patch"])
     end
 
+    it "3.0.1u2 is bigger than 3.0.1" do
+      expect( Naturalsorter::Sorter.sort_version(["3.0.1u2", "3.0.1"])).to eql(["3.0.1", "3.0.1u2"])
+    end
+
   end
 
   describe "sort_version_by_method" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: naturalsorter
 version: !ruby/object:Gem::Version
-  version: 3.0.14
+  version: 3.0.15
 platform: ruby
 authors:
 - reiz
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-06-19 00:00:00.000000000 Z
+date: 2017-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec