sunspot 0.10.9 → 1.0.0

data/History.txt

@@ -1,3 +1,33 @@
+== 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

data/README.rdoc

@@ -2,31 +2,44 @@
 
 http://outoftime.github.com/sunspot
 
-Sunspot is a Ruby library for expressive, powerful interaction with the Solr search engine.
-Sunspot is built on top of the RSolr gem, which provides a low-level interface for Solr
-interaction; Sunspot provides a simple, intuitive, expressive DSL backed by powerful
-features for indexing objects and searching for them.
+Sunspot is a Ruby library for expressive, powerful interaction with the Solr
+search engine. Sunspot is built on top of the RSolr library, which
+provides a low-level interface for Solr interaction; Sunspot provides a simple,
+intuitive, expressive DSL backed by powerful features for indexing objects and
+searching for them.
 
 Sunspot is designed to be easily plugged in to any ORM, or even non-database-backed
 objects such as the filesystem.
 
+=== Where to learn all about Sunspot: The Wiki!
+
 This README is intended as a quick primer on what Sunspot is capable of; for
 detailed treatment of Sunspot's full feature range, check out the wiki:
 http://wiki.github.com/outoftime/sunspot
 
+The API documentation is also complete and up-to-date; however, because of the
+way Sunspot is structured, it's not the easiest way for new users to get to know
+the library.
 
 === Features:
 
-* Define indexing strategy for each searchable class using intuitive block-based API
-* Clean separation between keyword-searchable fields and fields for scoping/ordering
-* Define fields based on existing attributes or "virtual fields" for custom indexing
-* Indexes each object's entire superclass hierarchy, for easy searching for all objects inheriting from a parent class
-* Intuitive DSL for scoping searches, with all the usual boolean operators available
+* Define indexing strategy for each searchable class using intuitive block-based
+  API
+* Clean separation between keyword-searchable fields and fields for
+  scoping/ordering
+* Define fields based on existing attributes or "virtual fields" for custom
+  indexing
+* Indexes each object's entire superclass hierarchy, for easy searching for all
+  objects inheriting from a parent class
+* Intuitive DSL for scoping searches, with all the usual boolean operators
+  available
 * Intuitive interface for requesting facets on indexed fields
-* Extensible adapter architecture for easy integration of other ORMs or non-model classes
-* Refine search using field facets, date range facets, or ultra-powerful query facets
+* Extensible adapter architecture for easy integration of other ORMs or
+  non-model classes
+* Refine search using field facets, date range facets, or ultra-powerful
+  query facets
 * Full compatibility with will_paginate
-* Ordering
+* Ordering by field value, relevance, geographical distance, or random
 
 == Installation
 
@@ -36,7 +49,8 @@ In order to start the packaged Solr installation, run:
 
   sunspot-solr start -- [-d /path/to/data/directory] [-p port] [-s path/to/solr/home] [--pid-dir=path/to/pid/dir]
 
-If you don't specify a data directory, your Solr index will be stored in your operating system's temporary directory.
+If you don't specify a data directory, your Solr index will be stored in your
+operating system's temporary directory.
 
 If you specify a solr home, the directory must contain a <code>conf</code>
 directory, which should contain at least <code>schema.xml</code> and
@@ -52,8 +66,11 @@ You can change the URL at which Sunspot accesses Solr with:
 
 == Rails Integration
 
-The {Sunspot::Rails}[http://github.com/outoftime/sunspot_rails] plugin makes
-integrating Sunspot into Rails drop-in easy.
+The Sunspot::Rails plugin makes integrating Sunspot into Rails drop-in easy.
+
+    gem install sunspot_rails
+
+See the README for that gem or the Sunspot Wiki for more information.
 
 == Using Sunspot
 
@@ -115,9 +132,8 @@ See Sunspot.search for more information.
         li.facet_row
           = link_to(row.instance.name, params.merge(:blog_id => row.value))
           %span.count== (#{row.count})
-  .page_info== Displaying page #{@search.page} of #{@search.per_page} out of #{@search.total} results
-  - @search.hits.each do |hit|
-    - post = hit.result
+  .page_info== Displaying page #{@search.hits.page} of #{@search.hits.per_page} out of #{@search.total} results
+  - @search.each_hit_with_result do |hit, post|
     .search_result
       %h3.title
         = link_to(h(hit.stored(:title)), post_url(post))
@@ -136,9 +152,8 @@ me so I can rectify the situation!
 
 == Dependencies
 
-1. RSolr 0.10.1
-2. Daemons 1.x
-4. Java 1.5+
+1. RSolr
+2. Java 1.5+
 
 Sunspot has been tested with MRI 1.8.6 and 1.8.7, REE 1.8.6, YARV 1.9.1, and
 JRuby 1.2.0
@@ -157,8 +172,8 @@ guidelines:
 
 * Contributions should be submitted via Sunspot's Lighthouse account, with an
   attached git patch. See below for how to create a git patch.
-* Patches should not make any changes in your patch to the gemspec task other
-  than adding/removing dependencies (e.g., changing the name, version, email,
+* Patches should not make any changes to the gemspec task other than
+  adding/removing dependencies (e.g., changing the name, version, email,
   description, etc.)
 * Patches should not include any changes to the gemspec itself.
 * Document any new methods, options, arguments, etc.
@@ -175,14 +190,28 @@ Here's how to create a Git patch - assuming you're pulling from the canonical
 Sunspot repository at `upstream`:
 
   git fetch upstream
-  git format-patch upstre
+  git format-patch --stdout upstream/master.. > my-awesome.patch
+
+== Help and Support
+
+=== Ask for help
+
+* Sunspot Discussion: {ruby-sunspot@googlegroups.com}[mailto:ruby-sunspot@googlegroups.com] / http://groups.google.com/group/ruby-sunspot
+* IRC: {#sunspot-ruby @ Freenode}[irc://chat.freenode.net/#sunspot-ruby]
 
-== Further Reading
+=== Tutorials and Articles
 
-* Sunspot Discussion: http://groups.google.com/group/ruby-sunspot
-* IRC: #sunspot-ruby @ Freenode
-* Posts about Sunspot from my tumblog: http://outofti.me/tagged/sunspot
-* Read about it on Linux Magazine: http://www.linux-mag.com/id/7341
+* {Full-text search in Rails with Sunspot}[http://tech.favoritemedium.com/2010/01/full-text-search-in-rails-with-sunspot.html] (Tropical Software Observations)
+* {Sunspot Full-text Search for Rails/Ruby}[http://therailworld.com/posts/23-Sunspot-Full-text-Search-for-Rails-Ruby] (The Rail World)
+* {A Few Sunspot Tips}[http://blog.trydionel.com/2009/11/19/a-few-sunspot-tips/] (spiral_code)
+* {Sunspot: A Solr-Powered Search Engine for Ruby}[http://www.linux-mag.com/id/7341] (Linux Magazine)
+* {Using Sunspot for Free-Text Search with Redis}[http://masonoise.wordpress.com/2010/02/06/using-sunspot-for-free-text-search-with-redis/] (While I Pondered...)
+* {Default scope with Sunspot}[http://www.cloudspace.com/blog/2010/01/15/default-scope-with-sunspot/] (Cloudspace)
+* {Testing Sunspot with Cucumber}[http://blog.trydionel.com/2010/02/06/testing-sunspot-with-cucumber/] (spiral_code)
+* {Running cucumber features with sunspot_rails}[http://blog.kabisa.nl/2010/02/03/running-cucumber-features-with-sunspot_rails] (Kabisa Blog)
+* {How To Use Twitter Lists to Determine Influence}[http://www.untitledstartup.com/2010/01/how-to-use-twitter-lists-to-determine-influence/] (Untitled Startup)
+* {Sunspot Quickstart}[http://wiki.websolr.com/index.php/Sunspot_Quickstart] (WebSolr)
+* {Solr, and Sunspot}[http://www.kuahyeow.com/2009/08/solr-and-sunspot.html] (YT!)
 
 == Contributors
 
@@ -196,6 +225,7 @@ Sunspot repository at `upstream`:
 * Brian Atkinson
 * Tom Coleman (tom@thesnail.org)
 * Matt Mitchell (goodieboy@gmail.com)
+* Nathan Beyer (nbeyer@gmail.com)
 
 == License
 

data/Rakefile

@@ -4,6 +4,8 @@ task :environment do
   require File.dirname(__FILE__) + '/lib/sunspot'
 end
 
+require File.join(File.dirname(__FILE__), 'lib', 'sunspot', 'version')
+
 Dir['tasks/**/*.rake'].each { |t| load t }
 
 task :default => 'spec:api'

data/TODO

@@ -1,22 +1,12 @@
-<<<<<<< HEAD:TODO
-=== 0.10.x ===
-* Can retrieve facets from search via string
-* Allow #latitude and #longitude as coordinate attributes
-* Allow use of #text_fields from inside disjunction
-=======
-=== 1.0 ===
-* Built-in session proxies; #thread_local_sessions! method
-* Support 1.4, retaining 1.3 support if/as much as possible
-* Working local + keyword search
-* Facet filter exclusion
->>>>>>> d8e4337... Minor API & documentation improvements:TODO
+=== Sunspot 1.0 ===
+* new_search should accept block
 
-* Assumed inconsistency
-* Support all operations in batches. Make it smart.
-  * Don't use more than one commits when one is equivalent
-  * Preserve adds/deletes that are done after last commit
-  * Don't do adds and deletes for the same document out of order
-  * Don't do more than one add for the same document
-  * Do use as few requests as possible within those constraints
 === Future ===
+* Shorthand arguments to Sunspot#search
+* Rudimentary fulltext prefixing support
+* commitWithin (need solr-ruby support for this)
 * Support Solr functions (e.g. dismax :bf)
+
+=== Solr 1.5 ===
+* Field Collapsing (SOLR-236)
+* Support for official spatial support (SOLR-773)

data/VERSION.yml

@@ -1,5 +1,4 @@
 --- 
-:major: 0
 :minor: 10
-:patch: 9
-:build: 
+:patch: 8
+:major: 0

data/bin/sunspot-installer

@@ -0,0 +1,19 @@
+#!/usr/bin/env ruby
+
+require 'optparse'
+require File.join(File.dirname(__FILE__), '..', 'lib', 'sunspot', 'installer')
+
+home = ARGV.select { |arg| arg !~ /^-/ }.last || Dir.pwd
+options = {}
+
+OptionParser.new do |opts|
+  opts.banner = "Usage: sunspot-install [options] [solr-home]"
+  opts.on('-v', '--[no-]verbose', 'Run verbosely') do |v|
+    options[:verbose] = v
+  end
+  opts.on('-f', '--[no-]force', 'Overwrite schema and solrconfig files with Sunspot default, instead of modifying them (recommended for new Solr installation)') do |f|
+    options[:force] = f
+  end
+end.parse!
+
+Sunspot::Installer.execute(home, options)

data/bin/sunspot-solr

@@ -1,95 +1,70 @@
 #!/usr/bin/env ruby
-using_gems = false
 begin
   require 'fileutils'
   require 'tempfile'
   require 'tmpdir'
   require 'optparse'
-  require 'daemons'
+  require File.join(File.dirname(__FILE__), '..', 'lib', 'sunspot', 'server')
 rescue LoadError => e
-  if using_gems
-    raise(e)
-  else
-    using_gems = true
-    require 'rubygems'
+  if require 'rubygems'
     retry
+  else
+    raise(e)
   end
 end
 
-working_directory = FileUtils.pwd
-solr_install = File.expand_path(File.join(File.dirname(__FILE__), '..', 'solr'))
-
-port        = '8983'
-data_dir    = File.expand_path(File.join(Dir.tmpdir, 'solr_data'))
-solr_home   = File.join(solr_install, 'solr')
-pid_dir     = working_directory
-log_file    = nil
-log_level   = 'OFF'
-min_memory  = '128m'
-max_memory  = '512m'
+server = Sunspot::Server.new
 
 OptionParser.new do |opts|
   opts.banner = "Usage: sunspot-solr start [options]"
 
   opts.on '-p', '--port=PORT', 'Port on which to run Solr (default 8983)' do |p|
-    port = p
+    server.port = p
   end
 
   opts.on '-d', '--data-directory=DIRECTORY', 'Solr data directory' do |d|
-    data_dir = File.expand_path(d)
+    server.solr_data_dir = File.expand_path(d)
   end
 
   opts.on '-s', '--solr-home=HOME', 'Solr home directory (should contain conf/ directory)' do |s|
-    solr_home = File.expand_path(s)
+    server.solr_home = File.expand_path(s)
   end
 
   opts.on '--pid-dir=PID_DIR', 'Directory for pid files' do |pd|
-    pid_dir = File.expand_path(pd)
+    server.pid_dir = File.expand_path(pd)
   end
 
   opts.on '-l', '--log-level=LOG_LEVEL', 'Solr logging level' do |l|
-    log_level = l
+    server.log_level = l
   end
 
   opts.on '--log-file=LOG_FILE', 'Path to Solr log file' do |lf|
-    log_file = File.expand_path(lf)
+    server.log_file = File.expand_path(lf)
   end
   
   opts.on '--max-memory=MEMORY', 'Specify the maximum size of the memory allocation pool' do |mm|
-    max_memory = mm
+    server.max_memory = mm
   end
   
   opts.on '--min-memory=MEMORY', 'Specify the initial size of the memory allocation pool' do |mm|
-    min_memory = mm
+    server.min_memory = mm
   end
 end.parse!
 
-options = { :dir_mode => :normal, :dir => pid_dir }
-
-def logging_properties( log_file, log_level )
-  temp_file = Tempfile.new 'logging.properties'
-  temp_file << <<PROPERTIES
-.level = #{log_level}
-handlers = java.util.logging.FileHandler
-java.util.logging.FileHandler.formatter = java.util.logging.SimpleFormatter
-java.util.logging.FileHandler.pattern   = #{log_file}
-PROPERTIES
-  temp_file.flush
-  temp_file.close
-  temp_file.path
-end
-
-Daemons.run_proc('sunspot-solr', options) do
-  FileUtils.cd(solr_install) do
-    args = ['java']
-    args << "-Xms#{min_memory}"
-    args << "-Xmx#{max_memory}"
-    args << "-Djetty.port=#{port}" if port
-    args << "-Dsolr.data.dir=#{data_dir}" if data_dir
-    args << "-Dsolr.solr.home=#{solr_home}" if solr_home
-    args << "-Djava.util.logging.config.file=#{logging_properties(log_file, log_level)}" if log_file and log_level != 'OFF'
-    args << '-jar' << File.join(solr_install, 'start.jar')
-    STDERR.puts(args * ' ')
-    Kernel.exec(*args)
+begin
+  case ARGV[0]
+  when 'start'
+    server.start
+  when 'run'
+    server.run
+  when 'stop'
+    server.stop
+  when 'restart'
+    server.stop
+    server.start
+  else
+    abort("Usage: sunspot-solr (start|stop|run)")
   end
+rescue Sunspot::Server::ServerError => e
+  abort(e.message)
 end

data/installer/config/schema.yml

@@ -0,0 +1,71 @@
+types: !omap
+  - text:
+      class: TextField
+      suffix: text
+      omit_norms: false
+      tokenizer: StandardTokenizerFactory
+      filters:
+        - StandardFilterFactory
+        - LowerCaseFilterFactory
+      invariants:
+        multiValued: true
+  - boolean:
+      class: BoolField
+      suffix: b
+  - date:
+      class: DateField
+      suffix: d
+  - rand:
+      class: RandomSortField
+  - sdouble:
+      class: SortableDoubleField
+      suffix: e
+  - sfloat:
+      class: SortableFloatField
+      suffix: f
+  - sint:
+      class: SortableIntField
+      suffix: i
+  - slong:
+      class: SortableLongField
+      suffix: l
+  - string:
+      class: StrField
+      suffix: s
+  - tint:
+      class: TrieIntField
+      suffix: it
+  - tfloat:
+      class: TrieFloatField
+      suffix: ft
+  - tdouble:
+      class: TrieDoubleField
+  - tdate:
+      class: TrieDateField
+      suffix: dt
+fixed: !omap
+  - id:
+      type: string
+      attributes: [stored]
+  - type:
+      type: string
+      attributes: [multiValued]
+  - class_name:
+      type: string
+  - text:
+      type: string
+      attributes: [multiValued]
+  - lat:
+      type: tdouble
+      attributes: [stored]
+  - lng:
+      type: tdouble
+      attributes: [stored]
+  - 'random_*':
+      type: rand
+  - '_local*':
+      type: tdouble
+    
+variants: !omap
+  - multiValued: m
+  - stored: s

data/lib/sunspot/configuration.rb

@@ -2,16 +2,6 @@ module Sunspot
   # The Sunspot::Configuration module provides a factory method for Sunspot
   # configuration objects. Available properties are:
   #
-  # Sunspot.config.http_client::
-  #   The client to use for HTTP communication with Solr. Available options are
-  #   :net_http, which is the default and uses Ruby's built-in pure-Ruby HTTP
-  #   library; and :curb, which uses Ruby's libcurl bindings and requires
-  #   installation of the 'curb' gem.
-  # Sunspot.config.xml_builder::
-  #   The library use to build XML messages sent to Solr. As of this writing the
-  #   options are :builder and :libxml - the latter is faster but less portable,
-  #   as it is native code. Check the documentation for RSolr::Message::Adapter
-  #   for more information.
   # Sunspot.config.solr.url::
   #   The URL at which to connect to Solr
   #   (default: 'http://localhost:8983/solr')

data/lib/sunspot/dsl/field_query.rb

@@ -38,10 +38,91 @@ module Sunspot
         order_by(:random)
       end
 
-      # Request facets on the given field names. If the last argument is a hash,
-      # the given options will be applied to all specified fields. See
-      # Sunspot::Search#facet and Sunspot::Facet for information on what is
-      # returned.
+      #
+      # Request a facet on the search query. A facet is a feature of Solr that
+      # determines the number of documents that match the existing search *and*
+      # an additional criterion. This allows you to build powerful drill-down
+      # interfaces for search, at each step presenting the searcher with a set
+      # of refinements that are known to return results.
+      #
+      # In Sunspot, each facet returns zero or more rows, each of which
+      # represents a particular criterion conjoined with the actual query being
+      # performed. For _field_ _facets_, each row represents a particular value
+      # for a given field. For _query_ _facets_, each row represents an
+      # arbitrary scope; the facet itself is just a means of logically grouping
+      # the scopes.
+      #
+      # === Examples
+      #
+      # ==== Field Facets
+      #
+      # A field facet is specified by passing one or more Symbol arguments to
+      # this method:
+      #
+      #   Sunspot.search(Post) do
+      #     with(:blog_id, 1)
+      #     facet(:category_id)
+      #   end
+      #   
+      # The facet specified above will have a row for each category_id that is
+      # present in a document which also has a blog_id of 1.
+      #
+      # ==== Multiselect Facets
+      #
+      # In certain circumstances, it is beneficial to exclude certain query
+      # scopes from a facet; the most common example is multi-select faceting,
+      # where the user has selected a certain value, but the facet should still
+      # show all options that would be available if they had not:
+      #
+      #   Sunspot.search(Post) do
+      #     with(:blog_id, 1)
+      #     category_filter = with(:category_id, 2)
+      #     facet(:category_id, :exclude => category_filter)
+      #   end
+      # 
+      # Although the results of the above search will be restricted to those
+      # with a category_id of 2, the category_id facet will operate as if a
+      # category had not been selected, allowing the user to select additional
+      # categories (which will presumably be ORed together).
+      #
+      # <strong>As far as I can tell, Solr only supports multi-select with
+      # field facets; if +:exclude+ is passed to a query facet, this method will
+      # raise an error. Also, the +:only+ and +:extra+ options use query
+      # faceting under the hood, so these can't be used with +:extra+ either.
+      # </strong>
+      #
+      # ==== Query Facets
+      #
+      # A query facet is a collection of arbitrary scopes, each of which
+      # represents a row. This is specified by passing a block into the #facet
+      # method; the block then contains one or more +row+ blocks, each of which
+      # creates a query facet row. The +row+ blocks follow the usual Sunspot
+      # scope DSL.
+      #
+      # For example, a query facet can be used to facet over a set of ranges:
+      #
+      #   Sunspot.search(Post) do
+      #     facet(:average_rating) do
+      #       row(1.0..2.0) do
+      #         with(:average_rating, 1.0..2.0)
+      #       end
+      #       row(2.0..3.0) do
+      #         with(:average_rating, 2.0..3.0)
+      #       end
+      #       row(3.0..4.0) do
+      #         with(:average_rating, 3.0..4.0)
+      #       end
+      #       row(4.0..5.0) do
+      #         with(:average_rating, 4.0..5.0)
+      #       end
+      #     end
+      #   end
+      #
+      # Note that the arguments to the +facet+ and +row+ methods simply provide
+      # labels for the facet and its rows, so that they can be retrieved and
+      # identified from the Search object. They are not passed to Solr and no
+      # semantic meaning is attached to them. The label for +facet+ should be
+      # a symbol; the label for +row+ can be whatever you'd like.
       #
       # ==== Parameters
       #
@@ -58,12 +139,29 @@ module Sunspot
       # :zeros<Boolean>::
       #   Return facet rows for which there are no matches (equivalent to
       #   :minimum_count => 0). Default is false.
+      # :exclude<Object,Array>::
+      #   Exclude one or more filters when performing the faceting (see
+      #   Multiselect Faceting above). The object given for this argument should
+      #   be the return value(s) of a scoping method (+with+, +any_of+,
+      #   +all_of+, etc.). <strong>Only can be used for field facets that do not
+      #   use the +:extra+ or +:only+ options.</strong>
+      # :name<Symbol>::
+      #   Give a custom name to a field facet. The main use case for this option
+      #   is for requesting the same field facet multiple times, using different
+      #   filter exclusions (see Multiselect Faceting above). If you pass this
+      #   option, it is also the argument that should be passed to Search#facet
+      #   when retrieving the facet result.
+      # :only<Array>::
+      #   Only return facet rows for the given values. Useful if you are only
+      #   interested in faceting on a subset of values for a given field.
+      #   <strong>Only applies to field facets.</strong>
       # :extra<Symbol,Array>::
       #   One or more of :any and :none. :any returns a facet row with a count
       #   of all matching documents that have some value for this field. :none
       #   returns a facet row with a count of all matching documents that have
       #   no value for this field. The facet row(s) corresponding to the extras
-      #   have a value of the symbol passed.
+      #   have a value of the symbol passed. <strong>Only applies to field
+      #   facets.</strong>
       #
       def facet(*field_names, &block)
         options = Sunspot::Util.extract_options_from(field_names)
@@ -75,12 +173,24 @@ module Sunspot
               "wrong number of arguments (#{field_names.length} for 1)"
             )
           end
+          if options.has_key?(:exclude)
+            raise(
+              ArgumentError,
+              "can't use :exclude with query facets"
+            )
+          end
           search_facet = @search.add_query_facet(field_names.first, options)
           Sunspot::Util.instance_eval_or_call(
             QueryFacet.new(@query, @setup, search_facet),
             &block
           )
         elsif options[:only]
+          if options.has_key?(:exclude)
+            raise(
+              ArgumentError,
+              "can't use :exclude with :only (see documentation)"
+            )
+          end
           field_names.each do |field_name|
             field = @setup.field(field_name)
             search_facet = @search.add_field_facet(field, options)
@@ -97,7 +207,7 @@ module Sunspot
             field = @setup.field(field_name)
             facet =
               if options[:time_range]
-                unless field.type == Sunspot::Type::TimeType
+                unless field.type.is_a?(Sunspot::Type::TimeType)
                   raise(
                     ArgumentError,
                     ':time_range can only be specified for Date or Time fields'
@@ -106,11 +216,17 @@ module Sunspot
                 search_facet = @search.add_date_facet(field, options)
                 Sunspot::Query::DateFieldFacet.new(field, options)
               else
-                search_facet = @search.add_field_facet(field)
+                search_facet = @search.add_field_facet(field, options)
                 Sunspot::Query::FieldFacet.new(field, options)
               end
             @query.add_field_facet(facet)
             Util.Array(options[:extra]).each do |extra|
+              if options.has_key?(:exclude)
+                raise(
+                  ArgumentError,
+                  "can't use :exclude with :extra (see documentation)"
+                )
+              end
               extra_facet = Sunspot::Query::QueryFacet.new
               case extra
               when :any