Ticket #215: aaf_init.patch

acts_as_ferret/init.rb

@@ -20 +20 @@
-
-require 'acts_as_ferret'
-
+config.after_initialize { ActsAsFerret::load_config }
+config.to_prepare       { ActsAsFerret::load_config }

acts_as_ferret/lib/acts_as_ferret.rb

@@ -46 +46 @@
-
-require 'ferret_server'
-
-require 'aaf_loader'
-require 'rdig_adapter'
-
-# The Rails ActiveRecord Ferret Mixin.
@@ -248 +247 @@
-    return index
-  end
-
-  # call this in environment.rb in case you use external index declarations in
-  # config/aaf.rb:
-  #
-  #   Rails::Initializer.run do |config|
-  #     ...
-  #     config.after_initialize do
-  #       ActsAsFerret::initialize
-  #     end
-  #   end
-  #
-  def self.initialize
-    load_config
-    # let the application reload the aaf config on each request so aaf stays
-    # active even when classes are reloaded in dev mode.
-    if RAILS_ENV == 'development'
-      ActionController::Base.send :include, ActsAsFerret::AafLoader
-    end
-  end
-
-  def self.load_config
-via AafLoader working
+work
-    require_dependency "#{RAILS_ROOT}/config/aaf.rb"
-    ActsAsFerret::logger.info "loaded configuration file aaf.rb"
-  rescue LoadError

/dev/null

@@ -1 @@
-# Helper to avoid class reloading issues when using shared index declarations
-# outside of model classes (RAILS_ROOT/config/aaf.rb).
-#
-# Include this module in your ApplicationController to make sure your
-# config/aaf.rb gets reloaded on every request in development mode.
-#
-module ActsAsFerret
-  module AafLoader
-    def self.included(target)
-      target.before_filter :load_aaf_config
-    end
-
-    def load_aaf_config
-      ActsAsFerret::load_config
-    end
-  end
-end