sunspot 0.9.8 → 0.10.0

data/spec/integration/local_search_spec.rb

@@ -0,0 +1,56 @@
+require File.join(File.dirname(__FILE__), 'spec_helper')
+
+describe 'local search' do
+  ORIGIN = [40.6749113, -73.9648859]
+  before :each do
+    Sunspot.remove_all
+    @posts = [
+      Post.new(:coordinates => ORIGIN),
+      Post.new(:coordinates => [40.725304, -73.997211], :title => 'teacup'),
+      Post.new(:coordinates => [40.800069, -73.962283]),
+      Post.new(:coordinates => [43.706488, -72.292233]),
+      Post.new(:coordinates => [38.920303, -77.110934], :title => 'teacup'),
+      Post.new(:coordinates => [47.661557, -122.349938])
+    ]
+    @posts.each_with_index { |post, i| post.blog_id = @posts.length - i }
+    Sunspot.index!(@posts)
+  end
+
+  it 'should find all the posts within a given radius' do
+    search = Sunspot.search(Post) { |query| query.near(ORIGIN, 20) }
+    search.results.to_set.should == @posts[0..2].to_set
+  end
+
+  it 'should perform a radial search with fulltext matching' do
+    pending 'fix for LocalSolr facet query or subquery support'
+    search = Sunspot.search(Post) do |query|
+      query.keywords 'teacup'
+      query.near(ORIGIN, 20)
+    end
+    search.results.should == [@posts[1]]
+  end
+
+  it 'should perform a radial search with attribute scoping' do
+    search = Sunspot.search(Post) do |query|
+      query.near(ORIGIN,20)
+      query.with(:title, 'teacup')
+    end
+    search.results.should == [@posts[1]]
+  end
+  
+  it 'should order by arbitrary field' do
+    search = Sunspot.search(Post) do |query|
+      query.near(ORIGIN, 20)
+      query.order_by(:blog_id)
+    end
+    search.results.should == @posts[0..2].reverse
+  end
+
+  it 'should order by geo distance' do
+    search = Sunspot.search(Post) do |query|
+      query.near(ORIGIN, 20)
+      query.order_by(:distance)
+    end
+    search.results.should == @posts[0..2]
+  end
+end

data/spec/integration/scoped_search_spec.rb

@@ -85,7 +85,7 @@ describe 'scoped_search' do
     end
   end
 
-  test_field_type 'String', :title, :title, 'apple', 'banana', 'cherry', 'date', 'eggplant'
+  test_field_type 'String', :title, :title, 'apple pie', 'banana split', 'cherry tart', 'date pastry', 'eggplant a la mode'
   test_field_type 'Integer', :blog_id, :blog_id, -2, 0, 3, 12, 20
   test_field_type 'Float', :ratings_average, :average_rating, -2.5, 0.0, 3.2, 3.5, 16.0
   test_field_type 'Time', :published_at, :published_at, *(['1970-01-01 00:00:00 UTC', '1983-07-08 04:00:00 UTC', '1983-07-08 02:00:00 -0500',
@@ -123,6 +123,20 @@ describe 'scoped_search' do
     end
   end
 
+  describe 'prefix searching' do
+    before :each do
+      Sunspot.remove_all
+      @posts = ['test', 'test post', 'some test', 'bogus'].map do |title|
+        Post.new(:title => title)
+      end
+      Sunspot.index!(@posts)
+    end
+
+    it 'should return results whose prefix matches' do
+      Sunspot.search(Post) { with(:title).starting_with('test') }.results.should == @posts[0..1]
+    end
+  end
+
   describe 'exclusion by identity' do
     before do
       @posts = (1..5).map do |i|

data/spec/integration/spec_helper.rb

@@ -1,7 +1,7 @@
-require File.join(File.dirname(__FILE__), '..', 'spec_helper')
+require File.expand_path(File.join(File.dirname(__FILE__), '..', 'spec_helper'))
 
 Spec::Runner.configure do |config|
-  config.before(:all) do
-    Sunspot.config.solr.url = 'http://localhost:8983/solr'
+  config.before(:each) do
+    Sunspot.config.solr.url = ENV['SOLR_URL'] || 'http://localhost:8983/solr'
   end
 end

data/spec/mocks/connection.rb

@@ -82,11 +82,24 @@ module Mock
       return unless @last_search
       if params.respond_to?(:all?)
         params.all? do |key, value|
-          @last_search.has_key?(key) && @last_search[key] == value
+          if @last_search.has_key?(key)
+            @last_search[key] == value
+          end
         end
       else
         @last_search.has_key?(params)
       end
     end
+
+    def has_last_search_including?(key, *values)
+      return unless @last_search
+      if @last_search.has_key?(key)
+        if @last_search[key].is_a?(Array)
+          (@last_search[key] & values).length == values.length
+        elsif values.length == 1
+          @last_search[key] == values.first
+        end
+      end
+    end
   end
 end

data/spec/mocks/photo.rb

@@ -3,6 +3,6 @@ class Photo < MockRecord
 end
 
 Sunspot.setup(Photo) do
-  text :caption
+  text :caption, :default_boost => 1.5
   boost 0.75
 end

data/spec/mocks/post.rb

@@ -1,8 +1,9 @@
 require File.join(File.dirname(__FILE__), 'blog')
+require File.join(File.dirname(__FILE__), 'super_class')
 
-class Post < MockRecord
+class Post < SuperClass
   attr_accessor :title, :body, :blog_id, :published_at, :ratings_average,
-                :author_name, :featured, :expire_date
+                :author_name, :featured, :expire_date, :coordinates
   alias_method :featured?, :featured
 
   def category_ids
@@ -31,7 +32,7 @@ end
 
 Sunspot.setup(Post) do
   text :title, :boost => 2
-  text :body
+  text :body, :stored => true
   text :backwards_title do
     title.reverse if title
   end
@@ -51,6 +52,7 @@ Sunspot.setup(Post) do
   time :last_indexed_at, :stored => true do
     Time.now
   end
+  coordinates :coordinates
 
   dynamic_string :custom_string
   dynamic_float :custom_float, :multiple => true, :using => :custom_fl

data/spec/mocks/super_class.rb

@@ -0,0 +1,2 @@
+class SuperClass < MockRecord
+end

data/spec/spec_helper.rb

@@ -27,6 +27,7 @@ rescue LoadError => e
     retry
   end
 end
+require 'ostruct'
 
 unless gem_name = ENV['SUNSPOT_TEST_GEM']
   $:.unshift(File.dirname(__FILE__) + '/../lib')
@@ -40,6 +41,18 @@ Dir.glob(File.join(File.dirname(__FILE__), 'mocks', '**', '*.rb')).each do |file
   require file unless File.basename(file) == 'mock_record.rb'
 end
 
+Spec::Runner.configure do |config|
+  Dir.glob(File.join(File.dirname(__FILE__), 'helpers', '*_helper.rb')).each do |helper|
+    helper_name = File.basename(helper, File.extname(helper))
+    spec_type = helper_name.sub(/_helper$/, '').to_sym
+    require(helper)
+    config.include(
+      Sunspot::Util.full_const_get(Sunspot::Util.camel_case(helper_name)),
+      :type => spec_type
+    )
+  end
+end
+
 def without_class(clazz)
   Object.class_eval { remove_const(clazz.name.to_sym) }
   yield

data/tasks/gemspec.rake

@@ -1,25 +1,36 @@
 begin
   require 'jeweler'
+  require 'jeweler/rubyforge_tasks'
+  require 'jeweler/gemcutter_tasks'
   Jeweler::Tasks.new do |s|
     s.name = 'sunspot'
     s.executables = ['sunspot-solr', 'sunspot-configure-solr']
-    s.summary = 'Library for expressive, powerful interaction with the Solr search engine'
     s.email = 'mat@patch.com'
-    s.homepage = 'http://github.com/outoftime/sunspot'
-    s.description = 'Library for expressive, powerful interaction with the Solr search engine'
-    s.authors = ['Mat Brown', 'Peer Allan', 'Dmitriy Dzema', 'Benjamin Krause']
-    s.files = FileList['[A-Z]*', '{bin,lib,spec,tasks,templates}/**/*', 'solr/{etc,lib,webapps}/**/*', 'solr/solr/conf/*', 'solr/start.jar']
+    s.homepage = 'http://outoftime.github.com/sunspot'
+    s.summary = 'Library for expressive, powerful interaction with the Solr search engine'
+    s.description = <<TEXT
+Sunspot is a library providing a powerful, all-ruby API for the Solr search engine. Sunspot manages the configuration of persistent Ruby classes for search and indexing and exposes Solr's most powerful features through a collection of DSLs. Complex search operations can be performed without hand-writing any boolean queries or building Solr parameters by hand.
+TEXT
+    s.authors = ['Mat Brown', 'Peer Allan', 'Dmitriy Dzema', 'Benjamin Krause', 'Marcel de Graaf', 'Brandon Keepers', 'Peter Berkenbosch', 'Brian Atkinson', 'Tom Coleman']
     s.rubyforge_project = 'sunspot'
+    s.files = FileList['[A-Z]*', '{bin,lib,spec,tasks,templates}/**/*', 'solr/{etc,lib,webapps}/**/*', 'solr/solr/{conf,lib}/*', 'solr/start.jar']
     s.add_dependency 'mwmitchell-rsolr', '= 0.9.6'
     s.add_dependency 'daemons', '~> 1.0'
-    s.add_dependency 'optiflag', '~> 0.6.5'
-    s.add_dependency 'haml', '~> 2.2'
     s.add_development_dependency 'rspec', '~> 1.1'
     s.add_development_dependency 'ruby-debug', '~> 0.10'
+    s.add_development_dependency 'technicalpickles-jeweler', '1.2.1'
     s.extra_rdoc_files = ['README.rdoc']
     s.rdoc_options << '--webcvs=http://github.com/outoftime/sunspot/tree/master/%s' <<
                       '--title' << 'Sunspot - Solr-powered search for Ruby objects - API Documentation' <<
                       '--main' << 'README.rdoc'
 
   end
+
+  Jeweler::RubyforgeTasks.new
+  Jeweler::GemcutterTasks.new
+end
+
+namespace :release do
+  desc "Release gem to RubyForge and GitHub"
+  task :all => [:release, :"rubyforge:release:gem", :"gemcutter:release"]
 end

data/tasks/schema.rake

@@ -1,5 +1,5 @@
 namespace :schema do
-  desc 'Compile schema from Haml template'
+  desc 'Generate schema from template'
   task :compile do
     require File.join(File.dirname(__FILE__), '..', 'lib', 'sunspot', 'schema')
     File.open(

data/tasks/spec.rake

@@ -12,7 +12,7 @@ end
 namespace :spec do
   desc 'run api specs (mock out Solr dependency)'
   Spec::Rake::SpecTask.new('api') do |t|
-    t.spec_files = FileList[File.join(File.dirname(__FILE__), '..', 'spec', 'api', '*_spec.rb')]
+    t.spec_files = FileList[File.join(File.dirname(__FILE__), '..', 'spec', 'api', '**', '*_spec.rb')]
     t.spec_opts = ['--color']
   end
 

data/templates/schema.xml.erb

@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<schema version="0.9" name="sunspot">
+  <types>
+    <fieldtype class="solr.TextField" positionIncrementGap="100" name="text">
+      <analyzer>
+        <tokenizer class="<%= tokenizer %>"/>
+        <%- filters.each do |filter| -%>
+        <filter class="<%= filter %>"/>
+        <%- end -%>
+      </analyzer>
+    </fieldtype>
+    <fieldtype class="solr.RandomSortField" name="rand"/>
+    <%- types.each do |type| -%>
+    <fieldtype name="<%= type.name %>" class="solr.<%= type.class_name  %>Field" omitNorms="true"/>
+    <%- end -%>
+  </types>
+  <fields>
+    <field name="id"         type="string"  indexed="true" stored="true"  multiValued="false" />
+    <field name="type"       type="string"  indexed="true" stored="false" multiValued="true" />
+    <field name="class_name" type="string"  indexed="true" stored="false" multiValued="false" />
+    <field name="text"       type="text"    indexed="true" stored="false" multiValued="true" />
+    <field name="lat"        type="sdouble" indexed="true" stored="true"  multiValued="false" />
+    <field name="long"       type="sdouble" indexed="true" stored="true"  multiValued="false" />
+    <dynamicField name="*_text"   type="text"    indexed="true" stored="false" multiValued="true" />
+    <dynamicField name="*_texts"  type="text"    indexed="true" stored="true"  multiValued="true" />
+    <dynamicField name="random_*" type="rand"    indexed="true" stored="false" multiValued="false" />
+    <dynamicField name="_local*" type="sdouble" indexed="true" stored="false" multiValued="false" />
+    <%- dynamic_fields.each do |dynamic_field| -%>
+    <dynamicField name="<%= dynamic_field.name %>" type="<%= dynamic_field.type %>" indexed="true" stored="<%= dynamic_field.stored? %>" multiValued="<%= dynamic_field.multiValued? %>" />
+    <%- end -%>
+  </fields>
+  <uniqueKey>id</uniqueKey>
+  <defaultSearchField>text</defaultSearchField>
+  <solrQueryParser defaultOperator="AND"/>
+  <copyField dest="text" source="*_text"/>
+</schema>

metadata

@@ -1,18 +1,23 @@
 --- !ruby/object:Gem::Specification 
 name: sunspot
 version: !ruby/object:Gem::Version 
-  version: 0.9.8
+  version: 0.10.0
 platform: ruby
 authors: 
 - Mat Brown
 - Peer Allan
 - Dmitriy Dzema
 - Benjamin Krause
+- Marcel de Graaf
+- Brandon Keepers
+- Peter Berkenbosch
+- Brian Atkinson
+- Tom Coleman
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2009-09-13 00:00:00 -04:00
+date: 2009-10-08 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -36,46 +41,38 @@ dependencies:
         version: "1.0"
     version: 
 - !ruby/object:Gem::Dependency 
-  name: optiflag
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        version: 0.6.5
-    version: 
-- !ruby/object:Gem::Dependency 
-  name: haml
-  type: :runtime
+  name: rspec
+  type: :development
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        version: "2.2"
+        version: "1.1"
     version: 
 - !ruby/object:Gem::Dependency 
-  name: rspec
+  name: ruby-debug
   type: :development
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        version: "1.1"
+        version: "0.10"
     version: 
 - !ruby/object:Gem::Dependency 
-  name: ruby-debug
+  name: technicalpickles-jeweler
   type: :development
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
-    - - ~>
+    - - "="
       - !ruby/object:Gem::Version 
-        version: "0.10"
+        version: 1.2.1
     version: 
-description: Library for expressive, powerful interaction with the Solr search engine
+description: |
+  Sunspot is a library providing a powerful, all-ruby API for the Solr search engine. Sunspot manages the configuration of persistent Ruby classes for search and indexing and exposes Solr's most powerful features through a collection of DSLs. Complex search operations can be performed without hand-writing any boolean queries or building Solr parameters by hand.
+
 email: mat@patch.com
 executables: 
 - sunspot-solr
@@ -102,6 +99,7 @@ files:
 - lib/sunspot/dsl.rb
 - lib/sunspot/dsl/field_query.rb
 - lib/sunspot/dsl/fields.rb
+- lib/sunspot/dsl/fulltext.rb
 - lib/sunspot/dsl/query.rb
 - lib/sunspot/dsl/query_facet.rb
 - lib/sunspot/dsl/restriction.rb
@@ -116,12 +114,15 @@ files:
 - lib/sunspot/instantiated_facet.rb
 - lib/sunspot/instantiated_facet_row.rb
 - lib/sunspot/query.rb
-- lib/sunspot/query/base_query.rb
+- lib/sunspot/query/boost_query.rb
 - lib/sunspot/query/connective.rb
-- lib/sunspot/query/dynamic_query.rb
+- lib/sunspot/query/dismax.rb
 - lib/sunspot/query/field_facet.rb
-- lib/sunspot/query/field_query.rb
+- lib/sunspot/query/fulltext_base_query.rb
+- lib/sunspot/query/highlighting.rb
+- lib/sunspot/query/local.rb
 - lib/sunspot/query/pagination.rb
+- lib/sunspot/query/query.rb
 - lib/sunspot/query/query_facet.rb
 - lib/sunspot/query/query_facet_row.rb
 - lib/sunspot/query/query_field_facet.rb
@@ -129,11 +130,14 @@ files:
 - lib/sunspot/query/scope.rb
 - lib/sunspot/query/sort.rb
 - lib/sunspot/query/sort_composite.rb
+- lib/sunspot/query/text_field_boost.rb
 - lib/sunspot/schema.rb
 - lib/sunspot/search.rb
+- lib/sunspot/search/highlight.rb
 - lib/sunspot/search/hit.rb
 - lib/sunspot/session.rb
 - lib/sunspot/setup.rb
+- lib/sunspot/text_field_setup.rb
 - lib/sunspot/type.rb
 - lib/sunspot/util.rb
 - solr/etc/jetty.xml
@@ -151,19 +155,52 @@ files:
 - solr/solr/conf/solrconfig.xml
 - solr/solr/conf/stopwords.txt
 - solr/solr/conf/synonyms.txt
+- solr/solr/lib/geoapi-nogenerics-2.1-M2.jar
+- solr/solr/lib/gt2-referencing-2.3.1.jar
+- solr/solr/lib/jsr108-0.01.jar
+- solr/solr/lib/locallucene.jar
+- solr/solr/lib/localsolr.jar
 - solr/start.jar
 - solr/webapps/solr.war
 - spec/api/adapters_spec.rb
-- spec/api/build_search_spec.rb
+- spec/api/indexer/attributes_spec.rb
+- spec/api/indexer/batch_spec.rb
+- spec/api/indexer/dynamic_fields_spec.rb
+- spec/api/indexer/fixed_fields_spec.rb
+- spec/api/indexer/fulltext_spec.rb
+- spec/api/indexer/removal_spec.rb
+- spec/api/indexer/spec_helper.rb
 - spec/api/indexer_spec.rb
-- spec/api/query_spec.rb
-- spec/api/search_retrieval_spec.rb
+- spec/api/query/connectives_spec.rb
+- spec/api/query/dsl_spec.rb
+- spec/api/query/dynamic_fields_spec.rb
+- spec/api/query/faceting_spec.rb
+- spec/api/query/fulltext_spec.rb
+- spec/api/query/highlighting_spec.rb
+- spec/api/query/local_spec.rb
+- spec/api/query/ordering_pagination_spec.rb
+- spec/api/query/scope_spec.rb
+- spec/api/query/spec_helper.rb
+- spec/api/query/text_field_scoping_spec.rb
+- spec/api/query/types_spec.rb
+- spec/api/search/dynamic_fields_spec.rb
+- spec/api/search/faceting_spec.rb
+- spec/api/search/highlighting_spec.rb
+- spec/api/search/hits_spec.rb
+- spec/api/search/results_spec.rb
+- spec/api/search/search_spec.rb
+- spec/api/search/spec_helper.rb
 - spec/api/session_spec.rb
 - spec/api/spec_helper.rb
 - spec/api/sunspot_spec.rb
+- spec/helpers/indexer_helper.rb
+- spec/helpers/query_helper.rb
+- spec/helpers/search_helper.rb
 - spec/integration/dynamic_fields_spec.rb
 - spec/integration/faceting_spec.rb
+- spec/integration/highlighting_spec.rb
 - spec/integration/keyword_search_spec.rb
+- spec/integration/local_search_spec.rb
 - spec/integration/scoped_search_spec.rb
 - spec/integration/spec_helper.rb
 - spec/integration/stored_fields_spec.rb
@@ -176,6 +213,7 @@ files:
 - spec/mocks/mock_record.rb
 - spec/mocks/photo.rb
 - spec/mocks/post.rb
+- spec/mocks/super_class.rb
 - spec/mocks/user.rb
 - spec/spec_helper.rb
 - tasks/gemspec.rake
@@ -184,9 +222,11 @@ files:
 - tasks/schema.rake
 - tasks/spec.rake
 - tasks/todo.rake
-- templates/schema.xml.haml
+- templates/schema.xml.erb
 has_rdoc: true
-homepage: http://github.com/outoftime/sunspot
+homepage: http://outoftime.github.com/sunspot
+licenses: []
+
 post_install_message: 
 rdoc_options: 
 - --charset=UTF-8
@@ -212,33 +252,62 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: sunspot
-rubygems_version: 1.3.1
+rubygems_version: 1.3.2
 signing_key: 
-specification_version: 2
+specification_version: 3
 summary: Library for expressive, powerful interaction with the Solr search engine
 test_files: 
-- spec/api/adapters_spec.rb
-- spec/api/build_search_spec.rb
-- spec/api/indexer_spec.rb
-- spec/api/query_spec.rb
-- spec/api/search_retrieval_spec.rb
-- spec/api/session_spec.rb
-- spec/api/spec_helper.rb
-- spec/api/sunspot_spec.rb
-- spec/integration/dynamic_fields_spec.rb
+- spec/spec_helper.rb
+- spec/helpers/indexer_helper.rb
+- spec/helpers/search_helper.rb
+- spec/helpers/query_helper.rb
+- spec/integration/spec_helper.rb
+- spec/integration/local_search_spec.rb
 - spec/integration/faceting_spec.rb
-- spec/integration/keyword_search_spec.rb
 - spec/integration/scoped_search_spec.rb
-- spec/integration/spec_helper.rb
+- spec/integration/highlighting_spec.rb
+- spec/integration/keyword_search_spec.rb
+- spec/integration/dynamic_fields_spec.rb
 - spec/integration/stored_fields_spec.rb
 - spec/integration/test_pagination.rb
-- spec/mocks/adapters.rb
+- spec/mocks/mock_record.rb
 - spec/mocks/blog.rb
-- spec/mocks/comment.rb
-- spec/mocks/connection.rb
+- spec/mocks/adapters.rb
 - spec/mocks/mock_adapter.rb
-- spec/mocks/mock_record.rb
+- spec/mocks/user.rb
 - spec/mocks/photo.rb
 - spec/mocks/post.rb
-- spec/mocks/user.rb
-- spec/spec_helper.rb
+- spec/mocks/comment.rb
+- spec/mocks/super_class.rb
+- spec/mocks/connection.rb
+- spec/api/spec_helper.rb
+- spec/api/session_spec.rb
+- spec/api/indexer/spec_helper.rb
+- spec/api/indexer/fixed_fields_spec.rb
+- spec/api/indexer/attributes_spec.rb
+- spec/api/indexer/dynamic_fields_spec.rb
+- spec/api/indexer/fulltext_spec.rb
+- spec/api/indexer/removal_spec.rb
+- spec/api/indexer/batch_spec.rb
+- spec/api/search/spec_helper.rb
+- spec/api/search/hits_spec.rb
+- spec/api/search/faceting_spec.rb
+- spec/api/search/highlighting_spec.rb
+- spec/api/search/dynamic_fields_spec.rb
+- spec/api/search/search_spec.rb
+- spec/api/search/results_spec.rb
+- spec/api/adapters_spec.rb
+- spec/api/query/dsl_spec.rb
+- spec/api/query/spec_helper.rb
+- spec/api/query/faceting_spec.rb
+- spec/api/query/connectives_spec.rb
+- spec/api/query/local_spec.rb
+- spec/api/query/highlighting_spec.rb
+- spec/api/query/ordering_pagination_spec.rb
+- spec/api/query/dynamic_fields_spec.rb
+- spec/api/query/types_spec.rb
+- spec/api/query/scope_spec.rb
+- spec/api/query/text_field_scoping_spec.rb
+- spec/api/query/fulltext_spec.rb
+- spec/api/sunspot_spec.rb
+- spec/api/indexer_spec.rb

data/lib/sunspot/query/base_query.rb

@@ -1,90 +0,0 @@
-module Sunspot
-  module Query
-    #
-    # Encapsulates information common to all queries - in particular, keywords
-    # and types.
-    #
-    class BaseQuery #:nodoc:
-      include RSolr::Char
-
-      attr_writer :keywords
-
-      def initialize(types, setup)
-        @types, @setup = types, setup
-      end
-
-      # 
-      # Generate params for the base query. If keywords are specified, build
-      # params for a dismax query, request all stored fields plus the score,
-      # and put the types in a filter query. If keywords are not specified,
-      # put the types query in the q parameter.
-      #
-      def to_params
-        params = {}
-        if @keywords
-          params[:q] = @keywords
-          params[:fl] = '* score'
-          params[:fq] = types_phrase
-          params[:qf] = text_field_names.join(' ')
-          params[:defType] = 'dismax'
-        else
-          params[:q] = types_phrase
-        end
-        params
-      end
-
-      # 
-      # Set keyword options
-      #
-      def keyword_options=(options)
-        if options
-          @text_field_names = options.delete(:fields)
-        end
-      end
-
-      private
-
-      # 
-      # Boolean phrase that restricts results to objects of the type(s) under
-      # query. If this is an open query (no types specified) then it sends a
-      # no-op phrase because Solr requires that the :q parameter not be empty.
-      #
-      # ==== Returns
-      #
-      # String:: Boolean phrase for type restriction
-      #
-      def types_phrase
-        if escaped_types.length == 1 then "type:#{escaped_types.first}"
-        else "type:(#{escaped_types * ' OR '})"
-        end
-      end
-
-      #
-      # Wraps each type in quotes to escape names of the form Namespace::Class
-      #
-      def escaped_types
-        @escaped_types ||=
-          @types.map { |type| escape(type.name)}
-      end
-
-      # 
-      # Returns the names of text fields that should be queried in a keyword
-      # search. If specific fields are requested, use those; otherwise use the
-      # union of all fields configured for the types under search.
-      #
-      def text_field_names
-        text_fields =
-          if @text_field_names
-            Array(@text_field_names).map do |field_name|
-              @setup.text_field(field_name.to_sym)
-            end
-          else
-            @setup.text_fields
-          end
-        text_fields.map do |text_field|
-          text_field.indexed_name
-        end
-      end
-    end
-  end
-end