naturalsorter 0.3.0 → 0.3.1

data/README.markdown

@@ -49,7 +49,7 @@ Get newest.
 
 You should add this line to your Gemfile
 
-`gem 'naturalsorter', '0.3.0'`
+`gem 'naturalsorter', '0.3.1'`
 
 and run this command in your app root directory
 

data/lib/naturalsorter/version.rb

@@ -1,3 +1,3 @@
 module Naturalsorter
-  VERSION = "0.3.0"
+  VERSION = "0.3.1"
 end

data/lib/versioncmp.rb

@@ -92,20 +92,20 @@ class Versioncmp
         return Versioncmp.getRcValue(a, b)
       end
     elsif (Versioncmp.isBeta(big))
-      bigwithoutBeta = big.gsub(/\.beta[1-9]*$/i, "")
-      bigwithoutBeta = bigwithoutBeta.gsub(/\-beta[1-9]*$/i, "")
+      bigwithoutBeta = big.gsub(/\.beta.*$/i, "")
+      bigwithoutBeta = bigwithoutBeta.gsub(/\-beta.*$/i, "")
       if (Versioncmp.compareString(bigwithoutBeta, small) == 0)
         return Versioncmp.getRcValue(a, b)
       end
     elsif (Versioncmp.isAlpha(big))
-      bigwithoutAlpha = big.gsub(/\.alpha[1-9]*$/i, "")
-      bigwithoutAlpha = bigwithoutAlpha.gsub(/\-alpha[1-9]*$/i, "")
+      bigwithoutAlpha = big.gsub(/\.alpha.*$/i, "")
+      bigwithoutAlpha = bigwithoutAlpha.gsub(/\-alpha.*$/i, "")
       if (Versioncmp.compareString(bigwithoutAlpha, small) == 0)
         return Versioncmp.getRcValue(a, b)
       end
     elsif (Versioncmp.isPre(big))
-      bigwithoutPre = big.gsub(/\.pre[1-9]*$/i, "")
-      bigwithoutPre = bigwithoutPre.gsub(/\-pre[1-9]*$/i, "")
+      bigwithoutPre = big.gsub(/\.pre.*$/i, "")
+      bigwithoutPre = bigwithoutPre.gsub(/\-pre.*$/i, "")
       if (Versioncmp.compareString(bigwithoutPre, small) == 0)
         return Versioncmp.getRcValue(a, b)
       end
@@ -130,15 +130,15 @@ class Versioncmp
   end
   
   def self.isBeta(a)
-    return a.match(/.*beta[1-9]*$/i) != nil;
+    return a.match(/.*beta.*$/i) != nil;
   end
   
   def self.isAlpha(a)
-    return a.match(/.*alpha[1-9]*$/i) != nil;
+    return a.match(/.*alpha.*$/i) != nil;
   end
   
   def self.isPre(a)
-    return a.match(/.*pre[1-9]*$/i) != nil;
+    return a.match(/.*pre.*$/i) != nil;
   end
   
   def self.getAPiece(offset, cake)

data/spec/versioncmp_spec.rb

@@ -42,10 +42,22 @@ describe Versioncmp do
     Versioncmp.compare("1.1-alpha1", "1.1").should eql(-1)
   end
   
+  it "smaller alpha-1" do
+    Versioncmp.compare("1.1-alpha-1", "1.1").should eql(-1)
+  end
+  
+  it "smaller alpha" do
+    Versioncmp.compare("1.1", "1.1-alpha-1").should eql(1)
+  end
+  
   it "smaller beta" do
     Versioncmp.compare("3.1-beta1", "3.1").should eql(-1)
   end
   
+  it "smaller beta" do
+    Versioncmp.compare("3.1-beta-1", "3.1").should eql(-1)
+  end
+  
   it "smaller 3.0-rc4-negotiate" do
     Versioncmp.compare("3.0-rc4-negotiate", "3.0").should eql(-1)
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: naturalsorter
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2012-04-06 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70191723925940 !ruby/object:Gem::Requirement
+  requirement: &70217385346580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,7 +21,7 @@ dependencies:
         version: '2.6'
   type: :development
   prerelease: false
-  version_requirements: *70191723925940
+  version_requirements: *70217385346580
 description: This GEM is sorting Arrays in a natural order. a2 < a10
 email:
 - robert.reiz@gmx.com