From 0aadd703a5916b63811d53993c14e97bf8ef5857 Mon Sep 17 00:00:00 2001
From: Joshua Clayton <jclayton@thoughtbot.com>
Date: Fri, 20 Apr 2012 22:33:54 -0400
Subject: [PATCH] Follow Ruby conventions of double-under's on each side of the
 method name

---
 lib/factory_girl/attribute_assigner.rb | 2 +-
 lib/factory_girl/evaluator.rb          | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/lib/factory_girl/attribute_assigner.rb b/lib/factory_girl/attribute_assigner.rb
index 4067356..2f3daa9 100644
--- a/lib/factory_girl/attribute_assigner.rb
+++ b/lib/factory_girl/attribute_assigner.rb
@@ -66,7 +66,7 @@ module FactoryGirl
     end
 
     def override_names
-      @evaluator.__overrides.keys
+      @evaluator.__override_names__
     end
 
     def hash_instance_methods_to_respond_to
diff --git a/lib/factory_girl/evaluator.rb b/lib/factory_girl/evaluator.rb
index 020a52f..91d5567 100644
--- a/lib/factory_girl/evaluator.rb
+++ b/lib/factory_girl/evaluator.rb
@@ -51,8 +51,8 @@ module FactoryGirl
       end
     end
 
-    def __overrides
-      @overrides
+    def __override_names__
+      @overrides.keys
     end
   end
 end