Requested fixes

Author: johnnyshields

lib/config/locales/en.yml

@@ -177,10 +177,10 @@ en:
             https://docs.mongodb.com/mongoid/current/reference/fields/#custom-field-options"
         invalid_field_type:
           message: "Invalid field type %{type_inspection} for field '%{field}' on model '%{klass}'."
-          summary: "Model '%{klass}' declares a field '%{field}' with an unknown :type value
+          summary: "Model '%{klass}' declares a field '%{field}' with an unknown type value
             %{type_inspection}. This value is neither present in Mongoid's default type mapping,
             nor defined in a custom field type mapping."
-          resolution: "Please provide a valid :type value for the field. If you
+          resolution: "Please provide a valid type value for the field. If you
             meant to define a custom field type, please do so first as follows:\n\n
             \_\_Mongoid::Fields.configure do\n
             \_\_\_\_define_type %{type_inspection}, YourTypeClass

lib/mongoid/fields/field_types.rb

@@ -43,21 +43,23 @@ class << self
         # @example
         #   Mongoid::FieldTypes.get(:point)
         #
-        # @param [ Symbol | String ] value the identifier of the defined type
-        def get(value)
-          mapping[value] || handle_unmapped_type(value)
+        # @param [ Symbol | String | Class | nil ] type the identifier of the defined
+        #   type, or a class to pass-through, or nil.
+        # @return [ Class | nil ] The mapped type class, or nil.
+        def get(type)
+          mapping[type] || handle_unmapped_type(type)
         end
 
         # Defines a field type mapping, for later use in field :type option.
         #
         # @example
         #   Mongoid::FieldTypes.define(:point, Point)
         #
-        # @param [ Symbol ] symbol the symbol identifier of the defined type
+        # @param [ Symbol ] type the symbol identifier of the defined type
         # @param [ Class ] klass the class of the defined type, which must
-        #   include mongoize and related methods.
-        def define(symbol, klass)
-          mapping[symbol.to_sym] = klass
+        #   include mongoize, demongoize, and evolve methods.
+        def define(type, klass)
+          mapping[type] = klass
         end
 
         delegate :delete, to: :mapping
@@ -74,6 +76,8 @@ def mapping
         # Handles fallback for case where mapping does not contain the
         # requested type.
         #
+        # @param [ Symbol | String | Class | nil ] type the identifier of the defined
+        #   type, or a class, or nil.
         # @return [ Class | nil ] The class to use as a fallback, or nil.
         def handle_unmapped_type(type)
           return Object if type.nil?

spec/mongoid/errors/invalid_field_type_spec.rb

@@ -23,7 +23,7 @@
 
       it "contains the summary in the message" do
         expect(error.message).to include(
-          "Model 'Person' declares a field 'first_name' with an unknown :type value :stringgy."
+          "Model 'Person' declares a field 'first_name' with an unknown type value :stringgy."
         )
       end
     end
@@ -41,14 +41,14 @@
 
       it "contains the summary in the message" do
         expect(error.message).to include(
-          %q,Model 'Person' declares a field 'first_name' with an unknown :type value "stringgy".,
+          %q,Model 'Person' declares a field 'first_name' with an unknown type value "stringgy".,
         )
       end
     end
 
     it "contains the resolution in the message" do
       expect(error.message).to include(
-        'Please provide a valid :type value for the field.'
+        'Please provide a valid type value for the field.'
       )
     end
   end

spec/mongoid/fields/field_types_spec.rb

@@ -4,8 +4,11 @@
 
 describe Mongoid::Fields::FieldTypes do
 
-  after do
-    described_class.instance_variable_set(:@mapping, described_class::DEFAULT_MAPPING.dup)
+  around do |example|
+    mapping = described_class::DEFAULT_MAPPING.dup
+    described_class.instance_variable_set(:@mapping, mapping)
+    example.run
+    described_class.instance_variable_set(:@mapping, mapping)
   end
 
   describe '.get' do

spec/mongoid/fields_spec.rb

@@ -369,15 +369,15 @@
         it 'raises InvalidFieldType' do
           lambda do
             klass.field(:test, type: :bogus)
-          end.should raise_error(Mongoid::Errors::InvalidFieldType, /declares a field 'test' with an unknown :type value :bogus/)
+          end.should raise_error(Mongoid::Errors::InvalidFieldType, /declares a field 'test' with an unknown type value :bogus/)
         end
       end
 
       context 'when using an unknown string' do
         it 'raises InvalidFieldType' do
           lambda do
             klass.field(:test, type: 'bogus')
-          end.should raise_error(Mongoid::Errors::InvalidFieldType, /declares a field 'test' with an unknown :type value "bogus"/)
+          end.should raise_error(Mongoid::Errors::InvalidFieldType, /declares a field 'test' with an unknown type value "bogus"/)
         end
       end
     end