naturalsorter 2.0.7 → 2.0.8

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ZGI4NzU3ZjlhMDA0NjI2MTljODI5ZTFhMDU4MTlhMzU5ZjM2YmZiNQ==
+    ZWZlNGQxOTJiYTNmMDcwODY2ZWEwYmIyNDM1M2Y1YjEzYWRiYTgwMQ==
   data.tar.gz: !binary |-
-    YTEzYzdlYTRhMGVkNDg2MzU4MWUxN2UwMDExMzQwYTg3OTFkNzI2Mg==
+    NTc2YzJjNDA5MjlhZDdmY2RjZTM5NjVkMzIzMjgwMTU0N2Q1ODEzYw==
 SHA512:
   metadata.gz: !binary |-
-    Y2E4YzFjYzI0MTIyZmRkY2IyMGM4NjcxYTIyOTVhMjM0NzliM2VjYjc5N2M0
-    ZjYwMTMyZWU1NmM0ZmM4Mjg3MTI4MGRiZGI5NDY0ZDU2NjgyNjllN2ZiZjA0
-    MDIyYTZjOWE3YmE4NTYyMGZiN2Q5MjJmMGNmODJhNzc4NmEyZWU=
+    ODk0ZjllMDY3MzUyZDUwMWFiODg1NDdkNTc2YjI0N2FjODJlNTg3YTZlMTc4
+    NTQ0NmQxZDExYzRmNTA2ZTJjYjRhZjYwYzRmNDk3M2M5ZGJkNTI2ZWEyMmNk
+    YWM1OTA5Yzk4MTNhYjRkODYwMDZjMWQ0MzlkMWZkNjVhMDFkOWE=
   data.tar.gz: !binary |-
-    ZTFhYWZjNGNjNmUzYmE0MTdmNWIzMjExYmEzM2JlM2U4NGJlMmEwYWU3Nzkz
-    NzU0MzdjODFkMTc3MGZlODVhMjY4YjU5YTVkNDg5ZDA5ZTNjZmU2NWJlYmVi
-    ZjU0YTg4ZGJhNTE0ZmRiZjdmNTM3ZmMxY2ZhZWQ3NmNjNjJkYzg=
+    MmY4NTYyNWE3MzhmMzgxMmJjMWMyZmRmZTI4MzRhZjVkYWEwYjE3NmM2YzE4
+    MmJjNDA1NzFhNjlkYjFkMjNmYzg5ZTJiNmM2ZDVhMTY2YzcxMmQ3YmZlZjFl
+    MDgyOTFjZDBiNjM0YjFkNTJjZTk2ODA3MWE3OWQ1NDFhMjdlZjI=

data/README.markdown

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

data/lib/naturalsorter/version.rb

@@ -1,3 +1,3 @@
 module Naturalsorter
-  VERSION = "2.0.7"
+  VERSION = "2.0.8"
 end

data/lib/versioncmp.rb

@@ -40,10 +40,11 @@ class Versioncmp
     a = pre_process a_val
     b = pre_process b_val
 
+    ab = [a, b]
     offsets = [0, 0]
 
     for i in 0..20
-      result = self.check_the_slice a, b, offsets
+      result = self.check_the_slice ab, offsets
       next if result.nil?
       return result if result == 1 || result == -1
     end
@@ -52,12 +53,12 @@ class Versioncmp
   end
 
 
-  def self.check_the_slice a, b, offsets
-    a += ".0" if offsets[0] >= a.length
-    b += ".0" if offsets[0] >= b.length
+  def self.check_the_slice ab, offsets
+    ab[0] += ".0" if offsets[0] >= ab[0].length
+    ab[1] += ".0" if offsets[0] >= ab[1].length
 
-    part1 = Versioncmp.get_a_piece_of_the_cake offsets[0], a
-    part2 = Versioncmp.get_a_piece_of_the_cake offsets[0], b
+    part1 = Versioncmp.get_a_piece_of_the_cake offsets[0], ab[0]
+    part2 = Versioncmp.get_a_piece_of_the_cake offsets[0], ab[1]
 
     return -1 if Versioncmp.timestamp?(part1) && part2.length() < 8
     return  1 if Versioncmp.timestamp?(part2) && part1.length() < 8
@@ -68,7 +69,7 @@ class Versioncmp
     if ( part1.match(/^[0-9]+$/) && part2.match(/^[0-9]+$/) )
       return self.compare_numbers part1, part2
     elsif ( !part1.match(/^[0-9]+$/) && !part2.match(/^[0-9]+$/) )
-      return self.compare_strings a, b, part1, part2
+      return self.compare_strings ab[0], ab[1], part1, part2
     else
       return self.compare_specia_cases part1, part2
     end
@@ -153,7 +154,7 @@ class Versioncmp
   end
 
 
-  def self.timestamp?(part)
+  def self.timestamp? part
     return part.length() == 8 && part.match(/^[0-9]+$/) != nil
   end
 

data/naturalsorter.gemspec

@@ -21,5 +21,5 @@ Gem::Specification.new do |s|
   # specify any dependencies here; for example:
   # s.add_development_dependency "rspec"
   # s.add_runtime_dependency "rest-client"
-  s.add_development_dependency "rspec", "2.13.0"
-end
+  s.add_development_dependency "rspec", "2.14.1"
+end

data/spec/versioncmp_spec.rb

@@ -158,4 +158,8 @@ describe Versioncmp do
     Versioncmp.compare("2.2.1-b03", "2.2").should eql(1)
   end
 
+  it "3.0.0 is equal to 3.0" do
+    Versioncmp.compare("3.0.0", "3.0").should eql(1)
+  end
+
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: naturalsorter
 version: !ruby/object:Gem::Version
-  version: 2.0.7
+  version: 2.0.8
 platform: ruby
 authors:
 - reiz
@@ -17,14 +17,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.13.0
+        version: 2.14.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.13.0
+        version: 2.14.1
 description: This GEM is sorting Arrays in a natural order. a2 < a10. Beside that
   this GEM has some methods to sort version strings. It even recognises alpha, beta,
   RC, dev and stable versions.