has_searcher 0.0.17 → 0.0.90

data/MIT-LICENSE

@@ -0,0 +1,20 @@
+Copyright 2012 YOURNAME
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/README.rdoc

@@ -0,0 +1,3 @@
+= HasSearcher
+
+This project rocks and uses MIT-LICENSE.

data/Rakefile

@@ -1,2 +1,28 @@
-require 'bundler'
+#!/usr/bin/env rake
+begin
+  require 'bundler/setup'
+rescue LoadError
+  puts 'You must `gem install bundler` and `bundle install` to run rake tasks'
+end
+begin
+  require 'rdoc/task'
+rescue LoadError
+  require 'rdoc/rdoc'
+  require 'rake/rdoctask'
+  RDoc::Task = Rake::RDocTask
+end
+
+RDoc::Task.new(:rdoc) do |rdoc|
+  rdoc.rdoc_dir = 'rdoc'
+  rdoc.title    = 'HasSearcher'
+  rdoc.options << '--line-numbers'
+  rdoc.rdoc_files.include('README.rdoc')
+  rdoc.rdoc_files.include('lib/**/*.rb')
+end
+
+APP_RAKEFILE = File.expand_path("../spec/dummy/Rakefile", __FILE__)
+load 'rails/tasks/engine.rake'
+
+
 Bundler::GemHelper.install_tasks
+

data/app/assets/stylesheets/has_searcher/application.css

@@ -0,0 +1,13 @@
+/*
+ * This is a manifest file that'll be compiled into application.css, which will include all the files
+ * listed below.
+ *
+ * Any CSS and SCSS file within this directory, lib/assets/stylesheets, vendor/assets/stylesheets,
+ * or vendor/assets/stylesheets of plugins, if any, can be referenced here using a relative path.
+ *
+ * You're free to add application-wide styles to this file and they'll appear at the top of the
+ * compiled file, but it's generally better to create a new file per style scope.
+ *
+ *= require_self
+ *= require_tree .
+ */

data/app/controllers/has_searcher/application_controller.rb

@@ -0,0 +1,4 @@
+module HasSearcher
+  class ApplicationController < ActionController::Base
+  end
+end

data/app/helpers/has_searcher/application_helper.rb

@@ -0,0 +1,4 @@
+module HasSearcher
+  module ApplicationHelper
+  end
+end

data/{lib/app/models → app/models/searcher}/boostificator.rb

@@ -1,23 +1,24 @@
-class Boostificator
+class Searcher::Boostificator
   MILLIS_IN_YEAR = 1000 * 60 * 60 * 24 * 365
   PRECISION = 6
 
-  attr_accessor :search, :field
+  attr_accessor :boost_field
 
   attr_accessor :m, :x, :a, :b
 
   attr_accessor :extra_boost
 
-  def initialize(options={})
+  def initialize(boost_field, options={})
+    self.boost_field = boost_field
     options.reverse_merge!(:a => 1.0, :b => 1.0, :m => 1.0 / MILLIS_IN_YEAR, :extra_boost => 1.0)
-    options.each do |field, value|
-      self.send("#{field}=", value)
+    options.each do |attribute, value|
+      self.send("#{attribute}=", value)
     end
   end
 
 
-  def adjust_solr_params
-    search.adjust_solr_params do |params|
+  def adjust_solr_params(sunspot)
+    sunspot.adjust_solr_params do |params|
       params[:boost] = "product(#{extra_boost},#{recip_s})"
       params[:defType] = 'edismax'
     end
@@ -25,7 +26,7 @@ class Boostificator
 
   private
     def recip_s
-      @recip_s ||= "map(recip(abs(ms(#{now_s},#{field})),#{m},#{a},#{b}),#{recip_min},#{recip_max},1)"
+      @recip_s ||= "map(recip(abs(ms(#{now_s},#{boost_field})),#{m},#{a},#{b}),#{recip_min},#{recip_max},1)"
     end
 
     def now
@@ -51,5 +52,4 @@ class Boostificator
     def recip_max
       @recip_max ||= sprintf("%f", (recip * 10**PRECISION).ceil/10.0**PRECISION)
     end
-
 end

data/app/models/searcher/configuration.rb

@@ -0,0 +1,76 @@
+class Searcher::Configuration
+  attr_accessor :searcher, :scopes
+
+  attr_accessor :facets
+
+  attr_writer :models
+
+  delegate :search_object, :to => :searcher
+
+  def initialize(searcher, &block)
+    self.searcher = searcher
+    self.scopes = {}
+    self.facets = {}
+    self.models = []
+    scope :runtime
+    scope :default
+    instance_eval &block if block
+  end
+
+  def keywords(field, options={})
+    search_object.create_field(field, options)
+    scope do |sunspot|
+      sunspot.fulltext search_object.send(field) if search_object.send(field).presence
+    end
+  end
+
+  def models(*names_or_clases)
+    self.models = [*names_or_clases]
+  end
+
+  def search_models
+    @search_models ||= @models.map do |name_or_class|
+      name_or_class.is_a?(Class) ? name_or_class : name_or_class.to_s.classify.constantize
+    end
+  end
+
+  def property(field, options={}, &block)
+    modificators = [*options[:modificator]] + [*options[:modificators]]
+
+    modificators.each do |modificator|
+
+      request_field = [field, modificator].compact.join('_')
+
+      search_object.create_field(request_field, options)
+
+      if block
+        scope &block
+      else
+        scope do |sunspot|
+          sunspot.with(field).send(modificator, search_object.send(request_field)) if search_object.send(request_field).presence
+        end
+      end
+    end
+
+    if modificators.empty?
+      search_object.create_field(field, options)
+      if block
+        scope &block
+      else
+        scope do |sunspot|
+          sunspot.with(field, search_object.send(field)) if search_object.send(field).presence
+        end
+      end
+    end
+  end
+
+  def facet(name, &block)
+    facets[name] = block
+  end
+
+  def scope(name=:default, &block)
+    scopes[name] ||= []
+    scopes[name] << block if block
+    searcher
+  end
+end

data/app/models/searcher/model.rb

@@ -0,0 +1,28 @@
+class Searcher::Model
+  attr_accessor :methods, :searcher
+
+  def initialize(searcher)
+    self.searcher = searcher
+    self.methods = Module.new
+    self.extend self.methods
+  end
+
+  def attributes=(params=nil)
+    params ||= {}
+    params.each do |field, value|
+      self.send "#{field}=", value if respond_to? "#{field}="
+    end
+  end
+
+  def create_field(name, options)
+    methods.class_eval do
+      define_method name do
+        instance_variable_get("@#{name}") ||
+          (options[:default].call if options[:default] && options[:default].respond_to?(:call))
+      end
+      define_method "#{name}=" do |value|
+        instance_variable_set("@#{name}", value)
+      end
+    end
+  end
+end

data/app/models/searcher.rb

@@ -0,0 +1,114 @@
+class Searcher
+
+  attr_accessor :configuration, :sunspot, :search_object
+  attr_accessor :scope_chain
+
+  delegate :current_page, :num_pages, :limit_value, :to => :results
+
+  def initialize(&block)
+    self.scope_chain = [:default, :runtime]
+    self.search_object = Searcher::Model.new(self)
+    self.configuration = Configuration.new(self, &block)
+  end
+
+  def sunspot
+    @sunspot ||= Sunspot.new_search configuration.search_models
+  end
+
+  def each(&block)
+    results.each(&block)
+  end
+
+  delegate :results, :total, :facet, :to => :executed_sunspot
+  alias_method :all, :results
+
+  def result_ids
+    executed_sunspot.hits.map(&:primary_key)
+  end
+
+  def order_by(name, type=:asc)
+    configuration.scope :runtime do |sunspot|
+      sunspot.order_by(name)
+    end
+  end
+  alias_method :order, :order_by
+
+  def limit(number)
+    paginate(:per_page => number)
+  end
+  alias_method :per_page, :limit
+  alias_method :per, :limit
+
+  def page(number)
+    paginate(:page => number)
+  end
+
+  def paginate(params)
+    configuration.scope :runtime do |sunspot|
+      sunspot.paginate(params)
+    end
+  end
+
+  def scoped
+    default.runtime
+  end
+
+  def boost_by(field, options={})
+    boostificator = Boostificator.new(field, options)
+    configuration.scope :runtime do |sunspot|
+      boostificator.adjust_solr_params(sunspot)
+    end
+  end
+
+  def execute
+    unless @executed
+      build_query
+      set_facets
+      sunspot.execute
+      @executed = true
+    end
+  end
+
+  def executed_sunspot
+    execute
+    sunspot
+  end
+
+  private
+
+    def build_query
+      scope_chain.uniq.each do |scope_name|
+        configuration.scopes[scope_name].each do |block|
+          sunspot.build do |sunspot|
+            case block.arity
+            when 0
+              sunspot.instance_eval(&block)
+            when 1
+              block.call(sunspot)
+            else
+              raise ArgumentError.new "arity > 1 not supported"
+            end
+          end
+        end
+      end
+    end
+
+    def set_facets
+      configuration.facets.each_pair do |facet_name, block|
+        sunspot.build do |search|
+          search.instance_eval do |search|
+            search.facet facet_name, &block
+          end
+        end
+      end
+    end
+
+    def method_missing(name, *args, &block)
+      if configuration.scopes.include?(name)
+        scope_chain << name
+        return self
+      end
+      return results.send(name, *args, &block) if results.respond_to?(name)
+      super
+    end
+end

data/app/views/layouts/has_searcher/application.html.erb

@@ -0,0 +1,14 @@
+<!DOCTYPE html>
+<html>
+<head>
+  <title>HasSearcher</title>
+  <%= stylesheet_link_tag    "has_searcher/application", :media => "all" %>
+  <%= javascript_include_tag "has_searcher/application" %>
+  <%= csrf_meta_tags %>
+</head>
+<body>
+
+<%= yield %>
+
+</body>
+</html>

data/config/routes.rb

@@ -0,0 +1,2 @@
+HasSearcher::Engine.routes.draw do
+end

data/lib/has_searcher/engine.rb

@@ -0,0 +1,5 @@
+module HasSearcher
+  class Engine < ::Rails::Engine
+    isolate_namespace HasSearcher
+  end
+end

data/lib/has_searcher/version.rb

@@ -1,3 +1,3 @@
 module HasSearcher
-  VERSION = "0.0.17"
+  VERSION = "0.0.90"
 end

data/lib/has_searcher.rb

@@ -1,19 +1,14 @@
-module HasSearcher
-  autoload :Base,               'has_searcher/base'
-  autoload :Helpers,            'has_searcher/helpers'
-end
+require "has_searcher/engine"
 
-class ActionController::Base
-  def self.has_searcher
-    HasSearcher::Base.has_searcher(self)
+module HasSearcher
+  @@searchers = {}
+  def self.create_searcher(name, &block)
+    @@searchers[name] = block
   end
-end
-
-require 'has_searcher/formtastic' rescue nil
 
-%w{ models controllers }.each do |dir|
-    path = File.join(File.dirname(__FILE__), 'app', dir)
-    $LOAD_PATH << path
-    ActiveSupport::Dependencies.autoload_paths << path
-    ActiveSupport::Dependencies.autoload_once_paths.delete(path)
+  def self.searcher(name, params={})
+    (Searcher.new &@@searchers[name]).tap do |searcher|
+      searcher.search_object.attributes = params
+    end
+  end
 end

data/lib/tasks/has_searcher_tasks.rake

@@ -0,0 +1,4 @@
+# desc "Explaining what the task does"
+# task :has_searcher do
+#   # Task goes here
+# end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: has_searcher
 version: !ruby/object:Gem::Version
-  version: 0.0.17
+  version: 0.0.90
   prerelease: 
 platform: ruby
 authors:
@@ -9,40 +9,99 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-27 00:00:00.000000000 Z
+date: 2012-07-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &14301560 !ruby/object:Gem::Requirement
+  requirement: &6913540 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 3.2.3
+  type: :runtime
+  prerelease: false
+  version_requirements: *6913540
+- !ruby/object:Gem::Dependency
+  name: sqlite3
+  requirement: &6913100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-  type: :runtime
+  type: :development
   prerelease: false
-  version_requirements: *14301560
-description: ! "This gem adds ability to construct search objects for indexed models.\n
-  \                    It works with sunspot, inherited_resources and formtastic"
+  version_requirements: *6913100
+- !ruby/object:Gem::Dependency
+  name: rspec-rails
+  requirement: &7006040 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: *7006040
+- !ruby/object:Gem::Dependency
+  name: sunspot_matchers
+  requirement: &7005240 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: *7005240
+- !ruby/object:Gem::Dependency
+  name: sunspot_rails
+  requirement: &7004020 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 2.0.0.pre
+  type: :development
+  prerelease: false
+  version_requirements: *7004020
+- !ruby/object:Gem::Dependency
+  name: sunspot_solr
+  requirement: &7003340 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 2.0.0.pre
+  type: :development
+  prerelease: false
+  version_requirements: *7003340
+description: ! "This gem adds ability to construct search objects for indexed models,
+  build search forms and execute searches.\n                     It works with sunspot,
+  inherited_resources and simple_form/formtastic"
 email:
 - lda@openteam.ru
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- Gemfile
-- Rakefile
-- has_searcher.gemspec
-- lib/app/controllers/crud_controller.rb
-- lib/app/controllers/suggestions_controller.rb
-- lib/app/models/boostificator.rb
-- lib/app/models/search.rb
-- lib/has_searcher.rb
-- lib/has_searcher/base.rb
-- lib/has_searcher/formtastic.rb
-- lib/has_searcher/helpers.rb
+- app/views/layouts/has_searcher/application.html.erb
+- app/assets/stylesheets/has_searcher/application.css
+- app/controllers/has_searcher/application_controller.rb
+- app/models/searcher/configuration.rb
+- app/models/searcher/model.rb
+- app/models/searcher/boostificator.rb
+- app/models/searcher.rb
+- app/helpers/has_searcher/application_helper.rb
+- config/routes.rb
+- lib/tasks/has_searcher_tasks.rake
+- lib/has_searcher/engine.rb
 - lib/has_searcher/version.rb
+- lib/has_searcher.rb
+- MIT-LICENSE
+- Rakefile
+- README.rdoc
 homepage: http://github.com/openteam/has_searcher
 licenses: []
 post_install_message: 
@@ -57,7 +116,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2828897147514902018
+      hash: -759190286511194393
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -66,9 +125,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2828897147514902018
+      hash: -759190286511194393
 requirements: []
-rubyforge_project: has_searcher
+rubyforge_project: 
 rubygems_version: 1.8.15
 signing_key: 
 specification_version: 3

data/.gitignore

@@ -1,5 +0,0 @@
-*.gem
-.bundle
-Gemfile.lock
-pkg/*
-bin/*

data/Gemfile

@@ -1,4 +0,0 @@
-source "http://rubygems.org"
-
-# Specify your gem's dependencies in has_searcher.gemspec
-gemspec

data/has_searcher.gemspec

@@ -1,23 +0,0 @@
-# -*- encoding: utf-8 -*-
-$:.push File.expand_path("../lib", __FILE__)
-require "has_searcher/version"
-
-Gem::Specification.new do |s|
-  s.name        = "has_searcher"
-  s.version     = HasSearcher::VERSION
-  s.platform    = Gem::Platform::RUBY
-  s.authors     = ["Dmitry Lihachev"]
-  s.email       = ["lda@openteam.ru"]
-  s.homepage    = "http://github.com/openteam/has_searcher"
-  s.summary     = %q{Adds ability to construct search objects for indexed models}
-  s.description = %q{This gem adds ability to construct search objects for indexed models.
-                     It works with sunspot, inherited_resources and formtastic}
-
-  s.add_dependency "rails"
-  s.rubyforge_project = "has_searcher"
-
-  s.files         = `git ls-files`.split("\n")
-  s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
-  s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
-  s.require_paths = ["lib"]
-end

data/lib/app/controllers/crud_controller.rb

@@ -1,56 +0,0 @@
-# encoding: utf-8
-
-class SearchController < ApplicationController
-  inherit_resources
-
-  helper_method :search_object_for
-
-  protected
-
-    def collection
-      get_collection_ivar || set_collection_ivar(search_and_paginate_collection)
-    end
-
-    def search_and_paginate_collection
-      if params[:utf8]
-        search_object = search_object_for(resource_instance_name)
-        search_object.pagination = paginate_options
-        search_object.results
-      else
-        end_of_association_chain.paginate(paginate_options)
-      end
-    end
-
-    def paginate_options(options={})
-      {
-        :page       => params[:page],
-        :per_page   => per_page
-      }.merge(options)
-    end
-
-    def per_page
-      20
-    end
-
-    def render_new_button?
-      respond_to? :new
-    end
-
-    def searcher_name(name)
-      "#{name}_search"
-    end
-
-    def create_searcher(searcher_name)
-      begin
-        searcher_clazz = searcher_name.classify.constantize
-        searcher_clazz.new(params[searcher_name]) do | searcher |
-          searcher_clazz.column_names.each do | column_name |
-            searcher[column_name] ||= params[column_name]
-          end
-        end
-      rescue NameError
-      end
-    end
-
-end
-

data/lib/app/controllers/suggestions_controller.rb

@@ -1,21 +0,0 @@
-class SuggestionsController < CrudController
-
-  def index
-    render :text => suggestions.to_json
-  end
-
-
-  protected
-
-    def suggestions
-      collection.map do | suggest |
-        { :id => suggest.id, :value => suggest.term }
-      end
-    end
-
-    def resource_instance_name
-      @resource_instance_name ||= params.delete(:model)
-    end
-
-
-end

data/lib/app/models/search.rb

@@ -1,106 +0,0 @@
-class Search < ActiveRecord::Base
-
-  attr_accessor :pagination
-
-  class << self
-    def columns
-      @columns ||= [];
-    end
-
-    def column(name, sql_type = nil, default = nil, null = true)
-      columns << ActiveRecord::ConnectionAdapters::Column.new(name.to_s, default,
-        sql_type.to_s, null)
-    end
-
-    def column_defaults
-      columns.map(&:name).inject({}) do | hash, name | hash[name] = nil; hash end
-    end
-
-    def columns_hash
-      columns.inject({}) do | hash, column | hash[column.name] = column; hash end
-    end
-  end
-
-  def pagination
-    @pagination ||= {}
-    @pagination.merge! per_page: per_page if respond_to? :per_page
-    @pagination
-  end
-
-  delegate :results, :to => :search
-  delegate :total, :to => :search
-
-  def result_ids
-    search.hits.map(&:primary_key)
-  end
-
-  protected
-
-    def search
-      Sunspot.search klass do | search |
-        search.keywords keywords if search_columns.delete("keywords")
-        search_columns.each do | column |
-          value = normalize(column)
-          if column_for_attribute(column).type == :text && self.class.serialized_attributes[column] != Array
-            if fuzzy?(value)
-              search.adjust_solr_params do |params|
-                params[:q] = value.split(/ /).map{ |value| "#{column}_text:#{value}"}.join(' ')
-              end
-            else
-              search.keywords value, :fields => column
-            end
-          else
-            case column
-            when /_lt$/
-              search.with(column[0..-4]).less_than(value)
-            when /_gt$/
-              search.with(column[0..-4]).greater_than(value)
-            else
-              search.with column, value
-            end
-          end
-        end
-        additional_search(search)
-        search.order_by *order_by.split(' ') if respond_to?(:order_by) && order_by.present?
-        search.paginate pagination if pagination.try(:any?)
-      end
-    end
-
-    def additional_search(search)
-    end
-
-    def save(validate = true)
-      validate ? valid? : true
-    end
-
-    def search_columns
-      @search_columns ||= (self.class.column_names - %w[per_page order_by]).select{ |column| normalize(column).present? }
-    end
-
-    def normalize(column)
-      if respond_to?("normalize_#{column}")
-        send "normalize_#{column}"
-      elsif self.class.serialized_attributes[column] == Array
-        [*self.send("#{column}_before_type_cast")].select(&:present?)
-      elsif column_for_attribute(column).type == :integer
-        self[column].try(:zero?) ? nil : self[column]
-      elsif column_for_attribute(column).type == :text && column =~ /term$/
-        normalize_term_column(self[column])
-      else
-        self[column]
-      end
-    end
-
-    def normalize_term_column(text)
-      text.gsub(/[^[:alnum:]~]+/, ' ').strip if text
-    end
-
-    def fuzzy?(text)
-      text =~ /~/
-    end
-
-    def klass
-      self.class.model_name.classify.gsub(/Search$/, '').constantize
-    end
-
-end

data/lib/has_searcher/base.rb

@@ -1,11 +0,0 @@
-class HasSearcher::Base < ::ApplicationController
-  def self.has_searcher(base)
-    base.class_eval do
-      include HasSearcher::Helpers
-      helper_method :searcher_for
-      helper_method :searcher
-    end
-
-  end
-  has_searcher(self)
-end

data/lib/has_searcher/formtastic.rb

@@ -1,72 +0,0 @@
-begin
-  require 'formtastic'
-
-  module Formtastic
-    module Helpers
-      module FormHelper
-        def semantic_search_form_for(name, *args, &proc)
-          options = args.extract_options!
-          options.reverse_merge! :html => {:method => :get}
-          url = params[:controller].sub(/\/\w+$/, '').split("/").map(&:underscore)
-          options[:url] ||= url.push name.to_s.pluralize
-          semantic_form_for searcher_for(name), *(args << options), &proc
-        end
-      end
-    end
-
-    module SemanticFormHelper
-      def semantic_search_form_for(*args)
-        Formtastic::Helpers::FormHelper.semantic_search_form_for(args)
-      end
-    end
-
-    class SemanticFormBuilder
-      def search_button(options={})
-        commit_button I18n.t('search'), options.merge(button_html:  {name: nil},
-                                                      wrapper_html: {class: 'button'})
-      end
-
-      def default_input_type_with_text_as_string_on_search(method, options={})
-        if object.is_a?(Search) && object.class.respond_to?(:has_enum?) && !object.class.has_enum?(method) && object.column_for_attribute(method).try(:type) == :text
-          :string
-        else
-          default_input_type_without_text_as_string_on_search(method, options)
-        end
-      end
-
-      alias_method_chain :default_input_type, :text_as_string_on_search
-
-      def inputs_with_search(*args, &block)
-        if args.empty? && object.is_a?(Search)
-          args = object.class.column_names.collect do | column |
-            if belongs_to? column
-              column = column.gsub /_id$/, ''
-            end
-            column
-          end.map(&:to_sym)
-          args -= [:term, :order_by, :per_page]
-        end
-        inputs_without_search(*args, &block)
-      end
-
-      alias_method_chain :inputs, :search
-
-      def buttons_with_search(*args, &block)
-        args = :search if args.empty? && object.is_a?(Search)
-        buttons_without_search(*args, &block)
-      end
-
-      alias_method_chain :buttons, :search
-
-      protected
-
-        def belongs_to?(method)
-          method = method.to_s
-          method =~ /_id$/ &&
-            (reflect = object.class.reflect_on_association(method.gsub(/_id$/, '').to_sym)) &&
-            reflect.macro == :belongs_to
-        end
-    end
-  end
-rescue LoadError
-end

data/lib/has_searcher/helpers.rb

@@ -1,33 +0,0 @@
-module HasSearcher::Helpers
-
-  protected
-
-    def searcher
-      @searcher ||= searcher_for(resource_instance_name)
-    end
-
-    def searcher_for(name)
-      instance_variable_get("@#{searcher_name(name)}") ||
-          instance_variable_set("@#{searcher_name(name)}", create_searcher(searcher_name(name)))
-    end
-
-  private
-
-    def searcher_name(name)
-      "#{name}_search"
-    end
-
-    def create_searcher(searcher_name)
-      begin
-        searcher_clazz = searcher_name.classify.constantize
-      rescue NameError
-        return
-      end
-      searcher_clazz.new(params[searcher_name]) do | searcher |
-        searcher_clazz.column_names.each do | column_name |
-          searcher.send("#{column_name}=", params[column_name]) if searcher.send(column_name).blank?
-        end
-      end
-   end
-
-end