version_compare 0.0.2 → 0.1.1

checksums.yaml

@@ -1,7 +1,15 @@
 ---
-SHA1:
-  metadata.gz: bb866c1ed445858b022983875066a98b0875dcac
-  data.tar.gz: fff6ce85b9bb3f11bb9bd9ae352f24789dd040ee
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    NDgxYzAxZWFkMzA1Mjc1NWIzODA4ZjA2Y2YzMWQ2OGM4ZWZjYjNmNg==
+  data.tar.gz: !binary |-
+    ZDYwNWExZDY4NmIyMjFiOWVhMDEyYmViNTNlNmQyYTdjYWVjNjkzNA==
 SHA512:
-  metadata.gz: 974085d3d812048c6aa7d6435381750c488bec4fab4d00d203ecd88f586f57af4b5f50d28b67d4543f5596edabe68998c2278204f34b4528cf29d59583c6ef27
-  data.tar.gz: 6fad959c52815eccf38476c136d90ef40fec1b909f0c3e9edd7551a69ebec521c728a1f8968fc48e683eb85ff66915f352c8db9c14ffac967fb1de8e65f7ebb5
+  metadata.gz: !binary |-
+    ODRlYjc2YmE3N2RiYWY2NjgzZDYxZTg4MzBkZGIxZjgxNmM2NGY4YzY4MGUz
+    NDZlMjc0ZDQ5ODU1MjRkMDY2MjJmMDhkMWUwNjVkMzU0YTczMDk2MzlmYmFi
+    NTY5Mjk1MzY1OTk2YWYxNzZlYTQ4YjJiOGY5OGNjYzVlZGFjNTc=
+  data.tar.gz: !binary |-
+    ZjVjZTM2NjJlYTc1M2Q3M2QwNmY0Nzc4NmNmZDAwN2FlM2E4NTE4NmU4NmNl
+    MTQzZDA0NzExYmVlNzk1YjBkOTVkYWMyOTFjNWZiZjcxMjBiODRiNzAzMjU4
+    ODBkNzYyODMxM2Q3ZjEwMGEwOWNhYzk1OGNjMDQzNDgxZGRhOTU=

data/README.md

@@ -4,7 +4,7 @@
 
 Version Compare allows you to easily compare if one Version (string) to another
 Version (string). It aims to be as light and flexible as possible. Inputs can be
-a String, Integer, Float, Array, or any object that defines `#to_version`.
+a String, Integer, Float, Array, or any object that defines `#to_comparable_version`.
 
 For simplicity's sake, Version Compare only works with up to four numeric
 values:
@@ -40,7 +40,7 @@ bundle
 
 ## Usage
 
-To get started, you can either use `Version.new(<value>)` or `Version(<value>)`.
+To get started, you can either use `ComparableVersion.new(<value>)` or `ComparableVersion(<value>)`.
 To get the latter to work, you'll need to call `include ::Conversions` in the
 class or context you're wanting to use it at.
 
@@ -49,7 +49,7 @@ class MyClass
   include Conversions
 
   def my_method
-    Version(1) > Version(2)
+    ComparableVersion(1) > ComparableVersion(2)
   end
 end
 ```
@@ -59,65 +59,65 @@ Or, to test on the Rails Console:
 ```ruby
 [1] pry(main)> include ::Conversions
 => Object
-[2] pry(main)> Version(1.0) > Version(1)
+[2] pry(main)> ComparableVersion(1.0) > ComparableVersion(1)
 => false
 
 # - OR (without using `include ::Conversions`) -
 
-[1] pry(main)> Conversions.Version(1.0) > Conversions.Version(1)
+[1] pry(main)> Conversions.ComparableVersion(1.0) > Conversions.ComparableVersion(1)
 => false
 ```
 
-Version Compare uses the `Comparable` mixin for comparisons, so you get all the
+ComparableVersion Compare uses the `Comparable` mixin for comparisons, so you get all the
 usual operators:
 
 ```ruby
-Version(2) > Version(1) # => true
-Version(1.2) > Version(1.2) # => false
-Version("1.2.3") >= Version("1.2") # => true
-Version("1.2.3.4") <= Version("1.2.3.4") # => true
-Version([1, 2]) == Version(["1", "2"]) # => true
-Version("1.2.0.0") == Version(1.2) # => true
-Version("1.0.0.0") != Version(1) # => false
-[Version(1), Version("1.0.0.1"), Version(0.1)].sort # => ["0.1", "1", "1.0.0.1"]
-[Version(1), Version("1.0.0.1"), Version(0.1)].sort { |a, b| b <=> a } # => ["1.0.0.1", "1", "0.1"]
+ComparableVersion(2) > ComparableVersion(1) # => true
+ComparableVersion(1.2) > ComparableVersion(1.2) # => false
+ComparableVersion("1.2.3") >= ComparableVersion("1.2") # => true
+ComparableVersion("1.2.3.4") <= ComparableVersion("1.2.3.4") # => true
+ComparableVersion([1, 2]) == ComparableVersion(["1", "2"]) # => true
+ComparableVersion("1.2.0.0") == ComparableVersion(1.2) # => true
+ComparableVersion("1.0.0.0") != ComparableVersion(1) # => false
+[ComparableVersion(1), ComparableVersion("1.0.0.1"), ComparableVersion(0.1)].sort # => ["0.1", "1", "1.0.0.1"]
+[ComparableVersion(1), ComparableVersion("1.0.0.1"), ComparableVersion(0.1)].sort { |a, b| b <=> a } # => ["1.0.0.1", "1", "0.1"]
 ```
 
 
-### Wait, so what exactly is this `Version` ... constant?
+### Wait, so what exactly is this `ComparableVersion` ... constant?
 
-`Version()` is actually a conversion function. It follows the Ruby convention of
+`ComparableVersion()` is actually a conversion function. It follows the Ruby convention of
 defining a conversion function that uses the same name as the class it
 represents, such as how `Array()` converts inputs to an `Array` object.
-Just like the standard Ruby conversion functions, `Version()` tries its hardest
-to convert any Version-like input into a new `Version` object. Given a numeric,
-string, or array input (which are all obvious conversions to make), `Version()`
-is essentially the same as `Version.new()`. However, `Version()` is otherwise a
+Just like the standard Ruby conversion functions, `ComparableVersion()` tries its hardest
+to convert any ComparableVersion-like input into a new `ComparableVersion` object. Given a numeric,
+string, or array input (which are all obvious conversions to make), `ComparableVersion()`
+is essentially the same as `ComparableVersion.new()`. However, `ComparableVersion()` is otherwise a
 little more strict in that if you pass in an object that doesn't reasonably look
-like a Version it will raise a `TypeError` exception. Doing the same for
-`Version.new()` will ultimately just `#to_s` the input; and since almost
+like a ComparableVersion it will raise a `TypeError` exception. Doing the same for
+`ComparableVersion.new()` will ultimately just `#to_s` the input; and since almost
 every object responds to `#to_s`, the result is that you may end up with a 0
 version. For example:
 
 ```ruby
-Version.new(OpenStruct.new(a: 1)).to_s # => "0"
+ComparableVersion.new(OpenStruct.new(a: 1)).to_s # => "0"
 ```
 
 
-### Can I pass my own custom objects into `Version()`?
+### Can I pass my own custom objects into `ComparableVersion()`?
 
-Yes! All you have to do is define a `#to_version` implicit conversion method in
-your object that creates a new Version object in the usual fashion.
+Yes! All you have to do is define a `#to_comparable_version` implicit conversion method in
+your object that creates a new ComparableVersion object in the usual fashion.
 
 ```ruby
 class MyObject
   VERSION = 1.9
-  def to_version
-    Version.new(VERSION.to_s)
+  def to_comparable_version
+    ComparableVersion.new(VERSION.to_s)
   end
 end
 
-Version(MyObject.new) > Version(2.0) # => false
+ComparableVersion(MyObject.new) > ComparableVersion(2.0) # => false
 ```
 
 
@@ -135,14 +135,14 @@ module Dummy
 
     VERSION = "1.2".freeze
 
-    def to_version
-      Version.new(VERSION) # Or Version.new([1, 2]) or whatever...
+    def to_comparable_version
+      ComparableVersion.new(VERSION) # Or ComparableVersion.new([1, 2]) or whatever...
     end
   end
 end
 
 # Now, from the context of that Rails app you can call:
-Version(Rails.application) > Version(1.0) # => true
+ComparableVersion(Rails.application) > ComparableVersion(1.0) # => true
 ```
 
 So you see... the sky is the limit!

data/lib/version_compare.rb

@@ -1,5 +1,5 @@
 require "version_compare/conversions"
 
 module VersionCompare
-  autoload :Version, "version_compare/version"
+  autoload :ComparableVersion, "version_compare/comparable_version"
 end

data/lib/version_compare/comparable_version.rb

@@ -0,0 +1,71 @@
+class ComparableVersion
+  DEFAULT_SEPARATOR = ".".freeze
+
+  include Comparable
+
+  # ComparableVersion component names
+  NAMES = [:major, :minor, :tiny, :patch].freeze
+
+  attr_accessor *NAMES
+  attr_reader :separator
+
+  def initialize(value, options = {})
+    @separator = options.fetch(:separator) { DEFAULT_SEPARATOR }
+
+    @major, @minor, @tiny, @patch =
+      if value.respond_to?(:to_comparable_version)
+        value.to_comparable_version.to_a
+      elsif value.respond_to?(:to_ary)
+        value.to_ary.map(&:to_i)
+      else
+        value.to_s.split(separator).map(&:to_i)
+      end
+  end
+
+  def inspect
+    "<#{identification}>"
+  end
+
+  # Implicit conversion method
+  def to_comparable_version
+    self
+  end
+
+  def to_s
+    NAMES.map { |name| public_send(name) }.compact.join(separator)
+  end
+  alias :to_str :to_s
+
+  def to_a
+    NAMES.map { |name| public_send(name) }.compact
+  end
+  alias :to_ary :to_a
+
+  # ComparableVersion components comparison method. Uses Comparable to assess whether
+  # This ComparableVersion's component value or the other ComparableVersion's component value is
+  # greater or lesser. The first value to be found as greater or lesser
+  # determines which ComparableVersion object is greater or lesser.
+  #
+  # Missing ComparableVersion components are treated as 0 values, which effectively gives
+  # them no weight in the comparison.
+  #
+  # @params [ComparableVersion] other the other ComparableVersion object we are comparing with
+  def <=>(other)
+    NAMES.each do |name|
+      result = send(name).to_i <=> other.send(name).to_i
+      return result unless result.zero?
+    end
+
+    0
+  end
+
+private
+
+  def identification
+    version_identifiers =
+      NAMES.map { |name| "#{name}:#{send(name)}" if send(name).present? }
+           .compact
+           .join(", ")
+    "#{self.class}[#{version_identifiers}]"
+  end
+end

data/lib/version_compare/conversions.rb

@@ -2,37 +2,37 @@
 # methods. Anytime one of the standard conversion methods are needed, the
 # Conversions module can be included and then used freely.
 module Conversions
-  require_relative "version"
+  require_relative "comparable_version"
 
-  # The `Version()` conversion method is defined as a module_function so that it
+  # The `ComparableVersion()` conversion method is defined as a module_function so that it
   # may also be called directly without needing to include the Conversions module
   # if so desired.
   #
   # @example
-  #   Conversions.Version(1.2).to_s # => "1.2"
+  #   Conversions.ComparableVersion(1.2).to_s # => "1.2"
   module_function
 
-  # Strict conversion method for creating a `Version` object out of anything
-  # that sensibly is a Version.
+  # Strict conversion method for creating a `ComparableVersion` object out of anything
+  # that sensibly is a ComparableVersion.
   #
   # @param [Object] value the object to be converted
   #
   # @example
-  #   Version(1) # => #<Version:0x007fd8144ea658 @major=1, @minor=nil, @tiny=nil, @patch=nil>
-  #   Version(1.2) # => #<Version:0x007fd8144ea658 @major=1, @minor=2, @tiny=nil, @patch=nil>
-  #   Version("1.2.3") # => #<Version:0x007fd8144ea658 @major=1, @minor=2, @tiny=3, @patch=nil>
-  #   Version(["1", "2", "3", "4"]) # => #<Version:0x007fd8144f98b0 @major=1, @minor=2, @tiny=3, @patch=4>
-  def Version(value)
+  #   ComparableVersion(1) # => #<ComparableVersion:0x007fd8144ea658 @major=1, @minor=nil, @tiny=nil, @patch=nil>
+  #   ComparableVersion(1.2) # => #<ComparableVersion:0x007fd8144ea658 @major=1, @minor=2, @tiny=nil, @patch=nil>
+  #   ComparableVersion("1.2.3") # => #<ComparableVersion:0x007fd8144ea658 @major=1, @minor=2, @tiny=3, @patch=nil>
+  #   ComparableVersion(["1", "2", "3", "4"]) # => #<ComparableVersion:0x007fd8144f98b0 @major=1, @minor=2, @tiny=3, @patch=4>
+  def ComparableVersion(value)
     case value
     when String,
          Integer,
          Float,
          -> val { val.respond_to?(:to_ary) }
-      Version.new(value)
-    when -> val { val.respond_to?(:to_version) }
-      value.to_version
+      ComparableVersion.new(value)
+    when -> val { val.respond_to?(:to_comparable_version) }
+      value.to_comparable_version
     else
-      raise TypeError, "Cannot convert #{value.inspect} to Version"
+      raise TypeError, "Cannot convert #{value.inspect} to ComparableVersion"
     end
   end
 end

data/test/comparable_version_test.rb

@@ -0,0 +1,188 @@
+require 'test_helper'
+
+describe ComparableVersion do
+  describe "#inspect" do
+    it "returns expected inspect String format" do
+      assert ComparableVersion("2.0.0").inspect
+        "ComparableVersion[major:2, minor:0, tiny:0]"
+    end
+  end
+
+  describe "#>" do
+    it "returns true when lvalue is greater than rvalue" do
+      ComparableVersion(2).must_be :>, ComparableVersion(1)
+      ComparableVersion(2).must_be :>, ComparableVersion(1.2)
+      ComparableVersion(2).must_be :>, ComparableVersion("1.2.3")
+      ComparableVersion(2).must_be :>, ComparableVersion("1.2.3.4")
+
+      ComparableVersion(2.0).must_be :>, ComparableVersion(1)
+      ComparableVersion(2.0).must_be :>, ComparableVersion(1.0)
+      ComparableVersion(2.1).must_be :>, ComparableVersion("2.0.3")
+      ComparableVersion(2.1).must_be :>, ComparableVersion("2.0.3.4")
+
+      ComparableVersion("2.0.0").must_be :>, ComparableVersion(1)
+      ComparableVersion("2.1.0").must_be :>, ComparableVersion(1.2)
+      ComparableVersion("2.1.0").must_be :>, ComparableVersion("1.2.0")
+      ComparableVersion("2.1.1").must_be :>, ComparableVersion("2.1.0.4")
+
+      ComparableVersion("2.0.0.0").must_be :>, ComparableVersion(1)
+      ComparableVersion("2.1.0.0").must_be :>, ComparableVersion(2.0)
+      ComparableVersion("2.1.1.0").must_be :>, ComparableVersion("2.1.0")
+      ComparableVersion("2.1.3.0").must_be :>, ComparableVersion("2.1.2.4")
+
+      ComparableVersion(2).must_be :>, ComparableVersion(1.99)
+      ComparableVersion(1.3).must_be :>, ComparableVersion("1.2.99")
+      ComparableVersion("1.2.4").must_be :>, ComparableVersion("1.2.3.99")
+    end
+
+    it "returns false when lvalue is less than rvalue" do
+      ComparableVersion(1).wont_be :>, ComparableVersion(2)
+      ComparableVersion(1.2).wont_be :>, ComparableVersion(2)
+      ComparableVersion("1.2.3").wont_be :>, ComparableVersion(2)
+      ComparableVersion("1.2.3.4").wont_be :>, ComparableVersion(2)
+
+      ComparableVersion(1).wont_be :>, ComparableVersion(2.0)
+      ComparableVersion(2.0).wont_be :>, ComparableVersion(2.1)
+      ComparableVersion("2.0.3").wont_be :>, ComparableVersion(2.1)
+      ComparableVersion("2.0.3.4").wont_be :>, ComparableVersion(2.1)
+
+      ComparableVersion(1).wont_be :>, ComparableVersion("2.0.0")
+      ComparableVersion(1.2).wont_be :>, ComparableVersion("2.1.0")
+      ComparableVersion("2.1.0").wont_be :>, ComparableVersion("2.1.1")
+      ComparableVersion("2.1.0.4").wont_be :>, ComparableVersion("2.1.1")
+
+      ComparableVersion(1).wont_be :>, ComparableVersion("2.0.0.0")
+      ComparableVersion(2.0).wont_be :>, ComparableVersion("2.1.0.0")
+      ComparableVersion("2.1.0").wont_be :>, ComparableVersion("2.1.1.0")
+      ComparableVersion("2.1.0.4").wont_be :>, ComparableVersion("2.1.1.0")
+
+      ComparableVersion(1.99).wont_be :>, ComparableVersion(2)
+      ComparableVersion("1.2.99").wont_be :>, ComparableVersion(1.3)
+      ComparableVersion("1.2.3.99").wont_be :>, ComparableVersion("1.2.4")
+    end
+
+    it "returns false when lvalue is equal to rvalue" do
+      ComparableVersion(1).wont_be :>, ComparableVersion(1.0)
+      ComparableVersion(1.2).wont_be :>, ComparableVersion("1.2.0")
+      ComparableVersion("1.2.3").wont_be :>, ComparableVersion("1.2.3.0")
+      ComparableVersion("1.2.3.4").wont_be :>, ComparableVersion("1.2.3.4")
+
+      ComparableVersion(1.0).wont_be :>, ComparableVersion(1)
+      ComparableVersion("1.2.0").wont_be :>, ComparableVersion(1.2)
+      ComparableVersion("1.2.3").wont_be :>, ComparableVersion("1.2.3.0")
+      ComparableVersion("1.2.3.4").wont_be :>, ComparableVersion("1.2.3.4")
+    end
+  end
+
+  describe "#==" do
+    it "returns false when lvalue is less than rvalue" do
+      ComparableVersion(1.2).wont_equal ComparableVersion(2)
+      ComparableVersion("1.2.3").wont_equal ComparableVersion(2)
+      ComparableVersion("1.2.3.4").wont_equal ComparableVersion(2)
+
+      ComparableVersion(1).wont_equal ComparableVersion(2.0)
+      ComparableVersion("2.0.3").wont_equal ComparableVersion(2.1)
+      ComparableVersion("2.0.3.4").wont_equal ComparableVersion(2.1)
+
+      ComparableVersion(1).wont_equal ComparableVersion("2.0.0")
+      ComparableVersion(1.2).wont_equal ComparableVersion("2.1.0")
+      ComparableVersion("2.1.0.4").wont_equal ComparableVersion("2.1.1")
+
+      ComparableVersion(1).wont_equal ComparableVersion("2.0.0.0")
+      ComparableVersion(2.0).wont_equal ComparableVersion("2.1.0.0")
+      ComparableVersion("2.1.0").wont_equal ComparableVersion("2.1.1.0")
+
+      ComparableVersion(1.99).wont_equal ComparableVersion(2)
+      ComparableVersion("1.2.99").wont_equal ComparableVersion(1.3)
+      ComparableVersion("1.2.3.99").wont_equal ComparableVersion("1.2.4")
+    end
+
+    it "returns false when lvalue is greater than rvalue" do
+      ComparableVersion(2).wont_equal ComparableVersion(1.2)
+      ComparableVersion(2).wont_equal ComparableVersion("1.2.3")
+      ComparableVersion(2).wont_equal ComparableVersion("1.2.3.4")
+
+      ComparableVersion(2.0).wont_equal ComparableVersion(1)
+      ComparableVersion(2.1).wont_equal ComparableVersion("2.0.3")
+      ComparableVersion(2.1).wont_equal ComparableVersion("2.0.3.4")
+
+      ComparableVersion("2.0.0").wont_equal ComparableVersion(1)
+      ComparableVersion("2.1.0").wont_equal ComparableVersion(1.2)
+      ComparableVersion("2.1.1").wont_equal ComparableVersion("2.1.0.4")
+
+      ComparableVersion("2.0.0.0").wont_equal ComparableVersion(1)
+      ComparableVersion("2.1.0.0").wont_equal ComparableVersion(2.0)
+      ComparableVersion("2.1.1.0").wont_equal ComparableVersion("2.1.0")
+
+      ComparableVersion(2).wont_equal ComparableVersion(1.99)
+      ComparableVersion(1.3).wont_equal ComparableVersion("1.2.99")
+      ComparableVersion("1.2.4").wont_equal ComparableVersion("1.2.3.99")
+    end
+
+    it "returns true when lvalue is equal to rvalue" do
+      ComparableVersion(1.0).must_equal ComparableVersion(1)
+      ComparableVersion("1.2.0").must_equal ComparableVersion(1.2)
+      ComparableVersion("1.2.3.0").must_equal ComparableVersion("1.2.3")
+
+      ComparableVersion(1).must_equal ComparableVersion(1.0)
+      ComparableVersion(1.2).must_equal ComparableVersion("1.2.0")
+      ComparableVersion("1.2.3").must_equal ComparableVersion("1.2.3.0")
+    end
+  end
+
+  describe "#<" do
+    it "returns true when lvalue is less than rvalue" do
+      ComparableVersion(1.2).must_be :<, ComparableVersion(2)
+      ComparableVersion("1.2.3").must_be :<, ComparableVersion(2)
+      ComparableVersion("1.2.3.4").must_be :<, ComparableVersion(2)
+
+      ComparableVersion(1).must_be :<, ComparableVersion(2.0)
+      ComparableVersion("2.0.3").must_be :<, ComparableVersion(2.1)
+      ComparableVersion("2.0.3.4").must_be :<, ComparableVersion(2.1)
+
+      ComparableVersion(1).must_be :<, ComparableVersion("2.0.0")
+      ComparableVersion(1.2).must_be :<, ComparableVersion("2.1.0")
+      ComparableVersion("2.1.0.4").must_be :<, ComparableVersion("2.1.1")
+
+      ComparableVersion(1).must_be :<, ComparableVersion("2.0.0.0")
+      ComparableVersion(2.0).must_be :<, ComparableVersion("2.1.0.0")
+      ComparableVersion("2.1.0").must_be :<, ComparableVersion("2.1.1.0")
+
+      ComparableVersion(1.99).must_be :<, ComparableVersion(2)
+      ComparableVersion("1.2.99").must_be :<, ComparableVersion(1.3)
+      ComparableVersion("1.2.3.99").must_be :<, ComparableVersion("1.2.4")
+    end
+
+    it "returns false when lvalue is greater than rvalue" do
+      ComparableVersion(2).wont_be :<, ComparableVersion(1.2)
+      ComparableVersion(2).wont_be :<, ComparableVersion("1.2.3")
+      ComparableVersion(2).wont_be :<, ComparableVersion("1.2.3.4")
+
+      ComparableVersion(2.0).wont_be :<, ComparableVersion(1)
+      ComparableVersion(2.1).wont_be :<, ComparableVersion("2.0.3")
+      ComparableVersion(2.1).wont_be :<, ComparableVersion("2.0.3.4")
+
+      ComparableVersion("2.0.0").wont_be :<, ComparableVersion(1)
+      ComparableVersion("2.1.0").wont_be :<, ComparableVersion(1.2)
+      ComparableVersion("2.1.1").wont_be :<, ComparableVersion("2.1.0.4")
+
+      ComparableVersion("2.0.0.0").wont_be :<, ComparableVersion(1)
+      ComparableVersion("2.1.0.0").wont_be :<, ComparableVersion(2.0)
+      ComparableVersion("2.1.1.0").wont_be :<, ComparableVersion("2.1.0")
+
+      ComparableVersion(2).wont_be :<, ComparableVersion(1.99)
+      ComparableVersion(1.3).wont_be :<, ComparableVersion("1.2.99")
+      ComparableVersion("1.2.4").wont_be :<, ComparableVersion("1.2.3.99")
+    end
+
+    it "returns false when lvalue is equal to rvalue" do
+      ComparableVersion(1.0).wont_be :<, ComparableVersion(1)
+      ComparableVersion("1.2.0").wont_be :<, ComparableVersion(1.2)
+      ComparableVersion("1.2.3.0").wont_be :<, ComparableVersion("1.2.3")
+
+      ComparableVersion(1).wont_be :<, ComparableVersion(1.0)
+      ComparableVersion(1.2).wont_be :<, ComparableVersion("1.2.0")
+      ComparableVersion("1.2.3").wont_be :<, ComparableVersion("1.2.3.0")
+    end
+  end
+end

data/test/conversions_test.rb

@@ -3,45 +3,45 @@ require 'test_helper'
 describe Conversions do
   describe "conversion function" do
     it "works on integers" do
-      Version(1).class.must_equal Version
+      ComparableVersion(1).class.must_equal ComparableVersion
     end
 
     it "works on floats" do
-      Version(1.2).class.must_equal Version
+      ComparableVersion(1.2).class.must_equal ComparableVersion
     end
 
     it "works on strings" do
-      Version("1.2.3.4").class.must_equal Version
+      ComparableVersion("1.2.3.4").class.must_equal ComparableVersion
     end
 
     it "works on arrays" do
-      Version([1, 2, 3, 4]).must_be_instance_of Version
-      Version([1, 2, 3, 4]).must_equal Version("1.2.3.4")
-      Version(["1", "2", "3", "4"]).must_equal Version("1.2.3.4")
+      ComparableVersion([1, 2, 3, 4]).must_be_instance_of ComparableVersion
+      ComparableVersion([1, 2, 3, 4]).must_equal ComparableVersion("1.2.3.4")
+      ComparableVersion(["1", "2", "3", "4"]).must_equal ComparableVersion("1.2.3.4")
     end
 
-    it "works on Versions" do
-      Version(Version(1.2)).must_be_instance_of Version
-      Version(Version(1.2)).must_equal Version(1.2)
+    it "works on ComparableVersions" do
+      ComparableVersion(ComparableVersion(1.2)).must_be_instance_of ComparableVersion
+      ComparableVersion(ComparableVersion(1.2)).must_equal ComparableVersion(1.2)
     end
   end
 
   describe "explicit conversions" do
     describe "#to_s" do
       it "returns string regardless of input" do
-        Version(1).to_s.must_equal "1"
-        Version(1.2).to_s.must_equal "1.2"
-        Version("1.2.3").to_s.must_equal "1.2.3"
+        ComparableVersion(1).to_s.must_equal "1"
+        ComparableVersion(1.2).to_s.must_equal "1.2"
+        ComparableVersion("1.2.3").to_s.must_equal "1.2.3"
       end
     end
 
     describe "#to_a" do
       it "returns an array of integers" do
-        Version(1).to_a.must_equal [1]
-        Version(1.0).to_a.must_equal [1, 0]
-        Version("1.2.3").to_a.must_equal [1, 2, 3]
-        Version("1.2.3.4").to_a.must_equal [1, 2, 3, 4]
-        Version(["1", "2", "3", "4"]).to_a.must_equal [1, 2, 3, 4]
+        ComparableVersion(1).to_a.must_equal [1]
+        ComparableVersion(1.0).to_a.must_equal [1, 0]
+        ComparableVersion("1.2.3").to_a.must_equal [1, 2, 3]
+        ComparableVersion("1.2.3.4").to_a.must_equal [1, 2, 3, 4]
+        ComparableVersion(["1", "2", "3", "4"]).to_a.must_equal [1, 2, 3, 4]
       end
     end
   end
@@ -49,32 +49,32 @@ describe Conversions do
   describe "implicit conversions" do
     describe "string concatenation" do
       it "concatenates" do
-        ("version: " + Version("1.2.3.4")).must_equal "version: 1.2.3.4"
+        ("version: " + ComparableVersion("1.2.3.4")).must_equal "version: 1.2.3.4"
       end
     end
 
     describe "CustomObjects" do
-      describe "without #to_version" do
-        it "raises TypeError when attempting to convert custom objects that don't implement #to_version" do
-          -> { Version(Object.new) }.must_raise TypeError
+      describe "without #to_comparable_version" do
+        it "raises TypeError when attempting to convert custom objects that don't implement #to_comparable_version" do
+          -> { ComparableVersion(Object.new) }.must_raise TypeError
         end
       end
 
-      describe "with #to_version" do
+      describe "with #to_comparable_version" do
         before do
           class CustomObject < Object
             VERSION = 1.9
-            def to_version
-              Version.new(VERSION.to_s)
+            def to_comparable_version
+              ComparableVersion.new(VERSION.to_s)
             end
           end
         end
 
         subject { CustomObject.new }
 
-        it "returns a Version object" do
-          Version(subject).must_be_instance_of Version
-          Version.new(subject).must_be_instance_of Version
+        it "returns a ComparableVersion object" do
+          ComparableVersion(subject).must_be_instance_of ComparableVersion
+          ComparableVersion.new(subject).must_be_instance_of ComparableVersion
         end
       end
     end

data/test/dummy/config/application.rb

@@ -21,8 +21,8 @@ module Dummy
 
     VERSION = "1.2".freeze
 
-    def to_version
-      Version.new(VERSION)
+    def to_comparable_version
+      ComparableVersion.new(VERSION)
     end
   end
 end

metadata

@@ -1,55 +1,55 @@
 --- !ruby/object:Gem::Specification
 name: version_compare
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.1.1
 platform: ruby
 authors:
 - Paul Dobbins
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-31 00:00:00.000000000 Z
+date: 2016-07-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 3.0.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 3.0.0
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: minitest-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: Version Compare allows you to easily compare if one Version is >, >=,
@@ -64,8 +64,9 @@ files:
 - README.md
 - Rakefile
 - lib/version_compare.rb
+- lib/version_compare/comparable_version.rb
 - lib/version_compare/conversions.rb
-- lib/version_compare/version.rb
+- test/comparable_version_test.rb
 - test/conversions_test.rb
 - test/dummy/README.rdoc
 - test/dummy/Rakefile
@@ -94,14 +95,12 @@ files:
 - test/dummy/config/initializers/wrap_parameters.rb
 - test/dummy/config/locales/en.yml
 - test/dummy/config/routes.rb
-- test/dummy/log/development.log
 - test/dummy/log/test.log
 - test/dummy/public/404.html
 - test/dummy/public/422.html
 - test/dummy/public/500.html
 - test/dummy/public/favicon.ico
 - test/test_helper.rb
-- test/version_compare_test.rb
 homepage: https://github.com/pdobb/version_compare
 licenses:
 - MIT
@@ -112,21 +111,22 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.1
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: Compare versions
 test_files:
+- test/comparable_version_test.rb
 - test/conversions_test.rb
 - test/dummy/app/assets/javascripts/application.js
 - test/dummy/app/assets/stylesheets/application.css
@@ -153,7 +153,6 @@ test_files:
 - test/dummy/config/locales/en.yml
 - test/dummy/config/routes.rb
 - test/dummy/config.ru
-- test/dummy/log/development.log
 - test/dummy/log/test.log
 - test/dummy/public/404.html
 - test/dummy/public/422.html
@@ -162,5 +161,4 @@ test_files:
 - test/dummy/Rakefile
 - test/dummy/README.rdoc
 - test/test_helper.rb
-- test/version_compare_test.rb
 has_rdoc: 

data/lib/version_compare/version.rb

@@ -1,53 +0,0 @@
-class Version
-  include Comparable
-
-  # Version component names
-  NAMES = [:major, :minor, :tiny, :patch].freeze
-
-  attr_accessor *NAMES
-
-  # Implicit conversion method
-  def to_version
-    self
-  end
-
-  def to_s
-    NAMES.map { |name| public_send(name) }.compact.join('.')
-  end
-  alias :to_str :to_s
-
-  def to_a
-    NAMES.map { |name| public_send(name) }.compact
-  end
-  alias :to_ary :to_a
-
-  # Version components comparison method. Uses Comparable to assess whether
-  # This Version's component value or the other Version's component value is
-  # greater or lesser. The first value to be found as greater or lesser
-  # determines which Version object is greater or lesser.
-  #
-  # Missing Version components are treated as 0 values, which effectively gives
-  # them no weight in the comparison.
-  #
-  # @params [Version] other the other Version object we are comparing with
-  def <=>(other)
-    NAMES.each do |name|
-      result = send(name).to_i <=> other.send(name).to_i
-      return result unless result.zero?
-    end
-    0
-  end
-
-  private
-
-  def initialize(value)
-    @major, @minor, @tiny, @patch =
-      if value.respond_to?(:to_ary)
-        value.to_ary.map(&:to_i)
-      elsif value.respond_to?(:to_version)
-        value.to_version.to_a
-      else
-        value.to_s.split('.').map(&:to_i)
-      end
-  end
-end

data/test/version_compare_test.rb

@@ -1,181 +0,0 @@
-require 'test_helper'
-
-describe VersionCompare do
-  describe "#>" do
-    it "returns true when lvalue is greater than rvalue" do
-      Version(2).must_be :>, Version(1)
-      Version(2).must_be :>, Version(1.2)
-      Version(2).must_be :>, Version("1.2.3")
-      Version(2).must_be :>, Version("1.2.3.4")
-
-      Version(2.0).must_be :>, Version(1)
-      Version(2.0).must_be :>, Version(1.0)
-      Version(2.1).must_be :>, Version("2.0.3")
-      Version(2.1).must_be :>, Version("2.0.3.4")
-
-      Version("2.0.0").must_be :>, Version(1)
-      Version("2.1.0").must_be :>, Version(1.2)
-      Version("2.1.0").must_be :>, Version("1.2.0")
-      Version("2.1.1").must_be :>, Version("2.1.0.4")
-
-      Version("2.0.0.0").must_be :>, Version(1)
-      Version("2.1.0.0").must_be :>, Version(2.0)
-      Version("2.1.1.0").must_be :>, Version("2.1.0")
-      Version("2.1.3.0").must_be :>, Version("2.1.2.4")
-
-      Version(2).must_be :>, Version(1.99)
-      Version(1.3).must_be :>, Version("1.2.99")
-      Version("1.2.4").must_be :>, Version("1.2.3.99")
-    end
-
-    it "returns false when lvalue is less than rvalue" do
-      Version(1).wont_be :>, Version(2)
-      Version(1.2).wont_be :>, Version(2)
-      Version("1.2.3").wont_be :>, Version(2)
-      Version("1.2.3.4").wont_be :>, Version(2)
-
-      Version(1).wont_be :>, Version(2.0)
-      Version(2.0).wont_be :>, Version(2.1)
-      Version("2.0.3").wont_be :>, Version(2.1)
-      Version("2.0.3.4").wont_be :>, Version(2.1)
-
-      Version(1).wont_be :>, Version("2.0.0")
-      Version(1.2).wont_be :>, Version("2.1.0")
-      Version("2.1.0").wont_be :>, Version("2.1.1")
-      Version("2.1.0.4").wont_be :>, Version("2.1.1")
-
-      Version(1).wont_be :>, Version("2.0.0.0")
-      Version(2.0).wont_be :>, Version("2.1.0.0")
-      Version("2.1.0").wont_be :>, Version("2.1.1.0")
-      Version("2.1.0.4").wont_be :>, Version("2.1.1.0")
-
-      Version(1.99).wont_be :>, Version(2)
-      Version("1.2.99").wont_be :>, Version(1.3)
-      Version("1.2.3.99").wont_be :>, Version("1.2.4")
-    end
-
-    it "returns false when lvalue is equal to rvalue" do
-      Version(1).wont_be :>, Version(1.0)
-      Version(1.2).wont_be :>, Version("1.2.0")
-      Version("1.2.3").wont_be :>, Version("1.2.3.0")
-      Version("1.2.3.4").wont_be :>, Version("1.2.3.4")
-
-      Version(1.0).wont_be :>, Version(1)
-      Version("1.2.0").wont_be :>, Version(1.2)
-      Version("1.2.3").wont_be :>, Version("1.2.3.0")
-      Version("1.2.3.4").wont_be :>, Version("1.2.3.4")
-    end
-  end
-
-  describe "#==" do
-    it "returns false when lvalue is less than rvalue" do
-      Version(1.2).wont_equal Version(2)
-      Version("1.2.3").wont_equal Version(2)
-      Version("1.2.3.4").wont_equal Version(2)
-
-      Version(1).wont_equal Version(2.0)
-      Version("2.0.3").wont_equal Version(2.1)
-      Version("2.0.3.4").wont_equal Version(2.1)
-
-      Version(1).wont_equal Version("2.0.0")
-      Version(1.2).wont_equal Version("2.1.0")
-      Version("2.1.0.4").wont_equal Version("2.1.1")
-
-      Version(1).wont_equal Version("2.0.0.0")
-      Version(2.0).wont_equal Version("2.1.0.0")
-      Version("2.1.0").wont_equal Version("2.1.1.0")
-
-      Version(1.99).wont_equal Version(2)
-      Version("1.2.99").wont_equal Version(1.3)
-      Version("1.2.3.99").wont_equal Version("1.2.4")
-    end
-
-    it "returns false when lvalue is greater than rvalue" do
-      Version(2).wont_equal Version(1.2)
-      Version(2).wont_equal Version("1.2.3")
-      Version(2).wont_equal Version("1.2.3.4")
-
-      Version(2.0).wont_equal Version(1)
-      Version(2.1).wont_equal Version("2.0.3")
-      Version(2.1).wont_equal Version("2.0.3.4")
-
-      Version("2.0.0").wont_equal Version(1)
-      Version("2.1.0").wont_equal Version(1.2)
-      Version("2.1.1").wont_equal Version("2.1.0.4")
-
-      Version("2.0.0.0").wont_equal Version(1)
-      Version("2.1.0.0").wont_equal Version(2.0)
-      Version("2.1.1.0").wont_equal Version("2.1.0")
-
-      Version(2).wont_equal Version(1.99)
-      Version(1.3).wont_equal Version("1.2.99")
-      Version("1.2.4").wont_equal Version("1.2.3.99")
-    end
-
-    it "returns true when lvalue is equal to rvalue" do
-      Version(1.0).must_equal Version(1)
-      Version("1.2.0").must_equal Version(1.2)
-      Version("1.2.3.0").must_equal Version("1.2.3")
-
-      Version(1).must_equal Version(1.0)
-      Version(1.2).must_equal Version("1.2.0")
-      Version("1.2.3").must_equal Version("1.2.3.0")
-    end
-  end
-
-  describe "#<" do
-    it "returns true when lvalue is less than rvalue" do
-      Version(1.2).must_be :<, Version(2)
-      Version("1.2.3").must_be :<, Version(2)
-      Version("1.2.3.4").must_be :<, Version(2)
-
-      Version(1).must_be :<, Version(2.0)
-      Version("2.0.3").must_be :<, Version(2.1)
-      Version("2.0.3.4").must_be :<, Version(2.1)
-
-      Version(1).must_be :<, Version("2.0.0")
-      Version(1.2).must_be :<, Version("2.1.0")
-      Version("2.1.0.4").must_be :<, Version("2.1.1")
-
-      Version(1).must_be :<, Version("2.0.0.0")
-      Version(2.0).must_be :<, Version("2.1.0.0")
-      Version("2.1.0").must_be :<, Version("2.1.1.0")
-
-      Version(1.99).must_be :<, Version(2)
-      Version("1.2.99").must_be :<, Version(1.3)
-      Version("1.2.3.99").must_be :<, Version("1.2.4")
-    end
-
-    it "returns false when lvalue is greater than rvalue" do
-      Version(2).wont_be :<, Version(1.2)
-      Version(2).wont_be :<, Version("1.2.3")
-      Version(2).wont_be :<, Version("1.2.3.4")
-
-      Version(2.0).wont_be :<, Version(1)
-      Version(2.1).wont_be :<, Version("2.0.3")
-      Version(2.1).wont_be :<, Version("2.0.3.4")
-
-      Version("2.0.0").wont_be :<, Version(1)
-      Version("2.1.0").wont_be :<, Version(1.2)
-      Version("2.1.1").wont_be :<, Version("2.1.0.4")
-
-      Version("2.0.0.0").wont_be :<, Version(1)
-      Version("2.1.0.0").wont_be :<, Version(2.0)
-      Version("2.1.1.0").wont_be :<, Version("2.1.0")
-
-      Version(2).wont_be :<, Version(1.99)
-      Version(1.3).wont_be :<, Version("1.2.99")
-      Version("1.2.4").wont_be :<, Version("1.2.3.99")
-    end
-
-    it "returns false when lvalue is equal to rvalue" do
-      Version(1.0).wont_be :<, Version(1)
-      Version("1.2.0").wont_be :<, Version(1.2)
-      Version("1.2.3.0").wont_be :<, Version("1.2.3")
-
-      Version(1).wont_be :<, Version(1.0)
-      Version(1.2).wont_be :<, Version("1.2.0")
-      Version("1.2.3").wont_be :<, Version("1.2.3.0")
-    end
-  end
-end