naturalsorter 0.7.12 → 1.0.0

data/README.markdown

@@ -42,7 +42,7 @@ This here is again for an array with objects. Spezially optimizied for sorting v
 
 `Naturalsorter::Sorter.sort_version_by_method(array, method)`
 
-`Naturalsorter::Sorter.sort_version_by_method_desc(array)`
+`Naturalsorter::Sorter.sort_version_by_method_desc(array, method)`
 
 Get the newest version from the both given.
 
@@ -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.7.12'`
+`gem 'naturalsorter', '1.0.0'`
 
 and run this command in your app root directory
 

data/lib/natcmp.rb

@@ -30,47 +30,47 @@ class Natcmp
 
 # 'Natural order' comparison of two strings
 def self.natcmp(str1, str2, caseInsensitive=false)
-	str1, str2 = str1.dup, str2.dup
-	compareExpression = /^(\D*)(\d*)(.*)$/
+  str1, str2 = str1.dup, str2.dup
+  compareExpression = /^(\D*)(\d*)(.*)$/
 
-	if caseInsensitive
-		str1.downcase!
-		str2.downcase!
-	end
+  if caseInsensitive
+    str1.downcase!
+    str2.downcase!
+  end
 
-	# Remove all whitespace
-	str1.gsub!(/\s*/, '')
-	str2.gsub!(/\s*/, '')
+  # Remove all whitespace
+  str1.gsub!(/\s*/, '')
+  str2.gsub!(/\s*/, '')
 
-	while (str1.length > 0) or (str2.length > 0) do
-		# Extract non-digits, digits and rest of string
-		str1 =~ compareExpression
-		chars1, num1, str1 = $1.dup, $2.dup, $3.dup
+  while (str1.length > 0) or (str2.length > 0) do
+    # Extract non-digits, digits and rest of string
+    str1 =~ compareExpression
+    chars1, num1, str1 = $1.dup, $2.dup, $3.dup
 
-		str2 =~ compareExpression
-		chars2, num2, str2 = $1.dup, $2.dup, $3.dup
+    str2 =~ compareExpression
+    chars2, num2, str2 = $1.dup, $2.dup, $3.dup
 
-		# Compare the non-digits
-		case (chars1 <=> chars2)
-			when 0 # Non-digits are the same, compare the digits...
-				# If either number begins with a zero, then compare alphabetically,
-				# otherwise compare numerically
-				if (num1[0] != 48) and (num2[0] != 48)
-					num1, num2 = num1.to_i, num2.to_i
-				end
+    # Compare the non-digits
+    case (chars1 <=> chars2)
+      when 0 # Non-digits are the same, compare the digits...
+        # If either number begins with a zero, then compare alphabetically,
+        # otherwise compare numerically
+        if (num1[0] != 48) and (num2[0] != 48)
+          num1, num2 = num1.to_i, num2.to_i
+        end
 
-				case (num1 <=> num2)
-					when -1 then return -1
-					when 1 then return 1
-				end
-			when -1 then return -1
-			when 1 then return 1
-		end # case
+        case (num1 <=> num2)
+          when -1 then return -1
+          when 1 then return 1
+        end
+      when -1 then return -1
+      when 1 then return 1
+    end # case
 
-	end # while
+  end # while
 
-	# Strings are naturally equal
-	return 0
+  # Strings are naturally equal
+  return 0
 end
 
 end

data/lib/naturalsorter.rb

@@ -156,7 +156,63 @@ module Naturalsorter
       end
       true
     end
+
+    def self.replace_minimum_stability val 
+      Sorter.replace_minimum_stability val 
+    end
   
   end
+
+  class ReleaseRecognizer
+
+    def self.value_for( value )
+      ReleaseRecognizer.value_for value
+    end
+
+    def self.compare_scopes( a, b)
+      ReleaseRecognizer.compare_scopes(a, b)
+    end
+
+    def self.scoped? value 
+      ReleaseRecognizer.scoped? value
+    end
+
+    def self.remove_scope value 
+      ReleaseRecognizer.remove_scope value 
+    end
+
+    def self.stable? value
+      ReleaseRecognizer.stable? value
+    end
+
+    def self.alpha? value 
+      ReleaseRecognizer.alpha? value
+    end
+
+    def self.beta? value 
+      ReleaseRecognizer.beta? value
+    end
+
+    def self.dev? value 
+      ReleaseRecognizer.dev? value 
+    end
+
+    def self.rc? value 
+      ReleaseRecognizer.rc? value 
+    end
+
+    def self.snapshot? value 
+      ReleaseRecognizer.snapshot? value 
+    end
+
+    def self.pre? value 
+      ReleaseRecognizer.pre? value 
+    end
+
+    def self.jbossorg? value 
+      ReleaseRecognizer.jbossorg? value 
+    end
+
+  end
   
 end

data/lib/naturalsorter/version.rb

@@ -1,3 +1,3 @@
 module Naturalsorter
-  VERSION = "0.7.12"
+  VERSION = "1.0.0"
 end

data/lib/release_recognizer.rb

@@ -1,16 +1,93 @@
 class ReleaseRecognizer
 
-  def self.release?(value)
+  def self.value_for( value )
+    return 0  if self.dev? value
+    return 2  if self.snapshot? value
+    return 3  if self.pre? value
+    return 4  if self.alpha? value
+    return 5  if self.beta? value
+    return 6  if self.rc? value
+    return 10 if self.stable? value
+    return 1
+  end
+
+  def self.compare_scopes( a, b)
+    a_val = self.value_for a 
+    b_val = self.value_for b
+    return -1 if a_val < b_val
+    return  1 if a_val > b_val
+    return 0
+  end
+
+  def self.scoped? value 
+    self.alpha?(value) or self.beta?(value) or 
+    self.dev?(value) or self.rc?(value) or 
+    self.snapshot?(value) or self.pre?(value) or 
+    self.jbossorg?(value)
+  end
+
+  def self.remove_scope value 
+    if self.alpha? value
+      new_value = value.gsub(/\.[\w-]*alpha.*$/i, "")
+      return new_value.gsub(/\.[\w-]*a.*$/i, "")
+    elsif self.beta? value
+      new_value = value.gsub(/\.[\w-]*beta.*$/i, "")
+      return new_value.gsub(/\.[\w-]*b.*$/i, "")
+    elsif self.rc? value
+      return value.gsub(/\.[\w-]*rc.*$/i, "")
+    elsif self.pre? value
+      return value.gsub(/\.[\w-]*pre.*$/i, "")
+    elsif self.jbossorg? value
+      return value.gsub(/\.jbossorg.*$/i, "")
+    elsif self.snapshot? value
+      return value.gsub(/\.snapshot.*$/i, "")
+    end
+    return value
+  end
+
+  def self.release? value
+    self.stable? value 
+  end
+
+  def self.stable? value
     if value.match(/.+RELEASE.*/i) or value.match(/.+BUILD.*/i) or 
       value.match(/.+FINAL.*/i) or value.match(/.+SP.*/i) or
       value.match(/.+GA.*/i) 
       return true 
     end
-    !value.match(/.*alpha.*/i) and !value.match(/.*beta.*/i) and 
-    !value.match(/.+a.*/i) and !value.match(/.+b.*/i) and 
-    !value.match(/.*dev.*/i) and !value.match(/.*pre.*/i) and
-    !value.match(/.*rc.*/i) and !value.match(/.+SEC.*/i) and 
-    !value.match(/.+SNAPSHOT.*/i) and !value.match(/.+M.+/i)
+    !self.alpha?(value) and !self.beta?(value) and 
+    !self.dev?(value) and !self.pre?(value) and
+    !self.rc?(value) and !value.match(/.+SEC.*/i) and 
+    !self.snapshot?(value) and !value.match(/.+M.+/i)
+  end
+
+  def self.alpha? value 
+    return false if self.beta? value
+    value.match(/.*alpha.*/i) or value.match(/.+a.*/i)
+  end
+
+  def self.beta? value 
+    value.match(/.*beta.*/i) or value.match(/.+b.*/i)
+  end
+
+  def self.dev? value 
+    value.match(/.*dev.*/i)
+  end
+
+  def self.rc? value 
+    value.match(/.*rc.*/i) 
+  end
+
+  def self.snapshot? value 
+    value.match(/.+SNAPSHOT.*/i)
+  end
+
+  def self.pre? value 
+    value.match(/.*pre.*$/i)
+  end
+
+  def self.jbossorg? value 
+    value.match(/.*jbossorg.*$/i)
   end
 
 end

data/lib/versioncmp.rb

@@ -26,6 +26,7 @@
 class Versioncmp
 
   # 'Natural version order' comparison of two version strings
+  #
   def self.compare(a_val, b_val)
 
     if (!a_val.nil? || a_val.eql?("") ) && b_val.nil?
@@ -40,154 +41,75 @@ class Versioncmp
       return -1
     end
 
-    a = do_x_dev_replacements a_val
-    b = do_x_dev_replacements b_val
+    a = pre_process a_val
+    b = pre_process b_val
 
-    replace_leading_v( a )
-    replace_leading_v( b )
-
-	  offset1 = 0;
+    offset1 = 0;
     offset2 = 0;
 
     for i in 0..100
       break if offset1 >= a.length() || offset2 >= b.length() 
 
-      part1 = Versioncmp.getAPiece(offset1, a);
-      part2 = Versioncmp.getAPiece(offset2, b);  
+      part1 = Versioncmp.get_a_piece_of_the_cake(offset1, a);
+      part2 = Versioncmp.get_a_piece_of_the_cake(offset2, b);
       
-      if Versioncmp.timestamp?(part1) && part2.length() < 8
-        return -1
-      end
-      if Versioncmp.timestamp?(part2) && part1.length() < 8
-        return 1
-      end
+      return -1 if Versioncmp.timestamp?(part1) && part2.length() < 8
+      return  1 if Versioncmp.timestamp?(part2) && part1.length() < 8
       
       offset1 += part1.length() + 1;
       offset2 += part2.length() + 1;
 
-      if ( part1.match(/^[0-9]+$/) != nil && part2.match(/^[0-9]+$/) != nil )
+      if ( part1.match(/^[0-9]+$/) && part2.match(/^[0-9]+$/) )
         ai = part1.to_i;
         bi = part2.to_i;
-        result = Versioncmp.compareInt(ai, bi);
+        result = Versioncmp.compare_int(ai, bi);
         return result if result != 0
         next 
-      elsif ( part1.match(/^[0-9]+$/) == nil && part2.match(/^[0-9]+$/) == nil )
-        result = Versioncmp.compareString(part1, part2)
+      elsif ( !part1.match(/^[0-9]+$/) && !part2.match(/^[0-9]+$/) )
+        result = double_scope_checker(a, b)
+        return result if result != 0      
+        result = Versioncmp.compare_string(part1, part2)
         return result if (result != 0)
         next
       else
         result = Versioncmp.check_jquery_versioning(part1, part2)
-        if result != nil
-          return result
-        end
-        return 1 if (part1.match(/^[0-9]+$/) != nil && part2.match(/^[0-9]+$/) == nil)
+        return result if result != nil
+        return  1 if (part1.match(/^[0-9]+$/) && part2.match(/^[0-9]+$/) == nil)
         return -1;
       end
-	  end
-	  result = Versioncmp.checkForRC(a, b) 
-	  return result
-  end
-  
-  def self.compareInt(ai, bi)
-    return -1 if (ai < bi)
-    return 0 if (ai == bi)
-    return 1
-  end
-  
-  def self.compareString(a, b)
-    return 0 if a.eql? b
-    return -1 if a < b
-    return 1
-  end
-
-  def self.check_jquery_versioning(part1, part2)
-    # --- START ---- special case for awesome jquery shitty verison numbers 
-    if ( part1.match(/^[0-9]+[a-zA-Z]+[0-9]+$/) != nil && part2.match(/^[0-9]+$/) != nil )
-      part1_1 = part1.match(/^[0-9]+/)
-      result = Versioncmp.compareInt(part1_1[0], part2)
-      if result != 0
-        return result
-      end
-      return -1
-    end
-
-    if ( part2.match(/^[0-9]+[a-zA-Z]+[0-9]+$/) != nil && part1.match(/^[0-9]+$/) != nil )
-      part2_1 = part2.match(/^[0-9]+/)
-      result = Versioncmp.compareInt(part1, part2_1[0])
-      if result != 0
-        return result
-      end
-      return 1
     end
-
-    return nil
-    # --- END ---- special case for awesome jquery shitty verison numbers 
+    result = Versioncmp.check_for_scopes(a, b) 
+    return result
   end
   
-  def self.checkForRC(a, b)
+  def self.check_for_scopes(a, b)
     big = String.new(a)
     small = String.new(b)
     if (a.length() < b.length())
       big = String.new(b)
       small = String.new(a)
     end
-    if (Versioncmp.isRc(big))
-      bigwithoutRc = big.gsub(/\.rc.*$/i, "")
-      bigwithoutRc = bigwithoutRc.gsub(/\-rc.*$/i, "")
-      if (Versioncmp.compareString(bigwithoutRc, small) == 0)
-        return Versioncmp.getRcValue(a, b)
-      end
-    elsif (Versioncmp.isBeta(big))
-      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.*$/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.*$/i, "")
-      bigwithoutPre = bigwithoutPre.gsub(/\-pre.*$/i, "")
-      if (Versioncmp.compareString(bigwithoutPre, small) == 0)
-        return Versioncmp.getRcValue(a, b)
-      end
-    elsif (Versioncmp.isJbossorg(big))
-      bigwithoutRc = big.gsub(/\.jbossorg.*$/i, "")
-      bigwithoutRc = bigwithoutRc.gsub(/\-jbossorg.*$/i, "")
-      if (Versioncmp.compareString(bigwithoutRc, small) == 0)
-        return Versioncmp.getRcValue(a, b)
+    if (ReleaseRecognizer.scoped?(big))
+      big_without_scope = ReleaseRecognizer.remove_scope big
+      if (Versioncmp.compare_string(big_without_scope, small) == 0)
+        return Versioncmp.compare_string_length(a, b)
       end
     end
-    return 1 if a.length > b.length
-    return -1 if a.length < b.length
-    return 0
-  end
-  
-  def self.isRc(a)
-    return a.match(/.*rc.*$/i) != nil;
+    self.compare_string_length_odd(a, b)  
   end
-  
-  def self.isJbossorg(a)
-    return a.match(/.*jbossorg.*$/i) != nil;
-  end
-  
-  def self.isBeta(a)
-    return a.match(/.*beta.*$/i) != nil;
-  end
-  
-  def self.isAlpha(a)
-    return a.match(/.*alpha.*$/i) != nil;
-  end
-  
-  def self.isPre(a)
-    return a.match(/.*pre.*$/i) != nil;
+
+  def self.double_scope_checker(a, b)
+    if ReleaseRecognizer.scoped?(a) && ReleaseRecognizer.scoped?(b)
+      a_without_scope   = ReleaseRecognizer.remove_scope a
+      b_without_scope = ReleaseRecognizer.remove_scope b
+      if a_without_scope.eql? b_without_scope
+        return ReleaseRecognizer.compare_scopes(a, b)
+      end
+    end
+    0 
   end
   
-  def self.getAPiece(offset, cake)
+  def self.get_a_piece_of_the_cake(offset, cake)
     for z in 0..100
       offsetz = offset + z
       break if offsetz > cake.length() 
@@ -203,16 +125,18 @@ class Versioncmp
     return piece
   end
   
-  def self.getRcValue(a, b)    
-    return 1 if (a.length() < b.length())
-    return -1
-  end
-  
   def self.timestamp?(part)
     return part.length() == 8 && part.match(/^[0-9]+$/) != nil
   end
 
-  def self.do_x_dev_replacements val 
+  def self.pre_process val 
+    a = replace_x_dev val
+    replace_leading_v( a )
+    replace_minimum_stability( a )
+    a 
+  end
+
+  def self.replace_x_dev val 
     new_val = String.new(val)
     if val.eql?("dev-master")
       new_val = "9999999"
@@ -230,4 +154,58 @@ class Versioncmp
     end
   end
 
+  def self.replace_minimum_stability val 
+    if val.match(/@.*$/)
+      val.gsub!(/@.*$/, "")  
+    end
+  end
+
+  def self.check_jquery_versioning(part1, part2)
+    # --- START ---- special case for awesome jquery shitty verison numbers 
+    if ( part1.match(/^[0-9]+[a-zA-Z]+[0-9]+$/) != nil && part2.match(/^[0-9]+$/) != nil )
+      part1_1 = part1.match(/^[0-9]+/)
+      result = Versioncmp.compare_int(part1_1[0], part2)
+      if result != 0
+        return result
+      end
+      return -1
+    end
+
+    if ( part2.match(/^[0-9]+[a-zA-Z]+[0-9]+$/) != nil && part1.match(/^[0-9]+$/) != nil )
+      part2_1 = part2.match(/^[0-9]+/)
+      result = Versioncmp.compare_int(part1, part2_1[0])
+      if result != 0
+        return result
+      end
+      return 1
+    end
+
+    return nil
+    # --- END ---- special case for awesome jquery shitty verison numbers 
+  end
+
+  def self.compare_int(ai, bi)
+    return -1 if (ai < bi)
+    return  0 if (ai == bi)
+    return  1
+  end
+  
+  def self.compare_string(a, b)
+    return  0 if a.eql? b
+    return -1 if a < b
+    return  1
+  end
+
+  def self.compare_string_length(a, b)  
+    return  0 if a.length() == b.length()
+    return  1 if a.length() <  b.length()
+    return -1
+  end
+
+  def self.compare_string_length_odd(a, b)  
+    return  1 if a.length > b.length
+    return -1 if a.length < b.length
+    return  0
+  end
+
 end

data/spec/release_recognizer_spec.rb

@@ -122,4 +122,119 @@ describe ReleaseRecognizer do
     ReleaseRecognizer.release?("2.0-m4").should be_false
   end
 
+
+
+  it "is alpha? is true" do
+    ReleaseRecognizer.alpha?("2.0.alpha").should be_true
+  end
+
+  it "is alpha? is true" do
+    ReleaseRecognizer.alpha?("2.1.0alpha").should be_true
+  end
+
+  it "is alpha? is false" do
+    ReleaseRecognizer.alpha?("2.0.1").should be_false
+  end
+
+  it "is alpha? is false" do
+    ReleaseRecognizer.alpha?("2.1.0-BETA1").should be_false
+  end
+
+  it "is scoped? is true" do
+    ReleaseRecognizer.scoped?("2.1.0alpha").should be_true
+  end
+
+  it "remove_scope is right" do
+    ReleaseRecognizer.remove_scope("2.1.0alpha").should eql("2.1")
+  end
+
+
+
+  it "is beta? is true" do
+    ReleaseRecognizer.beta?("2.0.beta").should be_true
+  end
+
+  it "is beta? is true" do
+    ReleaseRecognizer.beta?("2.1.0beta").should be_true
+  end
+
+  it "is beta? is false" do
+    ReleaseRecognizer.beta?("2.0.1").should be_false
+  end
+
+  it "is beta? is true" do
+    ReleaseRecognizer.beta?("2.2.0-BETA2").should be_true
+  end
+
+  it "is beta? is true" do
+    ReleaseRecognizer.beta?("2.1.0-BETA1").should be_true
+  end
+
+  it "is scoped? is true" do
+    ReleaseRecognizer.scoped?("2.1.0-BETA1").should be_true
+  end
+
+  it "remove_scope is right" do
+    ReleaseRecognizer.remove_scope("2.1.0-BETA1").should eql("2.1")
+  end
+  
+
+
+  it "is dev? is true" do
+    ReleaseRecognizer.dev?("dev-master").should be_true
+  end
+
+  it "is dev? is true" do
+    ReleaseRecognizer.dev?("dev-progress-helper").should be_true
+  end
+
+  it "is dev? is true" do
+    ReleaseRecognizer.dev?("dev-deprecated").should be_true
+  end
+
+  it "is dev? is true" do
+    ReleaseRecognizer.dev?("2.2.x-dev").should be_true
+  end
+
+  it "is dev? is false" do
+    ReleaseRecognizer.dev?("2.0.1").should be_false
+  end
+
+
+
+  it "is rc? is true" do
+    ReleaseRecognizer.rc?("2.0.rc").should be_true
+  end
+
+  it "is rc? is true" do
+    ReleaseRecognizer.rc?("2.1.0rc").should be_true
+  end
+
+  it "is rc? is true" do
+    ReleaseRecognizer.rc?("2.2.0-RC3").should be_true
+  end
+
+  it "is rc? is false" do
+    ReleaseRecognizer.rc?("2.0.1").should be_false
+  end
+
+
+
+  it "is snapshot? is true" do
+    ReleaseRecognizer.snapshot?("2.0.snapshot").should be_true
+  end
+
+  it "is snapshot? is true" do
+    ReleaseRecognizer.snapshot?("2.1.0snapshot").should be_true
+  end
+
+  it "is snapshot? is true" do
+    ReleaseRecognizer.snapshot?("2.2.0-snapshot3").should be_true
+  end
+
+  it "is snapshot? is false" do
+    ReleaseRecognizer.snapshot?("2.0.1").should be_false
+  end
+
+
 end

data/spec/versioncmp_spec.rb

@@ -45,6 +45,10 @@ describe Versioncmp do
   it "smaller RC" do
     Versioncmp.compare("1.1.rc1", "1.1").should eql(-1)
   end
+
+  it "smaller RC" do
+    Versioncmp.compare("1.1.rc1", "2.0").should eql(-1)
+  end
   
   it "smaller RC" do
     Versioncmp.compare("1.1-rc1", "1.1").should eql(-1)
@@ -53,6 +57,10 @@ describe Versioncmp do
   it "smaller alpha" do
     Versioncmp.compare("1.1-alpha1", "1.1").should eql(-1)
   end
+
+  it "alpha is smaller than BETA" do
+    Versioncmp.compare("2.1.0alpha", "2.1.0-BETA1").should eql(-1)
+  end
   
   it "smaller alpha-1" do
     Versioncmp.compare("1.1-alpha-1", "1.1").should eql(-1)

metadata

@@ -2,7 +2,7 @@
 name: naturalsorter
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.7.12
+  version: 1.0.0
 platform: ruby
 authors: 
 - reiz
@@ -11,7 +11,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2013-03-11 00:00:00 Z
+date: 2013-03-13 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rspec