thinking-sphinx 3.1.4 → 3.2.0

data/lib/thinking_sphinx/real_time.rb

@@ -15,5 +15,6 @@ require 'thinking_sphinx/real_time/index'
 require 'thinking_sphinx/real_time/interpreter'
 require 'thinking_sphinx/real_time/populator'
 require 'thinking_sphinx/real_time/transcriber'
+require 'thinking_sphinx/real_time/translator'
 
 require 'thinking_sphinx/real_time/callbacks/real_time_callbacks'

data/lib/thinking_sphinx/real_time/attribute.rb

@@ -8,7 +8,9 @@ class ThinkingSphinx::RealTime::Attribute < ThinkingSphinx::RealTime::Property
   end
 
   def translate(object)
-    super || default_value
+    output = super || default_value
+
+    json? ? output.to_json : output
   end
 
   private
@@ -16,4 +18,8 @@ class ThinkingSphinx::RealTime::Attribute < ThinkingSphinx::RealTime::Property
   def default_value
     type == :string ? '' : 0
   end
+
+  def json?
+    type == :json
+  end
 end

data/lib/thinking_sphinx/real_time/index.rb

@@ -69,6 +69,8 @@ class ThinkingSphinx::RealTime::Index < Riddle::Configuration::RealtimeIndex
       @rt_attr_float
     when :bigint
       attribute.multi? ? @rt_attr_multi_64 : @rt_attr_bigint
+    when :json
+      @rt_attr_json
     else
       raise "Unknown attribute type '#{attribute.type}'"
     end

data/lib/thinking_sphinx/real_time/populator.rb

@@ -12,9 +12,9 @@ class ThinkingSphinx::RealTime::Populator
 
     remove_files
 
-    scope.find_each do |instance|
-      transcriber.copy instance
-      instrument 'populated', :instance => instance
+    scope.find_in_batches do |instances|
+      transcriber.copy *instances
+      instrument 'populated', :instances => instances
     end
 
     controller.rotate

data/lib/thinking_sphinx/real_time/property.rb

@@ -14,10 +14,6 @@ class ThinkingSphinx::RealTime::Property
   end
 
   def translate(object)
-    return @column.__name unless @column.__name.is_a?(Symbol)
-
-    base = @column.__stack.inject(object) { |base, node| base.try(node) }
-    base = base.try(@column.__name)
-    base.is_a?(String) ? base.gsub("\u0000", '') : base
+    ThinkingSphinx::RealTime::Translator.call(object, @column)
   end
 end

data/lib/thinking_sphinx/real_time/transcriber.rb

@@ -3,22 +3,47 @@ class ThinkingSphinx::RealTime::Transcriber
     @index = index
   end
 
-  def copy(instance)
-    return unless instance.persisted? && copy?(instance)
+  def copy(*instances)
+    items = instances.select { |instance|
+      instance.persisted? && copy?(instance)
+    }
+    return unless items.present?
 
-    columns, values = ['id'], [index.document_id_for_key(instance.id)]
-    (index.fields + index.attributes).each do |property|
-      columns << property.name
-      values  << property.translate(instance)
-    end
+    values = items.collect { |instance|
+      TranscribeInstance.call(instance, index, properties)
+    }
 
     insert = Riddle::Query::Insert.new index.name, columns, values
     sphinxql = insert.replace!.to_sql
-    
+
     ThinkingSphinx::Logger.log :query, sphinxql do
       ThinkingSphinx::Connection.take do |connection|
         connection.execute sphinxql
-      end 
+      end
+    end
+  end
+
+  class TranscribeInstance
+    def self.call(instance, index, properties)
+      new(instance, index, properties).call
+    end
+
+    def initialize(instance, index, properties)
+      @instance, @index, @properties = instance, index, properties
+    end
+
+    def call
+      properties.each_with_object([document_id]) do |property, instance_values|
+        instance_values << property.translate(instance)
+      end
+    end
+
+    private
+
+    attr_reader :instance, :index, :properties
+
+    def document_id
+      index.document_id_for_key instance.id
     end
   end
 
@@ -26,6 +51,12 @@ class ThinkingSphinx::RealTime::Transcriber
 
   attr_reader :index
 
+  def columns
+    @columns ||= properties.each_with_object(['id']) do |property, columns|
+      columns << property.name
+    end
+  end
+
   def copy?(instance)
     index.conditions.empty? || index.conditions.all? { |condition|
       case condition
@@ -38,4 +69,8 @@ class ThinkingSphinx::RealTime::Transcriber
       end
     }
   end
+
+  def properties
+    @properties ||= index.fields + index.attributes
+  end
 end

data/lib/thinking_sphinx/real_time/translator.rb

@@ -0,0 +1,36 @@
+class ThinkingSphinx::RealTime::Translator
+  def self.call(object, column)
+    new(object, column).call
+  end
+
+  def initialize(object, column)
+    @object, @column = object, column
+  end
+
+  def call
+    return name   unless name.is_a?(Symbol)
+    return result unless result.is_a?(String)
+
+    result.gsub "\u0000", ''
+  end
+
+  private
+
+  attr_reader :object, :column
+
+  def name
+    @column.__name
+  end
+
+  def owner
+    stack.inject(object) { |previous, node| previous.try node }
+  end
+
+  def result
+    @result ||= owner.try name
+  end
+
+  def stack
+    @column.__stack
+  end
+end

data/lib/thinking_sphinx/search.rb

@@ -38,6 +38,16 @@ class ThinkingSphinx::Search < Array
     options[:page].to_i
   end
 
+  def marshal_dump
+    populate
+
+    [@populated, @query, @options, @context]
+  end
+
+  def marshal_load(array)
+    @populated, @query, @options, @context = array
+  end
+
   def masks
     @masks ||= @options[:masks] || DEFAULT_MASKS.clone
   end

data/lib/thinking_sphinx/search/context.rb

@@ -17,4 +17,12 @@ class ThinkingSphinx::Search::Context
   def []=(key, value)
     @memory[key] = value
   end
+
+  def marshal_dump
+    [@memory.except(:raw, :indices)]
+  end
+
+  def marshal_load(array)
+    @memory = array.first
+  end
 end

data/lib/thinking_sphinx/search/stale_ids_exception.rb

@@ -1,8 +1,9 @@
 class ThinkingSphinx::Search::StaleIdsException < StandardError
-  attr_reader :ids
+  attr_reader :ids, :context
 
-  def initialize(ids)
+  def initialize(ids, context)
     @ids = ids
+    @context = context
   end
 
   def message

data/lib/thinking_sphinx/subscribers/populator_subscriber.rb

@@ -21,7 +21,7 @@ class ThinkingSphinx::Subscribers::PopulatorSubscriber
   end
 
   def populated(event)
-    print '.'
+    print '.' * event.payload[:instances].length
   end
 
   def finish_populating(event)

data/lib/thinking_sphinx/tasks.rb

@@ -39,7 +39,9 @@ namespace :ts do
 
   desc 'Start the Sphinx daemon'
   task :start => :environment do
-    interface.start
+    options = {}
+    options[:nodetach] = true  if ENV['NODETACH'] == 'true'
+    interface.start(options)
   end
 
   desc 'Stop the Sphinx daemon'

data/spec/acceptance/remove_deleted_records_spec.rb

@@ -33,6 +33,24 @@ describe 'Hiding deleted records from search results', :live => true do
       should be_empty
   end
 
+  it "does not remove real-time results when callbacks are disabled" do
+    original = ThinkingSphinx::Configuration.instance.
+      settings['real_time_callbacks']
+    product = Product.create! :name => 'Shiny'
+    Product.search('Shiny', :indices => ['product_core']).to_a.
+      should == [product]
+
+    ThinkingSphinx::Configuration.instance.
+      settings['real_time_callbacks'] = false
+
+    product.destroy
+    Product.search_for_ids('Shiny', :indices => ['product_core']).
+      should_not be_empty
+
+    ThinkingSphinx::Configuration.instance.
+      settings['real_time_callbacks'] = original
+  end
+
   it "deletes STI child classes from parent indices" do
     duck = Bird.create :name => 'Duck'
     index

data/spec/acceptance/searching_with_filters_spec.rb

@@ -141,4 +141,17 @@ describe 'Searching with filters', :live => true do
     products = Product.search :with => {:category_ids => [flat.id]}
     products.to_a.should == [pancakes]
   end
+
+  it 'searches with real-time JSON attributes' do
+    pancakes = Product.create :name => 'Pancakes',
+      :options => {'lemon' => 1, 'sugar' => 1, :number => 3}
+    waffles  = Product.create :name => 'Waffles',
+      :options => {'chocolate' => 1, 'sugar' => 1, :number => 1}
+
+    products = Product.search :with => {"options.lemon" => 1}
+    products.to_a.should == [pancakes]
+
+    products = Product.search :with => {"options.sugar" => 1}
+    products.to_a.should == [pancakes, waffles]
+  end if JSONColumn.call
 end

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

@@ -4,6 +4,7 @@ ThinkingSphinx::Index.define :product, :with => :real_time do
   indexes name, :sortable => true
 
   has category_ids, :type => :integer, :multi => true
+  has options, :type => :json if JSONColumn.call
 end
 
 if multi_schema.active?

data/spec/internal/db/schema.rb

@@ -72,6 +72,7 @@ ActiveRecord::Schema.define do
 
   create_table(:products, :force => true) do |t|
     t.string :name
+    t.json :options if ::JSONColumn.call
   end
 
   create_table(:taggings, :force => true) do |t|

data/spec/spec_helper.rb

@@ -5,6 +5,7 @@ Bundler.require :default, :development
 
 root = File.expand_path File.dirname(__FILE__)
 require "#{root}/support/multi_schema"
+require "#{root}/support/json_column"
 require 'thinking_sphinx/railtie'
 
 Combustion.initialize! :active_record

data/spec/support/json_column.rb

@@ -0,0 +1,29 @@
+class JSONColumn
+  include ActiveRecord::ConnectionAdapters
+
+  def self.call
+    new.call
+  end
+
+  def call
+    postgresql? && column?
+  end
+
+  private
+
+  def column?
+    (
+      ActiveRecord::ConnectionAdapters.constants.include?(:PostgreSQLAdapter) &&
+      PostgreSQLAdapter.constants.include?(:TableDefinition) &&
+      PostgreSQLAdapter::TableDefinition.instance_methods.include?(:json)
+    ) || (
+      ActiveRecord::ConnectionAdapters.constants.include?(:PostgreSQL) &&
+      PostgreSQL.constants.include?(:ColumnMethods) &&
+      PostgreSQL::ColumnMethods.instance_methods.include?(:json)
+    )
+  end
+
+  def postgresql?
+    ENV['DATABASE'] == 'postgresql'
+  end
+end

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

@@ -53,5 +53,15 @@ describe ThinkingSphinx::ActiveRecord::Callbacks::DeleteCallbacks do
 
       callbacks.after_destroy
     end
+
+    it 'does nothing if callbacks are suspended' do
+      ThinkingSphinx::Callbacks.suspend!
+
+      ThinkingSphinx::Deletion.should_not_receive(:perform)
+
+      callbacks.after_destroy
+
+      ThinkingSphinx::Callbacks.resume!
+    end
   end
 end

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

@@ -70,5 +70,15 @@ describe ThinkingSphinx::ActiveRecord::Callbacks::UpdateCallbacks do
 
       lambda { callbacks.after_update }.should_not raise_error
     end
+
+    it 'does nothing if callbacks are suspended' do
+      ThinkingSphinx::Callbacks.suspend!
+
+      connection.should_not_receive(:execute)
+
+      callbacks.after_update
+
+      ThinkingSphinx::Callbacks.resume!
+    end
   end
 end

data/spec/thinking_sphinx/active_record/column_sql_presenter_spec.rb

@@ -0,0 +1,37 @@
+require 'spec_helper'
+
+describe ThinkingSphinx::ActiveRecord::ColumnSQLPresenter do
+  describe '#with_table' do
+    let(:model)        { double 'Model' }
+    let(:column)       { double 'Column', :__name => 'column_name',
+      :__stack => [], :string? => false }
+    let(:adapter)      { double 'Adapter' }
+    let(:associations) { double 'Associations' }
+    let(:path)         { double 'Path',
+      :model => double(:column_names => ['column_name']) }
+    let(:presenter) { ThinkingSphinx::ActiveRecord::ColumnSQLPresenter.new(
+      model, column, adapter, associations
+    ) }
+
+    before do
+      stub_const 'Joiner::Path', double(:new => path)
+      adapter.stub(:quote) { |arg| "`#{arg}`" }
+    end
+
+    context "when there's no explicit db name" do
+      before { associations.stub(:alias_for => 'table_name') }
+
+      it 'returns quoted table and column names' do
+        presenter.with_table.should == '`table_name`.`column_name`'
+      end
+    end
+
+    context 'when an eplicit db name is provided' do
+      before { associations.stub(:alias_for => 'db_name.table_name') }
+
+      it 'returns properly quoted table name with column name' do
+        presenter.with_table.should == '`db_name`.`table_name`.`column_name`'
+      end
+    end
+  end
+end

data/spec/thinking_sphinx/active_record/sql_builder_spec.rb

@@ -5,7 +5,7 @@ describe ThinkingSphinx::ActiveRecord::SQLBuilder do
     :fields => [], :attributes => [], :disable_range? => false,
     :delta_processor => nil, :conditions => [], :groupings => [],
     :adapter => adapter, :associations => [], :primary_key => :id,
-    :options => {}) }
+    :options => {}, :properties => []) }
   let(:model)        { double('model', :connection => connection,
     :descends_from_active_record? => true, :column_names => [],
     :inheritance_column => 'type', :unscoped => relation,
@@ -518,22 +518,6 @@ describe ThinkingSphinx::ActiveRecord::SQLBuilder do
     end
   end
 
-  describe 'sql_query_post_index' do
-    let(:processor) { double('processor', :reset_query => 'RESET DELTAS') }
-
-    it "adds a reset delta query if there is a delta processor and this is the core source" do
-      source.stub :delta_processor => processor, :delta? => false
-
-      builder.sql_query_post_index.should include('RESET DELTAS')
-    end
-
-    it "adds no reset delta query if there is a delta processor and this is the delta source" do
-      source.stub :delta_processor => processor, :delta? => true
-
-      builder.sql_query_post_index.should_not include('RESET DELTAS')
-    end
-  end
-
   describe 'sql_query_pre' do
     let(:processor) { double('processor', :reset_query => 'RESET DELTAS') }
 
@@ -542,6 +526,12 @@ describe ThinkingSphinx::ActiveRecord::SQLBuilder do
       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
+      source.stub :delta_processor => processor
+
+      builder.sql_query_pre.should include('RESET DELTAS')
+    end
+
     it "does not add a reset query if there is no delta processor" do
       builder.sql_query_pre.should_not include('RESET DELTAS')
     end