thinking-sphinx 3.0.1 → 3.0.2

data/lib/thinking_sphinx/core/index.rb

@@ -2,7 +2,7 @@ module ThinkingSphinx::Core::Index
   extend ActiveSupport::Concern
 
   included do
-    attr_reader :reference, :offset
+    attr_reader :reference, :offset, :options
     attr_writer :definition_block
   end
 

data/lib/thinking_sphinx/errors.rb

@@ -5,6 +5,8 @@ class ThinkingSphinx::SphinxError < StandardError
       replacement = ThinkingSphinx::ParseError.new(error.message)
     when /syntax error/
       replacement = ThinkingSphinx::SyntaxError.new(error.message)
+    when /query error/
+      replacement = ThinkingSphinx::QueryError.new(error.message)
     else
       replacement = new(error.message)
     end

data/lib/thinking_sphinx/masks/group_enumerators_mask.rb

@@ -3,6 +3,10 @@ class ThinkingSphinx::Masks::GroupEnumeratorsMask
     @search = search
   end
 
+  def can_handle?(method)
+    public_methods(false).include?(method)
+  end
+
   def each_with_count(&block)
     @search.raw.each_with_index do |row, index|
       yield @search[index], row['@count']

data/lib/thinking_sphinx/masks/pagination_mask.rb

@@ -3,6 +3,10 @@ class ThinkingSphinx::Masks::PaginationMask
     @search = search
   end
 
+  def can_handle?(method)
+    public_methods(false).include?(method)
+  end
+
   def current_page
     search.options[:page] = 1 if search.options[:page].blank?
     search.options[:page].to_i

data/lib/thinking_sphinx/masks/scopes_mask.rb

@@ -3,8 +3,8 @@ class ThinkingSphinx::Masks::ScopesMask
     @search = search
   end
 
-  def respond_to?(method, include_private = false)
-    super || can_apply_scope?(method)
+  def can_handle?(method)
+    public_methods(false).include?(method) || can_apply_scope?(method)
   end
 
   def search(query = nil, options = {})

data/lib/thinking_sphinx/masks/weight_enumerator_mask.rb

@@ -3,6 +3,10 @@ class ThinkingSphinx::Masks::WeightEnumeratorMask
     @search = search
   end
 
+  def can_handle?(method)
+    public_methods(false).include?(method)
+  end
+
   def each_with_weight(&block)
     @search.raw.each_with_index do |row, index|
       yield @search[index], row['@weight']

data/lib/thinking_sphinx/middlewares/active_record_translator.rb

@@ -52,15 +52,16 @@ class ThinkingSphinx::Middlewares::ActiveRecordTranslator <
 
     def results_for_models
       @results_for_models ||= model_names.inject({}) { |hash, name|
-        ids        = ids_for_model(name)
-        relation   = name.constantize.unscoped
+        ids      = ids_for_model(name)
+        model    = name.constantize
+        relation = model.unscoped
 
         relation = relation.includes sql_options[:include] if sql_options[:include]
         relation = relation.joins  sql_options[:joins]  if sql_options[:joins]
         relation = relation.order  sql_options[:order]  if sql_options[:order]
         relation = relation.select sql_options[:select] if sql_options[:select]
 
-        hash[name] = relation.where(:id => ids)
+        hash[name] = relation.where(model.primary_key => ids)
 
         hash
       }

data/lib/thinking_sphinx/middlewares/sphinxql.rb

@@ -1,7 +1,9 @@
 class ThinkingSphinx::Middlewares::SphinxQL <
   ThinkingSphinx::Middlewares::Middleware
 
-  SELECT_OPTIONS = [:field_weights, :ranker]
+  SELECT_OPTIONS = [:ranker, :max_matches, :cutoff, :max_query_time,
+    :retry_count, :retry_delay, :field_weights, :index_weights, :reverse_scan,
+    :comment]
 
   def call(contexts)
     contexts.each do |context|
@@ -102,6 +104,10 @@ class ThinkingSphinx::Middlewares::SphinxQL <
       indices.collect(&:name)
     end
 
+    def index_options
+      indices.first.options
+    end
+
     def indices
       @indices ||= ThinkingSphinx::IndexSet.new classes, options[:indices]
     end
@@ -120,12 +126,18 @@ class ThinkingSphinx::Middlewares::SphinxQL <
     end
 
     def select_options
-      @select_options ||= options.keys.inject({}) do |hash, key|
-        hash[key] = options[key] if SELECT_OPTIONS.include?(key)
+      @select_options ||= SELECT_OPTIONS.inject({}) do |hash, key|
+        hash[key] = settings[key.to_s] if settings.key? key.to_s
+        hash[key] = index_options[key] if index_options.key? key
+        hash[key] = options[key]       if options.key? key
         hash
       end
     end
 
+    def settings
+      context.configuration.settings
+    end
+
     def statement
       Riddle::Query::Select.new.tap do |select|
         select.from *index_names.collect { |index| "`#{index}`" }

data/lib/thinking_sphinx/railtie.rb

@@ -7,3 +7,16 @@ class ThinkingSphinx::Railtie < Rails::Railtie
     load File.expand_path('../tasks.rb', __FILE__)
   end
 end
+
+# Add 'app/indices' path to Rails Engines
+module ThinkingSphinx::EnginePaths
+  extend ActiveSupport::Concern
+
+  included do
+    initializer :add_indices_path do
+      paths.add "app/indices"
+    end
+  end
+end
+
+Rails::Engine.send :include, ThinkingSphinx::EnginePaths

data/lib/thinking_sphinx/search.rb

@@ -45,7 +45,8 @@ class ThinkingSphinx::Search < Array
 
   alias_method :offset_value, :offset
 
-  def per_page
+  def per_page(value = nil)
+    @options[:limit] = value unless value.nil?
     @options[:limit] ||= (@options[:per_page] || 20)
     @options[:limit].to_i
   end
@@ -93,7 +94,7 @@ class ThinkingSphinx::Search < Array
 
   def method_missing(method, *args, &block)
     mask_stack.each do |mask|
-      return mask.send(method, *args, &block) if mask.respond_to?(method)
+      return mask.send(method, *args, &block) if mask.can_handle?(method)
     end
 
     populate if !SAFE_METHODS.include?(method.to_s)

data/lib/thinking_sphinx/search/query.rb

@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 class ThinkingSphinx::Search::Query
   if Regexp.instance_methods.include?(:encoding)
     DefaultToken = Regexp.new('\p{Word}+')
@@ -13,6 +15,8 @@ class ThinkingSphinx::Search::Query
 
   def to_s
     (star_keyword(keywords) + ' ' + conditions.keys.collect { |key|
+       next if conditions[key].blank?
+
       "@#{key} #{star_keyword conditions[key], key}"
     }.join(' ')).strip
   end

data/spec/acceptance/specifying_sql_spec.rb

@@ -355,7 +355,7 @@ describe 'separate queries for field' do
     declaration, query = field.split(/;\s+/)
 
     declaration.should == 'tags from 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. ORDER BY .taggings.\..article_id. ASC\s?$/)
+    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? ORDER BY .taggings.\..article_id. ASC\s?$/)
   end
 
   it "respects has_many :through joins for MVF queries" do
@@ -368,7 +368,7 @@ describe 'separate queries for field' do
     declaration, query = field.split(/;\s+/)
 
     declaration.should == 'tags from 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. ORDER BY .taggings.\..article_id. ASC\s?$/)
+    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? ORDER BY .taggings.\..article_id. ASC\s?$/)
   end
 
   it "can handle multiple joins for MVF queries" do
@@ -383,7 +383,7 @@ describe 'separate queries for field' do
     declaration, query = field.split(/;\s+/)
 
     declaration.should == 'tags from query'
-    query.should match(/^SELECT .articles.\..user_id. \* #{count} \+ #{source.offset} AS .id., .tags.\..name. AS .tags. FROM .articles. INNER JOIN .taggings. ON .taggings.\..article_id. = .articles.\..id. INNER JOIN .tags. ON .tags.\..id. = .taggings.\..tag_id. ORDER BY .articles.\..user_id. ASC\s?$/)
+    query.should match(/^SELECT .articles.\..user_id. \* #{count} \+ #{source.offset} AS .id., .tags.\..name. AS .tags. FROM .articles. INNER JOIN .taggings. ON .taggings.\..article_id. = .articles.\..id. INNER JOIN .tags. ON .tags.\..id. = .taggings.\..tag_id.\s? ORDER BY .articles.\..user_id. ASC\s?$/)
   end
 
   it "generates a SQL query with joins when appropriate for MVFs" do
@@ -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\) 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. >= \$start\) AND \(.taggings.\..article_id. <= \$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/internal/app/models/tweet.rb

@@ -1,3 +1,3 @@
 class Tweet < ActiveRecord::Base
-  #
+  self.primary_key = :id
 end

data/spec/thinking_sphinx/active_record/associations_spec.rb

@@ -34,8 +34,11 @@ describe ThinkingSphinx::ActiveRecord::Associations do
   end
 
   describe '#add_join_to' do
-    it "adds just one join for a stack with a single association" do
+    before :each do
       JoinDependency::JoinAssociation.unstub :new
+    end
+
+    it "adds just one join for a stack with a single association" do
       JoinDependency::JoinAssociation.should_receive(:new).
         with(join.reflection, base, join_base).once.and_return(join)
 
@@ -43,7 +46,6 @@ describe ThinkingSphinx::ActiveRecord::Associations do
     end
 
     it "does not duplicate joins when given the same stack twice" do
-      JoinDependency::JoinAssociation.unstub :new
       JoinDependency::JoinAssociation.should_receive(:new).once.and_return(join)
 
       associations.add_join_to([:user])
@@ -52,7 +54,6 @@ describe ThinkingSphinx::ActiveRecord::Associations do
 
     context 'multiple joins' do
       it "adds two joins for a stack with two associations" do
-        JoinDependency::JoinAssociation.unstub :new
         JoinDependency::JoinAssociation.should_receive(:new).
           with(join.reflection, base, join_base).once.and_return(join)
         JoinDependency::JoinAssociation.should_receive(:new).
@@ -62,7 +63,6 @@ describe ThinkingSphinx::ActiveRecord::Associations do
       end
 
       it "extends upon existing joins when given stacks where parts are already mapped" do
-        JoinDependency::JoinAssociation.unstub :new
         JoinDependency::JoinAssociation.should_receive(:new).twice.
           and_return(join, sub_join)
 
@@ -70,6 +70,51 @@ describe ThinkingSphinx::ActiveRecord::Associations do
         associations.add_join_to([:user, :posts])
       end
     end
+
+    context 'join with conditions' do
+      let(:connection) { double }
+      let(:parent)     { double :aliased_table_name => 'qux' }
+
+      before :each do
+        JoinDependency::JoinAssociation.stub :new => join
+
+        join.stub :parent => parent
+        model.stub :connection => connection
+        connection.stub(:quote_table_name) { |table| "\"#{table}\"" }
+      end
+
+      it "leaves standard conditions untouched" do
+        join.stub :conditions => 'foo = bar'
+
+        associations.add_join_to [:user]
+
+        join.conditions.should == 'foo = bar'
+      end
+
+      it "modifies filtered polymorphic conditions" do
+        join.stub :conditions => '::ts_join_alias::.foo = bar'
+
+        associations.add_join_to [:user]
+
+        join.conditions.should == '"qux".foo = bar'
+      end
+
+      it "modifies filtered polymorphic conditions within arrays" do
+        join.stub :conditions => ['::ts_join_alias::.foo = bar']
+
+        associations.add_join_to [:user]
+
+        join.conditions.should == ['"qux".foo = bar']
+      end
+
+      it "does not modify conditions as hashes" do
+        join.stub :conditions => [{:foo => 'bar'}]
+
+        associations.add_join_to [:user]
+
+        join.conditions.should == [{:foo => 'bar'}]
+      end
+    end
   end
 
   describe '#aggregate_for?' do

data/spec/thinking_sphinx/active_record/sql_builder_spec.rb

@@ -503,7 +503,7 @@ describe ThinkingSphinx::ActiveRecord::SQLBuilder do
 
     before :each do
       source.stub :options => {}, :delta_processor => nil, :delta? => false
-      adapter.stub :utf8_query_pre => 'SET UTF8'
+      adapter.stub :utf8_query_pre => ['SET UTF8']
     end
 
     it "adds a reset delta query if there is a delta processor and this is the core source" do
@@ -598,11 +598,11 @@ describe ThinkingSphinx::ActiveRecord::SQLBuilder do
       builder.sql_query_range
     end
 
-    it "adds source conditions" do
+    it "does not add source conditions" do
       source.conditions << 'created_at > NOW()'
 
       relation.should_receive(:where) do |string|
-        string.should match(/created_at > NOW()/)
+        string.should_not match(/created_at > NOW()/)
         relation
       end
 

data/spec/thinking_sphinx/active_record/sql_source_spec.rb

@@ -2,7 +2,8 @@ require 'spec_helper'
 
 describe ThinkingSphinx::ActiveRecord::SQLSource do
   let(:model)      { double('model', :connection => connection,
-    :name => 'User', :column_names => [], :inheritance_column => 'type') }
+    :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',
@@ -132,6 +133,18 @@ describe ThinkingSphinx::ActiveRecord::SQLSource do
     end
   end
 
+  describe '#options' do
+    it "defaults to having utf8? set to false" do
+      source.options[:utf8?].should be_false
+    end
+
+    it "sets utf8? to true if the database encoding is utf8" do
+      db_config[:encoding] = 'utf8'
+
+      source.options[:utf8?].should be_true
+    end
+  end
+
   describe '#render' do
     let(:builder)   { double('builder', :sql_query_pre => []).as_null_object }
     let(:config)    { double('config', :settings => {}) }

data/spec/thinking_sphinx/configuration_spec.rb

@@ -28,6 +28,12 @@ describe ThinkingSphinx::Configuration do
       config.configuration_file.
         should == File.join(Rails.root, 'config', 'test.sphinx.conf')
     end
+
+    it "respects provided settings" do
+      write_configuration 'configuration_file' => '/path/to/foo.conf'
+
+      config.configuration_file.should == '/path/to/foo.conf'
+    end
   end
 
   describe '#controller' do
@@ -58,7 +64,19 @@ describe ThinkingSphinx::Configuration do
 
   describe '#index_paths' do
     it "uses app/indices in the Rails app by default" do
-      config.index_paths.should == [File.join(Rails.root, 'app', 'indices')]
+      config.index_paths.should include(File.join(Rails.root, 'app', 'indices'))
+    end
+
+    it "uses app/indices in the Rails engines" do
+      engine =
+        stub(:engine, { :paths => { 'app/indices' =>
+          stub(:path, { :existent => '/engine/app/indices' } )
+        } } )
+
+      Rails::Engine::Railties.should_receive(:engines).
+        and_return([ engine ])
+
+      config.index_paths.should include('/engine/app/indices')
     end
   end
 
@@ -77,6 +95,12 @@ describe ThinkingSphinx::Configuration do
       config.indices_location.
         should == File.join(Rails.root, 'db', 'sphinx', 'test')
     end
+
+    it "respects provided settings" do
+      write_configuration 'indices_location' => '/my/index/files'
+
+      config.indices_location.should == '/my/index/files'
+    end
   end
 
   describe '#initialize' do

data/spec/thinking_sphinx/connection_spec.rb

@@ -2,8 +2,8 @@ require 'spec_helper'
 
 describe ThinkingSphinx::Connection do
   describe '.take' do
-    let(:pool)             { double }
-    let(:connection)       { double }
+    let(:pool)             { double 'pool' }
+    let(:connection)       { double 'connection' }
     let(:error)            { Mysql2::Error.new '' }
     let(:translated_error) { ThinkingSphinx::SphinxError.new }
 
@@ -49,7 +49,7 @@ describe ThinkingSphinx::Connection do
           tries += 1
           raise error if tries < 4
         end
-      }.should raise_error(translated_error)
+      }.should raise_error(ThinkingSphinx::SphinxError)
     end
 
     [ThinkingSphinx::SyntaxError, ThinkingSphinx::ParseError].each do |klass|
@@ -59,7 +59,7 @@ describe ThinkingSphinx::Connection do
         it "raises the error" do
           lambda {
             ThinkingSphinx::Connection.take { |c| raise error }
-          }.should raise_error(translated_error)
+          }.should raise_error(klass)
         end
 
         it "does not yield the connection more than once" do

data/spec/thinking_sphinx/errors_spec.rb

@@ -19,6 +19,13 @@ describe ThinkingSphinx::SphinxError do
         should be_a(ThinkingSphinx::ParseError)
     end
 
+    it "translates query errors" do
+      error.stub :message => 'index foo: query error: something is wrong'
+
+      ThinkingSphinx::SphinxError.new_from_mysql(error).
+        should be_a(ThinkingSphinx::QueryError)
+    end
+
     it "defaults to sphinx errors" do
       error.stub :message => 'index foo: unknown error: something is wrong'