friendlyfashion-thinking-sphinx 2.0.14.1 → 2.0.14.2

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    OWFjNTMyOTc0ZTJjYWEwNzVlNGVjMGM4YjA4MDhhNzAyNjU0ZTcyMA==
+    MTFlN2QzODFjMWM3NTNkZGQxOTczNGYxYWY5MDMyMjVmOWM1YTZmMQ==
   data.tar.gz: !binary |-
-    NmYyODgwOGU4NTIzYWUxY2U3ZjQ4M2Y0Mzc1NWIwNjA3M2QwYTA5Yw==
+    NDhmN2I1ZWEzYmE1M2QxYjY2M2VmMTVhYzVjZWM3NjQ5ZTQyNGU0Mg==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    ZTRiNzcxNWI2Y2MyZGZlZmZlZjQ0NWZiYzUzZDQ5ZWM0OWQ4NTYzNzExZTBk
-    YzExNjM2Mjk2NWFlNDliNGQ0ZTk1YzY3Yzg0ZTc3NmRjZWE2ZTRiY2U3MzU2
-    MjFlNzQzNzk0NWJiM2Q3ZTU3NjY3ZTU0MWUxMWVmMGI2NTQzNmE=
+    ZGIzYjQyYmUzMTNjNjZlZDliY2ViNGFkNzJiN2M2YjkzZTYyMzI3YzFiMTE3
+    YWYzYzU5ODQyYTJhYThjZGU3MjJiMDFkZWNhNmE5OTU5ZjA2MWE5NjA5ZTRj
+    MDlkNjJiY2RmOWQ3NTgzYTk4ZDlmMWM4OTA0Y2E2Njg5Y2QxOTM=
   data.tar.gz: !binary |-
-    MjViNjZjZjVmMmRhODNjMjU3Njc2YmExYWQ4ZjdlZjZlMDZkMTcwYmI1MWZm
-    NjA1MGU5YWZiMmExNzZhMzk5YjExMTg0ZDkzYjdjMDVlYTdiZTdjZDk5MWUx
-    NzMzZGJlMzg4MDZkZWQ2ZTg2N2MwN2EwOTc3ZWViMTk5MTg4YTM=
+    Njk5NmY2MmQ2N2JkNDk4NTM2MTZmZmIwZTc5ZDI3ZDNhZGJjNjgwYzkxNjg3
+    OTM3ZThkMDgyZTYwYmI1NTFmNGNjMDM5MmRmZmYxZTAyOWJiMGU0YWNhY2Fk
+    ZjIyYzJiZmM4ZTJmMDg1N2RhNmM4ZmIwMDBlMjMwYWU2ODhjZDI=

data/features/deleting_instances.feature

@@ -28,15 +28,15 @@ Feature: Keeping Sphinx in line with deleted model instances
   Scenario: Deleting created instances from the delta index
     Given Sphinx is running
     And I am searching on betas
-    When I create a new beta named eleven
+    When I create a new beta named eighteen
     And I wait for Sphinx to catch up
     And I clear the connection pool
-    And I search for eleven
+    And I search for eighteen
     Then I should get 1 result
 
-    When I destroy beta eleven
+    When I destroy beta eighteen
     And I wait for Sphinx to catch up
-    And I search for eleven
+    And I search for eighteen
     Then I should get 0 results
 
   Scenario: Deleting edited instances from the delta index

data/lib/thinking_sphinx.rb

@@ -295,5 +295,11 @@ module ThinkingSphinx
     !!defined?(::ActiveRecord::Associations::CollectionProxy)
   end
 
+  def self.before_index_hooks
+    @before_index_hooks
+  end
+
+  @before_index_hooks = []
+
   extend ThinkingSphinx::SearchMethods::ClassMethods
 end

data/lib/thinking_sphinx/connection.rb

@@ -1,7 +1,7 @@
 class ThinkingSphinx::Connection
   def self.pool
     @pool ||= Innertube::Pool.new(
-      Proc.new { Rails.logger.debug '>>> CONNECTING <<<'; ThinkingSphinx::Connection.new },
+      Proc.new { ThinkingSphinx::Connection.new },
       Proc.new { |connection| connection.close }
     )
   end
@@ -14,7 +14,7 @@ class ThinkingSphinx::Connection
         connection.reset
         begin
           yield connection
-        rescue Riddle::ConnectionError, Riddle::ResponseError => error
+        rescue Riddle::ConnectionError, Riddle::ResponseError, SystemCallError => error
           original = error
           raise Innertube::Pool::BadResource
         end

data/lib/thinking_sphinx/deltas.rb

@@ -1,4 +1,6 @@
 require 'thinking_sphinx/deltas/default_delta'
+require 'thinking_sphinx/deltas/delete_job'
+require 'thinking_sphinx/deltas/index_job'
 
 module ThinkingSphinx
   module Deltas

data/lib/thinking_sphinx/deltas/default_delta.rb

@@ -2,23 +2,23 @@ module ThinkingSphinx
   module Deltas
     class DefaultDelta
       attr_accessor :column
-      
+
       def initialize(index, options)
         @index  = index
         @column = options.delete(:delta_column) || :delta
       end
-      
+
       def index(model, instance = nil)
         return true unless ThinkingSphinx.updates_enabled? &&
           ThinkingSphinx.deltas_enabled?
         return true if instance && !toggled(instance)
-        
+
         update_delta_indexes model
         delete_from_core     model, instance if instance
-        
+
         true
       end
-      
+
       def toggle(instance)
         instance.send "#{@column}=", true
       end
@@ -32,28 +32,24 @@ module ThinkingSphinx
         "#{model.connection.quote_column_name(@column.to_s)} = #{adapter.boolean(false)} " +
         "WHERE #{model.connection.quote_column_name(@column.to_s)} = #{adapter.boolean(true)}"
       end
-      
+
       def clause(model, toggled)
         "#{model.quoted_table_name}.#{model.connection.quote_column_name(@column.to_s)}" +
         " = #{adapter.boolean(toggled)}"
       end
-      
+
       private
-      
+
       def update_delta_indexes(model)
-        config = ThinkingSphinx::Configuration.instance
-        rotate = ThinkingSphinx.sphinx_running? ? "--rotate" : ""
-        
-        output = `#{config.bin_path}#{config.indexer_binary_name} --config "#{config.config_file}" #{rotate} #{model.delta_index_names.join(' ')}`
-        puts(output) unless ThinkingSphinx.suppress_delta_output?
+        ThinkingSphinx::Deltas::IndexJob.new(model.delta_index_names).perform
       end
-      
+
       def delete_from_core(model, instance)
-        model.core_index_names.each do |index_name|
-          model.delete_in_index index_name, instance.sphinx_document_id
-        end
+        ThinkingSphinx::Deltas::DeleteJob.new(
+          model.core_index_names, instance.sphinx_document_id
+        ).perform
       end
-      
+
       def adapter
         @adapter = @index.model.sphinx_database_adapter
       end

data/lib/thinking_sphinx/deltas/delete_job.rb

@@ -0,0 +1,16 @@
+class ThinkingSphinx::Deltas::DeleteJob
+  def initialize(indices, document_id)
+    @indices, @document_id = indices, document_id
+  end
+
+  def perform
+    ThinkingSphinx::Connection.take do |client|
+      @indices.each do |index|
+        client.update(index, ['sphinx_deleted'], {@document_id => [1]})
+      end
+    end
+  rescue Riddle::ConnectionError, Riddle::ResponseError,
+    ThinkingSphinx::SphinxError, Errno::ETIMEDOUT, Timeout::Error
+    # Not the end of the world if Sphinx isn't running.
+  end
+end

data/lib/thinking_sphinx/deltas/index_job.rb

@@ -0,0 +1,20 @@
+class ThinkingSphinx::Deltas::IndexJob
+  def initialize(indices)
+    @indices = indices
+  end
+
+  def perform
+    rotate = ThinkingSphinx.sphinx_running? ? "--rotate" : ""
+
+    output = `#{configuration.bin_path}#{configuration.indexer_binary_name} --config "#{configuration.config_file}" #{rotate} #{@indices.join(' ')}`
+    puts(output) unless ThinkingSphinx.suppress_delta_output?
+
+    ThinkingSphinx::Connection.pool.clear
+
+    true
+  end
+
+  def configuration
+    ThinkingSphinx::Configuration.instance
+  end
+end

data/lib/thinking_sphinx/search.rb

@@ -671,7 +671,8 @@ module ThinkingSphinx
       return '' if @options[:conditions].blank?
 
       ' ' + @options[:conditions].keys.collect { |key|
-        "@#{key} #{options[:conditions][key]}"
+        search_key = key.is_a?(::Array) ? "(#{key.join(',')})" : key
+        "@#{search_key} #{options[:conditions][key]}"
       }.join(' ')
     end
 

data/lib/thinking_sphinx/tasks.rb

@@ -89,6 +89,7 @@ namespace :thinking_sphinx do
     end
 
     FileUtils.mkdir_p config.searchd_file_path
+    ThinkingSphinx.before_index_hooks.each { |hook| hook.call }
     config.controller.index :verbose => true
   end
 

data/lib/thinking_sphinx/version.rb

@@ -1,3 +1,3 @@
 module ThinkingSphinx
-  Version = '2.0.14.1'
+  Version = '2.0.14.2'
 end

data/spec/thinking_sphinx/active_record/delta_spec.rb

@@ -65,12 +65,15 @@ describe "ThinkingSphinx::ActiveRecord::Delta" do
   end
 
   describe "index_delta method" do
+    let(:index_job) { double :perform => true }
+
     before :each do
       ThinkingSphinx::Configuration.stub!(:environment => "spec")
       ThinkingSphinx.deltas_enabled   = true
       ThinkingSphinx.updates_enabled  = true
       ThinkingSphinx.stub!(:sphinx_running? => true)
       Person.delta_objects.first.stub!(:` => "", :toggled => true)
+      ThinkingSphinx::Deltas::IndexJob.stub :new => index_job
 
       @person = Person.new
       Person.stub!(:search_for_id => false)
@@ -104,10 +107,8 @@ describe "ThinkingSphinx::ActiveRecord::Delta" do
       @person.send(:index_delta)
     end
 
-    it "should call indexer for the delta index" do
-      Person.sphinx_indexes.first.delta_object.should_receive(:`).with(
-        "#{ThinkingSphinx::Configuration.instance.bin_path}indexer --config \"#{ThinkingSphinx::Configuration.instance.config_file}\" --rotate person_delta"
-      )
+    it "should run the index job" do
+      index_job.should_receive(:perform)
 
       @person.send(:index_delta)
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: friendlyfashion-thinking-sphinx
 version: !ruby/object:Gem::Version
-  version: 2.0.14.1
+  version: 2.0.14.2
 platform: ruby
 authors:
 - Justas Janauskas
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-17 00:00:00.000000000 Z
+date: 2013-04-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -215,6 +215,8 @@ files:
 - lib/thinking_sphinx/core/string.rb
 - lib/thinking_sphinx/deltas.rb
 - lib/thinking_sphinx/deltas/default_delta.rb
+- lib/thinking_sphinx/deltas/delete_job.rb
+- lib/thinking_sphinx/deltas/index_job.rb
 - lib/thinking_sphinx/deploy/capistrano.rb
 - lib/thinking_sphinx/excerpter.rb
 - lib/thinking_sphinx/facet.rb