Load fabricators from folders specified in config

lib/fabrication/config.rb

@@ -9,10 +9,16 @@ def self.fabricator_dir=(folders)
       OPTIONS[:fabricator_dir] = (Array.new << folders).flatten
     end
 
+    def self.reset_defaults
+      OPTIONS.clear
+      OPTIONS.merge!(DEFAULTS)
+    end
+
     private
 
-    OPTIONS = {
-      :fabricator_dir => ['test/fabricators', 'spec/fabricators']
+    DEFAULTS = {
+      :fabricator_dir => ['test', 'spec']
     }
+    OPTIONS = {}.merge!(DEFAULTS)
   end
 end

lib/fabrication/support.rb

@@ -23,13 +23,9 @@ def variable_name_to_class_name(name)
     end
 
     def find_definitions
-      base_path = defined?(Rails) ? Rails.root : "."
-      ['test', 'spec'].each do |folder|
-        path = File.expand_path(File.join(base_path, folder, 'fabricators'))
-
-        load("#{path}.rb") if File.exists?("#{path}.rb")
-
-        File.directory? path and Dir[File.join(path, '*.rb')].sort.each do |file|
+      path_prefix = defined?(Rails) ? Rails.root : "."
+      Fabrication::Config.fabricator_dir.each do |folder|
+        Dir.glob(File.join(path_prefix, folder, '**', '*fabricator.rb')).sort.each do |file|
           load file
         end
       end

spec/fabrication/config_spec.rb

@@ -2,18 +2,27 @@
 
 describe Fabrication::Config do
   subject { Fabrication::Config }
+  after { Fabrication::Config.reset_defaults }
 
   context "default configs" do
-    its(:fabricator_dir) { should == ['test/fabricators', 'spec/fabricators'] }
+    its(:fabricator_dir) { should == ['test', 'spec'] }
   end
 
   describe ".fabricator_dir" do
     context "with a single folder" do
       before do
-        Fabrication::Config.fabricator_dir = 'lib/fabricators'
+        Fabrication::Config.fabricator_dir = 'lib'
       end
 
-      its(:fabricator_dir) { should == ['lib/fabricators'] }
+      its(:fabricator_dir) { should == ['lib'] }
+    end
+
+    context "with multiple folders" do
+      before do
+        Fabrication::Config.fabricator_dir = %w(lib support)
+      end
+
+      its(:fabricator_dir) { should == ['lib', 'support'] }
     end
   end
 end