Revert "Integrate with Virtus Coercion system (WIP)"

Gemfile

@@ -6,8 +6,6 @@ source :rubygems
 
 gemspec
 
-gem 'virtus', '~> 0.5', :git => 'https://github.com/solnic/virtus'
-
 SOURCE         = ENV.fetch('SOURCE', :git).to_sym
 REPO_POSTFIX   = SOURCE == :path ? ''                                : '.git'
 DATAMAPPER     = SOURCE == :path ? Pathname(__FILE__).dirname.parent : 'https://github.com/datamapper'

dm-core.gemspec

@@ -18,7 +18,7 @@ Gem::Specification.new do |gem|
   gem.version       = DataMapper::VERSION
 
   gem.add_runtime_dependency('addressable', '~> 2.2.6')
-  gem.add_runtime_dependency('virtus',      '~> 0.5')
+  gem.add_runtime_dependency('backports')
 
   gem.add_development_dependency('rake',  '~> 0.9.2')
   gem.add_development_dependency('rspec', '~> 1.3.2')

lib/dm-core.rb

@@ -11,14 +11,6 @@ module DataMapper
   module Undefined; end
 end
 
-require 'virtus'
-
-class Virtus::Coercion::Object
-  def self.to_string(value)
-    value.nil? ? value : value.to_s
-  end
-end
-
 require 'dm-core/support/ext/blank'
 require 'dm-core/support/ext/hash'
 require 'dm-core/support/ext/object'
@@ -68,8 +60,10 @@ def self.to_string(value)
 require 'dm-core/resource/persistence_state/deleted'
 require 'dm-core/resource/persistence_state/dirty'
 
-require 'dm-core/property'
 require 'dm-core/property/invalid_value_error'
+require 'dm-core/property'
+require 'dm-core/property/typecast/numeric'
+require 'dm-core/property/typecast/time'
 require 'dm-core/property/object'
 require 'dm-core/property/string'
 require 'dm-core/property/binary'

lib/dm-core/property.rb

@@ -319,7 +319,7 @@ class Property
     ].to_set.freeze
 
     OPTIONS = [
-      :load_as, :dump_as, :coercion_method,
+      :load_as, :dump_as,
       :accessor, :reader, :writer,
       :lazy, :default, :key, :field,
       :index, :unique_index,
@@ -335,8 +335,7 @@ class Property
                      Query::OPTIONS.to_a
                     ).map { |name| name.to_s }
 
-    attr_reader :load_as, :dump_as, :coercion_method,
-      :model, :name, :instance_variable_name,
+    attr_reader :load_as, :dump_as, :model, :name, :instance_variable_name,
       :reader_visibility, :writer_visibility, :options,
       :default, :repository_name, :allow_nil, :allow_blank, :required
 
@@ -675,7 +674,11 @@ def properties
 
     # @api semipublic
     def typecast(value)
-      Virtus::Coercion[value.class].send(coercion_method, value)
+      if value.nil? || value_loaded?(value)
+        value
+      elsif respond_to?(:typecast_to_primitive)
+        typecast_to_primitive(value)
+      end
     end
 
     # Test the value to see if it is a valid value for this Property
@@ -773,13 +776,10 @@ def initialize(model, name, options = {})
       @name                   = name.to_s.chomp('?').to_sym
       @options                = predefined_options.merge(options).freeze
       @instance_variable_name = "@#{@name}".freeze
-      @coercion_method        = @options.fetch(:coercion_method)
-
-      @load_as = self.class.load_as
-      @dump_as = self.class.dump_as
-
-      @field   = @options[:field].freeze unless @options[:field].nil?
-      @default = @options[:default]
+      @load_as   = self.class.load_as
+      @dump_as   = @options.fetch(:dump_as, @load_as)
+      @field     = @options[:field].freeze unless @options[:field].nil?
+      @default   = @options[:default]
 
       @serial       = @options.fetch(:serial,       false)
       @key          = @options.fetch(:key,          @serial)

lib/dm-core/property/binary.rb

@@ -1,7 +1,6 @@
 module DataMapper
   class Property
     class Binary < String
-
       if RUBY_VERSION >= "1.9"
 
         def load(value)
@@ -15,7 +14,6 @@ def dump(value)
         end
 
       end
-
     end # class Binary
   end # class Property
 end # module DataMapper

lib/dm-core/property/boolean.rb

@@ -1,9 +1,12 @@
 module DataMapper
   class Property
     class Boolean < Object
-      load_as         ::TrueClass
-      dump_as         ::TrueClass
-      coercion_method :to_boolean
+      load_as ::TrueClass
+
+      TRUE_VALUES  = [ 1, '1', 't', 'T', 'true',  'TRUE'  ].freeze
+      FALSE_VALUES = [ 0, '0', 'f', 'F', 'false', 'FALSE' ].freeze
+      BOOLEAN_MAP  = Hash[
+        TRUE_VALUES.product([ true ]) + FALSE_VALUES.product([ false ]) ].freeze
 
       # @api semipublic
       def value_dumped?(value)
@@ -15,6 +18,19 @@ def value_loaded?(value)
         value == true || value == false
       end
 
+      # Typecast a value to a true or false
+      #
+      # @param [Integer, #to_str] value
+      #   value to typecast
+      #
+      # @return [Boolean]
+      #   true or false constructed from value
+      #
+      # @api private
+      def typecast_to_primitive(value)
+        BOOLEAN_MAP.fetch(value, value)
+      end
+
     end # class Boolean
   end # class Property
 end # module DataMapper

lib/dm-core/property/class.rb

@@ -1,13 +1,19 @@
 module DataMapper
   class Property
     class Class < Object
-      load_as         ::Class
-      dump_as         ::Class
-      coercion_method :to_constant
+      load_as ::Class
 
-      # @api semipublic
-      def typecast(value)
-        DataMapper::Ext::Module.find_const(model, value.to_s) unless value.nil?
+      # Typecast a value to a Class
+      #
+      # @param [#to_s] value
+      #   value to typecast
+      #
+      # @return [Class]
+      #   Class constructed from value
+      #
+      # @api private
+      def typecast_to_primitive(value)
+        DataMapper::Ext::Module.find_const(model, value.to_s)
       rescue NameError
         value
       end

lib/dm-core/property/date.rb

@@ -1,10 +1,44 @@
 module DataMapper
   class Property
     class Date < Object
-      load_as         ::Date
-      dump_as         ::Date
-      coercion_method :to_date
+      include Typecast::Time
 
+      load_as ::Date
+
+      # Typecasts an arbitrary value to a Date
+      # Handles both Hashes and Date instances.
+      #
+      # @param [Hash, #to_mash, #to_s] value
+      #   value to be typecast
+      #
+      # @return [Date]
+      #   Date constructed from value
+      #
+      # @api private
+      def typecast_to_primitive(value)
+        if value.respond_to?(:to_date)
+          value.to_date
+        elsif value.is_a?(::Hash) || value.respond_to?(:to_mash)
+          typecast_hash_to_date(value)
+        else
+          ::Date.parse(value.to_s)
+        end
+      rescue ArgumentError
+        value
+      end
+
+      # Creates a Date instance from a Hash with keys :year, :month, :day
+      #
+      # @param [Hash, #to_mash] value
+      #   value to be typecast
+      #
+      # @return [Date]
+      #   Date constructed from hash
+      #
+      # @api private
+      def typecast_hash_to_date(value)
+        ::Date.new(*extract_time(value)[0, 3])
+      end
     end # class Date
   end # class Property
 end # module DataMapper

lib/dm-core/property/date_time.rb

@@ -1,10 +1,43 @@
 module DataMapper
   class Property
     class DateTime < Object
-      load_as         ::DateTime
-      dump_as         ::DateTime
-      coercion_method :to_datetime
+      include Typecast::Time
 
+      load_as ::DateTime
+
+      # Typecasts an arbitrary value to a DateTime.
+      # Handles both Hashes and DateTime instances.
+      #
+      # @param [Hash, #to_mash, #to_s] value
+      #   value to be typecast
+      #
+      # @return [DateTime]
+      #   DateTime constructed from value
+      #
+      # @api private
+      def typecast_to_primitive(value)
+        if value.is_a?(::Hash) || value.respond_to?(:to_mash)
+          typecast_hash_to_datetime(value)
+        else
+          ::DateTime.parse(value.to_s)
+        end
+      rescue ArgumentError
+        value
+      end
+
+      # Creates a DateTime instance from a Hash with keys :year, :month, :day,
+      # :hour, :min, :sec
+      #
+      # @param [Hash, #to_mash] value
+      #   value to be typecast
+      #
+      # @return [DateTime]
+      #   DateTime constructed from hash
+      #
+      # @api private
+      def typecast_hash_to_datetime(value)
+        ::DateTime.new(*extract_time(value))
+      end
     end # class DateTime
   end # class Property
 end # module DataMapper

lib/dm-core/property/decimal.rb

@@ -1,17 +1,15 @@
 module DataMapper
   class Property
     class Decimal < Numeric
-      load_as         BigDecimal
-      dump_as         BigDecimal
-      coercion_method :to_decimal
+      load_as BigDecimal
 
       DEFAULT_PRECISION = 10
       DEFAULT_SCALE     = 0
 
       precision(DEFAULT_PRECISION)
       scale(DEFAULT_SCALE)
 
-    protected
+      protected
 
       def initialize(model, name, options = {})
         super
@@ -31,6 +29,22 @@ def initialize(model, name, options = {})
         end
       end
 
+      # Typecast a value to a BigDecimal
+      #
+      # @param [#to_str, #to_d, Integer] value
+      #   value to typecast
+      #
+      # @return [BigDecimal]
+      #   BigDecimal constructed from value
+      #
+      # @api private
+      def typecast_to_primitive(value)
+        if value.kind_of?(::Integer)
+          value.to_s.to_d
+        else
+          typecast_to_numeric(value, :to_d)
+        end
+      end
     end # class Decimal
   end # class Property
 end # module DataMapper

lib/dm-core/property/discriminator.rb

@@ -20,7 +20,7 @@ def new(*args, &block)
             discriminator = properties(repository_name).discriminator
 
             if discriminator_value = args.first[discriminator.name]
-              model = discriminator.typecast(discriminator_value)
+              model = discriminator.typecast_to_primitive(discriminator_value)
 
               if model.kind_of?(Model) && !model.equal?(self)
                 return model.new(*args, &block)

lib/dm-core/property/float.rb

@@ -1,16 +1,28 @@
 module DataMapper
   class Property
     class Float < Numeric
-      load_as         ::Float
-      dump_as         ::Float
-      coercion_method :to_float
+      load_as ::Float
 
       DEFAULT_PRECISION = 10
       DEFAULT_SCALE     = nil
 
       precision(DEFAULT_PRECISION)
       scale(DEFAULT_SCALE)
 
+      protected
+
+      # Typecast a value to a Float
+      #
+      # @param [#to_str, #to_f] value
+      #   value to typecast
+      #
+      # @return [Float]
+      #   Float constructed from value
+      #
+      # @api private
+      def typecast_to_primitive(value)
+        typecast_to_numeric(value, :to_f)
+      end
     end # class Float
   end # class Property
 end # module DataMapper

lib/dm-core/property/integer.rb

@@ -1,13 +1,11 @@
 module DataMapper
   class Property
     class Integer < Numeric
-      load_as         ::Integer
-      dump_as         ::Integer
-      coercion_method :to_integer
+      load_as ::Integer
 
       accept_options :serial
 
-    protected
+      protected
 
       # @api semipublic
       def initialize(model, name, options = {})
@@ -17,6 +15,18 @@ def initialize(model, name, options = {})
         super
       end
 
+      # Typecast a value to an Integer
+      #
+      # @param [#to_str, #to_i] value
+      #   value to typecast
+      #
+      # @return [Integer]
+      #   Integer constructed from value
+      #
+      # @api private
+      def typecast_to_primitive(value)
+        typecast_to_numeric(value, :to_i)
+      end
     end # class Integer
   end # class Property
 end # module DataMapper