naturalsorter 3.0.23 → 3.0.28

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9290de5341a8ef7b6b9be56c88f1681f809a3c5228a88747c9e2ea45d6c514cc
-  data.tar.gz: d4d8428298d684556241c1cdd9d9fb55e87214e1f593808abaa7072fb660ae6d
+  metadata.gz: 2c3dd53e850c9f543a6720acd9076261217782b794a42bf911cad9e5ffde9b72
+  data.tar.gz: 9512924d1830308f8b6c16d272e9c450551efc04b2456dc0aea884216c223089
 SHA512:
-  metadata.gz: ea5558167d520a1593f1465f4523cc31d0bda2cf84a0ff0412108d5b15b166e2a71134fda097e16efeb263257d8c95496fb3b7cb756a858797d6fad0b899d56b
-  data.tar.gz: 4b6347068aac95054d835b9498157c0d68bc71d3ed62790412f977b89c9a9785171c8a463da11888427731e2aeacabf0a2a9f16f016dcf24e687318b138cdcd1
+  metadata.gz: 6671128838d34e04e4598030edc12be861902680be0fb952f360fb1e089fe33c0c6cbdaa928ea600f15680bb2fd0254969d0480dc5b560d1f0124d418ce61ddf
+  data.tar.gz: 9b38c32f74cc56aff89feda824e3430c24f8ee8e3d3cde08776bf94f208c991fab2ba84763f63b99e489957c4aade6e8f23c4984e9870d62d16b2ad6258e3834

data/lib/naturalsorter/version.rb

@@ -1,3 +1,3 @@
 module Naturalsorter
-  VERSION = "3.0.23"
+  VERSION = "3.0.28"
 end

data/lib/version_tag_recognizer.rb

@@ -78,7 +78,7 @@ class VersionTagRecognizer
   end
 
   def self.remove_minimum_stability val
-    val.gsub!(/@.*$/, "") if val.match(/@.*$/)
+    val.gsub!(/@.*$/, "") if val.to_s.match(/@.*$/)
   end
 
 
@@ -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,61 +141,62 @@ 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.to_s.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
-    !self.rc?(value)       and !value.match(/.+SEC.*/i) and
-    !self.snapshot?(value) and !value.match(/.+M.+/i)   and
+    !self.rc?(value)       and !value.to_s.match(/.+SEC.*/i) and
+    !self.snapshot?(value) and !value.to_s.match(/.+M.+/i)   and
     !self.build?(value)
   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) || value.to_s.match(/.*insiders.*$/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

@@ -33,34 +33,34 @@ class Versioncmp
     b_empty = b_val.to_s.empty?
 
     return  0 if  a_empty && b_empty
-    return  0 if  a_val.eql?( b_val )
+    return  0 if  a_val.to_s.eql?( b_val.to_s )
     return  1 if (a_empty == false) && (b_empty == true )
     return -1 if (b_empty == false) && (a_empty == true )
 
-    return  1 if b_val.length > a_val.length && b_val.match(/\A#{a_val}-SNAPSHOT/i)
-    return -1 if a_val.length > b_val.length && a_val.match(/\A#{a_val}-SNAPSHOT/i)
+    return  1 if b_val.length > a_val.length && b_val.to_s.match(/\A#{a_val}-SNAPSHOT/i)
+    return -1 if a_val.length > b_val.length && a_val.to_s.match(/\A#{a_val}-SNAPSHOT/i)
 
-    return  1 if b_val.length > a_val.length && b_val.match(/\A#{a_val}-BETA.*/i)
-    return -1 if a_val.length > b_val.length && a_val.match(/\A#{a_val}-BETA.*/i)
+    return  1 if b_val.length > a_val.length && b_val.to_s.match(/\A#{a_val}-BETA.*/i)
+    return -1 if a_val.length > b_val.length && a_val.to_s.match(/\A#{a_val}-BETA.*/i)
 
-    return  1 if b_val.length > a_val.length && b_val.match(/\A#{a_val}-alpha.*/i)
-    return -1 if a_val.length > b_val.length && a_val.match(/\A#{a_val}-alpha.*/i)
+    return  1 if b_val.length > a_val.length && b_val.to_s.match(/\A#{a_val}-alpha.*/i)
+    return -1 if a_val.length > b_val.length && a_val.to_s.match(/\A#{a_val}-alpha.*/i)
 
-    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.to_s.match(/\A#{a_val}-rc.*/i)
+    return -1 if a_val.length > b_val.length && a_val.to_s.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)
+    return -1 if b_val.length > a_val.length && b_val.to_s.match(/\A#{a_val}u\d/i)
+    return  1 if a_val.length > b_val.length && a_val.to_s.match(/\A#{b_val}u\d/i)
 
     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)
+    am = a.to_s.match(/\A(\d+\.\d+)\.\d+\z/i)
+    bm = b.to_s.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)
+    am = a.to_s.match(/\A(\d+\.\d+)-\w+\z/i)
+    bm = b.to_s.match(/\A(\d+\.\d+)\.\d+\z/i)
     return -1 if am && bm && am[1].eql?(bm[1])
 
     ab = [a, b]
@@ -95,9 +95,9 @@ class Versioncmp
     offsets[0] += part1.length() + 1;
     offsets[1] += part2.length() + 1;
 
-    if ( part1.match(/^[0-9]+$/) && part2.match(/^[0-9]+$/) )
+    if ( part1.to_s.match(/^[0-9]+$/) && part2.to_s.match(/^[0-9]+$/) )
       return self.compare_numbers part1, part2
-    elsif ( !part1.match(/^[0-9]+$/) && !part2.match(/^[0-9]+$/) )
+    elsif ( !part1.to_s.match(/^[0-9]+$/) && !part2.to_s.match(/^[0-9]+$/) )
       return self.compare_strings ab[0], ab[1], part1, part2
     else
       return self.compare_special_cases part1, part2
@@ -127,33 +127,33 @@ class Versioncmp
     result = Versioncmp.check_jquery_versioning(part1, part2)
     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*/) )
+    digit = part1 if part1.to_s.match(/\d/)
+    return -1 if ( part1.to_s.match(/\d/) && part2.to_s.match(/#{digit}\S*patch\S*/) )
 
-    digit = part2 if part2.match(/\d/)
-    return  1 if ( part2.match(/\d/) && part1.match(/#{digit}\S*patch\S*/) )
+    digit = part2 if part2.to_s.match(/\d/)
+    return  1 if ( part2.to_s.match(/\d/) && part1.to_s.match(/#{digit}\S*patch\S*/) )
 
-    if ( part1.match(/#\S*patch\S*/) && part2.match(/\S*patch\S*/) )
+    if ( part1.to_s.match(/#\S*patch\S*/) && part2.to_s.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.eql?("0") && part2.to_s.match(/^[a-zA-Z]+/) )
+    return -1 if ( part2.eql?("0") && part1.to_s.match(/^[a-zA-Z]+/) )
+    return -1 if ( part1.eql?("0") && part2.to_s.match(/^[1-9]+[-_a-zA-Z]+/) )
+    return  1 if ( part2.eql?("0") && part1.to_s.match(/^[1-9]+[-_a-zA-Z]+/) )
 
-    pm1 = part1.match(/\A[0-9]+\z/)
-    pm2 = part2.match(/\A(\d+)(\w+)\z/i)
+    pm1 = part1.to_s.match(/\A[0-9]+\z/)
+    pm2 = part2.to_s.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)
+    pm1 = part1.to_s.match(/\A(\d+)-(\w+)\z/i)
+    pm2 = part2.to_s.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)
+    pm1 = part1.to_s.match(/\A\d+\z/i)
+    pm2 = part2.to_s.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])
 
@@ -211,7 +211,7 @@ class Versioncmp
       break if offsetz > cake.length()
 
       p = cake[ offset..offset + z ]
-      break if ( p.match(/^\w+\.$/) != nil )
+      break if ( p.to_s.match(/^\w+\.$/) != nil )
     end
 
     z = z - 1 if z > 0
@@ -222,7 +222,7 @@ class Versioncmp
 
   def self.timestamp? part
     return false if part.to_s.empty?
-    return part.length() == 9 && part.match(/^[0-9]+$/) != nil
+    return part.length() == 9 && part.to_s.match(/^[0-9]+$/) != nil
   end
 
 
@@ -247,19 +247,19 @@ class Versioncmp
   end
 
   def self.replace_groovy val
-    if val.match(/\-groovy\-/)
+    if val.to_s.match(/\-groovy\-/)
       val.gsub!("-groovy-", ".")
     end
   end
 
   def self.replace_snapshot val
-    if val.match(/\-SNAPSHOT/)
+    if val.to_s.match(/\-SNAPSHOT/)
       val.gsub!("-SNAPSHOT", "")
     end
   end
 
   def self.replace_redhatx val
-    if val.match(/\-redhat\-[0-9]+$/i)
+    if val.to_s.match(/\-redhat\-[0-9]+$/i)
       val.gsub!(/\-redhat\-[0-9]+$/i, "")
     end
   end
@@ -270,9 +270,9 @@ class Versioncmp
   # Ganz grosses Kino !
   #
   def self.replace_timestamps val
-    if val.match(/^[0-9]{8}$/)
+    if val.to_s.match(/^[0-9]{8}$/)
       val.gsub!(/^[0-9]{8}$/, "0.0.0")
-    elsif val.match(/^[0-9]{8}.[0-9]{6}$/)
+    elsif val.to_s.match(/^[0-9]{8}.[0-9]{6}$/)
       val.gsub!(/^[0-9]{8}.[0-9]{6}$/, "0.0.0")
     end
   end
@@ -280,7 +280,7 @@ class Versioncmp
 
   def self.replace_wildcards val
     new_val = String.new(val)
-    new_val = "9999999" if val.match(/\.\*$/)
+    new_val = "9999999" if val.to_s.match(/\.\*$/)
     new_val
   end
 
@@ -291,11 +291,11 @@ class Versioncmp
       new_val = "99999999999"
     elsif val.eql?("dev-develop")
       new_val = "9999999999"
-    elsif val.match(/\Adev-/i)
+    elsif val.to_s.match(/\Adev-/i)
       new_val = "9999999"
-    elsif val.match(/\.x-dev$/i)
+    elsif val.to_s.match(/\.x-dev$/i)
       new_val = val.gsub("x-dev", "9999999")
-    elsif val.match(/-dev$/)
+    elsif val.to_s.match(/-dev$/)
       new_val = val.gsub("-dev", ".9999999")
     end
     new_val
@@ -303,7 +303,7 @@ class Versioncmp
 
 
   def self.replace_leading_v val
-    val.gsub!(/^v/, "") if val.match(/^v[0-9]+/)
+    val.gsub!(/^v/, "") if val.to_s.match(/^v[0-9]+/)
   end
 
 
@@ -315,7 +315,7 @@ class Versioncmp
 
   def self.check_jquery_versioning(part1, part2)
     # --- START ---- special case for awesome jquery shitty verison numbers
-    if ( part1.match(/^[0-9]+[a-zA-Z]+[0-9]+$/) != nil && part2.match(/^[0-9]+$/) != nil )
+    if ( part1.to_s.match(/^[0-9]+[a-zA-Z]+[0-9]+$/) != nil && part2.to_s.match(/^[0-9]+$/) != nil )
       part1_1 = part1.match(/^[0-9]+/)
       result = Versioncmp.compare_int(part1_1[0], part2)
       if result != 0
@@ -324,8 +324,8 @@ class Versioncmp
       return -1
     end
 
-    if ( part2.match(/^[0-9]+[a-zA-Z]+[0-9]+$/) != nil && part1.match(/^[0-9]+$/) != nil )
-      part2_1 = part2.match(/^[0-9]+/)
+    if ( part2.to_s.match(/^[0-9]+[a-zA-Z]+[0-9]+$/) != nil && part1.to_s.match(/^[0-9]+$/) != nil )
+      part2_1 = part2.to_s.match(/^[0-9]+/)
       result = Versioncmp.compare_int(part1, part2_1[0])
       if result != 0
         return result

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
@@ -344,6 +349,9 @@ describe VersionTagRecognizer do
   it "does fit stability" do
     expect( VersionTagRecognizer.does_it_fit_stability?( "2.2.1", "stable" )).to be_truthy
   end
+  it "does not fit stability" do
+    expect( VersionTagRecognizer.does_it_fit_stability?( "3.9.2-insiders.20200509", "stable" )).to be_falsey
+  end
   it "does not fit stability" do
     expect( VersionTagRecognizer.does_it_fit_stability?( "2.2.1-BETA", "stable" )).to be_falsey
   end

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: naturalsorter
 version: !ruby/object:Gem::Version
-  version: 3.0.23
+  version: 3.0.28
 platform: ruby
 authors:
 - reiz
 - versioneye
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-06-25 00:00:00.000000000 Z
+date: 2020-10-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -71,6 +71,7 @@ files:
 - LICENSE
 - README.markdown
 - Rakefile
+- lib/.DS_Store
 - lib/natcmp.rb
 - lib/naturalsorter.rb
 - lib/naturalsorter/version.rb
@@ -85,7 +86,7 @@ homepage: https://github.com/versioneye/naturalsorter
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -101,7 +102,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: