naturalsorter 0.5.11 → 0.7.11

data/LICENSE

@@ -0,0 +1,18 @@
+Copyright (c) 2012 Robert Reiz
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of 
+this software and associated documentation files (the "Software"), to deal in 
+the Software without restriction, including without limitation the rights to 
+use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of 
+the Software, and to permit persons to whom the Software is furnished to do so, 
+subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all 
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR 
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS 
+FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR 
+COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER 
+IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN 
+CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/README.markdown

@@ -76,7 +76,7 @@ because '~>1.1' doesn't fit anymore the newest version.
 
 You should add this line to your Gemfile
 
-`gem 'naturalsorter', '0.5.11'`
+`gem 'naturalsorter', '0.7.11'`
 
 and run this command in your app root directory
 

data/lib/natcmp.rb

@@ -73,4 +73,4 @@ def self.natcmp(str1, str2, caseInsensitive=false)
 	return 0
 end
 
-end
+end

data/lib/naturalsorter/version.rb

@@ -1,3 +1,3 @@
 module Naturalsorter
-  VERSION = "0.5.11"
-end
+  VERSION = "0.7.11"
+end

data/lib/naturalsorter.rb

@@ -92,24 +92,32 @@ module Naturalsorter
     end
     
     def self.bigger?(a, b)
+      Versioncmp.replace_leading_v( a )
+      Versioncmp.replace_leading_v( b )
       return false if a.eql?(b)
       newest = Sorter.get_newest_version(a, b)
       newest.eql?(a)
     end
     
     def self.bigger_or_equal?(a, b)
+      Versioncmp.replace_leading_v( a )
+      Versioncmp.replace_leading_v( b )
       return true if a.eql?(b)
       newest = Sorter.get_newest_version(a, b)
       newest.eql?(a)
     end
     
     def self.smaller?(a, b)
+      Versioncmp.replace_leading_v( a )
+      Versioncmp.replace_leading_v( b )
       return false if a.eql?(b)
       newest = Sorter.get_newest_version(a, b)
       newest.eql?(b)
     end
     
     def self.smaller_or_equal?(a, b)
+      Versioncmp.replace_leading_v( a )
+      Versioncmp.replace_leading_v( b )
       return true if a.eql?(b)
       newest = Sorter.get_newest_version(a, b)
       newest.eql?(b)
@@ -151,4 +159,4 @@ module Naturalsorter
   
   end
   
-end
+end

data/lib/release_recognizer.rb

@@ -13,4 +13,4 @@ class ReleaseRecognizer
     !value.match(/.+SNAPSHOT.*/i) and !value.match(/.+M.+/i)
   end
 
-end
+end

data/lib/versioncmp.rb

@@ -40,19 +40,11 @@ class Versioncmp
       return -1
     end
 
-    a = String.new(a_val)
-    if a_val.match(/\.x-dev$/)
-      a = a_val.gsub("x-dev", "9999999")
-    elsif a_val.match(/-dev$/)
-      a = a_val.gsub("-dev", ".9999999")
-    end
+    a = do_x_dev_replacements a_val
+    b = do_x_dev_replacements b_val
 
-    b = String.new(b_val)
-    if b_val.match(/\.x-dev$/)
-      b = b_val.gsub("x-dev", "9999999")
-    elsif b_val.match(/-dev$/)
-      b = b_val.gsub("-dev", ".9999999")
-    end
+    replace_leading_v( a )
+    replace_leading_v( b )
 
 	  offset1 = 0;
     offset2 = 0;
@@ -220,4 +212,20 @@ class Versioncmp
     return part.length() == 8 && part.match(/^[0-9]+$/) != nil
   end
 
-end
+  def self.do_x_dev_replacements val 
+    new_val = String.new(val)
+    if val.match(/\.x-dev$/)
+      new_val = val.gsub("x-dev", "9999999")
+    elsif val.match(/-dev$/)
+      new_val = val.gsub("-dev", ".9999999")
+    end
+    new_val
+  end
+
+  def self.replace_leading_v val 
+    if val.match(/^v[0-9]+/)
+      val.gsub!(/^v/, "")  
+    end
+  end
+
+end

data/naturalsorter.gemspec

@@ -6,7 +6,7 @@ Gem::Specification.new do |s|
   s.name        = "naturalsorter"
   s.version     = Naturalsorter::VERSION
   s.authors     = ["reiz", "versioneye"]
-  s.email       = ["robert.reiz@gmx.com"]
+  s.email       = ["reiz@versioneye.com"]
   s.homepage    = "https://github.com/versioneye/naturalsorter"
   s.summary     = %q{Sorting arrays in natural order}
   s.description = %q{This GEM is sorting Arrays in a natural order. a2 < a10}

data/spec/naturalsorter_spec.rb

@@ -126,7 +126,25 @@ describe Naturalsorter::Sorter do
     end
     it "returns 1.10" do
       Naturalsorter::Sorter.get_newest_version("1.10", "1.8").should eql("1.10")
-    end  
+    end
+    it "returns 1.10" do
+      Naturalsorter::Sorter.get_newest_version("1.10", "v1.0").should eql("1.10")
+    end
+    it "returns v1.10" do
+      Naturalsorter::Sorter.get_newest_version("v1.10", "v1.0").should eql("v1.10")
+    end
+    it "returns v1.10" do
+      Naturalsorter::Sorter.get_newest_version("v1.10", "1.0").should eql("v1.10")
+    end
+    it "returns 1.10.x-dev" do
+      Naturalsorter::Sorter.get_newest_version("1.10.x-dev", "1.10.1").should eql("1.10.x-dev")
+    end
+    it "returns still 1.10.x-dev" do
+      Naturalsorter::Sorter.get_newest_version("1.10.x-dev", "1.10.99").should eql("1.10.x-dev")
+    end
+    it "returns still 1.11.1" do
+      Naturalsorter::Sorter.get_newest_version("1.10.x-dev", "1.11.1").should eql("1.11.1")
+    end
   
   end
   
@@ -164,6 +182,12 @@ describe Naturalsorter::Sorter do
     it "returns true" do
       Naturalsorter::Sorter.bigger_or_equal?("2.20", "2.20").should be_true
     end
+    it "returns true" do
+      Naturalsorter::Sorter.bigger_or_equal?("v3.2.0", "3.2.0").should be_true
+    end
+    it "returns true" do
+      Naturalsorter::Sorter.bigger_or_equal?("v3.2.0", "3.1.0").should be_true
+    end
     it "returns false" do
       Naturalsorter::Sorter.bigger_or_equal?("2.20", "3.0").should be_false
     end
@@ -207,6 +231,9 @@ describe Naturalsorter::Sorter do
     it "returns true" do
       Naturalsorter::Sorter.smaller_or_equal?("2.20", "3.0").should be_true
     end
+    it "returns true" do
+      Naturalsorter::Sorter.smaller_or_equal?("2.20", "v3.0").should be_true
+    end
   
   end
   

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: naturalsorter
 version: !ruby/object:Gem::Version
-  version: 0.5.11
+  version: 0.7.11
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-21 00:00:00.000000000 Z
+date: 2013-02-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -30,13 +30,14 @@ dependencies:
         version: '2.6'
 description: This GEM is sorting Arrays in a natural order. a2 < a10
 email:
-- robert.reiz@gmx.com
+- reiz@versioneye.com
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
 - Gemfile
+- LICENSE
 - README.markdown
 - Rakefile
 - lib/natcmp.rb