versionomy 0.2.5 → 0.3.0

data/lib/versionomy/value.rb

@@ -71,8 +71,8 @@ module Versionomy
       @_unparse_params = unparse_params_
       @_field_path = []
       @_values = {}
-      schema_ = @_format.schema
-      field_ = schema_.root_field
+      values_ = _canonicalize_values_hash(values_) if values_.kind_of?(::Hash)
+      field_ = @_format.schema.root_field
       while field_
         value_ = values_.kind_of?(::Hash) ? values_[field_.name] : values_.shift
         value_ = value_ ? field_.canonicalize_value(value_) : field_.default_value
@@ -80,7 +80,7 @@ module Versionomy
         @_values[field_.name] = value_
         field_ = field_.child(value_)
       end
-      modules_ = schema_.modules
+      modules_ = @_format.schema.modules
       extend(*modules_) if modules_.size > 0
     end
     
@@ -150,7 +150,9 @@ module Versionomy
     end
     
     
+    # YAML tags. The last one is the canonical one.
     yaml_as "tag:danielazuma.com,2009:version"
+    yaml_as "tag:verse15.com,2009:version"
     
     
     # Deserialize a version number from YAML
@@ -259,7 +261,7 @@ module Versionomy
       when ::Integer
         @_field_path.size > field_ && field_ >= 0
       when ::String, ::Symbol
-        @_values.has_key?(field_.to_sym)
+        @_values.has_key?(@_format.schema.canonical_name(field_))
       else
         raise ::ArgumentError
       end
@@ -271,9 +273,7 @@ module Versionomy
     # or field index.
     
     def [](field_)
-      field_ = @_field_path[field_] if field_.kind_of?(::Integer)
-      field_ = field_.name if field_.kind_of?(Schema::Field)
-      field_ ? @_values[field_.to_sym] : nil
+      @_values[_interpret_field(field_)]
     end
     
     
@@ -298,17 +298,14 @@ module Versionomy
     # Returns self unchanged if the field was not recognized or could not
     # be modified.
     
-    def bump(name_)
-      name_ = @_field_path[name_] if name_.kind_of?(::Integer)
-      name_ = name_.name if name_.kind_of?(Schema::Field)
-      return self unless name_
-      name_ = name_.to_sym
-      return self unless @_values.include?(name_)
+    def bump(field_)
+      name_ = _interpret_field(field_)
+      return self unless name_ && @_values.include?(name_)
       values_ = []
-      @_field_path.each do |field_|
-        oldval_ = @_values[field_.name]
-        if field_.name == name_
-          newval_ = field_.bump_value(oldval_)
+      @_field_path.each do |fld_|
+        oldval_ = @_values[fld_.name]
+        if fld_.name == name_
+          newval_ = fld_.bump_value(oldval_)
           return self if newval_ == oldval_
           values_ << newval_
           return Value.new(values_, @_format, @_unparse_params)
@@ -320,6 +317,28 @@ module Versionomy
     end
     
     
+    # Returns a new version number created by resetting the given field. The
+    # field may be specified as a field object, field name, or field index.
+    # Returns self unchanged if the field was not recognized or could not
+    # be modified.
+    
+    def reset(field_)
+      name_ = _interpret_field(field_)
+      return self unless name_ && @_values.include?(name_)
+      values_ = []
+      @_field_path.each do |fld_|
+        oldval_ = @_values[fld_.name]
+        if fld_.name == name_
+          values_ << fld_.default_value
+          return Value.new(values_, @_format, @_unparse_params)
+        else
+          values_ << oldval_
+        end
+      end
+      self
+    end
+    
+    
     # Returns a new version number created by cloning this version number
     # and changing the given field values.
     # 
@@ -334,6 +353,7 @@ module Versionomy
     
     def change(values_={}, unparse_params_={})
       unparse_params_ = @_unparse_params.merge(unparse_params_) if @_unparse_params
+      values_ = _canonicalize_values_hash(values_)
       Value.new(@_values.merge(values_), @_format, unparse_params_)
     end
     
@@ -456,6 +476,32 @@ module Versionomy
     end
     
     
+    private
+    
+    def _interpret_field(field_)   # :nodoc:
+      case field_
+      when Schema::Field
+        @_format.schema.canonical_name(field_.name)
+      when ::Integer
+        field_ = @_field_path[field_]
+        field_ ? field_.name : nil
+      when ::String, ::Symbol
+        @_format.schema.canonical_name(field_)
+      end
+    end
+    
+    
+    def _canonicalize_values_hash(values_)  # :nodoc:
+      schema_ = @_format.schema
+      new_values_ = {}
+      values_.each do |k_,v_|
+        k_ = schema_.canonical_name(k_)
+        new_values_[k_] = v_ if k_
+      end
+      new_values_
+    end
+    
+    
   end
   
   

data/lib/versionomy/version.rb

@@ -37,7 +37,7 @@
 module Versionomy
   
   # Current gem version, as a frozen string.
-  VERSION_STRING = '0.2.5'.freeze
+  VERSION_STRING = '0.3.0'.freeze
   
   # Current gem version, as a Versionomy::Value.
   VERSION = ::Versionomy.parse(VERSION_STRING, :standard)

data/tests/tc_rubygems_basic.rb

@@ -76,6 +76,23 @@ module Versionomy
       end
       
       
+      # Test aliases
+      
+      def test_alias_fields
+        value_ = ::Versionomy.create([1, 9, 2, 'a', 2], :rubygems)
+        assert_equal(1, value_.major)
+        assert_equal(9, value_.minor)
+      end
+      
+      
+      # Test construction using aliases
+      
+      def test_alias_field_construction
+        value_ = ::Versionomy.create({:major => 1, :minor => 9, :field2 => 2}, :rubygems)
+        assert_equal([1, 9, 2, 0, 0, 0, 0, 0], value_.values_array)
+      end
+      
+      
       # Test comparison of numeric values.
       
       def test_numeric_comparison
@@ -153,6 +170,24 @@ module Versionomy
       end
       
       
+      # Test bumping an alias field.
+      
+      def test_bump_alias
+        value_ = ::Versionomy.create([1, 9, 2, 'a', 2], :rubygems)
+        value_ = value_.bump(:minor)
+        assert_equal([1, 10, 0, 0, 0, 0, 0, 0], value_.values_array)
+      end
+      
+      
+      # Test changing an alias field.
+      
+      def test_change_alias
+        value_ = ::Versionomy.create([1, 8, 7, 'a', 2], :rubygems)
+        value_ = value_.change(:minor => 9)
+        assert_equal([1, 9, 7, 'a', 2, 0, 0, 0], value_.values_array)
+      end
+      
+      
       # Test "prerelase?" custom method
       
       def test_method_prereleasep

data/tests/tc_standard_reset.rb

@@ -0,0 +1,106 @@
+# -----------------------------------------------------------------------------
+# 
+# Versionomy bump tests on standard schema
+# 
+# This file contains tests for the bump function on the standard schema
+# 
+# -----------------------------------------------------------------------------
+# Copyright 2008-2009 Daniel Azuma
+# 
+# All rights reserved.
+# 
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are met:
+# 
+# * Redistributions of source code must retain the above copyright notice,
+#   this list of conditions and the following disclaimer.
+# * Redistributions in binary form must reproduce the above copyright notice,
+#   this list of conditions and the following disclaimer in the documentation
+#   and/or other materials provided with the distribution.
+# * Neither the name of the copyright holder, nor the names of any other
+#   contributors to this software, may be used to endorse or promote products
+#   derived from this software without specific prior written permission.
+# 
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+# ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+# LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+# POSSIBILITY OF SUCH DAMAGE.
+# -----------------------------------------------------------------------------
+
+
+require 'rubygems'
+require 'test/unit'
+require ::File.expand_path("#{::File.dirname(__FILE__)}/../lib/versionomy.rb")
+
+
+module Versionomy
+  module Tests  # :nodoc:
+    
+    class TestStandardReset < ::Test::Unit::TestCase  # :nodoc:
+      
+      
+      # Test resetting a minor patchlevel.
+      
+      def test_reset_patchlevel_minor
+        value_ = ::Versionomy.create(:major => 2, :tiny => 1, :patchlevel => 3, :patchlevel_minor => 1)
+        value_ = value_.reset(:patchlevel_minor)
+        assert_equal([2,0,1,0,:final,3,0], value_.values_array)
+      end
+      
+      
+      # Test resetting a major patchlevel.
+      
+      def test_reset_patchlevel
+        value_ = ::Versionomy.create(:major => 2, :tiny => 1, :patchlevel => 3, :patchlevel_minor => 1)
+        value_ = value_.reset(:patchlevel)
+        assert_equal([2,0,1,0,:final,0,0], value_.values_array)
+      end
+      
+      
+      # Test resetting a beta release type.
+      
+      def test_reset_beta_release_type
+        value_ = ::Versionomy.create(:major => 2, :tiny => 1, :release_type => :beta, :beta_version => 2)
+        value_ = value_.reset(:release_type)
+        assert_equal([2,0,1,0,:final,0,0], value_.values_array)
+      end
+      
+      
+      # Test resetting a final release type.
+      
+      def test_reset_final_release_type
+        value_ = ::Versionomy.create(:major => 2, :tiny => 1, :patchlevel => 2)
+        value_ = value_.reset(:release_type)
+        assert_equal([2,0,1,0,:final,0,0], value_.values_array)
+      end
+      
+      
+      # Test resetting tiny.
+      
+      def test_reset_tiny
+        value_ = ::Versionomy.create(:major => 2, :tiny => 1, :tiny2 => 3, :release_type => :release_candidate, :release_candidate_version => 2)
+        value_ = value_.reset(:tiny)
+        assert_equal([2,0,0,0,:final,0,0], value_.values_array)
+      end
+      
+      
+      # Test resetting major.
+      
+      def test_reset_major
+        value_ = ::Versionomy.create(:major => 2, :tiny => 1, :tiny2 => 3, :release_type => :release_candidate, :release_candidate_version => 2)
+        value_ = value_.reset(:major)
+        assert_equal([1,0,0,0,:final,0,0], value_.values_array)
+      end
+      
+      
+    end
+    
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: versionomy
 version: !ruby/object:Gem::Version 
-  version: 0.2.5
+  version: 0.3.0
 platform: ruby
 authors: 
 - Daniel Azuma
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-11-24 00:00:00 -08:00
+date: 2009-11-30 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -30,18 +30,18 @@ extensions: []
 
 extra_rdoc_files: 
 - README.rdoc
+- Versionomy.rdoc
 - History.rdoc
 files: 
 - lib/versionomy/conversion/base.rb
 - lib/versionomy/conversion/parsing.rb
-- lib/versionomy/conversion/rubygems.rb
 - lib/versionomy/conversion.rb
 - lib/versionomy/errors.rb
 - lib/versionomy/format/base.rb
 - lib/versionomy/format/delimiter.rb
-- lib/versionomy/format/rubygems.rb
-- lib/versionomy/format/standard.rb
 - lib/versionomy/format.rb
+- lib/versionomy/format_definitions/rubygems.rb
+- lib/versionomy/format_definitions/standard.rb
 - lib/versionomy/interface.rb
 - lib/versionomy/schema/field.rb
 - lib/versionomy/schema/wrapper.rb
@@ -59,8 +59,10 @@ files:
 - tests/tc_standard_comparison.rb
 - tests/tc_standard_misc.rb
 - tests/tc_standard_parse.rb
+- tests/tc_standard_reset.rb
 - History.rdoc
 - README.rdoc
+- Versionomy.rdoc
 - Rakefile
 has_rdoc: true
 homepage: http://virtuoso.rubyforge.org/versionomy
@@ -101,3 +103,4 @@ test_files:
 - tests/tc_standard_comparison.rb
 - tests/tc_standard_misc.rb
 - tests/tc_standard_parse.rb
+- tests/tc_standard_reset.rb

data/lib/versionomy/conversion/rubygems.rb

@@ -1,146 +0,0 @@
-# -----------------------------------------------------------------------------
-# 
-# Versionomy standard format implementation
-# 
-# -----------------------------------------------------------------------------
-# Copyright 2008-2009 Daniel Azuma
-# 
-# All rights reserved.
-# 
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are met:
-# 
-# * Redistributions of source code must retain the above copyright notice,
-#   this list of conditions and the following disclaimer.
-# * Redistributions in binary form must reproduce the above copyright notice,
-#   this list of conditions and the following disclaimer in the documentation
-#   and/or other materials provided with the distribution.
-# * Neither the name of the copyright holder, nor the names of any other
-#   contributors to this software, may be used to endorse or promote products
-#   derived from this software without specific prior written permission.
-# 
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-# ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
-# LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-# POSSIBILITY OF SUCH DAMAGE.
-# -----------------------------------------------------------------------------
-;
-
-
-module Versionomy
-  
-  module Conversion
-    
-    
-    # This is a namespace for the implementation of the conversion between
-    # the rubygems and standard formats.
-    
-    module Rubygems
-      
-      
-      # Create the conversion from standard to rubygems format.
-      # This method is called internally when Versionomy initializes itself,
-      # and you should not need to call it again. It is documented, however,
-      # so that you can inspect its source code from RDoc, since the source
-      # contains useful examples of how to use the conversion DSLs.
-      
-      def self.create_standard_to_rubygems
-        
-        # We'll use a parsing conversion.
-        Conversion::Parsing.new do
-          
-          # We're going to modify how the standard format version is
-          # unparsed, so the rubygems format will have a better chance
-          # of parsing it.
-          to_modify_unparse_params do |params_, convert_params_|
-            
-            params_ ||= {}
-            
-            # If the standard format version has a prerelease notation,
-            # make sure it is set off using a delimiter that the rubygems
-            # format can recognize. So instead of "1.0b2", we force the
-            # unparsing to generate "1.0.b.2".
-            params_[:release_type_delim] = '.'
-            params_[:development_version_delim] = '.'
-            params_[:alpha_version_delim] = '.'
-            params_[:beta_version_delim] = '.'
-            params_[:release_candidate_version_delim] = '.'
-            params_[:preview_version_delim] = '.'
-            
-            # If the standard format version has a patchlevel notation,
-            # force it to use the default number rather than letter style.
-            # So instead of "1.2c", we force the unparsing to generate
-            # "1.2-3".
-            params_[:patchlevel_style] = nil
-            
-            # If the standard format version has a patchlevel notation,
-            # force it to use the default delimiter of "-" so the rubygems
-            # format will recognize it. So instead of "1.9.1p243", we force
-            # the unparsing to generate "1.9.1-243".
-            params_[:patchlevel_delim] = nil
-            
-            # If the standard format version includes a "v" prefix, strip
-            # it because rubygems doesn't like it.
-            params_[:major_delim] = nil
-            
-            params_
-          end
-          
-          # Standard formats sometimes allow hyphens and spaces in field
-          # delimiters, but the rubygems format requires periods. So modify
-          # the unparsed string to conform to rubygems's expectations.
-          to_modify_string do |str_, convert_params_|
-            str_.gsub(/[\.\s-]+/, '.')
-          end
-          
-        end
-        
-      end
-      
-      
-      # Create the conversion from rubygems to standard format.
-      # This method is called internally when Versionomy initializes itself,
-      # and you should not need to call it again. It is documented, however,
-      # so that you can inspect its source code from RDoc, since the source
-      # contains useful examples of how to use the conversion DSLs.
-      
-      def self.create_rubygems_to_standard
-        
-        # We'll use a parsing conversion.
-        Conversion::Parsing.new do
-          
-          # Handle the case where the rubygems version ends with a string
-          # field, e.g. "1.0.b". We want to treat this like "1.0b0" rather
-          # than "1.0-2" since the rubygems semantic states that this is a
-          # prerelease version. So we add 0 to the end of the parsed string
-          # if it ends in a letter.
-          to_modify_string do |str_, convert_params_|
-            str_.gsub(/([[:alpha:]])\z/, '\10')
-          end
-          
-        end
-        
-      end
-      
-      
-      unless Conversion.get(:standard, :rubygems)
-        Conversion.register(:standard, :rubygems, create_standard_to_rubygems)
-      end
-      unless Conversion.get(:rubygems, :standard)
-        Conversion.register(:rubygems, :standard, create_rubygems_to_standard)
-      end
-      
-      
-    end
-    
-    
-  end
-  
-end