versionomy 0.0.2 → 0.0.3

data/History.txt

@@ -1,6 +1,11 @@
+=== 0.0.3 / 2008-10-21
+
+* Fixed string representations (inspect method)
+* Fixed up equality and hash computation for version values
+
 === 0.0.2 / 2008-10-20
 
-* Second test release: Fixed manifest
+* Test release: Fixed manifest
 
 === 0.0.1 / 2008-10-20
 

data/README.txt

@@ -82,7 +82,7 @@ version numbers.
 
 === Installation
 
- sudo gem install versionomy
+ gem install versionomy
 
 === Known issues and limitations
 

data/lib/versionomy/schema.rb

@@ -139,6 +139,15 @@ module Versionomy
     end
     
     
+    def inspect   # :nodoc:
+      to_s
+    end
+    
+    def to_s   # :nodoc:
+      "#<#{self.class}:0x#{object_id.to_s(16)} name=#{@name}>"
+    end
+    
+    
     # The name of the field.
     
     def name

data/lib/versionomy/value.rb

@@ -75,16 +75,33 @@ module Versionomy
     end
     
     
+    def inspect  # :nodoc:
+      begin
+        str_ = unparse
+        "#<#{self.class}:0x#{object_id.to_s(16)} #{str_.inspect}>"
+      rescue Versionomy::Errors::ParseError
+        _inspect
+      end
+    end
+    
+    def _inspect  # :nodoc:
+      "#<#{self.class}:0x#{object_id.to_s(16)}#{_inspect2}>"
+    end
+    
+    def _inspect2  # :nodoc:
+      " #{@schema.name}=#{@value.inspect}#{@subvalue ? @subvalue._inspect2 : ''}"
+    end
+    
+    
     # Returns a string representation generated by unparsing.
     # If unparsing fails, does not raise Versionomy::Errors::ParseError,
     # but instead returns the string generated by +inspect+.
-    # 
     
     def to_s
       begin
         unparse
       rescue Versionomy::Errors::ParseError
-        inspect
+        _inspect
       end
     end
     
@@ -197,14 +214,27 @@ module Versionomy
     end
     
     
+    def hash  # :nodoc:
+      @schema.name.hash ^ @value.hash ^ @subvalue.hash
+    end
+    
+    
     # Returns true if this version number is equal to the given verison number.
     # Equality means the values and field names are the same, although the
     # schemas may actually be different.
     
     def eql?(obj_)
-      return false unless obj_.kind_of?(Versionomy::Value)
-      return false if @schema.name != obj_.schema.name || @value != obj_.toplevel_value
-      @subvalue.eql?(obj_.subvalue)
+      if obj_.kind_of?(Versionomy::Value)
+        if @schema.name != obj_.schema.name || @value != obj_.toplevel_value
+          false
+        elsif @subvalue
+          @subvalue.eql?(obj_.subvalue)
+        else
+          true
+        end
+      else
+        false
+      end
     end
     
     
@@ -222,17 +252,23 @@ module Versionomy
     # even if the schemas are different.
     
     def <=>(obj_)
-      return nil unless obj_.kind_of?(Versionomy::Value)
-      return nil if @schema.name != obj_.schema.name
-      val_ = @schema.compare_values(@value, obj_.toplevel_value)
-      if val_ == 0
-        if @subvalue.nil?
-          obj_.subvalue.nil? ? 0 : nil
+      if obj_.kind_of?(Versionomy::Value)
+        if @schema.name != obj_.schema.name
+          nil
         else
-          @subvalue <=> obj_.subvalue
+          val_ = @schema.compare_values(@value, obj_.toplevel_value)
+          if val_ == 0
+            if @subvalue.nil?
+              obj_.subvalue.nil? ? 0 : nil
+            else
+              @subvalue <=> obj_.subvalue
+            end
+          else
+            val_
+          end
         end
       else
-        val_
+        nil
       end
     end
     

data/lib/versionomy/version.rb

@@ -36,7 +36,7 @@
 
 module Versionomy
   
-  VERSION_STRING = '0.0.2'
+  VERSION_STRING = '0.0.3'
   VERSION = parse(VERSION_STRING)
   
 end

data/tests/tc_standard_comparison.rb

@@ -71,6 +71,36 @@ module Versionomy
       end
       
       
+      # Test equality for a simple case.
+      
+      def test_equality_simple
+        value1_ = Versionomy.create(:major => 2, :minor => 0, :release_type => :alpha, :alpha_version => 5)
+        value2_ = Versionomy.create(:major => 2, :release_type => :alpha, :alpha_version => 5)
+        assert_equal(value2_, value1_)
+        assert_equal(value2_.hash, value1_.hash)
+      end
+      
+      
+      # Test equality from parsed values.
+      
+      def test_equality_parsed
+        value1_ = Versionomy.parse("1.8.7p72")
+        value2_ = Versionomy.parse("1.8.7.0-72.0")
+        assert_equal(value2_, value1_)
+        assert_equal(value2_.hash, value1_.hash)
+      end
+      
+      
+      # Test non-equality from parsed values.
+      
+      def test_nonequality_parsed
+        value1_ = Versionomy.parse("1.8.7b7")
+        value2_ = Versionomy.parse("1.8.7a7")
+        assert_not_equal(value2_, value1_)
+        assert_not_equal(value2_.hash, value1_.hash)
+      end
+      
+      
     end
     
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: versionomy
 version: !ruby/object:Gem::Version 
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors: 
 - Daniel Azuma
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-10-20 00:00:00 -07:00
+date: 2008-10-21 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency