From 31491cc8480aa016111127d667f4ae56d2acd4f2 Mon Sep 17 00:00:00 2001 From: Braulio Bhavamitra Date: Sat, 23 Apr 2011 03:50:31 +0400 Subject: [PATCH] Disable Solr for db:data:minimal task --- Rakefile | 2 ++ lib/acts_as_searchable.rb | 18 +++++++++++------- 2 files changed, 13 insertions(+), 7 deletions(-) diff --git a/Rakefile b/Rakefile index 3bb0e85..6d7ea85 100644 --- a/Rakefile +++ b/Rakefile @@ -7,4 +7,6 @@ require 'rake' require 'rake/testtask' require 'rake/rdoctask' +ACTS_AS_SEARCHABLE_ENABLED = false if Rake.application.top_level_tasks.detect{|t| t == 'db:data:minimal'} + require 'tasks/rails' diff --git a/lib/acts_as_searchable.rb b/lib/acts_as_searchable.rb index 9b4d42a..46bdab5 100644 --- a/lib/acts_as_searchable.rb +++ b/lib/acts_as_searchable.rb @@ -1,15 +1,19 @@ module ActsAsSearchable module ClassMethods + ACTS_AS_SEARCHABLE_ENABLED = true unless defined? ACTS_AS_SEARCHABLE_ENABLED + def acts_as_searchable(options = {}) - if (!options[:fields]) - options[:additional_fields] |= [{:schema_name => :string}] - else - options[:fields] << {:schema_name => :string} + if ACTS_AS_SEARCHABLE_ENABLED + if (!options[:fields]) + options[:additional_fields] |= [{:schema_name => :string}] + else + options[:fields] << {:schema_name => :string} + end + acts_as_solr options + extend FindByContents + send :include, InstanceMethods end - acts_as_solr options - extend FindByContents - send :include, InstanceMethods end module InstanceMethods -- libgit2 0.21.2