Changeset 338

Timestamp:

04/23/08 07:22:40 (2 months ago)

Author:

jk

Message:

fix aafloader, new ActsAsFerret::initialize method, check if scope method is present before calling it (helps with non-AR models)

Files:

• trunk/plugin/acts_as_ferret/lib/aaf_loader.rb (modified) (1 diff)
• trunk/plugin/acts_as_ferret/lib/acts_as_ferret.rb (modified) (3 diffs)
• trunk/plugin/acts_as_ferret/lib/class_methods.rb (modified) (1 diff)

trunk/plugin/acts_as_ferret/lib/aaf_loader.rb

@@ -5 +5 @@
-# config/aaf.rb gets reloaded on every request in development mode.
-#
-
-
-
+
+
+
+
+
+
+
+
+
-  end
-end

trunk/plugin/acts_as_ferret/lib/acts_as_ferret.rb

@@ -47 +47 @@
-require 'ferret_server'
-
+require 'aaf_loader'
-require 'rdig_adapter'
-
@@ -246 +247 @@
-    index.register_class(clazz, options)
-    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
-
@@ -566 +586 @@
-ActiveRecord::Base.extend ActsAsFerret::ActMethods
-
-

trunk/plugin/acts_as_ferret/lib/class_methods.rb

@@ -146 +146 @@
-    # +conitions+ present in +find_options+.
-    def find_with_ferret(q, options = {}, find_options = {})
-
+respond_to?(:scope) && 
-        if find_options[:conditions]
-          find_options[:conditions] = "(#{find_options[:conditions]}) AND (#{scope(:find, :conditions)})"