thinking-sphinx 1.4.6 → 1.4.7

data/lib/thinking_sphinx/source/sql.rb

@@ -122,7 +122,7 @@ GROUP BY #{ sql_group_clause }
           
           adapter.case(adapter.convert_nulls(
             adapter.quote_with_table(@model.inheritance_column)),
-            types_to_crcs, @model.to_crc32)
+            types, @model.to_crc32)
         else
           @model.to_crc32.to_s
         end

data/lib/thinking_sphinx/tasks.rb

@@ -16,36 +16,36 @@ namespace :thinking_sphinx do
       Sinatra::Application.environment = ENV['RACK_ENV']
     end
   end
-  
+
   desc "Output the current Thinking Sphinx version"
   task :version => :app_env do
-    puts "Thinking Sphinx v" + ThinkingSphinx.version
+    puts "Thinking Sphinx v" + ThinkingSphinx::Version
   end
-  
+
   desc "Stop if running, then start a Sphinx searchd daemon using Thinking Sphinx's settings"
   task :running_start => :app_env do
     Rake::Task["thinking_sphinx:stop"].invoke if sphinx_running?
     Rake::Task["thinking_sphinx:start"].invoke
   end
-  
+
   desc "Start a Sphinx searchd daemon using Thinking Sphinx's settings"
   task :start => :app_env do
     config = ThinkingSphinx::Configuration.instance
-    
+
     FileUtils.mkdir_p config.searchd_file_path
     raise RuntimeError, "searchd is already running." if sphinx_running?
-    
+
     Dir["#{config.searchd_file_path}/*.spl"].each { |file| File.delete(file) }
-    
+
     config.controller.start
-    
+
     if sphinx_running?
       puts "Started successfully (pid #{sphinx_pid})."
     else
       puts "Failed to start searchd daemon. Check #{config.searchd_log_file}"
     end
   end
-  
+
   desc "Stop Sphinx using Thinking Sphinx's settings"
   task :stop => :app_env do
     unless sphinx_running?
@@ -54,26 +54,26 @@ namespace :thinking_sphinx do
       config = ThinkingSphinx::Configuration.instance
       pid    = sphinx_pid
       config.controller.stop
-      
+
       # Ensure searchd is stopped, but don't try too hard
-      Timeout.timeout(5) do
+      Timeout.timeout(config.stop_timeout) do
         sleep(1) until config.controller.stop
       end
-      
+
       puts "Stopped search daemon (pid #{pid})."
     end
   end
-  
+
   desc "Restart Sphinx"
   task :restart => [:app_env, :stop, :start]
-  
+
   desc "Generate the Sphinx configuration file using Thinking Sphinx's settings"
   task :configure => :app_env do
     config = ThinkingSphinx::Configuration.instance
     puts "Generating Configuration to #{config.config_file}"
     config.build
   end
-  
+
   desc "Index data for Sphinx using Thinking Sphinx's settings"
   task :index => :app_env do
     config = ThinkingSphinx::Configuration.instance
@@ -81,18 +81,20 @@ namespace :thinking_sphinx do
       puts "Generating Configuration to #{config.config_file}"
       config.build
     end
-    
+
     FileUtils.mkdir_p config.searchd_file_path
     config.controller.index :verbose => true
   end
-  
+
   desc "Reindex Sphinx without regenerating the configuration file"
   task :reindex => :app_env do
     config = ThinkingSphinx::Configuration.instance
     FileUtils.mkdir_p config.searchd_file_path
-    puts config.controller.index
+    output = config.controller.index
+    puts output
+    config.touch_reindex_file(output)
   end
-  
+
   desc "Stop Sphinx (if it's running), rebuild the indexes, and start Sphinx"
   task :rebuild => :app_env do
     Rake::Task["thinking_sphinx:stop"].invoke if sphinx_running?

data/lib/thinking_sphinx/version.rb

@@ -0,0 +1,3 @@
+module ThinkingSphinx
+  Version = '1.4.7'
+end

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
+  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

data/spec/fixtures/structure.sql

@@ -0,0 +1,146 @@
+DROP TABLE IF EXISTS `people`;
+
+CREATE TABLE `people` (
+  `id` int(11) NOT NULL auto_increment,
+  `first_name` varchar(50) NULL,
+  `middle_initial` varchar(10) NULL,
+  `last_name` varchar(50) NULL,
+  `gender` varchar(10) NULL,
+  `street_address` varchar(200) NULL,
+  `city` varchar(100) NULL,
+  `state` varchar(100) NULL,
+  `postcode` varchar(10) NULL,
+  `email` varchar(100) NULL,
+  `birthday` datetime NULL,
+  `team_id` int(11) NULL,
+  `team_type` varchar(50) NULL,
+  `type` varchar(50) NULL,
+  `parent_id` varchar(50) NULL,
+  `source_id` int(11) NULL,
+  `source_type` varchar(50) NULL,
+  `delta` tinyint(1) NOT NULL DEFAULT 0,
+  PRIMARY KEY  (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+
+DROP TABLE IF EXISTS `friendships`;
+
+CREATE TABLE `friendships` (
+  `id` int(11) NOT NULL auto_increment,
+  `person_id` int(11) NOT NULL,
+  `friend_id` int(11) NOT NULL,
+  `created_at` datetime NOT NULL,
+  `created_on` date NULL,
+  `updated_at` datetime NOT NULL,
+  PRIMARY KEY (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+
+DROP TABLE IF EXISTS `football_teams`;
+
+CREATE TABLE `football_teams` (
+  `id` int(11) NOT NULL auto_increment,
+  `name` varchar(50) NOT NULL,
+  `state` varchar(50) NOT NULL,
+  `league` varchar(50) NOT NULL,
+  PRIMARY KEY (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+
+DROP TABLE IF EXISTS `cricket_teams`;
+
+CREATE TABLE `cricket_teams` (
+  `id` int(11) NOT NULL auto_increment,
+  `name` varchar(50) NOT NULL,
+  `state` varchar(50) NOT NULL,
+  PRIMARY KEY (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+
+DROP TABLE IF EXISTS `contacts`;
+
+CREATE TABLE `contacts` (
+  `id` int(11) NOT NULL auto_increment,
+  `phone_number` varchar(50) NOT NULL,
+  `person_id` int(11) NOT NULL,
+  PRIMARY KEY (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+
+DROP TABLE IF EXISTS `alphas`;
+
+CREATE TABLE `alphas` (
+  `id` int(11) NOT NULL auto_increment,
+  `name` varchar(50) NOT NULL,
+  `value` int(11),
+  `cost` decimal(10,6),
+  PRIMARY KEY (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+
+DROP TABLE IF EXISTS `betas`;
+
+CREATE TABLE `betas` (
+  `id` int(11) NOT NULL auto_increment,
+  `name` varchar(50) NOT NULL,
+  `alpha_id` int(11),
+  `delta` tinyint(1) NOT NULL DEFAULT 0,
+  PRIMARY KEY (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+
+DROP TABLE IF EXISTS `gammas`;
+
+CREATE TABLE `gammas` (
+  `id` int(11) NOT NULL auto_increment,
+  `name` varchar(50) NOT NULL,
+  `value` int(11),
+  `beta_id` int(11),
+  PRIMARY KEY (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+
+DROP TABLE IF EXISTS `thetas`;
+
+CREATE TABLE `thetas` (
+  `id` int(11) NOT NULL auto_increment,
+  `name` varchar(50) NOT NULL,
+  `value` int(11),
+  `alpha_id` int(11),
+  PRIMARY KEY (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+
+DROP TABLE IF EXISTS `searches`;
+
+CREATE TABLE `searches` (
+  `id` int(11) NOT NULL auto_increment,
+  `name` varchar(50) NOT NULL,
+  PRIMARY KEY (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+
+DROP TABLE IF EXISTS `tags`;
+
+CREATE TABLE `tags` (
+  `id` int(11) NOT NULL auto_increment,
+  `person_id` int(11) NOT NULL,
+  `football_team_id` int(11) NOT NULL,
+  `cricket_team_id` int(11) NOT NULL,
+  `name` varchar(50) NOT NULL,
+  PRIMARY KEY (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+
+DROP TABLE IF EXISTS `links`;
+
+CREATE TABLE `links` (
+  `id` int(11) NOT NULL auto_increment,
+  `url` varchar(50) NOT NULL,
+  `description` varchar(200),
+  PRIMARY KEY (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+
+DROP TABLE IF EXISTS `links_people`;
+
+CREATE TABLE `links_people` (
+  `link_id` int(11) NOT NULL,
+  `person_id` int(11) NOT NULL
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+
+DROP TABLE IF EXISTS `big_foos`;
+
+CREATE TABLE `big_foos` (
+  `id` bigint NOT NULL auto_increment,
+  `name` varchar(50) NOT NULL,
+  PRIMARY KEY (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;