engine.rb in artfully_ose-1.2.0.pre.20

- old
+ new

@@ -1,7 +1,15 @@
 module ArtfullyOse
   class Engine < ::Rails::Engine
+
+    if Rails.env.test?
+      initializer 'artfully_ose.factories', :after => 'factory_girl.set_factory_paths' do
+        puts 'ArtfullyOse: Setting up additional FactoryGirl paths'
+        FactoryGirl.definition_file_paths << File.expand_path('../../../spec/factories', __FILE__) if defined?(FactoryGirl)
+      end
+    end
+
     initializer "artfully_ose.braintree_config" do |app|
       puts "ArtfullyOse: Initializing Braintree config"
       BraintreeConfig = Struct.new(:merchant_id, :public_key, :private_key)
       app.config.braintree = BraintreeConfig.new
       app.config.braintree.merchant_id   = ENV['BRAINTREE_MERCHANT_ID']
@@ -39,13 +47,26 @@
       app.config.google_analytics.storefront_account    = ENV['GA_STOREFRONT_ACCOUNT']
       app.config.google_analytics.domain                = ENV['GA_DOMAIN']
     end
    
     initializer "artfully_ose.autoload_paths", :before => :set_autoload_paths do |app|
+      # First level sub-directories only
+      model_paths = [
+        "#{config.root}/app/models/actions",
+        "#{config.root}/app/models/database_views",
+        "#{config.root}/app/models/discounts",
+        "#{config.root}/app/models/imports",
+        "#{config.root}/app/models/job",
+        "#{config.root}/app/models/kits",
+        "#{config.root}/app/models/orders",
+        "#{config.root}/app/models/payments",
+      ]
+
       puts "ArtfullyOse: Setting up additional autoload paths"
-      app.config.autoload_paths += Dir["#{config.root}/app/models/**/"]
+      app.config.autoload_paths += model_paths
+
     end
-    
+
     config.generators do |g|
       g.test_framework :rspec, :view_specs => false
     end
 
     config.autoload_paths += %W(
\ No newline at end of file