lib/mongoid/token/options.rb in mongoid_token-2.2.0 vs lib/mongoid/token/options.rb in mongoid_token-3.0.0

@@ -14,21 +14,25 @@
   def contains
     @options[:contains]
   end
 
   def field_name
-    @options[:field_name]
+    !@options[:id] && @options[:field_name] || :_id
   end
 
   def skip_finders?
     @options[:skip_finders]
   end
 
   def override_to_param?
     @options[:override_to_param]
   end
 
+  def generate_on_init
+    @options[:id] || @options[:generate_on_init]
+  end
+
   def pattern
     @options[:pattern] ||= case @options[:contains].to_sym
     when :alphanumeric
       "%s#{@options[:length]}"
     when :alpha
@@ -59,14 +63,16 @@
     options
   end
 
   def merge_defaults(options)
     {
-      :length => 4,
-      :retry_count => 3,
-      :contains => :alphanumeric,
-      :field_name => :token,
-      :skip_finders => false,
-      :override_to_param => true,
+      id: false,
+      length: 4,
+      retry_count: 3,
+      contains: :alphanumeric,
+      field_name: :token,
+      skip_finders: false,
+      override_to_param: true,
+      generate_on_init: false
     }.merge(options)
   end
 end