Use type definition when building type instance

lib/virtus/attribute.rb

@@ -59,8 +59,8 @@ def self.new(*args)
     end
 
     # @api private
-    def self.build_type(options)
-      Axiom::Types.infer(options[:primitive])
+    def self.build_type(definition)
+      Axiom::Types.infer(definition.primitive)
     end
 
     # @api private

lib/virtus/attribute/builder.rb

@@ -107,7 +107,7 @@ def initialize(type_definition, options)
         @type_definition = type_definition
 
         initialize_class
-        initialize_type(:type => type_definition.type, :primitive => type_definition.primitive)
+        initialize_type
         initialize_options(options)
         initialize_default_value
         initialize_coercer
@@ -116,34 +116,14 @@ def initialize(type_definition, options)
 
       private
 
-      # @api private
-      def initialize_attribute
-        @attribute = @klass.new(@type, @options) do |attribute|
-          attribute.extend(Accessor)    if @options[:name]
-          attribute.extend(Coercible)   if @options[:coerce]
-          attribute.extend(Strict)      if @options[:strict]
-          attribute.extend(LazyDefault) if @options[:lazy]
-        end
-      end
-
-      # @api private
-      def initialize_default_value
-        @options.update(:default_value => DefaultValue.build(@options[:default]))
-      end
-
-      # @api private
-      def initialize_coercer
-        @options.update(:coercer => @options.fetch(:coercer) { @klass.build_coercer(@type, @options) })
-      end
-
       # @api private
       def initialize_class
         @klass = self.class.determine_type(@type_definition.primitive, Attribute)
       end
 
       # @api private
-      def initialize_type(options)
-        @type = @klass.build_type(options)
+      def initialize_type
+        @type = @klass.build_type(@type_definition)
       end
 
       # @api private
@@ -161,6 +141,26 @@ def determine_visibility!
         @options.update(:reader => reader_visibility, :writer => writer_visibility)
       end
 
+      # @api private
+      def initialize_default_value
+        @options.update(:default_value => DefaultValue.build(@options[:default]))
+      end
+
+      # @api private
+      def initialize_coercer
+        @options.update(:coercer => @options.fetch(:coercer) { @klass.build_coercer(@type, @options) })
+      end
+
+      # @api private
+      def initialize_attribute
+        @attribute = @klass.new(@type, @options) do |attribute|
+          attribute.extend(Accessor)    if @options[:name]
+          attribute.extend(Coercible)   if @options[:coerce]
+          attribute.extend(Strict)      if @options[:strict]
+          attribute.extend(LazyDefault) if @options[:lazy]
+        end
+      end
+
     end # class Builder
 
   end # class Attribute

lib/virtus/attribute/collection.rb

@@ -51,8 +51,8 @@ def coercion_method
       end
 
       # @api private
-      def self.build_type(options)
-        Type.infer(options.fetch(:type), options.fetch(:primitive))
+      def self.build_type(definition)
+        Type.infer(definition.type, definition.primitive)
       end
 
       # @api private

lib/virtus/attribute/embedded_value.rb

@@ -66,9 +66,8 @@ def self.handles?(klass)
       end
 
       # @api private
-      def self.build_type(options)
-        klass = options[:primitive].is_a?(Class) ? options[:primitive] : options[:type]
-
+      def self.build_type(definition)
+        klass = definition.primitive.is_a?(Class) ? definition.primitive : definition.type
         Axiom::Types::Object.new { primitive klass }
       end
 

lib/virtus/attribute/hash.rb

@@ -58,8 +58,8 @@ def primitive
       end
 
       # @api private
-      def self.build_type(options)
-        Type.infer(options[:type])
+      def self.build_type(definition)
+        Type.infer(definition.type)
       end
 
       # @api private