naturalsorter 3.0.4 → 3.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9ec3495480af6412be235cedca0e391da3da6920
-  data.tar.gz: d07b2807cfdc5a9d4b75e68cafab8602e22f55bb
+  metadata.gz: e4bcfeb77065843f4df41aebbd0275236fe3ea2b
+  data.tar.gz: 2a096d344d38ff5c88c3f061b1a72decef62d009
 SHA512:
-  metadata.gz: d97a01a73a68871758784a29ef5471ce3071490cafcd2b44f069bfb1ad048e3db0056fd58d939228ff0a067bddfa4b8d4f26f79d152f4e2e371b6a4f31450c65
-  data.tar.gz: 3781db9ca46c941bb4048dccad7171e2d83597c17fdbc8bd8e1a3ff92d3a08f7379a6d8cb7767d552edd96092ff17635a47b8fcf8eeb6ff6fc5db696d289c527
+  metadata.gz: e9ec94d6f963303ae144b3e71aaaf2ac73938fac5efdba337a0409188e2b7925eff954c5b16eb317fc39c31b7c5442fc4755b7fc6e8369b380db93358b11becc
+  data.tar.gz: 468f456b3b7dde55bd4ef1aa9115bc28ad186fb8b5afa8a75584ebe2190258604963574d6597083fe7e02c67f468e9bfd303e8e28a5e3391de018722082b3999

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

data/lib/naturalsorter/version.rb

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

data/lib/versioncmp.rb

@@ -100,9 +100,17 @@ 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*/) )
+
+    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*/) ) 
+      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]+/) )

data/spec/naturalsorter_spec.rb

@@ -29,6 +29,9 @@ describe Naturalsorter::Sorter do
     it "c400b5a1 is a1b5c400" do
       Naturalsorter::Sorter.sort_by_method(["a400", "a5", "a1"], "to_s", true).should eql(["a1", "a5", "a400"])
     end
+    it "1.5.2 is lower than 1.5.2-patch" do
+      Naturalsorter::Sorter.sort_by_method(["1.5.2-patch", "1.5.2", "1.4.4"], "to_s", true).should eql(["1.4.4", "1.5.2", "1.5.2-patch"])
+    end
   end
   describe  "sort_by_method_desc" do
     it "a5 a400 a1 is a400 a5 a1" do
@@ -115,6 +118,16 @@ describe Naturalsorter::Sorter do
       Naturalsorter::Sorter.sort_version(["2.1.0-beta11", "2.1.0-beta9"]).should eql(["2.1.0-beta9", "2.1.0-beta11"])
     end
 
+    it "1.5.2-patch is bigger than 1.5.2" do
+      Naturalsorter::Sorter.sort_version(["1.5.2", "1.4.4", "1.5.2-patch"]).should eql(["1.4.4", "1.5.2", "1.5.2-patch"])
+    end
+
+  end
+
+  describe "sort_version_by_method" do
+    it "1.5.2-patch is bigger than 1.5.2" do
+      Naturalsorter::Sorter.sort_version_by_method(["1.5.2", "1.4.4", "1.4.2", "1.5.2-patch2", "1.5.2-patch1"], 'to_s').should eql(["1.4.2", "1.4.4", "1.5.2", "1.5.2-patch1", "1.5.2-patch2"])
+    end
   end
 
   describe "is_version_current?" do

metadata

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