Changeset 339

Timestamp:

04/30/08 12:13:36 (5 months ago)

Author:

jk

Message:

applying patch from #215

Files:

• trunk/plugin/acts_as_ferret/init.rb (modified) (1 diff)
• trunk/plugin/acts_as_ferret/lib/aaf_loader.rb (deleted)
• trunk/plugin/acts_as_ferret/lib/acts_as_ferret.rb (modified) (2 diffs)

trunk/plugin/acts_as_ferret/init.rb

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

trunk/plugin/acts_as_ferret/lib/acts_as_ferret.rb

@@ -47 +47 @@
-require 'ferret_server'
-
-require 'aaf_loader'
-require 'rdig_adapter'
-
@@ -249 +248 @@
-  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"