thinking-sphinx 1.3.15 → 1.3.16

data/VERSION

@@ -1 +1 @@
-1.3.15
+1.3.16

data/lib/thinking_sphinx.rb

@@ -63,17 +63,26 @@ module ThinkingSphinx
   # The collection of indexed models. Keep in mind that Rails lazily loads
   # its classes, so this may not actually be populated with _all_ the models
   # that have Sphinx indexes.
+  @@sphinx_mutex = Mutex.new
+  @@context      = nil
+  
   def self.context
-    if Thread.current[:thinking_sphinx_context].nil?
-      Thread.current[:thinking_sphinx_context] = ThinkingSphinx::Context.new
-      Thread.current[:thinking_sphinx_context].prepare
+    if @@context.nil?
+      @@sphinx_mutex.synchronize do
+        if @@context.nil?
+          @@context = ThinkingSphinx::Context.new
+          @@context.prepare
+        end
+      end
     end
     
-    Thread.current[:thinking_sphinx_context]
+    @@context
   end
-  
+
   def self.reset_context!
-    Thread.current[:thinking_sphinx_context] = nil
+    @@sphinx_mutex.synchronize do
+      @@context = nil
+    end
   end
 
   def self.unique_id_expression(offset = nil)

data/lib/thinking_sphinx/active_record/has_many_association.rb

@@ -2,28 +2,50 @@ module ThinkingSphinx
   module ActiveRecord
     module HasManyAssociation
       def search(*args)
+        options   = args.extract_options!
+        options[:with] ||= {}
+        options[:with].merge! default_filter
+        
+        args << options
+        @reflection.klass.search(*args)
+      end
+      
+      def method_missing(method, *args, &block)
+        if responds_to_scope(method)
+          @reflection.klass.
+            search(:with => default_filter).
+            send(method, *args, &block)
+        else
+          super
+        end
+      end
+      
+      private
+      
+      def attribute_for_foreign_key
         foreign_key = @reflection.primary_key_name
         stack = [@reflection.options[:through]].compact
         
-        attribute   = nil
         @reflection.klass.define_indexes
         (@reflection.klass.sphinx_indexes || []).each do |index|
           attribute = index.attributes.detect { |attrib|
             attrib.columns.length == 1 &&
             attrib.columns.first.__name  == foreign_key.to_sym
           }
-          break if attribute
+          return attribute unless attribute.nil?
         end
         
-        raise "Missing Attribute for Foreign Key #{foreign_key}" unless attribute
-        
-        options = args.extract_options!
-        options[:with] ||= {}
-        options[:with][attribute.unique_name] = @owner.id
-        
-        args << options
-        @reflection.klass.search(*args)
+        raise "Missing Attribute for Foreign Key #{foreign_key}"
+      end
+      
+      def default_filter
+        {attribute_for_foreign_key.unique_name => @owner.id}
+      end
+      
+      def responds_to_scope(scope)
+        @reflection.klass.respond_to?(:sphinx_scopes)   &&
+        @reflection.klass.sphinx_scopes.include?(scope)
       end
     end
   end
-end
+end

data/lib/thinking_sphinx/adapters/abstract_adapter.rb

@@ -33,6 +33,10 @@ module ThinkingSphinx
       "#{@model.quoted_table_name}.#{@model.connection.quote_column_name(column)}"
     end
     
+    def bigint_pattern
+      /bigint/i
+    end
+    
     protected
     
     def connection

data/lib/thinking_sphinx/attribute.rb

@@ -93,19 +93,18 @@ module ThinkingSphinx
       
       separator = all_ints? || all_datetimes? || @crc ? ',' : ' '
       
-      clause = @columns.collect { |column|
-        part = column_with_prefix(column)
+      clause = columns_with_prefixes.collect { |column|
         case type
         when :string
-          adapter.convert_nulls(part)
+          adapter.convert_nulls(column)
         when :datetime
-          adapter.cast_to_datetime(part)
+          adapter.cast_to_datetime(column)
         when :multi
-          part = adapter.cast_to_datetime(part)   if is_many_datetimes?
-          part = adapter.convert_nulls(part, '0') if is_many_ints?
-          part
+          column = adapter.cast_to_datetime(column)   if is_many_datetimes?
+          column = adapter.convert_nulls(column, '0') if is_many_ints?
+          column
         else
-          part
+          column
         end
       }.join(', ')
       
@@ -123,7 +122,8 @@ module ThinkingSphinx
         :string   => :sql_attr_str2ordinal,
         :float    => :sql_attr_float,
         :boolean  => :sql_attr_bool,
-        :integer  => :sql_attr_uint
+        :integer  => :sql_attr_uint,
+        :bigint   => :sql_attr_bigint
       }[type]
     end
     
@@ -301,19 +301,11 @@ WHERE #{@source.index.delta_object.clause(model, true)})
       is_many? && all_strings?
     end
        
-    def type_from_database
-      klass = @associations.values.flatten.first ? 
-        @associations.values.flatten.first.reflection.klass : @model
-      
-      column = klass.columns.detect { |col|
-        @columns.collect { |c| c.__name.to_s }.include? col.name
-      }
-      column.nil? ? nil : column.type
-    end
-    
     def translated_type_from_database
       case type_from_db = type_from_database
-      when :datetime, :string, :float, :boolean, :integer
+      when :integer
+        integer_type_from_db
+      when :datetime, :string, :float, :boolean
         type_from_db
       when :decimal
         :float
@@ -331,6 +323,32 @@ block:
       end
     end
     
+    def type_from_database
+      column = column_from_db
+      column.nil? ? nil : column.type
+    end
+    
+    def integer_type_from_db
+      column = column_from_db
+      return nil if column.nil?
+      
+      case column.sql_type
+      when adapter.bigint_pattern
+        :bigint
+      else
+        :integer
+      end
+    end
+    
+    def column_from_db
+      klass = @associations.values.flatten.first ? 
+        @associations.values.flatten.first.reflection.klass : @model
+      
+      klass.columns.detect { |col|
+        @columns.collect { |c| c.__name.to_s }.include? col.name
+      }
+    end
+    
     def all_of_type?(*column_types)
       @columns.all? { |col|
         klasses = @associations[col].empty? ? [@model] :
@@ -359,4 +377,4 @@ block:
       end
     end
   end
-end
+end

data/lib/thinking_sphinx/auto_version.rb

@@ -1,7 +1,7 @@
 module ThinkingSphinx
   class AutoVersion
     def self.detect
-      version = ThinkingSphinx::Configuration.instance.controller.sphinx_version
+      version = ThinkingSphinx::Configuration.instance.version
       case version
       when '0.9.8', '0.9.9'
         require "riddle/#{version}"

data/lib/thinking_sphinx/configuration.rb

@@ -68,6 +68,7 @@ module ThinkingSphinx
       :app_root, :model_directories, :delayed_job_priority
     
     attr_accessor :source_options, :index_options
+    attr_accessor :version
     
     attr_reader :environment, :configuration, :controller
     
@@ -114,7 +115,9 @@ module ThinkingSphinx
         :charset_type => "utf-8"
       }
       
+      self.version = nil
       parse_config
+      self.version ||= @controller.sphinx_version
       
       self
     end

data/lib/thinking_sphinx/field.rb

@@ -69,14 +69,12 @@ module ThinkingSphinx
     # multiple data values (has_many or has_and_belongs_to_many associations).
     # 
     def to_select_sql
-      clause = @columns.collect { |column|
-        column_with_prefix(column)
-      }.join(', ')
+      clause = columns_with_prefixes.join(', ')
       
       clause = adapter.concatenate(clause)       if concat_ws?
       clause = adapter.group_concatenate(clause) if is_many?
       
-      "#{adapter.cast_to_string clause } AS #{quote_column(unique_name)}"
+      "#{clause} AS #{quote_column(unique_name)}"
     end
   end
 end

data/lib/thinking_sphinx/property.rb

@@ -136,10 +136,16 @@ module ThinkingSphinx
           assoc.has_column?(column.__name) ?
           "#{quote_with_table(assoc.join.aliased_table_name, column.__name)}" :
           nil
-        }.compact.join(', ')
+        }.compact
       end
     end
     
+    def columns_with_prefixes
+      @columns.collect { |column|
+        column_with_prefix column
+      }.flatten
+    end
+    
     # Gets a stack of associations for a specific path.
     # 
     def association_stack(path, parent = nil)
@@ -159,4 +165,4 @@ module ThinkingSphinx
       assocs
     end
   end
-end
+end

data/lib/thinking_sphinx/search.rb

@@ -73,6 +73,8 @@ module ThinkingSphinx
       @array    = []
       @options  = args.extract_options!
       @args     = args
+      
+      populate if @options[:populate]
     end
     
     def to_a
@@ -129,8 +131,8 @@ module ThinkingSphinx
     # @param [Symbol] method The method name
     # @return [Boolean] true if either Search or Array responds to the method.
     # 
-    def respond_to?(method)
-      super || @array.respond_to?(method)
+    def respond_to?(method, include_private = false)
+      super || @array.respond_to?(method, include_private)
     end
     
     # The current page number of the result set. Defaults to 1 if no page was

data/lib/thinking_sphinx/source/internal_properties.rb

@@ -2,7 +2,8 @@ module ThinkingSphinx
   class Source
     module InternalProperties
       def add_internal_attributes_and_facets
-        add_internal_attribute :sphinx_internal_id, :integer, @model.primary_key_for_sphinx.to_sym
+        add_internal_attribute :sphinx_internal_id, nil,
+          @model.primary_key_for_sphinx.to_sym
         add_internal_attribute :class_crc,          :integer, crc_column, true
         add_internal_attribute :subclass_crcs,      :multi,   subclasses_to_s
         add_internal_attribute :sphinx_deleted,     :integer, "0"

data/spec/thinking_sphinx/active_record/has_many_association_spec.rb

@@ -52,4 +52,20 @@ describe 'ThinkingSphinx::ActiveRecord::HasManyAssociation' do
       @person.friends.search "test"
     end
   end
-end
+  
+  describe 'filtering sphinx scopes' do
+    before :each do
+      Friendship.stub!(:search => Friendship)
+      
+      @person = Person.find(:first)
+    end
+    
+    it "should add a filter for the attribute in a sphinx scope call" do
+      Friendship.should_receive(:search).with do |options|
+        options[:with][:person_id].should == @person.id
+      end
+      
+      @person.friendships.reverse
+    end
+  end
+end

data/spec/thinking_sphinx/attribute_spec.rb

@@ -47,47 +47,6 @@ describe ThinkingSphinx::Attribute do
     end
   end
   
-  describe '#column_with_prefix' do
-    before :each do
-      @attribute = ThinkingSphinx::Attribute.new @source, [
-        ThinkingSphinx::Index::FauxColumn.new(:col_name)
-      ]
-      @attribute.columns.each { |col| @attribute.associations[col] = [] }
-      @attribute.model = Person
-      
-      @first_join   = Object.new
-      @first_join.stub!(:aliased_table_name => "tabular")
-      @second_join  = Object.new
-      @second_join.stub!(:aliased_table_name => "data")
-      
-      @first_assoc  = ThinkingSphinx::Association.new nil, nil
-      @first_assoc.stub!(:join => @first_join, :has_column? => true)
-      @second_assoc = ThinkingSphinx::Association.new nil, nil
-      @second_assoc.stub!(:join => @second_join, :has_column? => true)
-    end
-    
-    it "should return the column name if the column is a string" do
-      @attribute.columns = [ThinkingSphinx::Index::FauxColumn.new("string")]
-      @attribute.send(:column_with_prefix, @attribute.columns.first).should == "string"
-    end
-    
-    it "should return the column with model's table prefix if there's no associations for the column" do
-      @attribute.send(:column_with_prefix, @attribute.columns.first).should == "`people`.`col_name`"
-    end
-    
-    it "should return the column with its join table prefix if an association exists" do
-      column = @attribute.columns.first
-      @attribute.associations[column] = [@first_assoc]
-      @attribute.send(:column_with_prefix, column).should == "`tabular`.`col_name`"
-    end
-    
-    it "should return multiple columns concatenated if more than one association exists" do
-      column = @attribute.columns.first
-      @attribute.associations[column] = [@first_assoc, @second_assoc]
-      @attribute.send(:column_with_prefix, column).should == "`tabular`.`col_name`, `data`.`col_name`"
-    end
-  end
-  
   describe '#to_select_sql' do
     it "should convert a mixture of dates and datetimes to timestamps" do
       attribute = ThinkingSphinx::Attribute.new(@source,
@@ -99,6 +58,16 @@ describe ThinkingSphinx::Attribute do
       
       attribute.to_select_sql.should == "CONCAT_WS(',', UNIX_TIMESTAMP(`friendships`.`created_at`), UNIX_TIMESTAMP(`friendships`.`created_on`)) AS `times`"
     end
+    
+    it "should handle columns which don't exist for polymorphic joins" do
+      attribute = ThinkingSphinx::Attribute.new(@source,
+        [ ThinkingSphinx::Index::FauxColumn.new(:team, :name),
+          ThinkingSphinx::Index::FauxColumn.new(:team, :league) ],
+        :as => :team
+      )
+      
+      attribute.to_select_sql.should == "CONCAT_WS(' ', IFNULL(`cricket_teams`.`name`, ''), IFNULL(`football_teams`.`name`, ''), IFNULL(`football_teams`.`league`, '')) AS `team`"
+    end
   end
   
   describe '#is_many?' do
@@ -183,15 +152,15 @@ describe ThinkingSphinx::Attribute do
     
     it "should return the column type from the database if not :multi or more than one association" do
       @column.send(:instance_variable_set, :@name, "birthday")
-      @attribute.send(:type).should == :datetime
+      @attribute.type.should == :datetime
       
       @attribute.send(:instance_variable_set, :@type, nil)
       @column.send(:instance_variable_set, :@name, "first_name")
-      @attribute.send(:type).should == :string
+      @attribute.type.should == :string
       
       @attribute.send(:instance_variable_set, :@type, nil)
       @column.send(:instance_variable_set, :@name, "id")
-      @attribute.send(:type).should == :integer
+      @attribute.type.should == :integer
     end
     
     it "should return :multi if the columns return multiple datetimes" do
@@ -200,6 +169,15 @@ describe ThinkingSphinx::Attribute do
       
       @attribute.type.should == :multi
     end
+    
+    it "should return :bigint for 64bit integers" do
+      Person.columns.detect { |col|
+        col.name == 'id'
+      }.stub!(:sql_type => 'BIGINT(20)')
+      @column.send(:instance_variable_set, :@name, 'id')
+      
+      @attribute.type.should == :bigint
+    end
   end
   
   describe '#all_ints?' do

data/spec/thinking_sphinx/auto_version_spec.rb

@@ -3,14 +3,14 @@ require 'spec/spec_helper'
 describe ThinkingSphinx::AutoVersion do
   describe '.detect' do
     before :each do
-      @controller = ThinkingSphinx::Configuration.instance.controller
+      @config = ThinkingSphinx::Configuration.instance
     end
     
     it "should require 0.9.8 if that is the detected version" do
       ThinkingSphinx::AutoVersion.should_receive(:require).
         with('riddle/0.9.8')
       
-      @controller.stub!(:sphinx_version => '0.9.8')
+      @config.stub!(:version => '0.9.8')
       ThinkingSphinx::AutoVersion.detect
     end
     
@@ -18,21 +18,21 @@ describe ThinkingSphinx::AutoVersion do
       ThinkingSphinx::AutoVersion.should_receive(:require).
         with('riddle/0.9.9')
       
-      @controller.stub!(:sphinx_version => '0.9.9')
+      @config.stub!(:version => '0.9.9')
       ThinkingSphinx::AutoVersion.detect
     end
     
     it "should output a warning if the detected version is something else" do
       STDERR.should_receive(:puts)
       
-      @controller.stub!(:sphinx_version => '0.9.7')
+      @config.stub!(:version => '0.9.7')
       ThinkingSphinx::AutoVersion.detect
     end
     
     it "should output a warning if the version cannot be determined" do
       STDERR.should_receive(:puts)
       
-      @controller.stub!(:sphinx_version => nil)
+      @config.stub!(:version => nil)
       ThinkingSphinx::AutoVersion.detect
     end
   end

data/spec/thinking_sphinx/configuration_spec.rb

@@ -37,6 +37,34 @@ describe ThinkingSphinx::Configuration do
       ThinkingSphinx::Configuration.environment.should == "development"
     end
   end
+  
+  describe '#version' do
+    before :each do
+      @config = ThinkingSphinx::Configuration.instance
+      @config.reset
+    end
+    
+    it "should use the given version from sphinx.yml if there is one" do
+      open("#{RAILS_ROOT}/config/sphinx.yml", "w") do |f|
+        f.write  YAML.dump({'development' => {'version' => '0.9.7'}})
+      end
+      @config.reset
+      
+      @config.version.should == '0.9.7'
+      
+      FileUtils.rm "#{RAILS_ROOT}/config/sphinx.yml"
+    end
+    
+    it "should detect the version from Riddle otherwise" do
+      controller = @config.controller
+      controller.stub!(:sphinx_version => '0.9.6')
+      
+      Riddle::Controller.stub!(:new => controller)
+      @config.reset
+      
+      @config.version.should == '0.9.6'
+    end
+  end
 
   describe "parse_config method" do
     before :each do

data/spec/thinking_sphinx/field_spec.rb

@@ -77,47 +77,6 @@ describe ThinkingSphinx::Field do
     end
   end
   
-  describe "column_with_prefix method" do
-    before :each do
-      @field = ThinkingSphinx::Field.new @source, [
-        ThinkingSphinx::Index::FauxColumn.new(:col_name)
-      ]
-      @field.columns.each { |col| @field.associations[col] = [] }
-      @field.model = Person
-      
-      @first_join   = Object.new
-      @first_join.stub!(:aliased_table_name => "tabular")
-      @second_join  = Object.new
-      @second_join.stub!(:aliased_table_name => "data")
-      
-      @first_assoc  = ThinkingSphinx::Association.new nil, nil
-      @first_assoc.stub!(:join => @first_join, :has_column? => true)
-      @second_assoc = ThinkingSphinx::Association.new nil, nil
-      @second_assoc.stub!(:join => @second_join, :has_column? => true)
-    end
-    
-    it "should return the column name if the column is a string" do
-      @field.columns = [ThinkingSphinx::Index::FauxColumn.new("string")]
-      @field.send(:column_with_prefix, @field.columns.first).should == "string"
-    end
-    
-    it "should return the column with model's table prefix if there's no associations for the column" do
-      @field.send(:column_with_prefix, @field.columns.first).should == "`people`.`col_name`"
-    end
-    
-    it "should return the column with its join table prefix if an association exists" do
-      column = @field.columns.first
-      @field.associations[column] = [@first_assoc]
-      @field.send(:column_with_prefix, column).should == "`tabular`.`col_name`"
-    end
-    
-    it "should return multiple columns concatenated if more than one association exists" do
-      column = @field.columns.first
-      @field.associations[column] = [@first_assoc, @second_assoc]
-      @field.send(:column_with_prefix, column).should == "`tabular`.`col_name`, `data`.`col_name`"
-    end
-  end
-  
   describe "is_many? method" do
     before :each do
       @assoc_a = stub('assoc', :is_many? => true)

data/spec/thinking_sphinx/search_spec.rb

@@ -43,7 +43,12 @@ describe ThinkingSphinx::Search do
     
     it "should be true once the client request has been made" do
       @search.first
-      @search.populated?.should be_true
+      @search.should be_populated
+    end
+    
+    it "should be populated if :populate is set to true" do
+      search = ThinkingSphinx::Search.new(:populate => true)
+      search.should be_populated
     end
   end
   

data/tasks/distribution.rb

@@ -28,8 +28,8 @@ Jeweler::Tasks.new do |gem|
   ]
   
   gem.add_dependency 'activerecord', '>= 1.15.6'
-  gem.add_dependency 'riddle',       '>= 1.0.9'
-  gem.add_dependency 'after_commit', '>= 1.0.5'
+  gem.add_dependency 'riddle',       '>= 1.0.10'
+  gem.add_dependency 'after_commit', '>= 1.0.6'
   
   gem.post_install_message = <<-MESSAGE
 If you're upgrading, you should read this:

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: thinking-sphinx
 version: !ruby/object:Gem::Version 
-  version: 1.3.15
+  version: 1.3.16
 platform: ruby
 authors: 
 - Pat Allan
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-01-29 00:00:00 +08:00
+date: 2010-02-16 00:00:00 +11:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -30,7 +30,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 1.0.9
+        version: 1.0.10
     version: 
 - !ruby/object:Gem::Dependency 
   name: after_commit
@@ -40,7 +40,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 1.0.5
+        version: 1.0.6
     version: 
 description: A concise and easy-to-use Ruby library that connects ActiveRecord to the Sphinx search daemon, managing configuration, indexing and searching.
 email: pat@freelancing-gods.com