Merge remote-tracking branch 'origin/master' into docs-restructuring

docs/CHANGES.rst

@@ -13,6 +13,10 @@ Changelog
 - Added context to search utility. This allows query to be used in AJAX calls.
   [tomgross]
 
+- Use GET method in spell check request (as it's an idempotent request which
+  does not affect server state)
+  [reinhardt]
+
 
 4.1.0 (2015-02-19)
 ------------------

src/collective/solr/browser/suggest.py

@@ -25,8 +25,8 @@ def __call__(self):
         params['wt'] = 'json'
 
         params = urllib.urlencode(params, doseq=True)
-        response = connection.doPost(
-            connection.solrBase + '/spell?' + params, '', {})
+        response = connection.doGet(
+            connection.solrBase + '/spell?' + params, {})
         results = json.loads(response.read())
 
         # Check for spellcheck

src/collective/solr/solr.py

@@ -122,8 +122,14 @@ def setTimeout(self, timeout):
         self.conn.setTimeout(timeout)
 
     def doPost(self, url, body, headers):
+        return self.doGetOrPost('POST', url, body, headers)
+
+    def doGet(self, url, headers):
+        return self.doGetOrPost('GET', url, '', headers)
+
+    def doGetOrPost(self, method, url, body, headers):
         try:
-            self.conn.request('POST', url, body, headers)
+            self.conn.request(method, url, body, headers)
             return self.__errcheck(self.conn.getresponse())
         except (
             socket.error, httplib.CannotSendRequest,
@@ -136,7 +142,7 @@ def doPost(self, url, body, headers):
             # HTTPConnection object can get in a bad state (seems like they
             # might be "ghosted" in the zodb).
             self.__reconnect()
-            self.conn.request('POST', url, body, headers)
+            self.conn.request(method, url, body, headers)
             return self.__errcheck(self.conn.getresponse())
 
     def doUpdateXML(self, request):

src/collective/solr/tests/test_browser_suggest.py

@@ -58,6 +58,9 @@ class MockConnection():
     def doPost(self, url, foo, bar):
         return MockResponse()
 
+    def doGet(self, url, bar):
+        return MockResponse()
+
 
 class MockSolrConnectionManager():