naturalsorter 3.0.20 → 3.0.25

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 882f355aed3f92457ee271ed1b6e8d411362356533559153f4f0bb8ca223ae57
-  data.tar.gz: 7fb4a30607b686aa832f9c4b3ff39da32962aa0cdc995c75e66b97a7d07ad06a
+  metadata.gz: 64f9e0f448ccaad8213ca33662905db43571a2056828a249921d155345757708
+  data.tar.gz: '0086cc8790c43e94cae90191898d0aca9ead6210923f2c1522df103ef6bee4e0'
 SHA512:
-  metadata.gz: 8d667855051e443833abecc71b4f40292584c58a81f07e53196448380d138dedc468a23d6f2c987fd2061458f9acf7cca4a869c12cc137abe57f52d42e28dc75
-  data.tar.gz: 8822a77b8a5797f9d0819da08aafbd7aa407f54b2daef5f5010227fc4e7b8770ff60a9e289a2dfe8af75cf7bebd67a0197327b4fb4fb1b55e932103353fdb814
+  metadata.gz: 41a05b255453f5ea3a4cef24375af6c03a6799a006629b1f18615371c7ab6366c352d0dce639daef65812a293e01ad1a583db5096fc1a1ff0c97f670d490bebc
+  data.tar.gz: 16f45ea622801d0b38c11138d2b4987eba44260991524593d472cbe72c42335054f5c60b6050d2d21e7493611f3683a58915e8a4f5cb434d1cc4082fb544c94f

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.20"
+  VERSION = "3.0.25"
 end

data/lib/version_tag_recognizer.rb

@@ -24,12 +24,24 @@ class VersionTagRecognizer
     return 1
   end
 
+  def self.value_for_key( value )
+    return 0  if A_STABILITY_DEV.eql? value
+    return 2  if A_STABILITY_SNAPSHOT.eql? value
+    return 3  if A_STABILITY_ALPHA.eql? value
+    return 4  if A_STABILITY_BETA.eql? value
+    return 5  if A_STABILITY_RC.eql? value
+    return 6  if A_STABILITY_PRE.eql? value
+    return 10 if A_STABILITY_STABLE.eql? value
+    return 11 if A_STABILITY_PATCH.eql? value
+    return 1
+  end
+
   def self.compare_tags( a, b)
     a_val = self.value_for a
     b_val = self.value_for b
     return -1 if a_val < b_val
     return  1 if a_val > b_val
-    return 0
+    return  0
   end
 
   def self.tagged? value
@@ -98,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
@@ -129,6 +141,7 @@ class VersionTagRecognizer
   end
 
   def self.stable? value
+    return true if value.to_s.empty?
     return false if value.match(/\Adev-/i) || value.match(/-dev\z/i)
     return false if self.preview?( value )
 
@@ -146,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
@@ -297,6 +302,31 @@ describe VersionTagRecognizer do
   end
 
 
+  it "returns the right value for stable" do
+    expect( VersionTagRecognizer.value_for_key(VersionTagRecognizer::A_STABILITY_STABLE)).to eql(10)
+  end
+  it "returns the right value for patch" do
+    expect( VersionTagRecognizer.value_for_key(VersionTagRecognizer::A_STABILITY_PATCH)).to eql(11)
+  end
+  it "returns the right value for pre" do
+    expect( VersionTagRecognizer.value_for_key(VersionTagRecognizer::A_STABILITY_PRE)).to eql(6)
+  end
+  it "returns the right value for rc" do
+    expect( VersionTagRecognizer.value_for_key(VersionTagRecognizer::A_STABILITY_RC)).to eql(5)
+  end
+  it "returns the right value for beta" do
+    expect( VersionTagRecognizer.value_for_key(VersionTagRecognizer::A_STABILITY_BETA)).to eql(4)
+  end
+  it "returns the right value for alpha" do
+    expect( VersionTagRecognizer.value_for_key(VersionTagRecognizer::A_STABILITY_ALPHA)).to eql(3)
+  end
+  it "returns the right value for snapshot" do
+    expect( VersionTagRecognizer.value_for_key(VersionTagRecognizer::A_STABILITY_SNAPSHOT)).to eql(2)
+  end
+  it "returns the right value for dev" do
+    expect( VersionTagRecognizer.value_for_key(VersionTagRecognizer::A_STABILITY_DEV)).to eql(0)
+  end
+
 
   it "returns compares right for alpha and beta" do
     expect( VersionTagRecognizer.compare_tags("1.1.1-alpha", "1.1.1-beta")).to eql(-1)
@@ -334,6 +364,9 @@ describe VersionTagRecognizer do
   it "does fit stability" do
     expect( VersionTagRecognizer.does_it_fit_stability?( "2.2.1-BETA", "beta" )).to be_truthy
   end
+  it "does fit stability" do
+    expect( VersionTagRecognizer.does_it_fit_stability?( "2.2.1-alpha", "beta" )).to be_falsey
+  end
   it "does fit stability" do
     expect( VersionTagRecognizer.does_it_fit_stability?( "2.2.x-dev", "dev" )).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.20
+  version: 3.0.25
 platform: ruby
 authors:
 - reiz
 - versioneye
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-06-11 00:00:00.000000000 Z
+date: 2020-07-09 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: