thinking-sphinx 3.0.3 → 3.0.4

data/lib/thinking_sphinx/search/glaze.rb

@@ -15,6 +15,11 @@ class ThinkingSphinx::Search::Glaze < BasicObject
     @object.equal? object
   end
 
+  def respond_to?(method, include_private = false)
+    @object.respond_to?(method, include_private) ||
+    @panes.any? { |pane| pane.respond_to?(method, include_private) }
+  end
+
   def unglazed
     @object
   end

data/lib/thinking_sphinx/search/query.rb

@@ -1,11 +1,7 @@
 # encoding: utf-8
 
 class ThinkingSphinx::Search::Query
-  if Regexp.instance_methods.include?(:encoding)
-    DefaultToken = Regexp.new('\p{Word}+')
-  else
-    DefaultToken = Regexp.new('\w+', nil, 'u')
-  end
+  DEFAULT_TOKEN = /[\p{Word}\\][\p{Word}\\@]+/
 
   attr_reader :keywords, :conditions, :star
 
@@ -14,7 +10,7 @@ class ThinkingSphinx::Search::Query
   end
 
   def to_s
-    (star_keyword(keywords) + ' ' + conditions.keys.collect { |key|
+    (star_keyword(keywords || '') + ' ' + conditions.keys.collect { |key|
        next if conditions[key].blank?
 
       "@#{key} #{star_keyword conditions[key], key}"
@@ -24,11 +20,11 @@ class ThinkingSphinx::Search::Query
   private
 
   def star_keyword(keyword, key = nil)
-    unless star && (key.nil? || key.to_s != 'sphinx_internal_class')
+    unless star && (key.nil? || key.to_s != 'sphinx_internal_class_name')
       return keyword.to_s
     end
 
-    token = star.is_a?(Regexp) ? star : DefaultToken
+    token = star.is_a?(Regexp) ? star : DEFAULT_TOKEN
     keyword.gsub(/("#{token}(.*?#{token})?"|(?![!-])#{token})/u) do
       pre, proper, post = $`, $&, $'
       # E.g. "@foo", "/2", "~3", but not as part of a token

data/lib/thinking_sphinx/tasks.rb

@@ -9,6 +9,11 @@ namespace :ts do
     interface.index(ENV['INDEX_ONLY'] != 'true')
   end
 
+  desc 'Clear out Sphinx files'
+  task :clear => :environment do
+    interface.clear
+  end
+
   desc 'Generate fresh index files for real-time indices'
   task :generate => :environment do
     interface.generate
@@ -17,6 +22,9 @@ namespace :ts do
   desc 'Stop Sphinx, index and then restart Sphinx'
   task :rebuild => [:stop, :index, :start]
 
+  desc 'Stop Sphinx, clear files, reconfigure, start Sphinx, generate files'
+  task :regenerate => [:stop, :clear, :configure, :start, :generate]
+
   desc 'Restart the Sphinx daemon'
   task :restart => [:stop, :start]
 

data/spec/acceptance/excerpts_spec.rb

@@ -24,4 +24,26 @@ describe 'Accessing excerpts for methods on a search result', :live => true do
     search.first.excerpts.title.
       should == 'Война и <span class="match">миръ</span>'
   end
+
+  it "does not include class names in excerpts" do
+    Book.create! :title => 'The Graveyard Book'
+    index
+
+    search = Book.search('graveyard')
+    search.context[:panes] << ThinkingSphinx::Panes::ExcerptsPane
+
+    search.first.excerpts.title.
+      should == 'The <span class="match">Graveyard</span> Book'
+  end
+
+  it "respects the star option with queries" do
+    Article.create! :title => 'Something'
+    index
+
+    search = Article.search('thin', :star => true)
+    search.context[:panes] << ThinkingSphinx::Panes::ExcerptsPane
+
+    search.first.excerpts.title.
+      should == '<span class="match">Something</span>'
+  end
 end

data/spec/acceptance/remove_deleted_records_spec.rb

@@ -20,4 +20,14 @@ describe 'Hiding deleted records from search results', :live => true do
 
     Article.search('pancakes').should be_empty
   end
+
+  it "removes records from real-time index results" do
+    product = Product.create! :name => 'Shiny'
+
+    Product.search('Shiny').to_a.should == [product]
+
+    product.destroy
+
+    Product.search_for_ids('Shiny').should be_empty
+  end
 end

data/spec/acceptance/searching_across_models_spec.rb

@@ -25,4 +25,14 @@ describe 'Searching across models', :live => true do
 
     ThinkingSphinx.search.to_a.should =~ [article, book]
   end
+
+  it "filters by multiple classes" do
+    article = Article.create! :title => 'Pancakes'
+    book    = Book.create! :title => 'American Gods'
+    user    = User.create! :name => 'Pat'
+    index
+
+    ThinkingSphinx.search(:classes => [User, Article]).to_a.
+      should =~ [article, user]
+  end
 end

data/spec/acceptance/searching_with_filters_spec.rb

@@ -106,4 +106,19 @@ describe 'Searching with filters', :live => true do
     articles = Article.search :without_all => {:tag_ids => [food.id, flat.id]}
     articles.to_a.should == [waffles]
   end
+
+  it "limits results on real-time indices with multi-value integer attributes" do
+    pancakes = Product.create :name => 'Pancakes'
+    waffles  = Product.create :name => 'Waffles'
+
+    food = Category.create :name => 'food'
+    flat = Category.create :name => 'flat'
+
+    pancakes.categories << food
+    pancakes.categories << flat
+    waffles.categories  << food
+
+    products = Product.search :with => {:category_ids => [flat.id]}
+    products.to_a.should == [pancakes]
+  end
 end

data/spec/acceptance/specifying_sql_spec.rb

@@ -264,7 +264,7 @@ describe 'separate queries for MVAs' do
     declaration, query, range = attribute.split(/;\s+/)
 
     declaration.should == 'uint tag_ids from ranged-query'
-    query.should match(/^SELECT .taggings.\..article_id. \* #{count} \+ #{source.offset} AS .id., .taggings.\..tag_id. AS .tag_ids. FROM .taggings. \s?WHERE \(.taggings.\..article_id. >= \$start\) AND \(.taggings.\..article_id. <= \$end\)$/)
+    query.should match(/^SELECT .taggings.\..article_id. \* #{count} \+ #{source.offset} AS .id., .taggings.\..tag_id. AS .tag_ids. FROM .taggings. \s?WHERE \(.taggings.\..article_id. BETWEEN \$start AND \$end\)$/)
     range.should match(/^SELECT MIN\(.taggings.\..article_id.\), MAX\(.taggings.\..article_id.\) FROM .taggings.\s?$/)
   end
 
@@ -281,7 +281,7 @@ describe 'separate queries for MVAs' do
     declaration, query, range = attribute.split(/;\s+/)
 
     declaration.should == 'uint tag_ids from ranged-query'
-    query.should match(/^SELECT .taggings.\..article_id. \* #{count} \+ #{source.offset} AS .id., .tags.\..id. AS .tag_ids. FROM .taggings. INNER JOIN .tags. ON .tags.\..id. = .taggings.\..tag_id. \s?WHERE \(.taggings.\..article_id. >= \$start\) AND \(.taggings.\..article_id. <= \$end\)$/)
+    query.should match(/^SELECT .taggings.\..article_id. \* #{count} \+ #{source.offset} AS .id., .tags.\..id. AS .tag_ids. FROM .taggings. INNER JOIN .tags. ON .tags.\..id. = .taggings.\..tag_id. \s?WHERE \(.taggings.\..article_id. BETWEEN \$start AND \$end\)$/)
     range.should match(/^SELECT MIN\(.taggings.\..article_id.\), MAX\(.taggings.\..article_id.\) FROM .taggings.\s?$/)
   end
 
@@ -396,7 +396,7 @@ describe 'separate queries for field' do
     declaration, query, range = field.split(/;\s+/)
 
     declaration.should == 'tags from ranged-query'
-    query.should match(/^SELECT .taggings.\..article_id. \* #{count} \+ #{source.offset} AS .id., .tags.\..name. AS .tags. FROM .taggings. INNER JOIN .tags. ON .tags.\..id. = .taggings.\..tag_id. \s?WHERE \(.taggings.\..article_id. >= \$start\) AND \(.taggings.\..article_id. <= \$end\)\s? ORDER BY .taggings.\..article_id. ASC$/)
+    query.should match(/^SELECT .taggings.\..article_id. \* #{count} \+ #{source.offset} AS .id., .tags.\..name. AS .tags. FROM .taggings. INNER JOIN .tags. ON .tags.\..id. = .taggings.\..tag_id. \s?WHERE \(.taggings.\..article_id. BETWEEN \$start AND \$end\)\s? ORDER BY .taggings.\..article_id. ASC$/)
     range.should match(/^SELECT MIN\(.taggings.\..article_id.\), MAX\(.taggings.\..article_id.\) FROM .taggings.\s?$/)
   end
 

data/spec/acceptance/sphinx_scopes_spec.rb

@@ -37,6 +37,17 @@ describe 'Sphinx scopes', :live => true do
     Book.by_query('Gods').search('Small').to_a.should == [pratchett]
   end
 
+  it "allows facet calls on scopes" do
+    Book.create! :title => 'American Gods', :author => 'Neil Gaiman'
+    Book.create! :title => 'Anansi Boys',   :author => 'Neil Gaiman'
+    Book.create! :title => 'Small Gods',    :author => 'Terry Pratchett'
+    index
+
+    Book.by_query('Gods').facets.to_hash[:author].should == {
+      'Neil Gaiman' => 1, 'Terry Pratchett' => 1
+    }
+  end
+
   it "allows accessing counts on scopes" do
     Book.create! :title => 'American Gods'
     Book.create! :title => 'Anansi Boys'

data/spec/internal/app/indices/product_index.rb

@@ -1,3 +1,5 @@
 ThinkingSphinx::Index.define :product, :with => :real_time do
   indexes name
+
+  has category_ids, :type => :integer, :multi => true
 end

data/spec/internal/app/models/categorisation.rb

@@ -0,0 +1,6 @@
+class Categorisation < ActiveRecord::Base
+  belongs_to :category
+  belongs_to :product
+
+  after_save ThinkingSphinx::RealTime.callback_for(:product, [:product])
+end

data/spec/internal/app/models/category.rb

@@ -0,0 +1,3 @@
+class Category < ActiveRecord::Base
+  #
+end

data/spec/internal/app/models/product.rb

@@ -1,3 +1,6 @@
 class Product < ActiveRecord::Base
-  #
+  has_many :categorisations
+  has_many :categories, :through => :categorisations
+
+  after_save ThinkingSphinx::RealTime.callback_for(:product)
 end

data/spec/internal/db/schema.rb

@@ -32,6 +32,16 @@ ActiveRecord::Schema.define do
     t.integer :genre_id
   end
 
+  create_table(:categories, :force => true) do |t|
+    t.integer :id
+    t.string  :name
+  end
+
+  create_table(:categorisations, :force => true) do |t|
+    t.integer :category_id
+    t.integer :product_id
+  end
+
   create_table(:cities, :force => true) do |t|
     t.string :name
     t.float  :lat

data/spec/thinking_sphinx/active_record/base_spec.rb

@@ -14,6 +14,39 @@ describe ThinkingSphinx::ActiveRecord::Base do
     end
   }
 
+  describe '.facets' do
+    it "returns a new search object" do
+      model.facets.should be_a(ThinkingSphinx::FacetSearch)
+    end
+
+    it "passes through arguments to the search object" do
+      model.facets('pancakes').query.should == 'pancakes'
+    end
+
+    it "scopes the search to a given model" do
+      model.facets('pancakes').options[:classes].should == [model]
+    end
+
+    it "merges the :classes option with the model" do
+      model.facets('pancakes', :classes => [sub_model]).
+        options[:classes].should == [sub_model, model]
+    end
+
+    it "applies the default scope if there is one" do
+      model.stub :default_sphinx_scope => :default,
+        :sphinx_scopes => {:default => Proc.new { {:order => :created_at} }}
+
+      model.facets.options[:order].should == :created_at
+    end
+
+    it "does not apply a default scope if one is not set" do
+      model.stub :default_sphinx_scope => nil,
+        :default => {:order => :created_at}
+
+      model.facets.options[:order].should be_nil
+    end
+  end
+
   describe '.search' do
     it "returns a new search object" do
       model.search.should be_a(ThinkingSphinx::Search)

data/spec/thinking_sphinx/active_record/callbacks/delete_callbacks_spec.rb

@@ -33,49 +33,18 @@ describe ThinkingSphinx::ActiveRecord::Callbacks::DeleteCallbacks do
   describe '#after_destroy' do
     let(:config)     { double('config', :indices_for_references => [index],
       :preload_indices => true) }
-    let(:connection) { double('connection', :execute => nil) }
-    let(:index)      {
-      double('index', :name => 'foo_core', :document_id_for_key => 14)
-    }
+    let(:index)      { double('index', :name => 'foo_core',
+      :document_id_for_key => 14, :type => 'plain') }
     let(:instance)   { double('instance', :id => 7) }
 
     before :each do
       ThinkingSphinx::Configuration.stub :instance => config
-      ThinkingSphinx::Connection.stub    :new => connection
-      Riddle::Query.stub :update => 'UPDATE STATEMENT'
     end
 
-    it "updates the deleted flag to false" do
-      connection.should_receive(:execute).with('UPDATE STATEMENT')
+    it "performs the deletion for the index and instance" do
+      ThinkingSphinx::Deletion.should_receive(:perform).with(index, instance)
 
       callbacks.after_destroy
     end
-
-    it "builds the update query for the given index" do
-      Riddle::Query.should_receive(:update).
-        with('foo_core', anything, anything).and_return('')
-
-      callbacks.after_destroy
-    end
-
-    it "builds the update query for the sphinx document id" do
-      Riddle::Query.should_receive(:update).
-        with(anything, 14, anything).and_return('')
-
-      callbacks.after_destroy
-    end
-
-    it "builds the update query for setting sphinx_deleted to true" do
-      Riddle::Query.should_receive(:update).
-        with(anything, anything, :sphinx_deleted => true).and_return('')
-
-      callbacks.after_destroy
-    end
-
-    it "doesn't care about Sphinx errors" do
-      connection.stub(:execute).and_raise(Mysql2::Error.new(''))
-
-      lambda { callbacks.after_destroy }.should_not raise_error
-    end
   end
 end

data/spec/thinking_sphinx/active_record/sql_builder_spec.rb

@@ -105,8 +105,7 @@ describe ThinkingSphinx::ActiveRecord::SQLBuilder do
 
       it "limits results to a set range" do
         relation.should_receive(:where) do |string|
-          string.should match(/`users`.`id` >= \$start/)
-          string.should match(/`users`.`id` <= \$end/)
+          string.should match(/`users`.`id` BETWEEN \$start AND \$end/)
           relation
         end
 
@@ -117,8 +116,7 @@ describe ThinkingSphinx::ActiveRecord::SQLBuilder do
         source.stub! :disable_range? => true
 
         relation.should_receive(:where) do |string|
-          string.should_not match(/`users`.`id` >= \$start/)
-          string.should_not match(/`users`.`id` <= \$end/)
+          string.should_not match(/`users`.`id` BETWEEN \$start AND \$end/)
           relation
         end
 
@@ -318,8 +316,7 @@ describe ThinkingSphinx::ActiveRecord::SQLBuilder do
 
       it "limits results to a set range" do
         relation.should_receive(:where) do |string|
-          string.should match(/"users"."id" >= \$start/)
-          string.should match(/"users"."id" <= \$end/)
+          string.should match(/"users"."id" BETWEEN \$start AND \$end/)
           relation
         end
 
@@ -330,8 +327,7 @@ describe ThinkingSphinx::ActiveRecord::SQLBuilder do
         source.stub! :disable_range? => true
 
         relation.should_receive(:where) do |string|
-          string.should_not match(/"users"."id" >= \$start/)
-          string.should_not match(/"users"."id" <= \$end/)
+          string.should_not match(/"users"."id" BETWEEN \$start AND \$end/)
           relation
         end
 
@@ -590,8 +586,7 @@ describe ThinkingSphinx::ActiveRecord::SQLBuilder do
 
     it "shouldn't limit results to a range" do
       relation.should_receive(:where) do |string|
-        string.should_not match(/`users`.`id` >= \$start/)
-        string.should_not match(/`users`.`id` <= \$end/)
+        string.should_not match(/`users`.`id` BETWEEN \$start AND \$end/)
         relation
       end
 

data/spec/thinking_sphinx/active_record/sql_source_spec.rb

@@ -1,9 +1,8 @@
 require 'spec_helper'
 
 describe ThinkingSphinx::ActiveRecord::SQLSource do
-  let(:model)      { double('model', :connection => connection,
-    :name => 'User', :column_names => [], :inheritance_column => 'type',
-    :primary_key => :id) }
+  let(:model)      { double('model', :name => 'User', :column_names => [],
+    :inheritance_column => 'type', :primary_key => :id) }
   let(:connection) {
     double('connection', :instance_variable_get => db_config) }
   let(:db_config)  { {:host => 'localhost', :user => 'root',
@@ -13,6 +12,8 @@ describe ThinkingSphinx::ActiveRecord::SQLSource do
   let(:adapter)    { double('adapter') }
 
   before :each do
+    stub_const 'ActiveRecord::Base', double(:connection => connection)
+
     ThinkingSphinx::ActiveRecord::DatabaseAdapters::MySQLAdapter.
       stub!(:=== => true)
     ThinkingSphinx::ActiveRecord::DatabaseAdapters.

data/spec/thinking_sphinx/configuration_spec.rb

@@ -23,6 +23,28 @@ describe ThinkingSphinx::Configuration do
     end
   end
 
+  describe '.reset' do
+    after :each do
+      config.framework = ThinkingSphinx::Frameworks.current
+    end
+
+    it 'does not cache settings after reset' do
+      File.stub :exists? => true
+      File.stub :read => {
+        'test'       => {'foo' => 'bugs'},
+        'production' => {'foo' => 'bar'}
+      }.to_yaml
+
+      ThinkingSphinx::Configuration.reset
+      # Grab a new copy of the instance.
+      config = ThinkingSphinx::Configuration.instance
+      config.settings['foo'].should == 'bugs'
+
+      config.framework = double :environment => 'production', :root => '/tmp/'
+      config.settings['foo'].should == 'bar'
+    end
+  end
+
   describe '#configuration_file' do
     it "uses the Rails environment in the configuration file name" do
       config.configuration_file.
@@ -68,13 +90,11 @@ describe ThinkingSphinx::Configuration do
     end
 
     it "uses app/indices in the Rails engines" do
-      engine =
-        stub(:engine, { :paths => { 'app/indices' =>
-          stub(:path, { :existent => '/engine/app/indices' } )
-        } } )
+      engine = stub(:engine, { :paths => { 'app/indices' =>
+        stub(:path, { :existent => '/engine/app/indices' } )
+      } } )
 
-      Rails::Engine::Railties.should_receive(:engines).
-        and_return([ engine ])
+      Rails::Engine::Railties.should_receive(:engines).and_return([ engine ])
 
       config.index_paths.should include('/engine/app/indices')
     end