use self.method syntax to resolve circular argument issues

rails · Jan 3, 2015 · 3a30b12 · 3a30b12 · parndt · Mar 18, 2015
1 parent 2f55808
commit 3a30b12
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/activerecord/lib/active_record/associations/has_many_association.rb b/activerecord/lib/active_record/associations/has_many_association.rb
@@ -50,15 +50,15 @@ def count_records
           [options[:limit], count].compact.min
         end
 
-        def has_cached_counter?(reflection = reflection())
+        def has_cached_counter?(reflection = self.reflection)
           owner.attribute_present?(cached_counter_attribute_name(reflection))
         end
 
-        def cached_counter_attribute_name(reflection = reflection())
+        def cached_counter_attribute_name(reflection = self.reflection)
           "#{reflection.name}_count"
         end
 
-        def update_counter(difference, reflection = reflection())
+        def update_counter(difference, reflection = self.reflection)
           if has_cached_counter?(reflection)
             counter = cached_counter_attribute_name(reflection)
             owner.class.update_counters(owner.id, counter => difference)
@@ -77,7 +77,7 @@ def update_counter(difference, reflection = reflection())
         #     it will be decremented twice.
         #
         # Hence this method.
-        def inverse_updates_counter_cache?(reflection = reflection())
+        def inverse_updates_counter_cache?(reflection = self.reflection)
           counter_name = cached_counter_attribute_name(reflection)
           reflection.klass.reflect_on_all_associations(:belongs_to).any? { |inverse_reflection|
             inverse_reflection.counter_cache_column == counter_name

diff --git a/activesupport/lib/active_support/values/time_zone.rb b/activesupport/lib/active_support/values/time_zone.rb
@@ -267,7 +267,7 @@ def at(secs)
     #
     #   Time.zone.now                 # => Fri, 31 Dec 1999 14:00:00 HST -10:00
     #   Time.zone.parse('22:30:00')   # => Fri, 31 Dec 1999 22:30:00 HST -10:00
-    def parse(str, now=now())
+    def parse(str, now=self.now)
       parts = Date._parse(str, false)
       return if parts.empty?