sunspot_rails 2.0.0.pre.120924 → 2.0.0.pre.120925

data/ci/travis.sh

@@ -1,67 +0,0 @@
-#!/bin/sh
-
-set +e
-
-solr_responding() {
-  port=$1
-  curl -o /dev/null "http://localhost:$port/solr/admin/ping" > /dev/null 2>&1
-}
-
-wait_until_solr_responds() {
-  port=$1
-  while ! solr_responding $1; do
-    /bin/echo -n "."
-    sleep 1
-  done
-}
-
-case $GEM in
-  "sunspot")
-    
-    cd sunspot
-    /bin/echo -n "Starting Solr on port 8983 for Sunspot specs..."
-    bundle install --quiet --path vendor/bundle
-    if [ -f sunspot-solr.pid ]; then bundle exec sunspot-solr stop || true; fi
-
-    bundle exec sunspot-solr start -p 8983 -d /tmp/solr
-    wait_until_solr_responds 8983
-    /bin/echo "done."
-    
-    # Invoke the sunspot specs
-    bundle exec rake spec
-    rv=$?
-    
-    /bin/echo -n "Stopping Solr... "
-    bundle exec sunspot-solr stop
-    /bin/echo "done."
-
-    exit $rv
-    ;;
-    
-  "sunspot_rails")
-  
-    cd sunspot
-    /bin/echo -n "Starting Solr on port 8983 for Sunspot specs..."
-    bundle install --quiet --path vendor/bundle
-    if [ -f sunspot-solr.pid ]; then bundle exec sunspot-solr stop || true; fi
-
-    bundle exec sunspot-solr start -p 8983 -d /tmp/solr
-    wait_until_solr_responds 8983
-    /bin/echo "done."
-    
-    # Install gems for test Rails application
-    cd ../sunspot_rails
-    rake spec RAILS=$RAILS
-    rv=$?
-    
-    # Cleanup Solr
-    /bin/echo -n "Stopping Solr... "
-    cd ../sunspot
-    bundle exec sunspot-solr stop
-    /bin/echo "done."
-
-    exit $rv
-    ;;
-    
-  *)
-esac

data/sunspot/.gitignore

@@ -1,13 +0,0 @@
-sunspot-solr.pid
-*.swp
-*.swo
-*~
-coverage
-pkg
-/doc
-.DS_Store
-
-.yardoc
-README.rdoc
-.bundle
-Gemfile.lock

data/sunspot/Gemfile

@@ -1,5 +0,0 @@
-source "http://rubygems.org"
-
-gem 'sunspot_solr', :path => File.expand_path('../../sunspot_solr', __FILE__)
-
-gemspec

data/sunspot/History.txt

@@ -1,258 +0,0 @@
-== 2.0.0
-* Adds support for field grouping (Andy Lindeman)
-* Adds support for native geospatial searches and ordering (Eric Tang, Bruno Miranda, Andy Lindeman)
-* Bundled Solr installation (`sunspot_solr`) is version 3.5.0 (Chris Parker)
-* Adds #query_time method to retrieve the Solr query time in
-  milliseconds (Jason Weathered)
-* Fixes syntax of highlighting when used with nested dismax queries (Marco Crepaldi)
-* Adds ability to nest `Sunspot.batch` calls (Thorbjørn Hermansen)
-* Adds `open_timeout` and `read_timeout` configuration options (Rob Di
-  Marco)
-* Adds `offset` options to facets (Federico Gonzalez)
-* Adds `Retry5xxSessionProxy` to retry requests when an internal server error
-  occurs (Nick Zadrozny)
-* Adds support for range queries (Jan Ulrich)
-* Allows custom field names specified with :as to be symbols (David Oliver)
-* Add field exclusion when faceting (Cuong Hoang)
-
-== 1.3.0 2011-11-26
-* Requests to Solr use HTTP POST verb by default to avoid issues when the query string grows too large for GET (Johan Van Ryseghem)
-* `sunspot.yml` supports ERB (Andrew Cholakian)
-* An error is raised when attempting to run the packaged Solr if Java is not available (Lucas Parry)
-* Pagination operates correctly without dependency on `will_paginate` (Larry Sprock, Dave Krupinski)
-* Stored boolean fields with `false` value are returned correctly (yipdw)
-* `highlight` accepts `:formatter` and `:fragmenter` parameters (Jeremy McNevin)
-* Default `headerBufferSize` is increased for packaged Solr make sure the limit is not reached during large queries (gjb83)
-* Packaged Solr respects the `data_path` configuration setting from `sunspot.yml` (djmaze)
-* Packaged Solr correctly uses the `pid_dir` configuration option from `sunspot.yml` (Russen Guggemos)
-* Specs run correctly in 1.9.2 (Larry Sprock)
-* Documentation improvements (Thibaut Barrère, gjb83, Breno Santos Salgado)
-* Adds :offset option to paginate method (Benjamin Fleischer)
-* Requires rsolr 1.0.6, which fixes issues with Unicode characters
-  returned by Solr
-
-== 1.2.1 2010-12-28
-* Decreased default reindexing batch size from 500 to 50
-
-== 1.2.0 2010-12-28
-* Replace solr-spatial-light with client-side geohash-based spatial search
-* Override Solr field naming conventions using :as option
-* Delegate #id method directly to calling context inside DSL
-* Create a SilentFailSessionProxy that rescues exceptions on write operations.
-* Inclusion by identity
-* Solr optimize command
-* Ignore negative :limit option for query facets
-* Eliminated value sorting for range scopes
-* Correctly cast stored boolean values if they are booleans
-* Correctly cast and return stored values for multi-valued fields
-
-== 1.1.0 2010-04-01
-* MoreLikeThis support
-* Allow multiple fulltext queries in one search
-* Function queries
-* Update solr-spatial-light to 0.0.6 build
-* Support for :prefix when faceting.
-* Allow specification of solr jar
-* Updated reindex task to allow setting of batch size and list of models to index
-* Use a '*:*' query for deleting the entire index
-* Ability to specify custom request handler for queries
-* Gracefully handle nonexistent search result
-
-== 1.0.4 2010-03-19
-* Update solr-spatial-light to 0.0.5
-  * Fix NullPointerException in repeated geo search
-  * Fix missing distances in repeated geo search
-* Don't query the data store more than once when results are missing
-
-== 1.0.2 2010-03-11
-* Restore Hit#distance for result geo distance
-* Remove :distance special sort
-* Quote reserved keywords in boolean queries
-* Add Search#facets accessor to retrieve all facets
-
-== 1.0.1 2010-03-05
-* Copy all needed config files when sunspot-installer run with force option
-
-== 1.0.0 2010-03-03
-* Multiselect Field Faceting
-* Named field facets
-* Upgrade to Solr 1.4
-* Deletion by query
-* Allow :latitude and :longitude as coordinate method names
-* Assumed inconsistency
-* Support for TrieField numeric/time types
-* Built-in Session Proxies: Thread-local, master/slave, sharding
-* Give DSL blocks access to calling context
-* Create sunspot-installer executable, which modifies an existing
-	schema/solrconfig to work with Sunspot
-* Support for Long and Double types
-* new_search method accepts DSL block
-* Sunspot::Server now a real class that manages embedded Sunspot instance
-* Add Search#each_hit_with_result method
-* Able to access stored dynamic fields
-* Access dynamic facets using the #facet method
-* Remove accidental existence of dynamic_text fields
-* Upgrade to RSolr 0.12.1
-* Switch from LocalSolr to solr-spatial-light
-* Turn off request logging in Jetty for default Solr install
-* Full support for class-reloading of Sunspot-setup classes
-* Support time ranges outside of 32-bit range
-* Remove sunspot-configure-solr executable
-* new_search method accepts DSL block
-
-== 0.10.8 2009-11-24
-* Strictly enforce RSolr 0.9.6 gem dependency (newer ones broken)
-
-== 0.10.7 2009-11-16
-* Ignore boost_fields that don't apply
-* Ability to specify text_fields inside connectives
-* Fix bug with newlines in strings incorrectly being considered multi-value
-* Compatibility with RSolr 0.10.1
-* Remove commented-out code entirely
-
-== 0.10.6 2009-11-05
-* Support more dismax parameters
-* Support multiple boost queries
-* Allow "extra" facet rows
-* Allow exclusion of fulltext fields
-* Allow specification of per-field highlighting params
-* Specify coordinates using block extraction
-* Return empty array if no highlights available
-* Get stored text fields from hits
-* Update docs to reflect a requirement of at least one search type
-* added --max-memory and --min-memory parameters to sunspot-solr
-* LocalLucene and LocalSolr compatible with Java 1.5
-
-== 0.10.5 2009-10-22
-* Fix highlighting for multiple-model search
-
-== 0.10.4 2009-10-20
-* Add adjust_params method, allowing experts to manually edit Solr params
-* Track adds and deletes separately in session, and expose delete_dirty? method
-* Allow clients to inject a singleton session proxy
-
-== 0.10.3 2009-10-15
-* Contiguous, not continuous
-* Fail fast if less-than-1 radius passed for local search
-
-== 0.10.2 2009-10-09
-* Add Sunspot.config.xml_builder option, which is passed to RSolr
-
-== 0.10.1 2009-10-08
-* Fix directory bugs in sunspot-solr executable
-
-== 0.10.0 2009-10-08
-* Support for geographical search using LocalSolr
-* Support for keyword highlighting, with custom deferred formatting
-* New fulltext DSL for specifying advanced dismax options
-* Support boost queries
-* Support for search-time field boost
-* Support for phrase fields
-* Support for prefix queries
-* Set default search-time field boost in setup
-* Restrict field facet to a set of desired values
-* Query facets support all facet options
-* Allow scoping by text fields
-* Support executing searches repeatedly
-* Allow setting of Solr URL for integration tests in environment variable
-* Add support for master/slave configurations
-* Added logging options to sunspot-solr executable
-* Added default solr config file location to Sunspot::Configuration
-* Informative, non-firehose Search#inspect
-* No longer require arguments to #paginate
-* Silently ignore keyword calls with nil/blank/whitespace keywords
-* Don't require that all searched types have a referenced field
-* Correct backwards ranges
-* Raise descriptive error if no types passed to search
-* Handle empty query facets, query facet rows, and connectives
-* Quote values in range restrictions if they contain spaces
-* Fix bug in Sunspot::Util.full_const_get
-* Remove support for :other option in time faceting
-* Remove order_by_random() method
-* Removed options and Query from public API
-* Use built-in optparse instead of optiflag in bin/sunspot-solr
-* Remove dependency on haml and use erb since it is only used to generate one file
-
-== 0.9.0 2009-07-21
-* Use Dismax parser for keyword search
-* Field and document boosting
-* Specify which fields to search in keyword search
-* Allow indexing of multiple values in text fields
-* Access keyword relevance score in Hit objects
-* Allow stored fields, retrieve stored values from Hit objects
-* Support more values in shorthand restrictions
-* Disjunctions and conjunctions
-* Random ordering
-* Control all options for field facets
-* Time range facets
-* Get referenced objects from facets on foreign keys
-* Facet by class
-* Batch indexing
-* New Date field type
-* Direct access to data accessors
-* Executable to configure production Solr instances
-* Replace solr-ruby with RSolr
-* Remove accidental ActiveSupport dependency
-
-== 0.8.9 2009-06-23
-* Fix OrderedHash bug in older versions of ActiveSupport
-
-== 0.8.8 2009-06-15
-* Escape type names to support namespaced classes
-* Fix bug with anonymous modules in Ruby 1.9
-
-== 0.8.7 2009-06-10
-* Add --pid-dir option for sunspot-solr executable
-
-== 0.8.5 2009-06-09
-* Added dependencies for sunspot-solr executable to gem dependencies
-* Search for adapters using class ancestors rather than superclasses
-
-== 0.8.3 2009-06-03
-* Index objects passed as a collection in a single HTTP request
-
-== 0.8.2 2009-05-27
-* Allow specification of Solr home when using sunspot-solr
-
-== 0.8.1 2009-05-26
-* Add Search#execute! to public API
-
-== 0.8.0 2009-05-22
-* Access query API directly; instantiate search without running it
-* Dynamic fields
-* Search blocks can be evaluated in calling context
-
-== 0.7.3 2009-05-06
-* Better exception handling when class doesn't have adapter/setup
-
-== 0.7.2 2009-04-29
-* Dirty sessions
-
-== 0.7.1 2009-04-29
-* Removed extlib dependency from gemspec
-
-== 0.7.0 2009-04-28
-* Less magic in the DSL
-* Restrict by empty values
-* Negative scoping using without() method
-* Exclusion by object identity using without(instance)
-* Support for faceting
-* Explicit commits
-* Boolean field type
-* Attribute field flexibility
-* Virtual field blocks can be evaluated in calling context
-* Order available by multiple fields
-* New adapter API
-* Got rid of builder API
-* Full documentation
-
-== 0.0.2 2009-02-14
-* Run sunspot's built-in Solr instance using
-  sunspot-solr executable
-* Search hash interpretation delegated to
-  Builder object
-
-== 0.0.1 2008-12-11
-* Initial release
-* Define indexing for any class using DSL
-* Search indexed classes using DSL

data/sunspot/Rakefile

@@ -1,13 +0,0 @@
-# encoding: UTF-8
-
-require 'rspec/core/rake_task'
-
-Dir['tasks/**/*.rake'].each { |t| load t }
-
-desc "Run all examples"
-RSpec::Core::RakeTask.new(:spec) do |t|
-  t.rspec_opts = '--format documentation'
-  t.ruby_opts  = "-W1"
-end
-
-task :default => :spec

data/sunspot/TODO

@@ -1,13 +0,0 @@
-=== Sunspot 1.1.x ===
-* commitWithin (needs support from RSolr, currently available in master)
-* commit options (non-blocking, etc.)
-
-=== Someday ===
-* Shorthand arguments to Sunspot#search
-* Rudimentary fulltext prefixing support
-
-=== Solr 1.5 ===
-* Field Collapsing (SOLR-236)
-* Support for official spatial support (SOLR-773)
-* Support sorting by function
-* Support string constants in functions

data/sunspot/lib/light_config.rb

@@ -1,40 +0,0 @@
-module LightConfig
-  class Configuration
-    def initialize(&block)
-      @properties = {}
-      ::LightConfig::Builder.new(self).instance_eval(&block)
-      singleton = (class <<self; self; end)
-      @properties.keys.each do |property|
-        singleton.module_eval do
-          define_method property do
-            @properties[property]
-          end
-
-          define_method "#{property}=" do |value|
-            @properties[property] = value
-          end
-        end
-      end
-    end
-  end
-
-  class Builder
-    def initialize(configuration)
-      @configuration = configuration
-    end
-
-    def method_missing(method, *args, &block)
-      raise ArgumentError("wrong number of arguments(#{args.length} for 1)") unless args.length < 2
-      value = if block then ::LightConfig::Configuration.new(&block)
-              else args.first
-              end
-      @configuration.instance_variable_get(:@properties)[method] = value
-    end
-  end
-
-  class <<self
-    def build(&block)
-      LightConfig::Configuration.new(&block)
-    end
-  end
-end

data/sunspot/lib/sunspot.rb

@@ -1,579 +0,0 @@
-require 'set'
-require 'time'
-require 'date'
-require 'enumerator'
-require 'cgi'
-begin
-  require 'rsolr'
-rescue LoadError
-  require 'rubygems'
-  require 'rsolr'
-end
-
-require File.join(File.dirname(__FILE__), 'light_config')
-
-%w(util adapters configuration setup composite_setup text_field_setup field
-   field_factory data_extractor indexer query search session session_proxy
-   type dsl class_set).each do |filename|
-  require File.join(File.dirname(__FILE__), 'sunspot', filename)
-end
-
-#
-# The Sunspot module provides class-method entry points to most of the
-# functionality provided by the Sunspot library. Internally, the Sunspot
-# singleton class contains a (non-thread-safe!) instance of Sunspot::Session,
-# to which it delegates most of the class methods it exposes. In the method
-# documentation below, this instance is referred to as the "singleton session".
-#
-# Though the singleton session provides a convenient entry point to Sunspot,
-# it is by no means required to use the Sunspot class methods. Multiple sessions
-# may be instantiated and used (if you need to connect to multiple Solr
-# instances, for example.)
-#
-# Note that the configuration of classes for index/search (the +setup+
-# method) is _not_ session-specific, but rather global.
-#
-module Sunspot
-  UnrecognizedFieldError = Class.new(StandardError)
-  UnrecognizedRestrictionError = Class.new(StandardError)
-  NoAdapterError = Class.new(StandardError)
-  NoSetupError = Class.new(StandardError)
-  IllegalSearchError = Class.new(StandardError)
-  NotImplementedError = Class.new(StandardError)
-
-  autoload :Installer, File.join(File.dirname(__FILE__), 'sunspot', 'installer')
-
-  # Array to track classes that have been set up for searching.
-  # Used by, e.g., Sunspot::Rails for reindexing all searchable classes.
-  @searchable = ClassSet.new
-
-  class <<self
-    # 
-    # Clients can inject a session proxy, allowing them to implement custom
-    # session-management logic while retaining the Sunspot singleton API as
-    # an available interface. The object assigned to this attribute must
-    # respond to all of the public methods of the Sunspot::Session class.
-    #
-    attr_writer :session
-
-    #
-    # Access the list of classes set up to be searched.
-    #
-    attr_reader :searchable
-
-    # Configures indexing and search for a given class.
-    #
-    # ==== Parameters
-    #
-    # clazz<Class>:: class to configure
-    #
-    # ==== Example
-    #
-    #   Sunspot.setup(Post) do
-    #     text :title, :body
-    #     string :author_name
-    #     integer :blog_id
-    #     integer :category_ids
-    #     float :average_rating, :using => :ratings_average
-    #     time :published_at
-    #     string :sort_title do
-    #       title.downcase.sub(/^(an?|the)\W+/, ''/) if title = self.title
-    #     end
-    #   end
-    #
-    # ====== Attribute Fields vs. Virtual Fields
-    #
-    # Attribute fields call a method on the indexed object and index the
-    # return value. All of the fields defined above except for the last one are
-    # attribute fields. By default, the field name will also be the attribute
-    # used; this can be overriden with the +:using+ option, as in
-    # +:average_rating+ above. In that case, the attribute +:ratings_average+
-    # will be indexed with the field name +:average_rating+.
-    #
-    # +:sort_title+ is a virtual field, which evaluates the block inside the
-    # context of the instance being indexed, and indexes the value returned
-    # by the block. If the block you pass takes an argument, it will be passed
-    # the instance rather than being evaluated inside of it; so, the following
-    # example is equivalent to the one above (assuming #title is public):
-    #
-    #   Sunspot.setup(Post) do
-    #     string :sort_title do |post|
-    #       post.title.downcase.sub(/^(an?|the)\W+/, ''/) if title = self.title
-    #     end
-    #   end
-    #
-    # ===== Field Types
-    #
-    # The available types are:
-    # 
-    # * +text+
-    # * +string+
-    # * +integer+
-    # * +float+
-    # * +time+
-    # * +boolean+
-    #
-    # Note that the +text+ type behaves quite differently from the others -
-    # this is the type that is indexed as fulltext, and is searched using the
-    # +keywords+ method inside the search DSL. Text fields cannot have
-    # restrictions set on them, nor can they be used in order statements or
-    # for facets. All other types are indexed literally, and thus can be used
-    # for all of those operations. They will not, however, be searched in
-    # fulltext. In this way, Sunspot provides a complete barrier between
-    # fulltext fields and value fields.
-    #
-    # It is fine to specify a field both as a text field and a string field;
-    # internally, the fields will have different names so there is no danger
-    # of conflict.
-    # 
-    # ===== Dynamic Fields
-    # 
-    # For use cases which have highly dynamic data models (for instance, an
-    # open set of key-value pairs attached to a model), it may be useful to
-    # defer definition of fields until indexing time. Sunspot exposes dynamic
-    # fields, which define a data accessor (either attribute or virtual, see
-    # above), which accepts a hash of field names to values. Note that the field
-    # names in the hash are internally scoped to the base name of the dynamic
-    # field, so any time they are referred to, they are referred to using both
-    # the base name and the dynamic (runtime-specified) name.
-    #
-    # Dynamic fields are speficied in the setup block using the type name
-    # prefixed by +dynamic_+. For example:
-    # 
-    #   Sunspot.setup(Post) do
-    #     dynamic_string :custom_values do
-    #       key_value_pairs.inject({}) do |hash, key_value_pair|
-    #         hash[key_value_pair.key.to_sym] = key_value_pair.value
-    #       end
-    #     end
-    #   end
-    # 
-    # If you later wanted to facet all of the values for the key "cuisine",
-    # you could issue:
-    # 
-    #   Sunspot.search(Post) do
-    #     dynamic :custom_values do
-    #       facet :cuisine
-    #     end
-    #   end
-    # 
-    # In the documentation, +:custom_values+ is referred to as the "base name" -
-    # that is, the one specified statically - and +:cuisine+ is referred to as
-    # the dynamic name, which is the part that is specified at indexing time.
-    # 
-    def setup(clazz, &block)
-      Sunspot.searchable << clazz
-      Setup.setup(clazz, &block)
-    end
-
-    # Indexes objects on the singleton session.
-    #
-    # ==== Parameters
-    #
-    # objects...<Object>:: objects to index (may pass an array or varargs)
-    #
-    # ==== Example
-    #
-    #   post1, post2 = new Array(2) { Post.create }
-    #   Sunspot.index(post1, post2)
-    #
-    # Note that indexed objects won't be reflected in search until a commit is
-    # sent - see Sunspot.index! and Sunspot.commit
-    #
-    def index(*objects)
-      session.index(*objects)
-    end
-
-    # Indexes objects on the singleton session and commits immediately.
-    #
-    # See: Sunspot.index and Sunspot.commit
-    #
-    # ==== Parameters
-    #
-    # objects...<Object>:: objects to index (may pass an array or varargs)
-    #
-    def index!(*objects)
-      session.index!(*objects)
-    end
-
-    # Commits the singleton session
-    #
-    # When documents are added to or removed from Solr, the changes are
-    # initially stored in memory, and are not reflected in Solr's existing
-    # searcher instance. When a commit message is sent, the changes are written
-    # to disk, and a new searcher is spawned. Commits are thus fairly
-    # expensive, so if your application needs to index several documents as part
-    # of a single operation, it is advisable to index them all and then call
-    # commit at the end of the operation.
-    #
-    # Note that Solr can also be configured to automatically perform a commit
-    # after either a specified interval after the last change, or after a
-    # specified number of documents are added. See
-    # http://wiki.apache.org/solr/SolrConfigXml
-    #
-    def commit
-      session.commit
-    end
-
-    # Optimizes the index on the singletion session.
-    #
-    # Frequently adding and deleting documents to Solr, leaves the index in a
-    # fragmented state. The optimize command merges all index segments into 
-    # a single segment and removes any deleted documents, making it faster to 
-    # search. Since optimize rebuilds the index from scratch, it takes some 
-    # time and requires double the space on the hard disk while it's rebuilding.
-    # Note that optimize also commits.
-    def optimize
-      session.optimize
-    end
-
-    # 
-    # Create a new Search instance, but do not execute it immediately. Generally
-    # you will want to use the #search method to build and execute searches in
-    # one step, but if you are building searches piecemeal you may call
-    # #new_search and then call #build one or more times to add components to
-    # the query.
-    #
-    # ==== Example
-    #
-    #   search = Sunspot.new_search do
-    #     with(:blog_id, 1)
-    #   end
-    #   search.build do
-    #     keywords('some keywords')
-    #   end
-    #   search.build do
-    #     order_by(:published_at, :desc)
-    #   end
-    #   search.execute
-    #
-    #   # This is equivalent to:
-    #   Sunspot.search do
-    #     with(:blog_id, 1)
-    #     keywords('some keywords')
-    #     order_by(:published_at, :desc)
-    #   end
-    # 
-    # ==== Parameters
-    #
-    # types<Class>...::
-    #   One or more types to search for. If no types are passed, all
-    #   configured types will be searched for.
-    #
-    # ==== Returns
-    #
-    # Sunspot::Search::
-    #   Search object, not yet executed. Query parameters can be added manually;
-    #   then #execute should be called.
-    # 
-    def new_search(*types, &block)
-      session.new_search(*types, &block)
-    end
-
-
-    # Search for objects in the index.
-    #
-    # ==== Parameters
-    #
-    # types<Class>...::
-    #   One or more types to search for. If no types are passed, all
-    #   configured types will be searched.
-    #
-    # ==== Returns
-    #
-    # Sunspot::Search:: Object containing results, facets, count, etc.
-    #
-    # The fields available for restriction, ordering, etc. are those that meet
-    # the following criteria:
-    #
-    # * They are not of type +text+.
-    # * They are defined for at least one of the classes being searched
-    # * They have the same data type for all of the classes being searched.
-    # * They have the same multiple flag for all of the classes being searched.
-    # * They have the same stored flag for all of the classes being searched.
-    #
-    # The restrictions available are the constants defined in the
-    # Sunspot::Restriction class. The standard restrictions are:
-    #
-    #   with(:field_name).equal_to(value)
-    #   with(:field_name, value) # shorthand for above
-    #   with(:field_name).less_than(value)
-    #   with(:field_name).greater_than(value)
-    #   with(:field_name).between(value1..value2)
-    #   with(:field_name).any_of([value1, value2, value3])
-    #   with(:field_name).all_of([value1, value2, value3])
-    #   without(some_instance) # exclude that particular instance
-    #
-    # +without+ can be substituted for +with+, causing the restriction to be
-    # negated. In the last example above, only +without+ works, as it does not
-    # make sense to search only for an instance you already have.
-    #
-    # Equality restrictions can take +nil+ as a value, which restricts the
-    # results to documents that have no value for the given field. Passing +nil+
-    # as a value to other restriction types is illegal. Thus:
-    #
-    #   with(:field_name, nil) # ok
-    #   with(:field_name).equal_to(nil) # ok
-    #   with(:field_name).less_than(nil) # bad
-    #
-    # ==== Example
-    #
-    #   Sunspot.search(Post) do
-    #     keywords 'great pizza'
-    #     with(:published_at).less_than Time.now
-    #     with :blog_id, 1
-    #     without current_post
-    #     facet :category_ids
-    #     order_by :published_at, :desc
-    #     paginate 2, 15
-    #   end
-    #  
-    # If the block passed to #search takes an argument, that argument will
-    # present the DSL, and the block will be evaluated in the calling context.
-    # This will come in handy for building searches using instance data or
-    # methods, e.g.:
-    #
-    #   Sunspot.search(Post) do |query|
-    #     query.with(:blog_id, @current_blog.id)
-    #   end
-    #
-    # See Sunspot::DSL::Search, Sunspot::DSL::Scope, Sunspot::DSL::FieldQuery
-    # and Sunspot::DSL::StandardQuery for the full API presented inside the
-    # block.
-    #
-    def search(*types, &block)
-      session.search(*types, &block)
-    end
-
-    def new_more_like_this(object, *types, &block)
-      session.new_more_like_this(object, *types, &block)
-    end
-
-    # 
-    # Initiate a MoreLikeThis search. MoreLikeThis is a special type of search
-    # that finds similar documents using fulltext comparison. The fields to be
-    # compared are `text` fields set up with the `:more_like_this` option set to
-    # `true`. By default, more like this returns objects of the same type as the
-    # object used for comparison, but a list of types can optionally be passed
-    # to this method to return similar documents of other types. This will only
-    # work for types that have common fields.
-    #
-    # The DSL for MoreLikeThis search exposes several methods for setting
-    # options specific to this type of search. See the
-    # Sunspot::DSL::MoreLikeThis class and the MoreLikeThis documentation on
-    # the Solr wiki: http://wiki.apache.org/solr/MoreLikeThis
-    #
-    # MoreLikeThis searches have all of the same scoping, ordering, and faceting
-    # functionality as standard searches; the only thing you can't do in a MLT
-    # search is fulltext matching (since the MLT itself is a fulltext query).
-    #
-    # ==== Example
-    #
-    #   post = Post.first
-    #   Sunspot.more_like_this(post, Post, Page) do
-    #     fields :title, :body
-    #     with(:updated_at).greater_than(1.month.ago)
-    #     facet(:category_ids)
-    #   end
-    #
-    #
-    def more_like_this(object, *types, &block)
-      session.more_like_this(object, *types, &block)
-    end
-
-    # Remove objects from the index. Any time an object is destroyed, it must
-    # be removed from the index; otherwise, the index will contain broken
-    # references to objects that do not exist, which will cause errors when
-    # those objects are matched in search results.
-    #
-    # If a block is passed, it is evaluated as a search scope; in this way,
-    # documents can be removed by an arbitrary query. In this case, the
-    # arguments to the method should be the classes to run the query on.
-    #
-    # ==== Parameters
-    #
-    # objects...<Object>::
-    #   Objects to remove from the index (may pass an array or varargs)
-    #
-    # ==== Example (remove a document)
-    #
-    #   post.destroy
-    #   Sunspot.remove(post)
-    #
-    # ==== Example (remove by query)
-    #
-    #   Sunspot.remove(Post) do
-    #     with(:created_at).less_than(Time.now - 14.days)
-    #   end
-    #
-    def remove(*objects, &block)
-      session.remove(*objects, &block)
-    end
-
-    # 
-    # Remove objects from the index and immediately commit. See Sunspot.remove
-    #
-    # ==== Parameters
-    #
-    # objects...<Object>:: Objects to remove from the index
-    #
-    def remove!(*objects)
-      session.remove!(*objects)
-    end
-
-    # 
-    # Remove an object from the index using its class name and primary key.
-    # Useful if you know this information and want to remove an object without
-    # instantiating it from persistent storage
-    #
-    # ==== Parameters
-    #
-    # clazz<Class>:: Class of the object, or class name as a string or symbol
-    # id::
-    #   Primary key of the object. This should be the same id that would be
-    #   returned by the class's instance adapter.
-    #
-    def remove_by_id(clazz, id)
-      session.remove_by_id(clazz, id)
-    end
-
-    # 
-    # Remove an object by class name and primary key, and immediately commit.
-    # See #remove_by_id and #commit
-    #
-    def remove_by_id!(clazz, id)
-      session.remove_by_id!(clazz, id)
-    end
-
-    # Remove all objects of the given classes from the index. There isn't much
-    # use for this in general operations but it can be useful for maintenance,
-    # testing, etc. If no arguments are passed, remove everything from the
-    # index.
-    #
-    # ==== Parameters
-    #
-    # classes...<Class>::
-    #   classes for which to remove all instances from the index (may pass an
-    #   array or varargs)
-    #
-    # ==== Example
-    #
-    #   Sunspot.remove_all(Post, Blog)
-    #
-    def remove_all(*classes)
-      session.remove_all(*classes)
-    end
-
-    # 
-    # Remove all objects of the given classes from the index and immediately
-    # commit. See Sunspot.remove_all
-    #
-    # ==== Parameters
-    #
-    # classes...<Class>::
-    #   classes for which to remove all instances from the index
-    def remove_all!(*classes)
-      session.remove_all!(*classes)
-    end
-
-    # 
-    # Process all adds in a batch. Any Sunspot adds initiated inside the block
-    # will be sent in bulk when the block finishes. Useful if your application
-    # initiates index adds from various places in code as part of a single
-    # operation; doing a batch add will give better performance.
-    #
-    # ==== Example
-    #
-    #   Sunspot.batch do
-    #     post = Post.new
-    #     Sunspot.add(post)
-    #     comment = Comment.new
-    #     Sunspot.add(comment)
-    #   end
-    #
-    # Sunspot will send both the post and the comment in a single request.
-    #
-    def batch(&block)
-      session.batch(&block)
-    end
-
-    #
-    # True if documents have been added, updated, or removed since the last
-    # commit.
-    #
-    # ==== Returns
-    #
-    # Boolean:: Whether there have been any updates since the last commit
-    #
-    def dirty?
-      session.dirty?
-    end
-
-    # 
-    # Sends a commit if the session is dirty (see #dirty?).
-    #
-    def commit_if_dirty
-      session.commit_if_dirty
-    end
-    
-    #
-    # True if documents have been removed since the last commit.
-    #
-    # ==== Returns
-    #
-    # Boolean:: Whether there have been any deletes since the last commit
-    #
-    def delete_dirty?
-      session.delete_dirty?
-    end
-
-    # 
-    # Sends a commit if the session has deletes since the last commit (see #delete_dirty?).
-    #
-    def commit_if_delete_dirty
-      session.commit_if_delete_dirty
-    end
-    
-    # Returns the configuration associated with the singleton session. See
-    # Sunspot::Configuration for details.
-    #
-    # ==== Returns
-    #
-    # LightConfig::Configuration:: configuration for singleton session
-    #
-    def config
-      session.config
-    end
-
-    # 
-    # Resets the singleton session. This is useful for clearing out all
-    # static data between tests, but probably nowhere else.
-    #
-    # ==== Parameters
-    #
-    # keep_config<Boolean>::
-    #   Whether to retain the configuration used by the current singleton
-    #   session. Default false.
-    #
-    def reset!(keep_config = false)
-      config =
-        if keep_config
-          session.config
-        else
-          Configuration.build
-        end
-      @session = Session.new(config)
-    end
-
-    # 
-    # Get the singleton session, creating it if none yet exists.
-    #
-    # ==== Returns
-    #
-    # Sunspot::Session:: the singleton session
-    #
-    def session #:nodoc:
-      @session ||= Session.new
-    end
-  end
-end