thinking-sphinx 1.5.0 → 2.0.0.rc1

data/README.textile

@@ -1,5 +1,9 @@
 h1. Thinking Sphinx
 
+Please note: this is the branch for Rails 3. At some point in the near future, it will be released as Thinking Sphinx 2.0. It does not work with versions of Rails before v3 - I'm not sure if that'll happen in the future, but was just too much hassle right now.
+
+If you want to give this a spin, clone the repo, check out the rails3 branch, and run @rake build@ to generate the gem.
+
 h2. Usage
 
 First, if you haven't done so already, check out the main "usage":http://ts.freelancing-gods.com/usage.html page. Once you've done that, the next place to look for information is the specific method docs - ThinkingSphinx::Search and ThinkingSphinx::Index::Builder in particular.
@@ -15,11 +19,11 @@ To quickly see if your system is ready to run the thinking sphinx specs, run the
 To get the spec suite running, you will need to install the ginger gem:
 
 <pre><code>sudo gem install ginger --source http://gemcutter.org</code></pre>
-
+  
 Then install the cucumber, yard, jeweler and rspec gems. Make sure you have a git install version 1.6.0.0 or higher, otherwise the jeweler gem won't install. Bluecloth is required for some of the yard documentation.
 
 <pre>
-  sudo gem install bluecloth cucumber yard jeweler rspec
+  sudo gem install bluecloth cucumber yard jeweler rspec 
 </pre>
 
 Then set up your database:
@@ -28,7 +32,7 @@ Then set up your database:
   cp spec/fixtures/database.yml.default spec/fixtures/database.yml &&
   mysqladmin -u root create thinking_sphinx
 </pre>
-
+  
 This last step can be done automatically by the contribute.rb script if all dependencies are met.
 
 Make sure you don't have another Sphinx daemon (searchd) running. If you do, quit it with "rake ts:stop"
@@ -122,6 +126,7 @@ Since I first released this library, there's been quite a few people who have su
 * Andrei Bocan
 * László Bácsi
 * Peter Wagenet
+* Max Lapshin
 * Martin Emde
 * David Wennergren
 * Mark Lane
@@ -162,51 +167,13 @@ Since I first released this library, there's been quite a few people who have su
 * Edgars Beigarts
 * Ivan Ukhov
 * Tomáš Pospíšek
+* Jeffrey Hardy
+* David Heinemeier Hansson
+* Jimmy Hsu
+* Bruno Michel
+* Joren De Groof
+* Jan De Poorter
 * Tom Stuart
 * James Brooks
+* Andrew Coldham
 * Mark Dodwell
-* Frédéric Malamitsas
-* Jon Gubman
-* Michael Schuerig
-* Ben Hutton
-* Alfonso Jiménez
-* Szymon Nowak
-* Keith Pitt
-* Lee Capps
-* Sam Goldstein
-* Matt Todd
-* Paco Guzmán
-* Marcin Stecki
-* Robert Glaser
-* Paul Schyska
-* Kirill Maximov
-* Hans Hasselberg
-* Robert Stern
-* George Anderson
-* Greg Weber
-* Javier Ramírez
-* Patrick Tulskie
-* Konstantin Shabanov
-* Clemens Kofler
-* Ryan Mohr
-* Alex Chee
-* Bruno Santschi
-* Lars Weiler
-* Andrey Deryabin
-* Andrew White
-* Rémi Prévost
-* Justin Tanner
-* Josh Goebel
-* Ngan Pham
-* Martin Gordon
-* Aaron Gibralter
-* Pete Deffendol
-* Tony Pitale
-* Kenn Ejima
-* Matthew Barnett
-* Ilia Lobsanov
-* Andrew Hunter
-* Simon Hürlimann
-* Nathan Smith
-* Cedric Maion
-* George Ogata

data/VERSION

@@ -0,0 +1 @@
+2.0.0.rc1

data/features/attribute_transformation.feature

@@ -2,21 +2,21 @@ Feature: Handle not-quite-supported column types as attributes
   In order for Thinking Sphinx to be more understanding with model structures
   The plugin
   Should be able to use translatable columns as attributes
-
+  
   Scenario: Decimals as floats
     Given Sphinx is running
     And I am searching on alphas
     When I filter between 1.0 and 3.0 on cost
     Then I should get 2 results
-
+  
   Scenario: Dates as Datetimes
     Given Sphinx is running
     And I am searching on alphas
-    When I filter between 2 and 4 days ago on created_on by date
-    Then I should get 3 results
-
+    When I filter between 1 and 3 days ago on created_on
+    Then I should get 2 results
+  
   Scenario: Timestamps as Datetimes
     Given Sphinx is running
     And I am searching on alphas
-    When I filter between 2 and 4 days ago on created_at
-    Then I should get 2 results
+    When I filter between 1 and 3 days ago on created_at
+    Then I should get 2 results

data/features/attribute_updates.feature

@@ -2,13 +2,13 @@ Feature: Update attributes directly to Sphinx
   In order for updates to be more seamless
   The plugin
   Should update Sphinx's attributes where possible
-
+  
   Scenario: Updating attributes in Sphinx without delta indexes
     Given Sphinx is running
     And I am searching on alphas
     When I filter by 3 on value
     Then I should get 1 result
-
+    
     When I change the value of alpha four to 13
     And I wait for Sphinx to catch up
     And I filter by 13 on value
@@ -16,7 +16,7 @@ Feature: Update attributes directly to Sphinx
     Then I should get 1 result
     When I use index alternative_core
     Then I should get 1 result
-
+    
     When I change the value of alpha four to 4
     And I wait for Sphinx to catch up
     And I filter by 13 on value
@@ -30,49 +30,47 @@ Feature: Update attributes directly to Sphinx
     And I am searching on betas
     When I filter by 8 on value
     Then I should get 1 result
-
+    
     When I change the value of beta eight to 18
     And I wait for Sphinx to catch up
     And I filter by 18 on value
     Then I should get 1 result
-
-    When I search for the document id of beta eight in the secondary_beta_delta index
+    
+    When I search for the document id of beta eight in the beta_delta index
     Then it should not exist
-
+  
   Scenario: Updating attributes in a delta index
     Given Sphinx is running
     And I am searching on betas
-
+    
     When I change the name of beta nine to nineteen
     And I change the value of beta nineteen to 19
     And I wait for Sphinx to catch up
-
+    
     When I filter by 19 on value
-    And I use index secondary_beta_delta
-    And I clear the connection pool
+    And I use index beta_delta
     Then I should get 1 result
-
+    
   Scenario: Updating attributes in a delta index with deltas disabled
     Given Sphinx is running
     And I am searching on betas
-
+  
     When I change the name of beta eleven to twentyone
     And I disable delta updates
     And I change the value of beta twentyone to 21
     And I wait for Sphinx to catch up
-    And I clear the connection pool
-
+  
     When I filter by 21 on value
-    And I use index secondary_beta_delta
+    And I use index beta_delta
     Then I should get 1 result
     And I enable delta updates
-
+  
   Scenario: Updating boolean attribute in Sphinx
     Given Sphinx is running
     And I am searching on alphas
     When I filter by active alphas
     Then I should get 10 results
-
+    
     When I flag alpha five as inactive
     And I wait for Sphinx to catch up
     And I filter by active alphas

data/features/deleting_instances.feature

@@ -2,52 +2,50 @@ Feature: Keeping Sphinx in line with deleted model instances
   In order to avoid deleted items being returned by Sphinx
   Thinking Sphinx
   Should keep deleted items out of search results
-
+  
   Scenario: Deleting instances from the core index
     Given Sphinx is running
     And I am searching on betas
     When I search for three
     Then I should get 1 result
-
+    
     When I destroy beta three
     And I wait for Sphinx to catch up
     And I search for three
     Then I should get 0 results
-
+  
   Scenario: Deleting subclasses when the parent class is indexed
     Given Sphinx is running
     And I am searching on cats
     When I search for moggy
     Then I should get 1 result
-
+    
     When I destroy cat moggy
     And I wait for Sphinx to catch up
     And I search for moggy
     Then I should get 0 results
-
+  
   Scenario: Deleting created instances from the delta index
     Given Sphinx is running
     And I am searching on betas
-    When I create a new beta named eighteen
+    When I create a new beta named eleven
     And I wait for Sphinx to catch up
-    And I clear the connection pool
-    And I search for eighteen
+    And I search for eleven
     Then I should get 1 result
-
-    When I destroy beta eighteen
+    
+    When I destroy beta eleven
     And I wait for Sphinx to catch up
-    And I search for eighteen
+    And I search for eleven
     Then I should get 0 results
-
+  
   Scenario: Deleting edited instances from the delta index
     Given Sphinx is running
     And I am searching on betas
     When I change the name of beta four to fourteen
     And I wait for Sphinx to catch up
-    And I clear the connection pool
     And I search for fourteen
     Then I should get 1 result
-
+    
     When I destroy beta fourteen
     And I wait for Sphinx to catch up
     And I search for fourteen
@@ -58,10 +56,9 @@ Feature: Keeping Sphinx in line with deleted model instances
     And I am searching on betas
     When I create a new beta named thirteen
     And I wait for Sphinx to catch up
-    And I clear the connection pool
     And I search for thirteen
     Then I should get 1 result
-
+    
     And I disable delta updates
     And I destroy beta thirteen
     And I wait for Sphinx to catch up

data/features/excerpts.feature

@@ -11,11 +11,3 @@ Feature: Generate excerpts for search results
     And I am searching on comments
     And I search for "lorem"
     Then calling content on the first result excerpts object should return "de un sitio mientras que mira su diseño. El punto de usar <span class="match">Lorem</span> Ipsum es que tiene una distribución"
-
-  Scenario: Excerpt Options
-    Given Sphinx is running
-    And I am searching on comments
-    And I search for "lorem"
-    And I provide excerpt option "before_match" with value "<em>"
-    And I provide excerpt option "after_match" with value "</em>"
-    Then calling content on the first result excerpts object should return "de un sitio mientras que mira su diseño. El punto de usar <em>Lorem</em> Ipsum es que tiene una distribución"

data/features/facets.feature

@@ -1,10 +1,8 @@
 Feature: Search and browse models by their defined facets
   
-  Background:
-    Given Sphinx is running
-  
   Scenario: Requesting facets
-    Given I am searching on developers
+    Given Sphinx is running
+    And I am searching on developers
     When I am requesting facet results
     Then I should have valid facet results
     And I should have 6 facets
@@ -16,7 +14,8 @@ Feature: Search and browse models by their defined facets
     And I should have the facet Tags
   
   Scenario: Requesting specific facets
-    Given I am searching on developers
+    Given Sphinx is running
+    And I am searching on developers
     When I am requesting facet results
     And I am requesting just the facet State
     Then I should have valid facet results
@@ -28,26 +27,30 @@ Feature: Search and browse models by their defined facets
     And I should have the facet State
     And I should have the facet Age
   
-  Scenario: Requesting float facets
-    Given I am searching on alphas
+  Scenario: Requseting float facets
+    Given Sphinx is running
+    And I am searching on alphas
     When I am requesting facet results
     Then I should have 1 facet
     And the Cost facet should have a 5.55 key
   
   Scenario: Requesting facet results
-    Given I am searching on developers
+    Given Sphinx is running
+    And I am searching on developers
     When I am requesting facet results
     And I drill down where Country is Australia
     Then I should get 11 results
   
   Scenario: Requesting facet results by multiple facets
-    Given I am searching on developers
+    Given Sphinx is running
+    And I am searching on developers
     When I am requesting facet results
     And I drill down where Country is Australia and Age is 30
     Then I should get 4 results
     
   Scenario: Requesting facets with classes included
-    Given I am searching on developers
+    Given Sphinx is running
+    And I am searching on developers
     When I am requesting facet results
     And I want classes included
     Then I should have valid facet results
@@ -55,7 +58,8 @@ Feature: Search and browse models by their defined facets
     And I should have the facet Class
   
   Scenario: Requesting MVA facets
-    Given I am searching on developers
+    Given Sphinx is running
+    And I am searching on developers
     When I am requesting facet results
     And I drill down where tag_ids includes the id of tag Australia
     Then I should get 11 results
@@ -64,25 +68,15 @@ Feature: Search and browse models by their defined facets
     Then I should get 5 results
   
   Scenario: Requesting MVA string facets
-    Given I am searching on developers
+    Given Sphinx is running
+    And I am searching on developers
     When I am requesting facet results
     Then the Tags facet should have an "Australia" key
     Then the Tags facet should have an "Melbourne" key
     Then the Tags facet should have an "Victoria" key
 
   Scenario: Requesting MVA facets from source queries
-    Given I am searching on posts
+    Given Sphinx is running
+    And I am searching on posts
     When I am requesting facet results
     Then the Comment Ids facet should have 9 keys
-  
-  Scenario: Requesting facets from a subclass
-    Given I am searching on animals
-    When I am requesting facet results
-    And I want classes included
-    Then I should have the facet Class
-  
-  Scenario: Requesting facets with explicit value sources
-    Given I am searching on developers
-    When I am requesting facet results
-    Then the City facet should have a "Melbourne" key
-  

data/features/handling_edits.feature

@@ -2,75 +2,70 @@ Feature: Keeping Sphinx in line with model changes when requested
   In order to keep indexes as up to date as possible
   Thinking Sphinx
   Should return the expected results depending on whether delta indexes are used
-
+  
   Scenario: Returning instance from old data if there is no delta
     Given Sphinx is running
     And I am searching on alphas
     When I search for two
     Then I should get 1 result
-
+    
     When I change the name of alpha two to twelve
     And I wait for Sphinx to catch up
     And I search for two
     Then I should get 1 result
-
+  
   Scenario: Not returning an instance from old data if there is a delta
     Given Sphinx is running
     And I am searching on betas
     When I search for two
     Then I should get 1 result
-
+  
     When I change the name of beta two to twelve
     And I wait for Sphinx to catch up
-    And I clear the connection pool
     And I search for two
     Then I should get 0 results
-
+  
   Scenario: Returning instance from new data if there is a delta
     Given Sphinx is running
     And I am searching on betas
     When I search for one
     Then I should get 1 result
-
-    When I change the name of beta one to eleventeen
+  
+    When I change the name of beta one to eleven
     And I wait for Sphinx to catch up
-    And I clear the connection pool
     And I search for one
     Then I should get 0 results
-
-    When I search for eleventeen
+    
+    When I search for eleven
     Then I should get 1 result
-
+  
   Scenario: Returning new records if there's a delta
     Given Sphinx is running
     And I am searching on betas
     When I search for fifteen
     Then I should get 0 results
-
+    
     When I create a new beta named fifteen
     And I wait for Sphinx to catch up
-    And I clear the connection pool
     And I search for fifteen
     Then I should get 1 result
-
+  
   Scenario: Avoiding delta updates if there hasn't been changes
     Given Sphinx is running
     And I am searching on betas
     When I search for five
     Then I should get 1 result
-
+    
     When I change the name of beta five to five
     And I wait for Sphinx to catch up
     And I search for five
     Then I should get 1 result
-
+    
     When I search for the document id of beta five in the beta_core index
     Then it should exist if using Rails 2.1 or newer
-    When I search for the document id of beta five in the secondary_beta_core index
-    Then it should exist if using Rails 2.1 or newer
-    When I search for the document id of beta five in the secondary_beta_delta index
+    When I search for the document id of beta five in the beta_delta index
     Then it should not exist if using Rails 2.1 or newer
-
+  
   Scenario: Handling edits with a delta when Sphinx isn't running
     Given Sphinx is running
     And I am searching on betas
@@ -79,19 +74,19 @@ Feature: Keeping Sphinx in line with model changes when requested
     And I start Sphinx
     And I search for sixteen
     Then I should get 1 result
-
+  
   Scenario: Handling edits when updates are disabled
     Given Sphinx is running
     And updates are disabled
     And I am searching on betas
-
+    
     When I search for seven
     Then I should get 1 result
-
+    
     When I change the name of beta seven to seventeen
     And I wait for Sphinx to catch up
     And I search for seven
     Then I should get 1 result
-
+    
     When I search for seventeen
     Then I should get 0 results