thinking-sphinx 2.0.5 → 2.0.6

data/README.textile

@@ -126,7 +126,6 @@ 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
@@ -210,3 +209,10 @@ Since I first released this library, there's been quite a few people who have su
 * Alex Chee
 * Florent Piteau
 * Bruno Santschi
+* Lars Weiler
+* Andrey Deryabin
+* Andrew White
+* Rémi Prévost
+* Justin Tanner
+* Josh Goebel
+* Jonathan Viney

data/features/searching_by_model.feature

@@ -2,19 +2,19 @@ Feature: Searching on a single model
   In order to use Thinking Sphinx's core functionality
   A developer
   Should be able to search on a single model
-  
+
   Scenario: Searching using a basic query
     Given Sphinx is running
     And I am searching on people
     When I search for James
     Then I should get 3 results
-  
+
   Scenario: Searching on a specific field
     Given Sphinx is running
     And I am searching on people
     When I search for James on first_name
     Then I should get 2 results
-  
+
   Scenario: Searching on multiple fields
     Given Sphinx is running
     And I am searching on people
@@ -25,32 +25,32 @@ Feature: Searching on a single model
   Scenario: Searching on association content
 	  Given Sphinx is running
 	  And I am searching on posts
-	
+
 	  When I search for "Waffles"
 	  Then I should get 1 result
 
 	  When I search for "Turtle"
 	  Then I should get 1 result
-  
+
   Scenario: Searching with a filter
     Given Sphinx is running
     And I am searching on alphas
     When I filter by 1 on value
     Then I should get 1 result
-  
+
   Scenario: Searching with multiple filters
     Given Sphinx is running
     And I am searching on boxes
     When I filter by 2 on width
     And I filter by 2 on length
     Then I should get 1 result
-  
+
   Scenario: Searching with a ranged time filter
     Given Sphinx is running
     And I am searching on people
     When I filter by birthday between 1975 and 1976
     Then I should get 16 results
-    
+
   Scenario: Searching to filter multiple values on an MVA
     Given Sphinx is running
     And I am searching on boxes
@@ -59,31 +59,25 @@ Feature: Searching on a single model
     When I clear existing filters
     And I filter by both 11 and 12 on dimensions
     Then I should get 1 result
-  
+
   Scenario: Filtering on timestamp MVAs
     Given Sphinx is running
     And I am searching on posts
     When I filter by 2001-01-01 on comments_created_at
     Then I should get 1 result
-  
-  Scenario: Filtering on a wordcount attribute
-    Given Sphinx is running
-    And I am searching on developers
-    When I filter between 0 and 1 on state_wordcount
-    Then I should get 5 results
-  
+
   Scenario: Searching by NULL/0 values in MVAs
     Given Sphinx is running
     And I am searching on boxes
     When I filter by 0 on dimensions
     Then I should get 1 result
-    
+
     Given Sphinx is running
     And I am searching on developers
     When I clear existing filters
     And I filter by 0 on tag_ids
     Then I should get 1 result
-  
+
   Scenario: Searching on a MVA configured as ranged_query
     Given Sphinx is running
     And I am searching on posts
@@ -95,59 +89,59 @@ Feature: Searching on a single model
     When I clear existing filters
     And I filter by 10 on comment_ids
     Then I should get 0 results
-  
+
   Scenario: Searching with ordering by attribute
     Given Sphinx is running
     And I am searching on alphas
     When I order by value
     Then I should get 10 results
     And the value of each result should indicate order
-  
+
   Scenario: Intepreting Sphinx Internal Identifiers
     Given Sphinx is running
     And I am searching on people
     Then I should get 20 results
     And each result id should match the corresponding sphinx internal id
-  
+
   Scenario: Retrieving weightings
     Given Sphinx is running
     And I am searching on people
     When I search for "Ellie Ford"
     And I set match mode to any
     Then I can iterate by result and weighting
-  
+
   Scenario: Retrieving group counts
     Given Sphinx is running
     And I am searching on people
     When I group results by the birthday attribute
     Then I can iterate by result and count
-  
+
   Scenario: Retrieving group values
     Given Sphinx is running
     And I am searching on people
     When I group results by the birthday attribute
     Then I can iterate by result and group
-  
+
   Scenario: Retrieving both group values and counts
     Given Sphinx is running
     And I am searching on people
     When I group results by the birthday attribute
     Then I can iterate by result and group and count
-  
+
   Scenario: Searching for ids
     Given Sphinx is running
     And I am searching on people
     When I search for Ellie
     And I am searching for ids
     Then I should have an array of integers
-  
+
   Scenario: Search results should match Sphinx's order
     Given Sphinx is running
     And I am searching on people
     When I search for Ellie
     And I order by "sphinx_internal_id DESC"
     Then searching for ids should match the record ids of the normal search results
-  
+
   Scenario: Retrieving total result count when total is less than a page
     Given Sphinx is running
     And I am searching on people
@@ -160,7 +154,7 @@ Feature: Searching on a single model
     And I am searching on people
     When I am retrieving the result count
     Then I should get a value of 1000
-  
+
   Scenario: Searching with Unicode Characters
     Given Sphinx is running
     And I am searching on people
@@ -172,10 +166,10 @@ Feature: Searching on a single model
     And I am searching on posts
     When I search for "Shakespeare"
     Then I should get 1 result
-  
+
   Scenario: Searching on content from file field
     Given Sphinx is running
     And I am searching on posts
     When I search for "foo bar baz"
     Then I should get 1 result
-  
+

data/features/step_definitions/common_steps.rb

@@ -1,6 +1,6 @@
 Before do
   $queries_executed = []
-  
+
   @model      = nil
   @method     = :search
   @query      = ""
@@ -10,7 +10,7 @@ Before do
   @with_all   = {}
   @options    = {}
   @results    = nil
-  
+
   Given "updates are enabled"
 end
 
@@ -73,7 +73,7 @@ end
 
 When /^I filter by (\d\d\d\d)\-(\d\d)\-(\d\d) on (\w+)$/ do |y, m, d, attribute|
   @results = nil
-  @with[attribute.to_sym] = Time.local(y.to_i, m.to_i, d.to_i).to_i
+  @with[attribute.to_sym] = Time.gm(y.to_i, m.to_i, d.to_i).to_i
 end
 
 When /^I filter by (\d+) and (\d+) on (\w+)$/ do |value_one, value_two, attribute|
@@ -150,7 +150,7 @@ Then /^the (\w+) of each result should indicate order$/ do |attribute|
     unless prev.nil?
       current.send(attribute.to_sym).should >= prev.send(attribute.to_sym)
     end
-    
+
     current
   end
 end
@@ -166,7 +166,7 @@ Then /^I can iterate by result and (\w+)$/ do |attribute|
       attr_value.should be_kind_of(Integer)
     end
   }
-  
+
   results.send("each_with_#{attribute}", &iteration)
 end
 

data/features/thinking_sphinx/db/.gitignore

@@ -0,0 +1 @@
+database.yml

data/features/thinking_sphinx/db/fixtures/post_keywords.txt

@@ -0,0 +1 @@
+foo bar baz

data/spec/fixtures/data.sql

@@ -0,0 +1,32 @@
+insert into `people` (gender, first_name, middle_initial, last_name, street_address, city, state, postcode, email, birthday, team_id, team_type) values('female','Ellie','K','Ford','38 Mills Street','Eagle Farm Bc','QLD','4009','Ellie.K.Ford@mailinator.com','1970/1/23 00:00:00', 3, 'CricketTeam');
+insert into `people` (gender, first_name, middle_initial, last_name, street_address, city, state, postcode, email, birthday, team_id, team_type) values('female','Aaliyah','E','Allen','71 Murphy Street','Wyola West','WA','6407','Aaliyah.E.Allen@dodgit.com','1980/3/23 00:00:00', 3, 'CricketTeam');
+insert into `people` (gender, first_name, middle_initial, last_name, street_address, city, state, postcode, email, birthday, team_id, team_type) values('male','Callum','C','Miah','89 Dalgarno Street','Bullawa Creek','NSW','2390','Callum.C.Miah@trashymail.com','1973/3/25 00:00:00', 3, 'CricketTeam');
+insert into `people` (gender, first_name, middle_initial, last_name, street_address, city, state, postcode, email, birthday, team_id, team_type) values('male','Finley','L','Buckley','18 Queen Street','Manly Vale','NSW','2093','Finley.L.Buckley@spambob.com','1962/11/20 00:00:00', 3, 'CricketTeam');
+insert into `people` (gender, first_name, middle_initial, last_name, street_address, city, state, postcode, email, birthday, team_id, team_type) values('female','Poppy','A','Hilton','36 Nerrigundah Drive','Nyora','VIC','3987','Poppy.A.Hilton@dodgit.com','1972/10/30 00:00:00', 3, 'CricketTeam');
+insert into `people` (gender, first_name, middle_initial, last_name, street_address, city, state, postcode, email, birthday, team_id, team_type) values('female','Eloise','Z','Kennedy','18 Mt Berryman Road','Lilydale','QLD','4344','Eloise.Z.Kennedy@spambob.com','1973/9/28 00:00:00', 3, 'CricketTeam');
+insert into `people` (gender, first_name, middle_initial, last_name, street_address, city, state, postcode, email, birthday, team_id, team_type) values('female','Shannon','L','Manning','60 Ocean Pde','Greenvale','QLD','4816','Shannon.L.Manning@dodgit.com','1956/6/13 00:00:00', 3, 'FootballTeam');
+insert into `people` (gender, first_name, middle_initial, last_name, street_address, city, state, postcode, email, birthday, team_id, team_type) values('male','Oscar','C','Lawson','43 Feather Street','Battery Hill','QLD','4551','Oscar.C.Lawson@spambob.com','1979/10/17 00:00:00', 3, 'CricketTeam');
+insert into `people` (gender, first_name, middle_initial, last_name, street_address, city, state, postcode, email, birthday, team_id, team_type) values('female','Sofia','K','Bray','26 Clifton Street','Pental Island','VIC','3586','Sofia.K.Bray@mailinator.com','1970/5/10 00:00:00', 3, 'CricketTeam');
+insert into `people` (gender, first_name, middle_initial, last_name, street_address, city, state, postcode, email, birthday, team_id, team_type) values('male','Andrew','N','Byrne','35 Cecil Street','Monash Park','NSW','2111','Andrew.N.Byrne@spambob.com','1983/2/16 00:00:00', 3, 'CricketTeam');
+
+insert into `alphas` (name) values ('one');
+insert into `alphas` (name) values ('two');
+insert into `alphas` (name) values ('three');
+insert into `alphas` (name) values ('four');
+insert into `alphas` (name) values ('five');
+insert into `alphas` (name) values ('six');
+insert into `alphas` (name) values ('seven');
+insert into `alphas` (name) values ('eight');
+insert into `alphas` (name) values ('nine');
+insert into `alphas` (name) values ('ten');
+
+insert into `betas` (name) values ('one');
+insert into `betas` (name) values ('two');
+insert into `betas` (name) values ('three');
+insert into `betas` (name) values ('four');
+insert into `betas` (name) values ('five');
+insert into `betas` (name) values ('six');
+insert into `betas` (name) values ('seven');
+insert into `betas` (name) values ('eight');
+insert into `betas` (name) values ('nine');
+insert into `betas` (name) values ('ten');

data/spec/fixtures/database.yml.default

@@ -0,0 +1,3 @@
+username: root
+password: 
+host: localhost

data/spec/fixtures/models.rb

@@ -0,0 +1,161 @@
+class Tag < ActiveRecord::Base
+  belongs_to :person
+  belongs_to :football_team
+  belongs_to :cricket_team
+end
+
+class FootballTeam < ActiveRecord::Base
+  has_many :tags
+  has_many :people, :through => :tags
+end
+
+class CricketTeam < ActiveRecord::Base
+  has_many :people, :foreign_key => :team_id
+
+  define_index do
+    indexes :name
+    has "SELECT cricket_team_id, id FROM tags", :source => :query, :as => :tags
+  end
+end
+
+class Contact < ActiveRecord::Base
+  belongs_to :person
+end
+
+class Friendship < ActiveRecord::Base
+  belongs_to :person
+  belongs_to :friend, :class_name => "Person", :foreign_key => :friend_id
+
+  define_index do
+    indexes "'something'", :as => :something
+    has person_id, friend_id
+
+    set_property :latitude_attr   => :person_id
+    set_property :longitude_attr  => :person_id
+  end
+
+  sphinx_scope(:reverse) {
+    {:order => "@weight ASC"}
+  }
+end
+
+class Link < ActiveRecord::Base
+  has_and_belongs_to_many :people
+end
+
+class Person < ActiveRecord::Base
+  belongs_to :team, :polymorphic => :true
+  belongs_to :source, :polymorphic => :true
+  has_many :contacts
+
+  has_many :friendships
+  has_many :friends, :through => :friendships
+
+  has_many :tags
+  has_many :football_teams, :through => :tags
+
+  has_and_belongs_to_many :links
+
+  define_index do
+    indexes [first_name, middle_initial, last_name], :as => :name
+    indexes team.name, :as => :team_name
+    indexes contacts.phone_number, :as => :phone_numbers
+    indexes city,   :prefixes => true, :facet => true
+    indexes state,  :infixes  => true, :facet => true
+
+    has [first_name, middle_initial, last_name], :as => :name_sort
+    has team.name, :as => :team_name_sort
+
+    has [:id, :team_id], :as => :ids
+    has team(:id), :as => :team_id
+    has football_teams(:id), :as => :football_team_id
+
+    has contacts.phone_number, :as => :phone_number_sort
+    has contacts(:id), :as => :contact_ids
+
+    has birthday, :facet => true
+
+    has friendships.person_id, :as => :friendly_ids
+
+    has :id, :as => :latitude
+    has :id, :as => :longitude
+
+    set_property :delta => true
+  end
+end
+
+class Parent < Person
+end
+
+module Admin
+  class Person < ::Person
+  end
+end
+
+class Child < Person
+  belongs_to :parent
+  define_index do
+    indexes [parent.first_name, parent.middle_initial, parent.last_name], :as => :parent_name
+  end
+end
+
+class Alpha < ActiveRecord::Base
+  has_many :betas, :class_name => 'Beta'
+  has_many :thetas
+
+  define_index do
+    indexes :name, :sortable => true
+
+    has :id, :as => :lat
+    has :id, :as => :lng
+
+    set_property :field_weights => {"name" => 10}
+  end
+
+  def big_name
+    name.upcase
+  end
+
+  def sphinx_attributes
+    :existing
+  end
+end
+
+class Beta < ActiveRecord::Base
+  has_many :gammas
+
+  define_index do
+    indexes :name, :sortable => true
+
+    has :id, :as => :lat
+    has :id, :as => :lon
+
+    set_property :delta => true
+  end
+
+  def excerpts
+    false
+  end
+
+  def matching_fields
+    :foo
+  end
+end
+
+class Gamma < ActiveRecord::Base
+  #
+end
+
+class Theta < ActiveRecord::Base
+  #
+end
+
+class Search < ActiveRecord::Base
+  #
+end
+
+class BigFoo < ActiveRecord::Base
+  define_index do
+    indexes name
+  end
+end