Refactor nested attributes limit logic to lookup :limit option only once

1 files changed, 12 insertions, 11 deletions

diff --git a/activerecord/lib/active_record/nested_attributes.rb b/activerecord/lib/active_record/nested_attributes.rb
index f91e41b535..3005dc042c 100644
--- a/activerecord/lib/active_record/nested_attributes.rb
+++ b/activerecord/lib/active_record/nested_attributes.rb
@@ -389,17 +389,19 @@ module ActiveRecord
         raise ArgumentError, "Hash or Array expected, got #{attributes_collection.class.name} (#{attributes_collection.inspect})"
       end
 
-      limit = case options[:limit]
-      when Symbol
-        send(options[:limit])
-      when Proc
-        options[:limit].call
-      else
-        options[:limit]
-      end
+      if limit = options[:limit]
+        limit = case limit
+        when Symbol
+          send(limit)
+        when Proc
+          limit.call
+        else
+          limit
+        end
 
-      if limit && attributes_collection.size > limit
-        raise TooManyRecords, "Maximum #{limit} records are allowed. Got #{attributes_collection.size} records instead."
+        if limit && attributes_collection.size > limit
+          raise TooManyRecords, "Maximum #{limit} records are allowed. Got #{attributes_collection.size} records instead."
+        end
       end
 
       if attributes_collection.is_a? Hash
@@ -438,7 +440,6 @@ module ActiveRecord
             else
               association.add_to_target(existing_record)
             end
-
           end
 
           if !call_reject_if(association_name, attributes)