Software Publico / Noosfero

Commit 4280df894b6bac6bed15b60c29ba270e13e31c8d

Authored by Fernanda Lopes 2010-05-08 17:51:03 -0300

Committed by Antonio Terceiro 2010-05-11 12:43:56 -0300

class ActsAsSearchable transformed into a module

(ActionItem1519)

Showing 1 changed file with 35 additions and 28 deletions Show diff stats

lib/acts_as_searchable.rb

Diff comments View file @4280df8

--class << ActiveRecord::Base
--
--  def acts_as_searchable(options = {})
--    acts_as_ferret({ :remote => true }.merge(options))
--    def find_by_contents(query, ferret_options = {}, db_options = {})
--      pg_options = {}
--      if ferret_options[:page]
--        pg_options[:page] = ferret_options.delete(:page)
--      end
--      if ferret_options[:per_page]
--        pg_options[:per_page] = ferret_options.delete(:per_page)
--      end
++module ActsAsSearchable
++
++  module ClassMethods
++    def acts_as_searchable(options = {})
++      acts_as_ferret({ :remote => true }.merge(options))
++      extend FindByContents
++    end
--      ferret_options[:limit] = :all
--
--      # FIXME this is a HORRIBLE HACK
--      ids = find_ids_with_ferret(query, ferret_options)[1][0..8000].map{|r|r[:id].to_i}
++    module FindByContents
++      def find_by_contents(query, ferret_options = {}, db_options = {})
++        pg_options = {}
++        if ferret_options[:page]
++          pg_options[:page] = ferret_options.delete(:page)
++        end
++        if ferret_options[:per_page]
++          pg_options[:per_page] = ferret_options.delete(:per_page)
++        end
--      if ids.empty?
--        ids << -1
--      end
++        ferret_options[:limit] = :all
--      if db_options[:conditions]
--        db_options[:conditions] = sanitize_sql_for_conditions(db_options[:conditions]) + " and #{table_name}.id in (#{ids.join(', ')})"
--      else
--        db_options[:conditions] = "#{table_name}.id in (#{ids.join(', ')})"
--      end
++        # FIXME this is a HORRIBLE HACK
++        ids = find_ids_with_ferret(query, ferret_options)[1][0..8000].map{|r|r[:id].to_i}
--      pg_options[:page] ||= 1
--      result = find(:all, db_options)
--      result.paginate(pg_options)
++        if ids.empty?
++          ids << -1
++        end
++
++        if db_options[:conditions]
++          db_options[:conditions] = sanitize_sql_for_conditions(db_options[:conditions]) + " and #{table_name}.id in (#{ids.join(', ')})"
++        else
++          db_options[:conditions] = "#{table_name}.id in (#{ids.join(', ')})"
++        end
++
++        pg_options[:page] ||= 1
++        result = find(:all, db_options)
++        result.paginate(pg_options)
++      end
      end
    end
--
  end
++
++ActiveRecord::Base.send(:extend, ActsAsSearchable::ClassMethods)