Add Version.clean, stricter valid?, and || handling in satisfies?

lib/vers.rb

@@ -119,13 +119,15 @@ def self.to_vers_string(version_range, scheme)
   #   Vers.satisfies?("1.5.0", "^1.2.3", "npm")            # => true
   #
   def self.satisfies?(version, constraint, scheme = nil)
-    range = if scheme
-              parse_native(constraint, scheme)
-            else
-              parse(constraint)
-            end
-
-    range.contains?(version)
+    sub_ranges = constraint.split('||').map(&:strip).reject(&:empty?)
+    sub_ranges.any? do |sub_range|
+      range = if scheme
+                parse_native(sub_range, scheme)
+              else
+                parse(sub_range)
+              end
+      range.contains?(version)
+    end
   end
 
   ##
@@ -177,6 +179,10 @@ def self.valid?(version_string)
     Version.valid?(version_string)
   end
 
+  def self.clean(version_string)
+    Version.clean(version_string)
+  end
+
   ##
   # Creates an exact version range
   #

lib/vers/version.rb

@@ -104,10 +104,12 @@ def self.normalize(version_string)
     # @return [Boolean] true if the version is valid
     #
     def self.valid?(version_string)
-      cached_new(version_string)
-      true
-    rescue ArgumentError
-      false
+      version_string.to_s.match?(/\Av?\d+\.\d+\.\d+/)
+    end
+
+    def self.clean(version_string)
+      return nil unless valid?(version_string)
+      version_string.to_s.sub(/\Av/, '')
     end
 
     ##

test/test_vers.rb

@@ -54,7 +54,27 @@ def test_normalize_version
   def test_valid_version
     assert Vers.valid?("1.2.3")
     assert Vers.valid?("1.0.0-alpha")
+    assert Vers.valid?("v1.0.0")
     refute Vers.valid?("")
+    refute Vers.valid?("not-a-version")
+    refute Vers.valid?("1.0")
+    refute Vers.valid?("latest")
+  end
+
+  def test_clean_version
+    assert_equal "1.0.0", Vers.clean("1.0.0")
+    assert_equal "1.0.0", Vers.clean("v1.0.0")
+    assert_equal "2.5.3", Vers.clean("v2.5.3")
+    assert_equal "1.7.0-alpha.2", Vers.clean("1.7.0-alpha.2")
+    assert_nil Vers.clean("not-a-version")
+    assert_nil Vers.clean("1.0")
+    assert_nil Vers.clean("latest")
+  end
+
+  def test_satisfies_with_or_ranges
+    assert Vers.satisfies?("1.5.0", ">= 1.0.0, < 2.0.0 || >= 3.0.0, < 4.0.0", "gem")
+    assert Vers.satisfies?("3.5.0", ">= 1.0.0, < 2.0.0 || >= 3.0.0, < 4.0.0", "gem")
+    refute Vers.satisfies?("2.5.0", ">= 1.0.0, < 2.0.0 || >= 3.0.0, < 4.0.0", "gem")
   end
 
   def test_exact_range

test/test_version.rb

@@ -78,9 +78,21 @@ def test_version_normalize
   def test_version_valid
     assert Vers::Version.valid?("1.2.3")
     assert Vers::Version.valid?("1.0.0-alpha")
-    assert Vers::Version.valid?("1")
+    assert Vers::Version.valid?("v1.0.0")
     assert Vers::Version.valid?("0.0.1")
     refute Vers::Version.valid?("")
+    refute Vers::Version.valid?("1")
+    refute Vers::Version.valid?("1.0")
+    refute Vers::Version.valid?("not-a-version")
+    refute Vers::Version.valid?("latest")
+  end
+
+  def test_version_clean
+    assert_equal "1.0.0", Vers::Version.clean("1.0.0")
+    assert_equal "1.0.0", Vers::Version.clean("v1.0.0")
+    assert_equal "1.7.0-alpha.2", Vers::Version.clean("1.7.0-alpha.2")
+    assert_nil Vers::Version.clean("not-a-version")
+    assert_nil Vers::Version.clean("1.0")
   end
 
   def test_version_equality