naturalsorter 3.0.3 → 3.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0057390025a6528368be274f2b63d6bd41e4ec35
-  data.tar.gz: 55f9fe1879d27e00d685f1f8fd07f47ef35d9ed1
+  metadata.gz: 9ec3495480af6412be235cedca0e391da3da6920
+  data.tar.gz: d07b2807cfdc5a9d4b75e68cafab8602e22f55bb
 SHA512:
-  metadata.gz: dfebbedb80998e35e945bfa1d9b955fe6abfdf11749ac6c20c02616814081d4d4cb309fdd0eb367e6775cfeba1df0a17de757d0ab977c94639dc44b1caa04772
-  data.tar.gz: e5f31f6da7fdfc773aead02b3b5c5b8864c5ee8b3eea6fc29b33941caba5b8be5088f51ca9f9ea610df4abe654526b212126ba92b0bbc8d324caef54e31689d3
+  metadata.gz: d97a01a73a68871758784a29ef5471ce3071490cafcd2b44f069bfb1ad048e3db0056fd58d939228ff0a067bddfa4b8d4f26f79d152f4e2e371b6a4f31450c65
+  data.tar.gz: 3781db9ca46c941bb4048dccad7171e2d83597c17fdbc8bd8e1a3ff92d3a08f7379a6d8cb7767d552edd96092ff17635a47b8fcf8eeb6ff6fc5db696d289c527

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

data/lib/naturalsorter/version.rb

@@ -1,3 +1,3 @@
 module Naturalsorter
-  VERSION = "3.0.3"
+  VERSION = "3.0.4"
 end

data/lib/version_tag_recognizer.rb

@@ -32,6 +32,7 @@ class VersionTagRecognizer
   end
 
   def self.tagged? value
+    return true if self.patch?(value)
     return true if self.alpha?(value)
     return true if self.beta?(value)
     return true if self.dev?(value)
@@ -43,7 +44,9 @@ class VersionTagRecognizer
   end
 
   def self.remove_tag value
-    if self.alpha? value
+    if self.patch? value
+      return value.gsub(/\.patch.*$/i, "")
+    elsif self.alpha? value
       new_value = value.gsub(/\.[\w-]*alpha.*$/i, "")
       return new_value.gsub(/\.[\w-]*a.*$/i, "")
     elsif self.beta? value
@@ -66,6 +69,7 @@ class VersionTagRecognizer
   end
 
   def self.does_it_fit_stability?( version_number, stability )
+    patch    = self.patch?( version_number )
     stable   = self.stable?( version_number )
     pre      = stable || self.pre?( version_number )
     rc       = stable || self.rc?( version_number )
@@ -73,6 +77,7 @@ class VersionTagRecognizer
     alpha    = beta   || self.alpha?( version_number )
     snapshot = alpha  || self.pre?( version_number ) || self.snapshot?( version_number )
 
+    return true if (stability.casecmp( A_STABILITY_PATCH )    == 0) && patch
     return true if (stability.casecmp( A_STABILITY_STABLE )   == 0) && stable
     return true if (stability.casecmp( A_STABILITY_PRE )      == 0) && pre
     return true if (stability.casecmp( A_STABILITY_RC )       == 0) && rc
@@ -117,7 +122,7 @@ class VersionTagRecognizer
     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.match(/.*patch.*/i)
 
     !self.alpha?(value)    and !self.beta?(value)       and
     !self.dev?(value)      and !self.pre?(value)        and

data/lib/versioncmp.rb

@@ -100,6 +100,9 @@ class Versioncmp
   def self.compare_specia_cases part1, part2
     result = Versioncmp.check_jquery_versioning(part1, part2)
     return result if result != nil
+
+    digit = part1 if part1.match(/\d/)
+    return -1 if ( part1.match(/\d/) && part2.match(/#{digit}\S*patch\S*/) )
     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]+/) )

data/spec/naturalsorter_spec.rb

@@ -12,7 +12,7 @@ describe Naturalsorter::Sorter do
     it "c400b5a1 is a1b5c400" do
       Naturalsorter::Sorter.sort(["a400", "a5", "a1"], true).should eql(["a1", "a5", "a400"])
     end
-    it "cba is abc" do
+    it "1.5.2 is lower than 1.5.2-patch" do
       Naturalsorter::Sorter.sort(["1.5.2", "1.4.4", "1.5.2-patch"], true).should eql(["1.4.4", "1.5.2", "1.5.2-patch"])
     end
   end

data/spec/versioncmp_spec.rb

@@ -194,4 +194,8 @@ describe Versioncmp do
     Versioncmp.compare("3.1", "3.2-SNAPSHOT").should eql(-1)
   end
 
+  it "1.5.2 is smaller than 1.5.2-patch1" do
+    Versioncmp.compare("1.5.2", "1.5.2-patch1").should eql(-1)
+  end
+
 end

metadata

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