thinking-sphinx 2.0.11 → 2.0.12

data/lib/thinking_sphinx/search.rb

@@ -95,6 +95,11 @@ module ThinkingSphinx
       populate if @options[:populate]
     end
 
+    def ==(object)
+      populate
+      super
+    end
+
     def to_a
       populate
       @array
@@ -442,6 +447,8 @@ module ThinkingSphinx
     def compose_results
       if options[:ids_only]
         compose_ids_results
+      elsif options[:attributes_only]
+        compose_attributes_results
       elsif options[:only]
         compose_only_results
       else
@@ -458,6 +465,16 @@ module ThinkingSphinx
       }
     end
 
+    def compose_attributes_results
+      replace @results[:matches].collect { |match|
+        attributes = {}
+        match[:attributes].each do |name, value|
+          attributes[name.to_sym] = match[:attributes][name]
+        end
+        attributes
+      }
+    end
+
     def compose_only_results
       replace @results[:matches].collect { |match|
         case only = options[:only]
@@ -544,7 +561,7 @@ module ThinkingSphinx
       [
         :max_matches, :group_by, :group_function, :group_clause,
         :group_distinct, :id_range, :cut_off, :retry_count, :retry_delay,
-        :rank_mode, :max_query_time, :field_weights
+        :rank_mode, :rank_expr, :max_query_time, :field_weights
       ].each do |key|
         value = options[key] || index_options[key]
         client.send("#{key}=", value) if value
@@ -775,8 +792,10 @@ module ThinkingSphinx
         filter_value(value.first).first..filter_value(value.last).first
       when Array
         value.collect { |v| filter_value(v) }.flatten
-      when Date, Time
-        [value.to_time.to_i]
+      when Time
+        [value.to_i]
+      when Date
+        [Time.utc(value.year, value.month, value.day).to_i]
       when NilClass
         0
       else
@@ -885,7 +904,7 @@ module ThinkingSphinx
       index_options = klass.sphinx_index_options
 
       ids = matches.collect { |match| match[:attributes]["sphinx_internal_id"] }
-      instances = ids.length > 0 ? klass.find(
+      instances = ids.length > 0 ? klass.unscoped.find(
         :all,
         :joins      => options[:joins],
         :conditions => {klass.primary_key_for_sphinx.to_sym => ids},

data/lib/thinking_sphinx/source.rb

@@ -27,11 +27,6 @@ module ThinkingSphinx
         @model, [], initial_joins
       )
 
-      unless @model.descends_from_active_record?
-        stored_class = @model.store_full_sti_class ? @model.name : @model.name.demodulize
-        @conditions << "#{@model.quoted_table_name}.#{quote_column(@model.inheritance_column)} = '#{stored_class}'"
-      end
-
       add_internal_attributes_and_facets
     end
 
@@ -97,6 +92,11 @@ module ThinkingSphinx
       source.sql_db   = config[:database]
       source.sql_port = config[:port]
       source.sql_sock = config[:socket]
+
+      # MySQL SSL support
+      source.mysql_ssl_ca   = config[:sslca]   if config[:sslca]
+      source.mysql_ssl_cert = config[:sslcert] if config[:sslcert]
+      source.mysql_ssl_key  = config[:sslkey]  if config[:sslkey]
     end
 
     def set_source_fields(source)

data/lib/thinking_sphinx/source/sql.rb

@@ -6,9 +6,9 @@ module ThinkingSphinx
       # the version filtered for delta values, send through :delta => true in
       # the options. Won't do much though if the index isn't set up to support a
       # delta sibling.
-      # 
+      #
       # Examples:
-      # 
+      #
       #   source.to_sql
       #   source.to_sql(:delta => true)
       #
@@ -32,10 +32,10 @@ module ThinkingSphinx
       # Simple helper method for the query range SQL - which is a statement that
       # returns minimum and maximum id values. These can be filtered by delta -
       # so pass in :delta => true to get the delta version of the SQL.
-      # 
+      #
       def to_sql_query_range(options={})
         return nil if @index.options[:disable_range]
-        
+
         min_statement = adapter.convert_nulls(
           "MIN(#{quote_column(@model.primary_key_for_sphinx)})", 1
         )
@@ -54,7 +54,7 @@ module ThinkingSphinx
 
       # Simple helper method for the query info SQL - which is a statement that
       # returns the single row for a corresponding id.
-      # 
+      #
       def to_sql_query_info(offset)
         "SELECT * FROM #{@model.quoted_table_name} WHERE " +
         "#{quote_column(@model.primary_key_for_sphinx)} = (($id - #{offset}) / #{ThinkingSphinx.context.indexed_models.size})"
@@ -64,7 +64,7 @@ module ThinkingSphinx
         unique_id_expr = ThinkingSphinx.unique_id_expression(adapter, offset)
 
         (
-          ["#{@model.quoted_table_name}.#{quote_column(@model.primary_key_for_sphinx)} #{unique_id_expr} AS #{quote_column(@model.primary_key_for_sphinx)} "] + 
+          ["#{@model.quoted_table_name}.#{quote_column(@model.primary_key_for_sphinx)} #{unique_id_expr} AS #{quote_column(@model.primary_key_for_sphinx)} "] +
           @fields.collect     { |field|     field.to_select_sql     } +
           @attributes.collect { |attribute| attribute.to_select_sql }
         ).compact.join(", ")
@@ -92,7 +92,7 @@ module ThinkingSphinx
         end
 
         (
-          ["#{@model.quoted_table_name}.#{quote_column(@model.primary_key_for_sphinx)}"] + 
+          ["#{@model.quoted_table_name}.#{quote_column(@model.primary_key_for_sphinx)}"] +
           @fields.collect     { |field|     field.to_group_sql     }.compact +
           @attributes.collect { |attribute| attribute.to_group_sql }.compact +
           @groupings + internal_groupings
@@ -118,40 +118,57 @@ module ThinkingSphinx
       def crc_column
         if @model.table_exists? &&
           @model.column_names.include?(@model.inheritance_column)
-          
+
           types = types_to_crcs
           return @model.to_crc32.to_s if types.empty?
-          
+
           adapter.case(adapter.convert_nulls(
-            adapter.quote_with_table(@model.inheritance_column)),
+            adapter.quote_with_table(@model.inheritance_column), @model.name),
             types, @model.to_crc32)
         else
           @model.to_crc32.to_s
         end
       end
-      
+
       def internal_class_column
+        quoted_name = "'#{@model.name}'"
+
         if @model.table_exists? &&
           @model.column_names.include?(@model.inheritance_column)
-          adapter.quote_with_table(@model.inheritance_column)
+
+          types = types_to_hash
+          return quoted_name if types.empty?
+
+          adapter.case(adapter.convert_nulls(
+            adapter.quote_with_table(@model.inheritance_column), @model.name),
+            types, quoted_name)
         else
-          "'#{@model.name}'"
+          quoted_name
         end
       end
-      
+
       def type_values
+        return @model.sphinx_types unless @model.sphinx_types.nil?
+
         @model.connection.select_values <<-SQL
 SELECT DISTINCT #{@model.inheritance_column}
 FROM #{@model.table_name}
         SQL
       end
-      
+
       def types_to_crcs
         type_values.compact.inject({}) { |hash, type|
           hash[type] = type.to_crc32
           hash
         }
       end
+
+      def types_to_hash
+        type_values.compact.inject({}) { |hash, type|
+          hash[type] = "'#{type}'"
+          hash
+        }
+      end
     end
   end
-end
+end

data/lib/thinking_sphinx/version.rb

@@ -1,3 +1,3 @@
 module ThinkingSphinx
-  Version = '2.0.11'
+  Version = '2.0.12'
 end

data/spec/fixtures/models.rb

@@ -99,6 +99,9 @@ class Child < Person
   end
 end
 
+class Teenager < Child
+end
+
 class Alpha < ActiveRecord::Base
   has_many :betas, :class_name => 'Beta'
   has_many :thetas

data/spec/spec_helper.rb

@@ -10,7 +10,6 @@ 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}

data/spec/sphinx_helper.rb

@@ -18,6 +18,9 @@ class SphinxHelper
       @username = config['username']
       @password = config['password']
       @socket   = config['socket']
+      @sslca    = config['sslca']
+      @sslcert  = config['sslcert']
+      @sslkey   = config['sslkey']
     end
 
     @path = File.expand_path(File.dirname(__FILE__))
@@ -30,7 +33,10 @@ class SphinxHelper
       :username => @username,
       :password => @password,
       :host     => @host,
-      :socket   => @socket
+      :socket   => @socket,
+      :sslca    => @sslca,
+      :sslcert  => @sslcert,
+      :sslkey   => @sslkey
     )
     ActiveRecord::Base.logger = Logger.new(File.open('tmp/activerecord.log', 'a'))
 

data/spec/thinking_sphinx/active_record_spec.rb

@@ -419,6 +419,21 @@ describe ThinkingSphinx::ActiveRecord do
     end
   end
 
+  describe '#types_for_sphinx' do
+    after :each do
+      Person.set_sphinx_types nil
+    end
+
+    it "should return nil by default" do
+      Person.sphinx_types.should == nil
+    end
+
+    it "should return the specified value" do
+      Person.set_sphinx_types %w(Person Parent)
+      Person.sphinx_types.should == %w(Person Parent)
+    end
+  end
+
   describe '.sphinx_index_names' do
     it "should return the core index" do
       Alpha.define_index { indexes :name }

data/spec/thinking_sphinx/auto_version_spec.rb

@@ -54,6 +54,14 @@ describe ThinkingSphinx::AutoVersion do
       ThinkingSphinx::AutoVersion.detect
     end
 
+    it "should require 2.1.0 if using Sphinx 2.0.3" do
+      ThinkingSphinx::AutoVersion.should_receive(:require).
+        with('riddle/2.1.0')
+
+      @config.stub!(:version => '2.0.3-release')
+      ThinkingSphinx::AutoVersion.detect
+    end
+
     it "should require 2.1.0 if using Sphinx 2.1.0 dev" do
       ThinkingSphinx::AutoVersion.should_receive(:require).
         with('riddle/2.1.0')

data/spec/thinking_sphinx/index/builder_spec.rb

@@ -10,338 +10,338 @@ describe ThinkingSphinx::Index::Builder do
         indexes first_name, last_name
         has birthday
         has id, :as => :internal_id
-        
+
         set_property :sql_range_step => 1000
-        
+
         where "birthday <= NOW()"
         group_by "first_name"
       end
-      
+
       @source = @index.sources.first
     end
-    
+
     it "should return an index" do
       @index.should be_a_kind_of(ThinkingSphinx::Index)
     end
-    
+
     it "should have one source for the index" do
       @index.sources.length.should == 1
     end
-    
+
     it "should have two fields" do
       @source.fields.length.should == 2
       @source.fields[0].unique_name.should == :first_name
       @source.fields[1].unique_name.should == :last_name
     end
-    
+
     it "should have two attributes alongside the internal ones" do
       @source.attributes.length.should == 2 + internal_attribute_count
       @source.attributes[internal_attribute_count].unique_name.should == :birthday
       @source.attributes[1 + internal_attribute_count].unique_name.should == :internal_id
     end
-    
+
     it "should have one condition" do
       @source.conditions.length.should == 1
       @source.conditions.first.should == "birthday <= NOW()"
     end
-    
+
     it "should have one grouping" do
       @source.groupings.length.should == 1
       @source.groupings.first.should == "first_name"
     end
-    
+
     it "should have one option" do
       @source.options.length.should == 1
       @source.options[:sql_range_step].should == 1000
     end
   end
-  
+
   describe 'aliased field' do
     before :each do
       @index = ThinkingSphinx::Index::Builder.generate(Person) do
         indexes first_name, :as => 'name'
       end
-      
+
       @source = @index.sources.first
     end
-    
+
     it "should store the alias as a symbol for consistency" do
       @source.fields.last.unique_name.should == :name
     end
   end
-  
+
   describe 'aliased attribute' do
     before :each do
       @index = ThinkingSphinx::Index::Builder.generate(Person) do
         indexes first_name
         has :id, :as => 'real_id'
       end
-      
+
       @source = @index.sources.first
     end
-    
+
     it "should store the alias as a symbol for consistency" do
       @source.attributes.last.unique_name.should == :real_id
     end
   end
-  
+
   describe "sortable field" do
     before :each do
       @index = ThinkingSphinx::Index::Builder.generate(Person) do
         indexes first_name, :sortable => true
       end
-      
+
       @source = @index.sources.first
     end
-    
+
     it "should have one field" do
       @source.fields.length.should == 1
     end
-    
+
     it "should have one attribute alongside the internal ones" do
       @source.attributes.length.should == 1 + internal_attribute_count
     end
-    
+
     it "should set the attribute name to have the _sort suffix" do
       @source.attributes.last.unique_name.should == :first_name_sort
     end
-    
+
     it "should set the attribute column to be the same as the field" do
       @source.attributes.last.columns.length.should == 1
       @source.attributes.last.columns.first.__name.should == :first_name
     end
   end
-  
+
   describe '#join' do
     before :each do
       @index = ThinkingSphinx::Index::Builder.generate(Person) do
         indexes first_name
-        
+
         join contacts
       end
-      
+
       @source = @index.sources.first
     end
-    
+
     it "should include the explicit join" do
       @source.joins.length.should == 1
     end
   end
-  
+
   describe "faceted field" do
     before :each do
       @index = ThinkingSphinx::Index::Builder.generate(Person) do
         indexes first_name, :facet => true
       end
-      
+
       @source = @index.sources.first
     end
-    
+
     after :each do
       Person.sphinx_facets.delete_at(-1)
     end
-    
+
     it "should have one field" do
       @source.fields.length.should == 1
     end
-    
+
     it "should have one attribute alongside the internal ones" do
       @source.attributes.length.should == 1 + internal_attribute_count
     end
-    
+
     it "should set the attribute name to have the _facet suffix" do
       @source.attributes.last.unique_name.should == :first_name_facet
     end
-    
+
     it "should set the attribute type to integer" do
       @source.attributes.last.type.should == :integer
     end
-    
+
     it "should set the attribute column to be the same as the field" do
       @source.attributes.last.columns.length.should == 1
       @source.attributes.last.columns.first.__name.should == :first_name
     end
   end
-  
+
   describe "faceted integer attribute" do
     before :each do
       @index = ThinkingSphinx::Index::Builder.generate(Alpha) do
         indexes :name
         has value, :facet => true
       end
-      
+
       @source = @index.sources.first
     end
-    
+
     after :each do
       Alpha.sphinx_facets.delete_at(-1)
     end
-    
+
     it "should have just one attribute alongside the internal ones" do
       @source.attributes.length.should == 1 + internal_attribute_count
     end
   end
-  
+
   describe "faceted timestamp attribute" do
     before :each do
       @index = ThinkingSphinx::Index::Builder.generate(Person) do
         indexes first_name
         has birthday, :facet => true
       end
-      
+
       @source = @index.sources.first
     end
-    
+
     after :each do
       Person.sphinx_facets.delete_at(-1)
     end
-    
+
     it "should have just one attribute alongside the internal ones" do
       @source.attributes.length.should == 1 + internal_attribute_count
     end
   end
-  
+
   describe "faceted boolean attribute" do
     before :each do
       @index = ThinkingSphinx::Index::Builder.generate(Beta) do
         indexes :name
         has delta, :facet => true
       end
-      
+
       @source = @index.sources.first
     end
-    
+
     after :each do
       Beta.sphinx_facets.delete_at(-1)
     end
-    
+
     it "should have just one attribute alongside the internal ones" do
       @source.attributes.length.should == 1 + internal_attribute_count
     end
   end
-  
+
   describe "faceted float attribute" do
     before :each do
       @index = ThinkingSphinx::Index::Builder.generate(Alpha) do
         indexes :name
         has cost, :facet => true
       end
-      
+
       @source = @index.sources.first
     end
-    
+
     after :each do
       Alpha.sphinx_facets.delete_at(-1)
     end
-    
+
     it "should have just one attribute alongside the internal ones" do
       @source.attributes.length.should == 1 + internal_attribute_count
     end
   end
-  
+
   describe "faceted string attribute" do
     before :each do
       @index = ThinkingSphinx::Index::Builder.generate(Person) do
         indexes first_name
         has last_name, :facet => true
       end
-      
+
       @source = @index.sources.first
     end
-    
+
     after :each do
       Person.sphinx_facets.delete_at(-1)
     end
-    
+
     it "should have two attributes alongside the internal ones" do
       @source.attributes.length.should == 2 + internal_attribute_count
     end
-    
+
     it "should set the facet attribute name to have the _facet suffix" do
       @source.attributes.last.unique_name.should == :last_name_facet
     end
-    
+
     it "should set the attribute type to integer" do
       @source.attributes.last.type.should == :integer
     end
-    
+
     it "should set the attribute column to be the same as the field" do
       @source.attributes.last.columns.length.should == 1
       @source.attributes.last.columns.first.__name.should == :last_name
     end
   end
-  
+
   describe 'faceted manual MVA' do
     before :each do
       @index = ThinkingSphinx::Index::Builder.generate(Person) do
         indexes first_name
         has 'SQL STATEMENT', :type => :multi, :as => :sql, :facet => true
       end
-      
+
       @source = @index.sources.first
     end
-    
+
     after :each do
       Person.sphinx_facets.delete_at(-1)
     end
-    
+
     it "should have two attributes alongside the internal ones" do
       @source.attributes.length.should == 2 + internal_attribute_count
     end
-    
+
     it "should set the facet attribute name to have the _facet suffix" do
       @source.attributes.last.unique_name.should == :sql_facet
     end
-    
+
     it "should keep the original attribute's name set as requested" do
       @source.attributes[-2].unique_name.should == :sql
     end
-    
+
     it "should set the attribute type to multi" do
       @source.attributes.last.type.should == :multi
     end
-    
+
     it "should set the attribute column to be the same as the field" do
       @source.attributes.last.columns.length.should == 1
       @source.attributes.last.columns.first.__name.should == 'SQL STATEMENT'
     end
   end
-  
+
   describe 'faceted MVA field' do
     before :each do
       @index = ThinkingSphinx::Index::Builder.generate(Person) do
         indexes tags(:name), :as => :tags, :facet => true
       end
-      
+
       @source = @index.sources.first
     end
-    
+
     after :each do
       Person.sphinx_facets.delete_at(-1)
     end
-    
+
     it "should have one field" do
       @source.fields.length.should == 1
     end
-    
+
     it "should have one attribute alongside the internal ones" do
       @source.attributes.length.should == 1 + internal_attribute_count
     end
-    
+
     it "should set the attribute name to have the _facet suffix" do
       @source.attributes.last.unique_name.should == :tags_facet
     end
-    
+
     it "should set the attribute type to multi" do
       @source.attributes.last.type.should == :multi
     end
-    
+
     it "should set the attribute column to be the same as the field" do
       @source.attributes.last.columns.length.should == 1
       @source.attributes.last.columns.first.__name.should == :name
     end
   end
-  
+
   describe "no fields" do
     it "should raise an exception" do
       lambda {
@@ -351,7 +351,7 @@ describe ThinkingSphinx::Index::Builder do
       }.should raise_error
     end
   end
-  
+
   describe "explicit source" do
     before :each do
       @index = ThinkingSphinx::Index::Builder.generate(Person) do
@@ -359,38 +359,38 @@ describe ThinkingSphinx::Index::Builder do
           indexes first_name, last_name
           has birthday
           has id, :as => :internal_id
-        
+
           set_property :delta => true
-        
+
           where "birthday <= NOW()"
           group_by "first_name"
         end
       end
-      
+
       @source = @index.sources.first
     end
-    
+
     it "should return an index" do
       @index.should be_a_kind_of(ThinkingSphinx::Index)
     end
-    
+
     it "should have one source for the index" do
       @index.sources.length.should == 1
     end
-    
+
     it "should have two fields" do
       @source.fields.length.should == 2
       @source.fields[0].unique_name.should == :first_name
       @source.fields[1].unique_name.should == :last_name
     end
-    
+
     it "should have two attributes alongside the internal ones" do
       @source.attributes.length.should == 2 + internal_attribute_count
       @source.attributes[internal_attribute_count].unique_name.should == :birthday
       @source.attributes[1 + internal_attribute_count].unique_name.should == :internal_id
     end
   end
-  
+
   describe "multiple sources" do
     before :each do
       @index = ThinkingSphinx::Index::Builder.generate(Person) do
@@ -398,104 +398,125 @@ describe ThinkingSphinx::Index::Builder do
           indexes first_name
           has birthday
         end
-        
+
         define_source do
           indexes last_name
           has :id, :as => :internal_id
         end
       end
     end
-    
+
     it "should have two sources" do
       @index.sources.length.should == 2
     end
-    
+
     it "should have two fields" do
       @index.fields.length.should == 2
     end
-    
+
     it "should have one field in each source" do
       @index.sources.each do |source|
         source.fields.length.should == 1
       end
     end
-    
+
     it "should have two attributes alongside the six internal ones" do
       @index.attributes.length.should == 2 + (internal_attribute_count * 2)
     end
-    
+
     it "should have one attribute in each source alongside the internal ones" do
       @index.sources.each do |source|
         source.attributes.length.should == 1 + internal_attribute_count
       end
     end
   end
-  
+
+  describe "multiple local indexes" do
+    before :each do
+      @index = ThinkingSphinx::Index::Builder.generate(Person) do
+        indexes first_name
+
+        use_local_index :other_local_index_1
+        use_local_indices "other_local_index_2", "other_local_index_3"
+      end
+    end
+
+    it "should have three additional indexes" do
+      @index.additional_indices.length.should == 3
+    end
+
+    it "should append _core to the name of each local index" do
+      @index.additional_indices[0].should eql("other_local_index_1_core")
+      @index.additional_indices[1].should eql("other_local_index_2_core")
+      @index.additional_indices[2].should eql("other_local_index_3_core")
+    end
+  end
+
   describe "index options" do
     before :each do
       @index = ThinkingSphinx::Index::Builder.generate(Person) do
         indexes first_name
-        
+
         set_property :charset_type => "utf16"
         set_property :group_concat_max_len => 1024
       end
     end
-    
+
     it "should store the index setting for the index" do
       @index.local_options[:charset_type].should == "utf16"
     end
-    
+
     it "should store non-Sphinx settings for the index" do
       @index.local_options[:group_concat_max_len].should == 1024
     end
   end
-  
+
   describe "delta options" do
     before :each do
       @index = ThinkingSphinx::Index::Builder.generate(Person) do
         indexes first_name
-        
+
         set_property :delta => true
       end
     end
-    
+
     it "should not keep the delta setting in source options" do
       @index.sources.first.options.should be_empty
     end
-    
+
     it "should not keep the delta setting in index options" do
       @index.local_options.should be_empty
     end
-    
+
     it "should set the index delta object set" do
       @index.delta_object.should be_a_kind_of(ThinkingSphinx::Deltas::DefaultDelta)
     end
   end
-  
+
   context 'index options' do
     before :each do
       @index = ThinkingSphinx::Index::Builder.generate(Person) do
         indexes first_name
-        
+
         set_property :index_exact_words => true
       end
     end
-    
+
     it "should track the index_exact_words option to the index" do
       @index.local_options[:index_exact_words].should be_true
     end
   end
-  
+
   context 'with an explicit name' do
     it "should set the index's name using the provided value" do
       index = ThinkingSphinx::Index::Builder.generate(Person, 'custom') do
         indexes first_name
       end
-      
+
       index.name.should == 'custom'
     end
   end
-  
+
   describe "sanitize_sql" do
     def index
       @index ||= ThinkingSphinx::Index::Builder.generate(Person) do
@@ -503,7 +524,7 @@ describe ThinkingSphinx::Index::Builder do
         where sanitize_sql(["gender = ?", "female"])
       end
     end
-    
+
     it "should be aliased to ActiveRecord::Base.sanitize_sql" do
       index.sources.first.conditions.first.should == index.model.send(:sanitize_sql, ["gender = ?", "female"])
     end