Cleaning up more code

lib/mongoid/associations.rb

@@ -143,8 +143,8 @@ def reflect_on_association(name)
       #   end
       #
       def relates_to_one(name, options = {})
-        field "#{name.to_s}_id"
-        index "#{name.to_s}_id"
+        key = name.to_s
+        field "#{key}_id"; index "#{key}_id"
         add_association(
           Associations::RelatesToOne,
           Associations::Options.new(options.merge(:name => name))

lib/mongoid/criteria.rb

@@ -360,11 +360,8 @@ def order_by(params = [])
     # Either returns the page option and removes it from the options, or
     # returns a default value of 1.
     def page
-      if @options[:skip] && @options[:limit]
-        (@options[:skip].to_i + @options[:limit].to_i) / @options[:limit].to_i
-      else
-        1
-      end
+      skips, limits = @options[:skip], @options[:limit]
+      (skips && limits) ? (skips + limits) / limits : 1
     end
 
     # Executes the +Criteria+ and paginates the results.
@@ -498,8 +495,8 @@ def filter_options
       page_num = @options.delete(:page)
       per_page_num = @options.delete(:per_page)
       if (page_num || per_page_num)
-        @options[:limit] = (per_page_num || 20).to_i
-        @options[:skip] = (page_num || 1).to_i * @options[:limit] - @options[:limit]
+        @options[:limit] = limits = (per_page_num || 20).to_i
+        @options[:skip] = (page_num || 1).to_i * limits - limits
       end
     end
 

lib/mongoid/document.rb

@@ -109,8 +109,9 @@ def define(name, options = {})
 
       # Set up a default value for a field.
       def default(name, options = {})
+        value = options[:default]
         @defaults ||= {}.with_indifferent_access
-        @defaults[name] = options[:default] if options[:default]
+        @defaults[name] = value if value
       end
 
     end
@@ -284,8 +285,8 @@ def to_param
     # This will also cause the observing +Document+ to notify it's parent if
     # there is any.
     def update(child, clear = false)
-      @attributes.insert(child.association_name, child.attributes) unless clear
-      @attributes.delete(child.association_name) if clear
+      name = child.association_name
+      clear ? @attributes.delete(name) : @attributes.insert(name, child.attributes)
       notify
     end