LCShen · February 7, 2019 04:28 · Jan 5, 2015 · Jan 5, 2015 · Jan 5, 2015 · Jan 5, 2015
diff --git a/factory_girl_strategy_find_or_create.rb b/factory_girl_strategy_find_or_create.rb
@@ -1,3 +1,4 @@
+## http://stackoverflow.com/questions/7145256
 module FactoryGirl
   module Strategy
     class Find

diff --git a/factory_girl_strategy_find_or_create.rb b/factory_girl_strategy_find_or_create.rb
@@ -43,5 +43,4 @@ def result(evaluation)
 
   register_strategy(:find, Strategy::Find)
   register_strategy(:find_or_create, Strategy::FindOrCreate)
-
 end
diff --git a/factory_girl_strategy_find_or_create.rb b/factory_girl_strategy_find_or_create.rb
@@ -40,7 +40,8 @@ def result(evaluation)
       end
     end
   end
-end
-
-FactoryGirl.register_strategy(:find, FactoryGirl::Strategy::Find)
-FactoryGirl.register_strategy(:find_or_create, FactoryGirl::Strategy::FindOrCreate)
+
+  register_strategy(:find, Strategy::Find)
+  register_strategy(:find_or_create, Strategy::FindOrCreate)
+
+end
diff --git a/factory_girl.rb → factory_girl_strategy_find_or_create.rb b/factory_girl.rb → factory_girl_strategy_find_or_create.rb
@@ -30,7 +30,7 @@ def initialize
 
       def result(evaluation)
         found_object = @strategy.result(evaluation)
-        
+
         if found_object.nil?
           @strategy = FactoryGirl.strategy_by_name(:create).new
           @strategy.result(evaluation)

diff --git a/factory_girl.rb b/factory_girl.rb
@@ -9,16 +9,16 @@ def result(evaluation)
         build_class(evaluation).where(get_overrides(evaluation)).first
       end
 
-      protected
+      private
 
-        def build_class(evaluation)
-          evaluation.instance_variable_get(:@attribute_assigner).instance_variable_get(:@build_class)
-        end
+      def build_class(evaluation)
+        evaluation.instance_variable_get(:@attribute_assigner).instance_variable_get(:@build_class)
+      end
 
-        def get_overrides(evaluation = nil)
-          return @overrides unless @overrides.nil?
-          evaluation.instance_variable_get(:@attribute_assigner).instance_variable_get(:@evaluator).instance_variable_get(:@overrides).clone
-        end
+      def get_overrides(evaluation = nil)
+        return @overrides unless @overrides.nil?
+        evaluation.instance_variable_get(:@attribute_assigner).instance_variable_get(:@evaluator).instance_variable_get(:@overrides).clone
+      end
     end
 
     class FindOrCreate
@@ -30,7 +30,7 @@ def initialize
 
       def result(evaluation)
         found_object = @strategy.result(evaluation)
-        # byebug
+
         if found_object.nil?
           @strategy = FactoryGirl.strategy_by_name(:create).new
           @strategy.result(evaluation)

diff --git a/factory_girl.rb b/factory_girl.rb
@@ -0,0 +1,46 @@
+module FactoryGirl
+  module Strategy
+    class Find
+      def association(runner)
+        runner.run
+      end
+
+      def result(evaluation)
+        build_class(evaluation).where(get_overrides(evaluation)).first
+      end
+
+      protected
+
+        def build_class(evaluation)
+          evaluation.instance_variable_get(:@attribute_assigner).instance_variable_get(:@build_class)
+        end
+
+        def get_overrides(evaluation = nil)
+          return @overrides unless @overrides.nil?
+          evaluation.instance_variable_get(:@attribute_assigner).instance_variable_get(:@evaluator).instance_variable_get(:@overrides).clone
+        end
+    end
+
+    class FindOrCreate
+      def initialize
+        @strategy = FactoryGirl.strategy_by_name(:find).new
+      end
+
+      delegate :association, to: :@strategy
+
+      def result(evaluation)
+        found_object = @strategy.result(evaluation)
+        # byebug
+        if found_object.nil?
+          @strategy = FactoryGirl.strategy_by_name(:create).new
+          @strategy.result(evaluation)
+        else
+          found_object
+        end
+      end
+    end
+  end
+end
+
+FactoryGirl.register_strategy(:find, FactoryGirl::Strategy::Find)
+FactoryGirl.register_strategy(:find_or_create, FactoryGirl::Strategy::FindOrCreate)
No results found