Merge branch 'master' into avoid-pks-seen-on-update

Change smart_text into smart_bytes as in master

Conflicts:
	haystack/management/commands/update_index.py

Author: stefanw

.gitignore

@@ -1,3 +1,4 @@
+.settings
 *.pyc
 .DS_Store
 _build
@@ -7,6 +8,8 @@ dist
 build
 MANIFEST
 .tox
+env
+env3
 
 # Because I'm ghetto like that.
 tests/pyelasticsearch.py

.travis.yml

@@ -1,9 +1,32 @@
 language: python
 python:
-    - "2.6"
-    - "2.7"
-    - "3.2"
+  - "2.7"
 
-branches:
-    only:
-        - travis-config
+before_install:
+  - sudo apt-get update
+  - sudo apt-get install wajig binutils gdal-bin libproj-dev libgeos-c1 libxapian22 python-xapian default-jdk
+  - curl https://raw.github.com/moliware/travis-solr/master/travis-solr.sh | SOLR_CONFS="tests/schema.xml tests/solrconfig.xml" SOLR_VERSION=4.4.0 bash
+
+install:
+  - pip install tox
+  - pip install -e .
+
+script:
+  - tox -e $TOX_ENV
+
+env:
+  - TOX_ENV=py26-django1.4
+  - TOX_ENV=py26-django1.5
+  - TOX_ENV=py26-django1.6
+  - TOX_ENV=py27-django1.4
+  - TOX_ENV=py27-django1.5
+  - TOX_ENV=py27-django1.6
+  - TOX_ENV=py32-django1.5
+  - TOX_ENV=py32-django1.6
+
+services:
+  - elasticsearch
+
+notifications:
+  #irc: "irc.freenode.org#haystack"
+  email: false

AUTHORS

@@ -4,7 +4,17 @@ Primary Authors:
     * Matt Croydon (some documentation, sanity checks and the sweet name)
     * Travis Cline (the original SQ implementation, improvements to ModelSearchIndex)
     * David Sauve (notanumber) for the Xapian backend, the simple backend and various patches.
-    * Jannis Leidel
+    * Jannis Leidel (jezdez)
+    * Chris Adams (acdha)
+    * Justin Caratzas (bigjust)
+    * Andrew Schoen (andrewschoen)
+    * Dan Watson (dcwatson)
+    * Matt Woodward (mpwoodward)
+    * Alex Vidal (avidal)
+    * Zach Smith (zmsmith)
+    * Stefan Wehrmeyer (stefanw)
+    * George Hickman (ghickman)
+    * Ben Spaulding (benspaulding)
 
 
 Thanks to
@@ -69,3 +79,10 @@ Thanks to
     * Eric Holscher (ericholscher) for a docs fix.
     * Erik Rose (erikrose) for a quick pyelasticsearch-compatibility patch
     * Stefan Wehrmeyer (stefanw) for a simple search filter fix
+    * Dan Watson (dcwatson) for various patches.
+    * Andrew Schoen (andrewschoen) for the addition of ``HAYSTACK_IDENTIFIER_METHOD``
+    * Pablo SEMINARIO (pabluk) for a docs fix, and a fix in the ElasticSearch backend.
+    * Eric Thurgood (ethurgood) for a import fix in the Elasticssearch backend.
+    * Revolution Systems & The Python Software Foundation for funding a significant portion of the port to Python 3!
+    * Artem Kostiuk (postatum) for patch allowing to search for slash character in ElasticSearch since Lucene 4.0.
+    * Luis Barrueco (luisbarrueco) for a simple fix regarding updating indexes using multiple backends.

LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2009-2012, Daniel Lindsley.
+Copyright (c) 2009-2013, Daniel Lindsley.
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without modification,

README.rst

@@ -3,7 +3,7 @@ Haystack
 ========
 
 :author: Daniel Lindsley
-:date: 2012/03/30
+:date: 2013/07/28
 
 Haystack provides modular search for Django. It features a unified, familiar
 API that allows you to plug in different search backends (such as Solr_,
@@ -33,7 +33,9 @@ Documentation
 =============
 
 * Development version: http://docs.haystacksearch.org/
-* v1.2.X: http://django-haystack.readthedocs.org/en/v1.2.6/
+* v2.1.X: http://django-haystack.readthedocs.org/en/v2.1.0/
+* v2.0.X: http://django-haystack.readthedocs.org/en/v2.0.0/
+* v1.2.X: http://django-haystack.readthedocs.org/en/v1.2.7/
 * v1.1.X: http://django-haystack.readthedocs.org/en/v1.1/
 
 
@@ -42,25 +44,9 @@ Requirements
 
 Haystack has a relatively easily-met set of requirements.
 
-* Python 2.5+
-* Django 1.3+
+* Python 2.6+ or Python 3.3+
+* Django 1.5+
 
 Additionally, each backend has its own requirements. You should refer to
 http://docs.haystacksearch.org/dev/installing_search_engines.html for more
 details.
-
-
-Commercial Support
-==================
-
-If you're using Haystack in a commercial environment, paid support is available
-from `Toast Driven`_. Services offered include:
-
-* Advice/help with setup
-* Implementation in your project
-* Bugfixes in Haystack itself
-* Features in Haystack itself
-
-If you're interested, please contact Daniel Lindsley ([email protected]).
-
-.. _`Toast Driven`: http://toastdriven.com/

docs/autocomplete.rst

@@ -105,7 +105,7 @@ A stripped-down view might look like::
 
 
     def autocomplete(request):
-        sqs = SearchQuerySet().autocomplete(request.GET.get('q', ''))[:5]
+        sqs = SearchQuerySet().autocomplete(content_auto=request.GET.get('q', ''))[:5]
         suggestions = [result.title for result in sqs]
         # Make sure you return a JSON object, not a bare list.
         # Otherwise, you could be vulnerable to an XSS attack.

docs/backend_support.rst

@@ -50,7 +50,7 @@ Elasticsearch
 * Stored (non-indexed) fields
 * Highlighting
 * Spatial search
-* Requires: pyelasticsearch 0.4+ & Elasticsearch 0.17.7+
+* Requires: elasticsearch-py 0.4.3+ & Elasticsearch 0.17.7+
 
 Whoosh
 ------
@@ -59,10 +59,11 @@ Whoosh
 
 * Full SearchQuerySet support
 * Automatic query building
+* "More Like This" functionality
 * Term Boosting
 * Stored (non-indexed) fields
 * Highlighting
-* Requires: whoosh (1.1.1+)
+* Requires: whoosh (2.0.0+)
 
 Xapian
 ------
@@ -89,7 +90,7 @@ Backend Support Matrix
 +----------------+------------------------+---------------------+----------------+------------+----------+---------------+--------------+---------+
 | Elasticsearch  | Yes                    | Yes                 | Yes            | Yes        | Yes      | Yes           | Yes          | Yes     |
 +----------------+------------------------+---------------------+----------------+------------+----------+---------------+--------------+---------+
-| Whoosh         | Yes                    | Yes                 | No             | Yes        | No       | Yes           | Yes          | No      |
+| Whoosh         | Yes                    | Yes                 | Yes            | Yes        | No       | Yes           | Yes          | No      |
 +----------------+------------------------+---------------------+----------------+------------+----------+---------------+--------------+---------+
 | Xapian         | Yes                    | Yes                 | Yes            | Yes        | Yes      | Yes           | Yes (plugin) | No      |
 +----------------+------------------------+---------------------+----------------+------------+----------+---------------+--------------+---------+

docs/boost.rst

@@ -23,7 +23,7 @@ Despite all being types of boost, they take place at different times and have
 slightly different effects on scoring.
 
 Term boost happens at query time (when the search query is run) and is based
-around increasing the score is a certain word/phrase is seen.
+around increasing the score if a certain word/phrase is seen.
 
 On the other hand, document & field boosts take place at indexing time (when
 the document is being added to the index). Document boost causes the relevance

docs/conf.py

@@ -38,16 +38,16 @@
 
 # General information about the project.
 project = u'Haystack'
-copyright = u'2009-2012, Daniel Lindsley'
+copyright = u'2009-2013, Daniel Lindsley'
 
 # The version info for the project you're documenting, acts as replacement for
 # |version| and |release|, also used in various other places throughout the
 # built documents.
 #
 # The short X.Y version.
-version = '2.0'
+version = '2.1.1'
 # The full version, including alpha/beta/rc tags.
-release = '2.0.0-beta'
+release = '2.1.1-dev'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.

docs/faceting.rst

@@ -8,7 +8,7 @@ What Is Faceting?
 -----------------
 
 Faceting is a way to provide users with feedback about the number of documents
-which match terms they may be interested in. At it's simplest, it gives
+which match terms they may be interested in. At its simplest, it gives
 document counts based on words in the corpus, date ranges, numeric ranges or
 even advanced queries.
 

docs/glossary.rst

@@ -4,7 +4,7 @@
 Glossary
 ========
 
-Search is a domain full of it's own jargon and definitions. As this may be an
+Search is a domain full of its own jargon and definitions. As this may be an
 unfamiliar territory to many developers, what follows are some commonly used
 terms and what they mean.
 

docs/index.rst

@@ -13,8 +13,8 @@ Elasticsearch_, Whoosh_, Xapian_, etc.) without having to modify your code.
 
 .. note::
 
-    This documentation represents the development version of Haystack. For
-    old versions of the documentation: `1.2`_, `1.1`_.
+    This documentation represents the development version of Haystack (2.0.x).
+    For old versions of the documentation: `1.2`_, `1.1`_.
 
 .. _`1.2`: http://django-haystack.readthedocs.org/en/v1.2.6/index.html
 .. _`1.1`: http://django-haystack.readthedocs.org/en/v1.1/index.html
@@ -44,6 +44,7 @@ you up and running:
    debugging
 
    migration_from_1_to_2
+   python3
    contributing
 
 
@@ -109,24 +110,8 @@ Requirements
 
 Haystack has a relatively easily-met set of requirements.
 
-* Python 2.5+
-* Django 1.3+
+* Python 2.6+ or Python 3.3+
+* Django 1.5+
 
 Additionally, each backend has its own requirements. You should refer to
 :doc:`installing_search_engines` for more details.
-
-
-Commercial Support
-==================
-
-If you're using Haystack in a commercial environment, paid support is available
-from `Toast Driven`_. Services offered include:
-
-* Advice/help with setup
-* Implementation in your project
-* Bugfixes in Haystack itself
-* Features in Haystack itself
-
-If you're interested, please contact Daniel Lindsley ([email protected]).
-
-.. _`Toast Driven`: http://toastdriven.com/

docs/inputtypes.rst

@@ -125,7 +125,7 @@ Example::
 
 .. class:: haystack.inputs.AltParser
 
-``AltParser`` let's you specify that a portion of the query should use a
+``AltParser`` lets you specify that a portion of the query should use a
 separate parser in the search engine. This is search-engine-specific, so it may
 decrease the portability of your app.
 
@@ -153,7 +153,7 @@ The ``prepare`` method lets you alter the query the user provided before it
 becomes of the main query. It is lazy, called as late as possible, right before
 the final query is built & shipped to the engine.
 
-A full, if somewhat silly, example look like::
+A full, if somewhat silly, example looks like::
 
     from haystack.inputs import Clean
 

docs/installing_search_engines.rst

@@ -42,7 +42,7 @@ somewhere on your ``PYTHONPATH``.
 
 .. note::
 
-    ``pysolr`` has it's own dependencies that aren't covered by Haystack. For
+    ``pysolr`` has its own dependencies that aren't covered by Haystack. For
     best results, you should have an ElementTree variant install (preferably the
     ``lxml`` variant), ``httplib2`` for timeouts (though it will fall back to
     ``httplib``) and either the ``json`` module that comes with Python 2.5+ or
@@ -74,7 +74,7 @@ Something like the following is suggested::
         suggestions = indexes.FacetCharField()
 
         def prepare(self, obj):
-            prepared_data = super(NoteIndex, self).prepare(obj)
+            prepared_data = super(MySearchIndex, self).prepare(obj)
             prepared_data['suggestions'] = prepared_data['text']
             return prepared_data
 
@@ -117,8 +117,8 @@ Official Download Location: http://www.elasticsearch.org/download/
 
 Elasticsearch is Java but comes in a pre-packaged form that requires very
 little other than the JRE. It's also very performant, scales easily and has
-an advanced featureset. Haystack requires at least version 0.17.7 (0.18.6 is
-current as of writing). Installation is best done using a package manager::
+an advanced featureset. Haystack requires at least version 0.90.0+.
+Installation is best done using a package manager::
 
     # On Mac OS X...
     brew install elasticsearch
@@ -130,7 +130,7 @@ current as of writing). Installation is best done using a package manager::
     elasticsearch -f -D es.config=<path to YAML config>
 
     # Example:
-    elasticsearch -f -D es.config=/usr/local/Cellar/elasticsearch/0.17.7/config/elasticsearch.yml
+    elasticsearch -f -D es.config=/usr/local/Cellar/elasticsearch/0.90.0/config/elasticsearch.yml
 
 You may have to alter the configuration to run on ``localhost`` when developing
 locally. Modifications should be done in a YAML file, the stock one being
@@ -152,17 +152,16 @@ locally. Modifications should be done in a YAML file, the stock one being
       logs: /usr/local/var/log
       data: /usr/local/var/data
 
-You'll also need an Elasticsearch binding: pyelasticsearch_ (**NOT**
-``pyes``). Place ``pyelasticsearch`` somewhere on your ``PYTHONPATH``
-(usually ``python setup.py install`` or ``pip install pyelasticsearch``).
+You'll also need an Elasticsearch binding: elasticsearch-py_ (**NOT**
+``pyes``). Place ``elasticsearch`` somewhere on your ``PYTHONPATH``
+(usually ``python setup.py install`` or ``pip install elasticsearch``).
 
-.. _pyelasticsearch: http://pypi.python.org/pypi/pyelasticsearch/
+.. _elasticsearch-py: http://pypi.python.org/pypi/elasticsearch/
 
 .. note::
 
-    ``pyelasticsearch`` has it's own dependencies that aren't covered by
-    Haystack. You'll also need ``requests`` & ``simplejson`` for speedier
-    JSON construction/parsing.
+    ``elasticsearch`` has its own dependencies that aren't covered by
+    Haystack. You'll also need ``urllib3``.
 
 
 Whoosh
@@ -172,11 +171,8 @@ Official Download Location: http://bitbucket.org/mchaput/whoosh/
 
 Whoosh is pure Python, so it's a great option for getting started quickly and
 for development, though it does work for small scale live deployments. The
-current recommended version is 1.3.1+. You can install via PyPI_ using::
-
-    sudo easy_install whoosh
-    # ... or ...
-    sudo pip install whoosh
+current recommended version is 1.3.1+. You can install via PyPI_ using
+``sudo easy_install whoosh`` or ``sudo pip install whoosh``.
 
 Note that, while capable otherwise, the Whoosh backend does not currently
 support "More Like This" or faceting. Support for these features has recently

docs/other_apps.rst

@@ -28,6 +28,14 @@ Also provides a queue-based setup, this time centered around Celery. Useful
 for keeping the index fresh per model instance or with the included task
 to call the ``update_index`` management command instead.
 
+haystack-rqueue
+---------------
+
+https://github.com/mandx/haystack-rqueue (2.X compatible)
+
+Also provides a queue-based setup, this time centered around RQ. Useful
+for keeping the index fresh using ``./manage.py rqworker``.
+
 django-celery-haystack
 ----------------------