thinking-sphinx 2.0.5 → 2.0.6

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;

data/spec/spec_helper.rb

@@ -0,0 +1,62 @@
+$:.unshift File.dirname(__FILE__) + '/../lib'
+Dir[File.join(File.dirname(__FILE__), '../vendor/*/lib')].each do |path|
+  $:.unshift path
+end
+
+require 'fileutils'
+require 'logger'
+require 'bundler'
+
+Bundler.require :default, :development
+
+require 'active_support/core_ext/module/attribute_accessors'
+require 'active_support/core_ext/class/inheritable_attributes'
+require "#{File.dirname(__FILE__)}/sphinx_helper"
+
+Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each {|f| require f}
+
+ThinkingSphinx::Configuration.instance
+ThinkingSphinx::ActiveRecord::LogSubscriber.logger = Logger.new(StringIO.new)
+
+RSpec.configure do |config|
+  %w( tmp tmp/config tmp/log tmp/db ).each do |path|
+    FileUtils.mkdir_p "#{Dir.pwd}/#{path}"
+  end
+
+  sphinx = SphinxHelper.new
+  sphinx.setup_mysql
+
+  ActiveRecord::Base.send(:include, ThinkingSphinx::ActiveRecord)
+
+  require "#{File.dirname(__FILE__)}/fixtures/models"
+  ThinkingSphinx.context.define_indexes
+
+  config.before :each do
+    %w( tmp tmp/config tmp/log tmp/db ).each do |path|
+      FileUtils.mkdir_p "#{Dir.pwd}/#{path}"
+    end
+
+    ThinkingSphinx.updates_enabled = true
+    ThinkingSphinx.deltas_enabled = true
+    ThinkingSphinx.suppress_delta_output = true
+
+    ThinkingSphinx::Configuration.instance.reset
+  end
+
+  config.after :all do
+    FileUtils.rm_r "#{Dir.pwd}/tmp" rescue nil
+  end
+end
+
+def minimal_result_hashes(*instances)
+  instances.collect do |instance|
+    {
+      :weight     => 21,
+      :attributes => {
+        'sphinx_internal_id'    => instance.id,
+        'sphinx_internal_class' => instance.class.name,
+        'class_crc'             => instance.class.name.to_crc32
+      }
+    }
+  end
+end

data/spec/sphinx_helper.rb

@@ -0,0 +1,61 @@
+require 'active_record'
+prefix = defined?(JRUBY_VERSION) ? "jdbc" : ""
+require "active_record/connection_adapters/#{prefix}mysql_adapter"
+require "active_record/connection_adapters/mysql2_adapter"
+
+begin
+  require "active_record/connection_adapters/#{prefix}postgresql_adapter"
+rescue LoadError
+  # No postgres?  no prob...
+end
+require 'yaml'
+
+class SphinxHelper
+  attr_accessor :host, :username, :password, :socket
+  attr_reader   :path
+
+  def initialize
+    @host     = 'localhost'
+    @username = 'root'
+    @password = ''
+
+    if File.exist?('spec/fixtures/database.yml')
+      config    = YAML.load(File.open('spec/fixtures/database.yml'))
+      @host     = config['host']
+      @username = config['username']
+      @password = config['password']
+      @socket   = config['socket']
+    end
+
+    @path = File.expand_path(File.dirname(__FILE__))
+  end
+
+  def setup_mysql
+    ActiveRecord::Base.establish_connection(
+      :adapter  => mysql_adapter,
+      :database => 'thinking_sphinx',
+      :username => @username,
+      :password => @password,
+      :host     => @host,
+      :socket   => @socket
+    )
+    ActiveRecord::Base.logger = Logger.new(File.open('tmp/activerecord.log', 'a'))
+
+    structure = File.open('spec/fixtures/structure.sql') { |f| f.read.chomp }
+    structure.split(';').each { |table|
+      ActiveRecord::Base.connection.execute table
+    }
+
+    File.open('spec/fixtures/data.sql') { |f|
+      while line = f.gets
+        ActiveRecord::Base.connection.execute line unless line.blank?
+      end
+    }
+  end
+
+  private
+
+  def mysql_adapter
+    defined?(JRUBY_VERSION) ? 'jdbcmysql' : 'mysql2'
+  end
+end

data/spec/support/rails.rb

@@ -0,0 +1,18 @@
+module Rails
+  def self.root
+    File.join(Dir.pwd, 'tmp')
+  end
+  
+  def self.env
+    @@environment ||= 'development'
+  end
+  
+  def self.env=(env)
+    @@environment = env
+  end
+end
+
+ActiveSupport::Inflector.inflections do |inflect|
+  inflect.plural /^beta$/i, 'betas'
+  inflect.singular /^betas$/i, 'beta'
+end

data/spec/thinking_sphinx/active_record/delta_spec.rb

@@ -3,18 +3,18 @@ require 'spec_helper'
 describe "ThinkingSphinx::ActiveRecord::Delta" do
   it "should call the toggle_delta method after a save" do
     @beta = Beta.new(:name => 'beta')
-    @beta.should_receive(:toggle_delta).and_return(true)
-    
+    @beta.should_receive(:toggle_delta).at_least(1).times.and_return(true)
+
     @beta.save
   end
-  
+
   it "should call the toggle_delta method after a save!" do
     @beta = Beta.new(:name => 'beta')
-    @beta.should_receive(:toggle_delta).and_return(true)
-    
+    @beta.should_receive(:toggle_delta).at_least(1).times.and_return(true)
+
     @beta.save!
   end
-  
+
   describe "suspended_delta method" do
     before :each do
       ThinkingSphinx.deltas_suspended = false
@@ -47,23 +47,23 @@ describe "ThinkingSphinx::ActiveRecord::Delta" do
       Person.should_receive(:index_delta)
       Person.suspended_delta { 'no-op' }
     end
-    
+
     it "should not reindex after the code block if false is passed in" do
       Person.should_not_receive(:index_delta)
       Person.suspended_delta(false) { 'no-op' }
     end
   end
-  
+
   describe "toggle_delta method" do
     it "should set the delta value to true" do
       @person = Person.new
-      
+
       @person.delta.should be_false
       @person.send(:toggle_delta)
       @person.delta.should be_true
     end
   end
-  
+
   describe "index_delta method" do
     before :each do
       ThinkingSphinx::Configuration.stub!(:environment => "spec")
@@ -71,57 +71,57 @@ describe "ThinkingSphinx::ActiveRecord::Delta" do
       ThinkingSphinx.updates_enabled  = true
       ThinkingSphinx.stub!(:sphinx_running? => true)
       Person.delta_objects.first.stub!(:` => "", :toggled => true)
-      
+
       @person = Person.new
       Person.stub!(:search_for_id => false)
       @person.stub!(:sphinx_document_id => 1)
-      
+
       @client = Riddle::Client.new
       @client.stub!(:update => true)
       ThinkingSphinx::Configuration.instance.stub!(:client => @client)
     end
-    
+
     it "shouldn't index if delta indexing is disabled" do
       ThinkingSphinx.deltas_enabled = false
       Person.sphinx_indexes.first.delta_object.should_not_receive(:`)
       @client.should_not_receive(:update)
-      
+
       @person.send(:index_delta)
     end
-    
+
     it "shouldn't index if index updating is disabled" do
       ThinkingSphinx.updates_enabled = false
       Person.sphinx_indexes.first.delta_object.should_not_receive(:`)
-      
+
       @person.send(:index_delta)
     end
-    
+
     it "shouldn't index if the environment is 'test'" do
       ThinkingSphinx.deltas_enabled = nil
       ThinkingSphinx::Configuration.stub!(:environment => "test")
       Person.sphinx_indexes.first.delta_object.should_not_receive(:`)
-      
+
       @person.send(:index_delta)
     end
-    
+
     it "should call indexer for the delta index" do
       Person.sphinx_indexes.first.delta_object.should_receive(:`).with(
         "#{ThinkingSphinx::Configuration.instance.bin_path}indexer --config \"#{ThinkingSphinx::Configuration.instance.config_file}\" --rotate person_delta"
       )
-      
+
       @person.send(:index_delta)
     end
-    
+
     it "shouldn't update the deleted attribute if not in the index" do
       @client.should_not_receive(:update)
-      
+
       @person.send(:index_delta)
     end
-    
+
     it "should update the deleted attribute if in the core index" do
       Person.stub!(:search_for_id => true)
       @client.should_receive(:update)
-      
+
       @person.send(:index_delta)
     end
   end

data/spec/thinking_sphinx/active_record/has_many_association_spec.rb

@@ -23,6 +23,17 @@ describe 'ThinkingSphinx::ActiveRecord::HasManyAssociation' do
       @person.friendships.search "test"
     end
     
+    it "should add a filter for an aliased attribute into a normal search call" do
+      @team = CricketTeam.new
+      @team.stub!(:id => 1)
+
+      Person.should_receive(:search).with do |query, options|
+        options[:with][:team_id].should == @team.id
+      end
+
+      @team.people.search "test"
+    end
+
     it "should define indexes for the reflection class" do
       Friendship.should_receive(:define_indexes)
       
@@ -51,6 +62,17 @@ describe 'ThinkingSphinx::ActiveRecord::HasManyAssociation' do
       
       @person.friends.search "test"
     end
+
+    it "should add a filter for an aliased attribute into a normal search call" do
+      @team = FootballTeam.new
+      @team.stub!(:id => 1)
+
+      Person.should_receive(:search).with do |query, options|
+        options[:with][:football_team_id].should == @team.id
+      end
+
+      @team.people.search "test"
+    end
   end
   
   describe 'filtering sphinx scopes' do
@@ -68,5 +90,10 @@ describe 'ThinkingSphinx::ActiveRecord::HasManyAssociation' do
       
       @person.friendships.reverse
     end
+
+    it "should pass method_missing onto CollectionProxy" do
+      Friendship.stub!(:missing_method => true)
+      @person.friendships.missing_method.should == true
+    end
   end
 end