naturalsorter 3.0.21 → 3.0.26

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ab1f05afaca4d011db3ad1d1238b9669c330b48a16bbaa334be0f0b09bd53729
-  data.tar.gz: 34b3348f206adad23c86044180038c39d849d54bc0c072766b50cf882a4fe685
+  metadata.gz: 9537d7c543199b95ae71b0481b04018af4dae7df66615a3e9d61ce2b42123e97
+  data.tar.gz: 27a81c712f0993b8a2c60b00b4b6a68af8b87824ba22e2848862a9f7754fbc6f
 SHA512:
-  metadata.gz: 635bef8758a11ef53c8c8d876c0ce9e2e3d4326f0c52a4a868004daa4929a9844a98fc93cce882790a24f65b27cd399a5adc8da32879fa559fa0174c3d8fc4f8
-  data.tar.gz: 4fe4e73b1f4a819711c443e7cbaf259aca84705e869c9dd36985b1baa034ec0ca2eb0be4b25af175fb923bbc897c7ba39273865b2ce8f521e3ae5174f501ad70
+  metadata.gz: 9913d031d0bb8d381f0edbe3ad16027a4325a2ab3d9b115d16c8247d8b6bf4fb283a0495e2bd94c7912b22e5d5d5e938373e1b022f6e2e61bd5a489768b8dcac
+  data.tar.gz: 9e75702297826a080562a4faefdcd7e255b2444f71bc32693de516575cbf1ee609dda33bb145ab4b805513f55fb8f5264a29ba6d0052f17b3b66f06649f1e653

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

data/lib/naturalsorter/version.rb

@@ -1,3 +1,3 @@
 module Naturalsorter
-  VERSION = "3.0.21"
+  VERSION = "3.0.26"
 end

data/lib/version_tag_recognizer.rb

@@ -110,11 +110,11 @@ class VersionTagRecognizer
 
 
   def self.stability_tag_for( version )
-    if version.match(/@.*$/)
+    if version.to_s.match(/@.*$/)
       spliti = version.split("@")
       return spliti[1]
     else
-      return A_STABILITY_DEV if version.match(/\Adev-/i) || version.match(/-dev\z/i)
+      return A_STABILITY_DEV if version.to_s.match(/\Adev-/i) || version.to_s.match(/-dev\z/i)
 
       if self.stable? version
         return A_STABILITY_STABLE
@@ -141,14 +141,15 @@ class VersionTagRecognizer
   end
 
   def self.stable? value
-    return false if value.match(/\Adev-/i) || value.match(/-dev\z/i)
+    return true if value.to_s.empty?
+    return false if value.to_s.match(/\Adev-/i) || value.match(/-dev\z/i)
     return false if self.preview?( value )
 
-    return true if value.match(/.+RELEASE.*/i)
-    return true if value.match(/.+FINAL.*/i)
-    return true if value.match(/.+SP.*/i)
-    return true if value.match(/.+GA.*/i)
-    return true if value.match(/.*patch.*/i)
+    return true if value.to_s.match(/.+RELEASE.*/i)
+    return true if value.to_s.match(/.+FINAL.*/i)
+    return true if value.to_s.match(/.+SP.*/i)
+    return true if value.to_s.match(/.+GA.*/i)
+    return true if value.to_s.match(/.*patch.*/i)
 
     !self.alpha?(value)    and !self.beta?(value)       and
     !self.dev?(value)      and !self.pre?(value)        and
@@ -158,44 +159,44 @@ class VersionTagRecognizer
   end
 
   def self.patch? value
-    value.match(/.*patch.*/i)
+    value.to_s.match(/.*patch.*/i)
   end
 
   def self.alpha? value
     return false if self.beta? value
-    value.match(/.*alpha.*/i) or value.match(/.+a.*/i)
+    value.to_s.match(/.*alpha.*/i) or value.to_s.match(/.+a.*/i)
   end
 
   def self.beta? value
-    value.match(/.*beta.*/i) or value.match(/.+b.*/i)
+    value.to_s.match(/.*beta.*/i) or value.to_s.match(/.+b.*/i)
   end
 
   def self.dev? value
-    value.match(/.*dev.*/i)
+    value.to_s.match(/.*dev.*/i)
   end
 
   def self.rc? value
-    value.match(/.*rc.*/i) || value.match(/.*cr.*/i)
+    value.to_s.match(/.*rc.*/i) || value.to_s.match(/.*cr.*/i)
   end
 
   def self.snapshot? value
-    value.match(/.+SNAPSHOT.*/i)
+    value.to_s.match(/.+SNAPSHOT.*/i)
   end
 
   def self.build? value
-    value.match(/.+build.*/i)
+    value.to_s.match(/.+build.*/i)
   end
 
   def self.pre? value
-    value.match(/.*pre.*$/i)
+    value.to_s.match(/.*pre.*$/i)
   end
 
   def self.jbossorg? value
-    value.match(/.*jbossorg.*$/i)
+    value.to_s.match(/.*jbossorg.*$/i)
   end
 
   def self.preview? value
-    value.match(/-preview\d+-/i) || value.match(/-preview-/i)
+    value.to_s.match(/-preview\d+-/i) || value.to_s.match(/-preview-/i)
   end
 
 end

data/lib/versioncmp.rb

@@ -287,7 +287,7 @@ class Versioncmp
 
   def self.replace_x_dev val
     new_val = String.new(val)
-    if val.eql?("dev-master")
+    if ['dev-master', 'master', 'trunk'].include?( val )
       new_val = "99999999999"
     elsif val.eql?("dev-develop")
       new_val = "9999999999"

data/spec/naturalsorter/version_tag_recognizer_spec.rb

@@ -3,6 +3,11 @@ require "naturalsorter"
 
 describe VersionTagRecognizer do
 
+  it "release? is true for nil" do
+    # if nill we assume the latest stable version.
+    expect( VersionTagRecognizer.release?(nil)).to be_truthy
+  end
+
   it "release? is true" do
     expect( VersionTagRecognizer.release?("1.1")).to be_truthy
   end

data/spec/naturalsorter/versioncmp_spec.rb

@@ -95,6 +95,14 @@ describe Versioncmp do
     expect( Versioncmp.compare("dev-master", "10.10.999")).to eql(1)
   end
 
+  it "master is bigger than 10.10.999" do
+    expect( Versioncmp.compare("master", "10.10.999")).to eql(1)
+  end
+
+  it "trunk is bigger than 10.10.999" do
+    expect( Versioncmp.compare("trunk", "10.10.999")).to eql(1)
+  end
+
   it "2.2.x-dev is bigger than 2.2.1" do
     expect( Versioncmp.compare("2.2.x-dev", "2.2.1")).to eql(1)
   end

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: naturalsorter
 version: !ruby/object:Gem::Version
-  version: 3.0.21
+  version: 3.0.26
 platform: ruby
 authors:
 - reiz
 - versioneye
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-06-11 00:00:00.000000000 Z
+date: 2020-09-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -85,7 +85,7 @@ homepage: https://github.com/versioneye/naturalsorter
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -101,7 +101,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubygems_version: 3.0.8
-signing_key: 
+signing_key:
 specification_version: 4
 summary: Sorting arrays in natural order
 test_files: