ts-sidekiq-delta 0.3.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0a34f8c20bb7dd19b659c3102c1ce469f0a774b16802f72fc3d48c28ee7095cc
-  data.tar.gz: 88ba8dd20506b3e103aa96b44ce684f91df76135026bc367c56002bb5050ab17
+  metadata.gz: 34668cf810659d724a770fabad19841b92e40cb06f22d79f5df942e6d4c7bb15
+  data.tar.gz: 0fa4dac9ab3ebfc622b439f6a3d84abe702e0a22613dc318d77531180439295f
 SHA512:
-  metadata.gz: 4a2933c6c6123d71f535360795d394a39106fa9addf8f6f9c1a17b0d68f9dbf5e33c4da19effd520036da9950495719dc3b6c1cbcab039b1cee1a0f0e33b1ab7
-  data.tar.gz: '029b98245027eb02d4d151b3545bd41e00b982fb84d2b5a2532393e7ac52a4acd37d00d745357295b107bc41b43bcff497838a61fe4f3486f3733864deb6cce0'
+  metadata.gz: 4af5489c0957f6b9e75d2903c42c20d6ad17dd46d206cbaf26fe0fce03307645a7373e272d433ed02a56bfcea922d33b8c062f2cf4ed00db9d980182df540d2a
+  data.tar.gz: 36af1174a628ed52eca178d64842123543d4c55e67aaba6d158bf5711277952374ad46385882c5e85964dfa9a711baaf9f70aee22409c9f020dca4cef0e148f4

data/README.markdown

@@ -8,7 +8,7 @@ This version of `ts-sidekiq-delta` works only with [Thinking Sphinx](https://git
 
 Get it into your Gemfile - and don't forget the version constraint!
 
-    gem 'ts-sidekiq-delta', '~> 0.3.0'
+    gem 'ts-sidekiq-delta', '~> 0.4.0'
 
 If you're using Thinking Sphinx v3.0.x, you'll need to jump back to the 0.1.0 release of this gem.
 
@@ -37,4 +37,4 @@ Make sure you have a sidekiq worker monitoring the `ts_delta` queue.
 
 ## Licence
 
-Copyright (c) 2013, ts-sidekiq-delta was originally developed by Danny Hawkins, is currently maintained by Pat Allan, and is released under the open MIT Licence.
+Copyright (c) 2013-2021, ts-sidekiq-delta was originally developed by Danny Hawkins, is currently maintained by Pat Allan, and is released under the open MIT Licence.

data/lib/thinking_sphinx/deltas/sidekiq_delta/delta_job.rb

@@ -3,7 +3,7 @@
 class ThinkingSphinx::Deltas::SidekiqDelta::DeltaJob
   include Sidekiq::Worker
 
-  sidekiq_options lock: :until_executed, retry: true, queue: 'ts_delta', unique_prefix: 'tsdelta'
+  sidekiq_options lock: :until_executed, retry: true, queue: 'ts_delta', lock_prefix: 'tsdelta'
 
   # Runs Sphinx's indexer tool to process the index.
   #

data/lib/thinking_sphinx/deltas/sidekiq_delta/flag_as_deleted_job.rb

@@ -3,7 +3,7 @@ class ThinkingSphinx::Deltas::SidekiqDelta::FlagAsDeletedJob
 
   # Runs Sphinx's indexer tool to process the index. Currently assumes Sphinx
   # is running.
-  sidekiq_options lock: :until_executed, retry: true, queue: 'ts_delta', unique_prefix: "tsflagasdeleted"
+  sidekiq_options lock: :until_executed, retry: true, queue: 'ts_delta', lock_prefix: "tsflagasdeleted"
 
   def perform(index, document_id)
     ThinkingSphinx::Deltas::DeleteJob.new(index, document_id).perform

data/spec/acceptance/sidekiq_deltas_spec.rb

@@ -28,7 +28,7 @@ describe 'SQL delta indexing', :live => true do
 
     Book.search('Harry').to_a.should == [book]
 
-    book.reload.update_attributes(:author => 'Terry Pratchett')
+    book.reload.update!(:author => 'Terry Pratchett')
     work
     sleep 0.25
 
@@ -41,7 +41,7 @@ describe 'SQL delta indexing', :live => true do
 
     Book.search('Harry').to_a.should == [book]
 
-    book.reload.update_attributes(:author => 'Terry Pratchett')
+    book.reload.update!(:author => 'Terry Pratchett')
     work
     sleep 0.25
 

data/spec/acceptance/support/database_cleaner.rb

@@ -3,9 +3,7 @@ RSpec.configure do |config|
     DatabaseCleaner.strategy = :truncation
   end
 
-  config.after(:each) do
-    if example.example_group_instance.class.metadata[:live]
-      DatabaseCleaner.clean
-    end
+  config.after(:each, :live) do
+    DatabaseCleaner.clean
   end
 end

data/spec/acceptance/support/sphinx_controller.rb

@@ -7,13 +7,6 @@ class SphinxController
     FileUtils.mkdir_p config.indices_location
     config.render_to_file && index
 
-    ThinkingSphinx::Configuration.reset
-    ActiveSupport::Dependencies.clear
-
-    config.index_paths.each do |path|
-      Dir["#{path}/**/*.rb"].each { |file| $LOADED_FEATURES.delete file }
-    end
-
     config.searchd.mysql41 = 9307
     config.settings['quiet_deltas']      = true
     config.settings['attribute_updates'] = true

data/spec/acceptance/support/sphinx_helpers.rb

@@ -14,10 +14,11 @@ module SphinxHelpers
   end
 
   def work
-    client    = Redis.connect(:url => "resque://localhost:6379/")
+    client    = Redis.new(:url => "redis://localhost:6379/")
     namespace = Redis::Namespace.new('test', :redis => client)
 
-    Sidekiq::Client.registered_queues.each do |queue_name|
+    queues = namespace.sscan_each("queues").to_a
+    queues.each do |queue_name|
       while message = namespace.lpop("queue:#{queue_name}")
         message = JSON.parse(message)
         message['class'].constantize.new.perform(*message['args'])

data/spec/internal/app/models/book.rb

@@ -1,3 +1,5 @@
 class Book < ActiveRecord::Base
-  #
+  ThinkingSphinx::Callbacks.append(
+    self, :behaviours => [:sql, :deltas]
+  )
 end

data/ts-sidekiq-delta.gemspec

@@ -1,7 +1,7 @@
 # -*- encoding: utf-8 -*-
 Gem::Specification.new do |s|
   s.name        = 'ts-sidekiq-delta'
-  s.version     = '0.3.0'
+  s.version     = '0.4.0'
   s.platform    = Gem::Platform::RUBY
   s.authors     = ['Pat Allan', 'Aaron Gibralter', 'Danny Hawkins']
   s.email       = ['pat@freelancing-gods.com', 'danny.hawkins@gmail.com']
@@ -17,7 +17,7 @@ Gem::Specification.new do |s|
 
   s.add_dependency 'thinking-sphinx',     '>= 3.1.0'
   s.add_dependency 'sidekiq',             '>= 2.5.4'
-  s.add_dependency 'sidekiq-unique-jobs', '>= 6.0.0'
+  s.add_dependency 'sidekiq-unique-jobs', '>= 7.0.0'
 
   s.add_development_dependency 'activerecord',     '>= 3.1.0'
   s.add_development_dependency 'combustion'

metadata

@@ -1,16 +1,16 @@
 --- !ruby/object:Gem::Specification
 name: ts-sidekiq-delta
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - Pat Allan
 - Aaron Gibralter
 - Danny Hawkins
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-05-07 00:00:00.000000000 Z
+date: 2021-12-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thinking-sphinx
@@ -46,14 +46,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 6.0.0
+        version: 7.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 6.0.0
+        version: 7.0.0
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
@@ -216,7 +216,7 @@ homepage: https://github.com/pat/ts-sidekiq-delta
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -231,8 +231,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
-signing_key: 
+rubygems_version: 3.2.32
+signing_key:
 specification_version: 4
 summary: Thinking Sphinx - Sidekiq Deltas
 test_files: