naturalsorter 3.0.10 → 3.0.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f77ff5a0c7843443a170d17863591648994e8d4e
-  data.tar.gz: 70345fa0e81a99dc9ac2ebb055a8a3ea08704694
+  metadata.gz: b5ef3f2f8651e025ce0853aaa502b530f6b60e97
+  data.tar.gz: c802e36cfe0f9ef3796783c69a16e2018611801a
 SHA512:
-  metadata.gz: 802d8e6f34de0cd67ef29f176e3c47337c141a9d5945f99bfaf3b69c09307c893f4e52679727240d4dc94628a053a7e825bb1e55430dbfe162e81c2e9eb06b0c
-  data.tar.gz: c1e51ac23f8fcc923b106d4549dc1b505468491d6ac8c64ad0ea343099a457f42a7fe9847ddb6e7e5a96f43bf73b824309575a1ae5b756e6570fee2a00b81e30
+  metadata.gz: 03935e8d1da7c6d459753a72f6ef61b829dabf7bc042b737339ab06fced3d02700950fa6edbed4feb3a6bdf51f712e4ef50d8d2e865fcece142c730a0eb2b382
+  data.tar.gz: 0ff45ca12f2a93ef2ce0e1e652a93a7ff6d01400fe3f836949416a1a340c5d7259f4f931bffb8f902b7dc3d0125632621e6e58058db92020cda795feea73a39c

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

data/lib/naturalsorter/version.rb

@@ -1,3 +1,3 @@
 module Naturalsorter
-  VERSION = "3.0.10"
+  VERSION = "3.0.11"
 end

data/lib/version_tag_recognizer.rb

@@ -94,10 +94,10 @@ class VersionTagRecognizer
       return spliti[1]
     else
       return A_STABILITY_DEV if version.match(/\Adev-/i) || version.match(/-dev\z/i)
-      
+
       if self.stable? version
         return A_STABILITY_STABLE
-      elsif self.patch? version 
+      elsif self.patch? version
         return A_STABILITY_PATCH
       elsif self.pre? version
         return A_STABILITY_PRE

data/lib/versioncmp.rb

@@ -108,14 +108,14 @@ class Versioncmp
   def self.compare_special_cases part1, part2
     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 = part2 if part2.match(/\d/)
     return  1 if ( part2.match(/\d/) && part1.match(/#{digit}\S*patch\S*/) )
-    
-    if ( part1.match(/#\S*patch\S*/) && part2.match(/\S*patch\S*/) ) 
+
+    if ( part1.match(/#\S*patch\S*/) && part2.match(/\S*patch\S*/) )
       return compare_string(part1, part2)
     end
 
@@ -132,27 +132,27 @@ class Versioncmp
     pm1 = part1.match(/\A(\d+)-(\w+)\z/i)
     pm2 = part2.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]) 
+    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)
     return  1 if try_to_i_bigger( pm1, pm2, part2 )
-    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])
 
     return  1 if ( part1.match(/\A[0-9]+\z/) && !part2.match(/\A[0-9]+\z/) )
 
     return -1;
-  rescue => e 
-    p e.message 
+  rescue => e
+    p e.message
     p e.backtrace.join("\n")
-    return -1 
+    return -1
   end
 
 
-  def self.try_to_i_bigger pm1, pm2, part2 
-    pm2 && pm1 && pm1[1].to_i > part2.to_i 
-  rescue => e 
-    false 
+  def self.try_to_i_bigger pm1, pm2, part2
+    pm2 && pm1 && pm1[1].to_i > part2.to_i
+  rescue => e
+    false
   end
 
 
@@ -232,7 +232,7 @@ class Versioncmp
     end
   end
 
-  def self.replace_snapshot val 
+  def self.replace_snapshot val
     if val.match(/\-SNAPSHOT/)
       val.gsub!("-SNAPSHOT", "")
     end
@@ -261,8 +261,10 @@ class Versioncmp
 
   def self.replace_x_dev val
     new_val = String.new(val)
-    if val.eql?("dev-master") || val.eql?("dev-develop")
-      new_val = "9999999"
+    if val.eql?("dev-master")
+      new_val = "99999999999"
+    elsif val.eql?("dev-develop")
+      new_val = "9999999999"
     elsif val.match(/\Adev-/i)
       new_val = "9999999"
     elsif val.match(/\.x-dev$/i)

data/spec/versioncmp_spec.rb

@@ -41,7 +41,7 @@ describe Versioncmp do
   it "3.5.5 is smaller than 3.5.5-1 " do
     Versioncmp.compare("3.5.5", "3.5.5-1").should eql(-1)
   end
-  
+
   it "2.3.1-b01 is bigger than 2.3.1" do
     Versioncmp.compare("2.3.1-b01", "2.3.1").should eql(1)
   end
@@ -54,7 +54,7 @@ describe Versioncmp do
     Versioncmp.compare("2.3.d-b01", "2.3.1").should eql(-1)
   end
 
-    
+
   it "2.18.1 is bigger than 2.18-20141019" do
     Versioncmp.compare("2.18.1", "2.18-20141019").should eql(1)
   end
@@ -232,6 +232,10 @@ describe Versioncmp do
     Versioncmp.compare("dev-master", "1.0.0").should eql(1)
   end
 
+  it "dev-master is bigger than dev-support_old" do
+    Versioncmp.compare("dev-master", "dev-support_old").should eql(1)
+  end
+
   it "dev-develop is bigger than 1.0.0" do
     Versioncmp.compare("dev-develop", "1.0.0").should eql(1)
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: naturalsorter
 version: !ruby/object:Gem::Version
-  version: 3.0.10
+  version: 3.0.11
 platform: ruby
 authors:
 - reiz
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-15 00:00:00.000000000 Z
+date: 2015-10-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec