ts-resque-delta 2.0.0 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 2584321ee1b15d855877ef9fb3dc0b4d0719c21e
-  data.tar.gz: fc74627b7a3265a8cafe125ab59585c8de2e2a0c
+SHA256:
+  metadata.gz: c2fc9168de9bac099a5bacaaa4b1b8da790abea571158e5ed8a31a8148b17193
+  data.tar.gz: 0e995d85eeda921523fb01cedbd2cacece23f94577967fab7ea71d724a708870
 SHA512:
-  metadata.gz: 7380a6e12204a7e6ea243c6c2f6726f637e7125b37b1d09fb88ab93169e78820127b1d28dc07bcff23e0b4199f117a1ef0a147664c2fc64188c026884d1c0dff
-  data.tar.gz: a00d91e7bddb444c493fc4fb7ae74167b0b7af598e9d78f5a8790aafd53cfcc730439b81e99520658c1f657eccd015acce30bb6e0ce7b931b793f529f170ef33
+  metadata.gz: 52177488504d0596050803df383fdde379dbb53b0722f4a8c981fa62c9a48332edec0ba0e97907b8cf521260f459b96cb45cec681fe334fdda9c1950a6b73f31
+  data.tar.gz: d2f8246a0cecf69db0ed889bddf330f21dfcc9660c893cf58083310d29611e87b3de0b8bebcda6403f4d5150a43d9b0bec628cedce45d9cca34532eb961272c3

data/.travis.yml

@@ -8,8 +8,6 @@ before_install:
 before_script:
   - "mysql -e 'create database thinking_sphinx;' > /dev/null"
   - "psql -c 'create database thinking_sphinx;' -U postgres > /dev/null"
-services:
-  - redis-server
 env:
   - SPHINX_BIN=/usr/local/sphinx-2.0.9/bin/ SPHINX_VERSION=2.0.9 DATABASE=mysql2
   - SPHINX_BIN=/usr/local/sphinx-2.0.9/bin/ SPHINX_VERSION=2.0.9 DATABASE=postgresql

data/README.markdown

@@ -7,56 +7,56 @@ Delayed Deltas for Thinking Sphinx (with Resque)
 
 Installation
 ------------
+This gem depends on the following gems: _thinking-sphinx_, _resque_, and
+_resque-lock-timeout_.
 
-This gem depends on the following gems: `thinking-sphinx` and `resque`.
+    gem install ts-resque-delta
 
-Currently, you'll need Thinking Sphinx v1.5.0 (for Rails 2), v2.1.0
-(for Rails 3), or - ideally - v3.0.3 or newer (for Rails 3.1 onwards). If you're
-on a version of Thinking Sphinx that's too old, you better go upgrade - but
-otherwise, add `ts-resque-delta` to your `Gemfile` file with the rest of your
-gem dependencies:
+Add _ts-resque-delta_ to your **Gemfile** file, with the rest of your gem
+dependencies:
 
-    gem 'ts-resque-delta', '~> 2.0.0'
+    gem 'ts-resque-delta', '~> 2.1'
 
-Add the delta property to index definition. If you're using Thinking Sphinx v3,
-then it'll look something like this:
+If you're using Rails 3, the rake tasks will automatically be loaded by Rails.
+If you're using Rails 2, add the following line to your **Rakefile**:
 
-    ThinkingSphinx::Index.define(:article,
-      :with  => :active_record,
-      :delta => ThinkingSphinx::Deltas::ResqueDelta
-    ) do
-      # fields and attributes and so on...
-    end
+    require 'thinking_sphinx/deltas/resque_delta/tasks'
 
-But if you're still using v1.5 or v2.1, you'll want the following:
+Add the delta property to each `define_index` block:
 
     define_index do
-      # fields and attributes and so on...
-
+      # ...
       set_property :delta => ThinkingSphinx::Deltas::ResqueDelta
     end
 
-If you've never used delta indexes before, you'll need to add the boolean
-column named `:delta` to each table for indexed models. A database index for
-that column is also recommended.
+If you've never used delta indexes before, you'll want to add the boolean
+column named `:delta` to each model's table (note, you must set the `:default`
+value to `true`):
+
+    def self.up
+      add_column :foos, :delta, :boolean, :default => true, :null => false
+    end
+
+Also, I highly recommend adding a MySQL index to the table of any model using
+delta indexes. The Sphinx indexer uses `WHERE table.delta = 1` whenever the
+delta indexer runs and `... = 0` whenever the normal indexer runs. Having the
+MySQL index on the delta column will generally be a win:
 
-    def change
-      add_column :articles, :delta, :boolean, :default => true, :null => false
-      add_index  :articles, :delta
+    def self.up
+      # ...
+      add_index :foos, :delta
     end
 
 Usage
 -----
-
 Once you've got it all set up, all you need to do is make sure that the Resque
-worker is running. You can do this by specifying the `ts_delta` queue when
+worker is running. You can do this by specifying the `:ts_delta` queue when
 running Resque:
 
     QUEUE=ts_delta,other_queues rake resque:work
 
 Contributors (for ts-resque-delta)
 -----------------------------------
-
 * [Aaron Gibralter](https://github.com/agibralter)
 * [Ryan Schlesinger](https://github.com/ryansch) (Locking/`smart_index`)
 * [Pat Allan](https://github.com/freelancing-god) (FlyingSphinx support)
@@ -64,7 +64,6 @@ Contributors (for ts-resque-delta)
 
 Original Contributors (for ts-delayed-delta)
 --------------------------------------------
-
 * [Pat Allan](https://github.com/freelancing-god)
 * [Ryan Schlesinger](https://github.com/ryansch) (Allowing installs as a plugin)
 * [Maximilian Schulz](https://max.jungeelite.de) (Ensuring compatibility with Bundler)
@@ -73,6 +72,4 @@ Original Contributors (for ts-delayed-delta)
 
 Copyright
 ---------
-
-Copyright (c) 2011-2014 Aaron Gibralter and Pat Allan, and released under an MIT
-Licence.
+Copyright (c) 2011 Aaron Gibralter, and released under an MIT Licence.

data/spec/acceptance/resque_deltas_spec.rb

@@ -1,50 +1,46 @@
 require 'acceptance/spec_helper'
 
 describe 'SQL delta indexing', :live => true do
-  def sleep_for_sphinx
-    sleep ENV['CI'] ? 1.0 : 0.25
-  end
-
   it "automatically indexes new records" do
     guards = Book.create(
       :title => 'Guards! Guards!', :author => 'Terry Pratchett'
     )
     index
 
-    Book.search('Terry Pratchett').to_a.should == [guards]
+    expect(Book.search('Terry Pratchett').to_a).to  eq([guards])
 
     men = Book.create(
       :title => 'Men At Arms', :author => 'Terry Pratchett'
     )
     work
-    sleep_for_sphinx
+    sleep 0.25
 
-    Book.search('Terry Pratchett').to_a.should == [guards, men]
+    expect(Book.search('Terry Pratchett').to_a).to eq([guards, men])
   end
 
   it "automatically indexes updated records" do
     book = Book.create :title => 'Night Watch', :author => 'Harry Pritchett'
     index
 
-    Book.search('Harry').to_a.should == [book]
+    expect(Book.search('Harry').to_a).to  eq([book])
 
-    book.reload.update_attributes(:author => 'Terry Pratchett')
+    book.reload.update(:author => 'Terry Pratchett')
     work
-    sleep_for_sphinx
+    sleep 0.25
 
-    Book.search('Terry').to_a.should == [book]
+    expect(Book.search('Terry').to_a).to  eq([book])
   end
 
   it "does not match on old values" do
     book = Book.create :title => 'Night Watch', :author => 'Harry Pritchett'
     index
 
-    Book.search('Harry').to_a.should == [book]
+    expect(Book.search('Harry').to_a).to  eq([book])
 
-    book.reload.update_attributes(:author => 'Terry Pratchett')
+    book.reload.update(:author => 'Terry Pratchett')
     work
-    sleep_for_sphinx
+    sleep 0.25
 
-    Book.search('Harry').should be_empty
+    expect(Book.search('Harry')).to be_empty
   end
 end

data/spec/acceptance/support/database_cleaner.rb

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

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

@@ -1,4 +1,8 @@
 class Book < ActiveRecord::Base
+  ThinkingSphinx::Callbacks.append(
+    self, :behaviours => [:sql, :deltas, :updates]
+  )
+
   define_index do
     indexes title, author
 

data/spec/internal/config/database.yml

@@ -1,5 +1,27 @@
+<%
+    socket = [
+      ENV["MYSQL_SOCKET"],
+      "/var/run/mysql5/mysqld.sock",
+      "/tmp/mysql.sock"
+    ].detect { |f| f && File.exist?(f) }
+%>
+
 test:
   adapter:      <%= ENV['DATABASE'] || 'mysql2' %>
   database:     thinking_sphinx
-  username:     <%= ENV['DATABASE'] == 'postgresql' ? ENV['USER'] : 'root' %>
+  username:     "<%= ENV['DATABASE'] == 'postgresql' ? ENV['USER'] : 'root' %>"
+  password:     "<%= ENV['PASSWORD'] || 'root' %>"
   min_messages: warning
+  pool: 1000
+  encoding: utf8mb4
+  collation: utf8mb4_unicode_ci # rails 6 PR: https://github.com/rails/rails/pull/33608/files
+  <% if socket %>
+  host: <%= ENV["MYSQL_HOST"] || "0.0.0.0" %>
+  socket: <%= socket %>
+  <% else %>
+  host: <%= ENV["MYSQL_HOST"] || "0.0.0.0" %>
+  port: <%= ENV["MYSQL_PORT"] || "3306" %>
+  <% end %>
+  sql_mode: TRADITIONAL
+  variables:
+    sql_mode: TRADITIONAL

data/spec/thinking_sphinx/deltas/resque_delta/delta_job_spec.rb

@@ -9,21 +9,20 @@ describe ThinkingSphinx::Deltas::ResqueDelta::DeltaJob do
     let(:job) { double 'Job', :perform => true }
 
     before :each do
-      ThinkingSphinx::Deltas::ResqueDelta.stub :locked? => false
-      ThinkingSphinx::Deltas::IndexJob.stub :new => job
+      allow(ThinkingSphinx::Deltas::ResqueDelta).to receive(:locked?).and_return(false)
+      allow(ThinkingSphinx::Deltas::IndexJob).to receive(:new).and_return(job)
     end
 
     it "sets up the internal Thinking Sphinx job with the provided index" do
-      ThinkingSphinx::Deltas::IndexJob.should_receive(:new).with('foo_delta').
-        and_return(job)
-
       subject.perform 'foo_delta'
+      expect(ThinkingSphinx::Deltas::IndexJob).to have_received(:new).with('foo_delta')
     end
 
-    it "should execute the internal job" do
-      job.should_receive :perform
+    it "executes the internal job" do
+      allow(job).to receive(:perform)
 
       subject.perform 'foo_delta'
+      expect(job).to have_received(:perform)
     end
   end
 end

data/spec/thinking_sphinx/deltas/resque_delta_spec.rb

@@ -20,9 +20,9 @@ describe ThinkingSphinx::Deltas::ResqueDelta do
       Resque.enqueue(RandomJob, '1234')
     end
 
-    it 'should remove all jobs' do
+    it 'removes all jobs' do
       subject
-      Resque.size('ts_delta').should eq(0)
+      expect(Resque.size('ts_delta')).to eq(0)
     end
   end
 end

data/ts-resque-delta.gemspec

@@ -1,7 +1,7 @@
 # -*- encoding: utf-8 -*-
 Gem::Specification.new do |s|
   s.name        = 'ts-resque-delta'
-  s.version     = '2.0.0'
+  s.version     = '2.1.0'
   s.platform    = Gem::Platform::RUBY
   s.authors     = ['Aaron Gibralter', 'Pat Allan']
   s.email       = ['aaron.gibralter@gmail.com']
@@ -17,16 +17,17 @@ Gem::Specification.new do |s|
   s.require_paths = ['lib']
 
   s.add_dependency 'thinking-sphinx',     '>= 1.5.0'
-  s.add_dependency 'resque',              '~> 1.10'
+  s.add_dependency 'resque',              '>= 1.10'
 
-  s.add_development_dependency 'activerecord',     '~> 3.2'
-  s.add_development_dependency 'activesupport',    '~> 3.2'
-  s.add_development_dependency 'appraisal',        '~> 0.4.1'
-  s.add_development_dependency 'combustion',       '~> 0.4.0'
-  s.add_development_dependency 'database_cleaner', '~> 0.7.1'
-  s.add_development_dependency 'mock_redis',       '~> 0.12.1'
-  s.add_development_dependency 'mysql2',           '~> 0.3.12b4'
-  s.add_development_dependency 'pg',               '~> 0.11'
-  s.add_development_dependency 'rake',             '>= 0.9.2'
-  s.add_development_dependency 'rspec',            '~> 2.11.0'
+  s.add_development_dependency 'activerecord', '< 7'
+  s.add_development_dependency 'activesupport', '< 7'
+
+  s.add_development_dependency 'appraisal', '~> 2.4.1'
+  s.add_development_dependency 'combustion', '~> 1.3.7'
+  s.add_development_dependency 'database_cleaner', '~> 2.0.1'
+  s.add_development_dependency 'mock_redis', '~> 0.34.0'
+  s.add_development_dependency 'mysql2', '~> 0.5.4'
+  s.add_development_dependency 'pg', '~> 1.4.4'
+  s.add_development_dependency 'rake', '~> 13.0.6'
+  s.add_development_dependency 'rspec', '~> 3.12.0'
 end

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: ts-resque-delta
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.1.0
 platform: ruby
 authors:
 - Aaron Gibralter
 - Pat Allan
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2014-04-21 00:00:00.000000000 Z
+date: 2023-01-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thinking-sphinx
@@ -29,156 +29,156 @@ dependencies:
   name: resque
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.10'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.10'
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '3.2'
+        version: '7'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '3.2'
+        version: '7'
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '3.2'
+        version: '7'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '3.2'
+        version: '7'
 - !ruby/object:Gem::Dependency
   name: appraisal
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.4.1
+        version: 2.4.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.4.1
+        version: 2.4.1
 - !ruby/object:Gem::Dependency
   name: combustion
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.4.0
+        version: 1.3.7
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.4.0
+        version: 1.3.7
 - !ruby/object:Gem::Dependency
   name: database_cleaner
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.7.1
+        version: 2.0.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.7.1
+        version: 2.0.1
 - !ruby/object:Gem::Dependency
   name: mock_redis
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.12.1
+        version: 0.34.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.12.1
+        version: 0.34.0
 - !ruby/object:Gem::Dependency
   name: mysql2
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.3.12b4
+        version: 0.5.4
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.3.12b4
+        version: 0.5.4
 - !ruby/object:Gem::Dependency
   name: pg
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.11'
+        version: 1.4.4
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.11'
+        version: 1.4.4
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.9.2
+        version: 13.0.6
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.9.2
+        version: 13.0.6
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.11.0
+        version: 3.12.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.11.0
+        version: 3.12.0
 description: Manage delta indexes via Resque for Thinking Sphinx
 email:
 - aaron.gibralter@gmail.com
@@ -217,12 +217,11 @@ files:
 - spec/spec_helper.rb
 - spec/thinking_sphinx/deltas/resque_delta/delta_job_spec.rb
 - spec/thinking_sphinx/deltas/resque_delta_spec.rb
-- tasks/rails.rake
 - ts-resque-delta.gemspec
 homepage: https://github.com/agibralter/ts-resque-delta
 licenses: []
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -237,9 +236,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: ts-resque-delta
-rubygems_version: 2.2.2
-signing_key: 
+rubygems_version: 3.2.32
+signing_key:
 specification_version: 4
 summary: Thinking Sphinx - Resque Deltas
 test_files:

data/tasks/rails.rake

@@ -1 +0,0 @@
-require File.join(File.dirname(__FILE__), '/../lib/thinking_sphinx/deltas/resque_delta/tasks')