ts-delayed-delta 2.0.1 → 2.0.2

checksums.yaml

@@ -1,7 +1,7 @@
---- 
-SHA1: 
-  metadata.gz: e3c39830b3c7c1b99120c3b5e194166de5aa3170
-  data.tar.gz: e46cb87b4ea21830a05e97f69555ae66a168e6b2
-SHA512: 
-  metadata.gz: 12980e2228f8c7b78e1157f288126cf28100b2c092381f5a79bb01c7c3ae12d7582fef3bd9d77de46885a9d3675f7d85e756250f3949139d762fe4f63883eccf
-  data.tar.gz: 7674ba0bc569432a17be263d46b3ae88486f1d779a44e12a7a08e67f4528465f11d1bf41045e288371291ec7b6a36b9b9e36d7f38d66ef775406e34e792fa8ed
+---
+SHA1:
+  metadata.gz: 490d0d61f6fc9fa371213d65861da39f5ed4483e
+  data.tar.gz: dd8d005064422491c4114792acdc9f276d89a07d
+SHA512:
+  metadata.gz: f4676c88ab08ead306b808e62c6bb14ccff97bb8198a8355d1e90fa36089b2213b7c38fce40ec31638f2545961ebe2555d48c9349c6fd7242395649a1e0769bd
+  data.tar.gz: 5297c1672a78300db8e1ad2b04fcc3c1b9a6c322c12d08d3619f7988942980e9b4c79b3f913821bb3ddeb2d41d1d817200bfc9a21bd19a39e9f16218cbb7543d

data/.travis.yml

@@ -8,8 +8,9 @@ before_install:
 before_script:
   - "mysql -e 'create database thinking_sphinx;' > /dev/null"
   - "psql -c 'create database thinking_sphinx;' -U postgres > /dev/null"
-  - "bundle exec rake appraisal:install"
 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
-script: "bundle exec rake appraisal spec"
+gemfile:
+  - gemfiles/binary.gemfile
+  - gemfiles/sphinxql.gemfile

data/README.textile

@@ -2,11 +2,11 @@ h1. Delayed Deltas for Thinking Sphinx
 
 h2. Installation
 
-This version requires Thinking Sphinx 3.x (currently the edge branch) and Delayed Job 3.x.
+This version works with Thinking Sphinx v1.5.0, v2.1.0 and v3.x.
 
 In your @Gemfile@, it'll likely look something like this:
 
-<pre><code>gem 'ts-delayed-delta', '~> 2.0.1'</code></pre>
+<pre><code>gem 'ts-delayed-delta', '~> 2.0.2'</code></pre>
 
 Or, if you're referring directly to the git repository:
 
@@ -25,6 +25,14 @@ In your index definitions, make sure you set the @:delta@ setting to @ThinkingSp
   # ...
 end</code></pre>
 
+For those still on pre-v3 versions of Thinking Sphinx, the delta option goes within the define_index block:
+
+<pre><code>define_index do
+  # ...
+
+  set_property :delta => ThinkingSphinx::Deltas::DelayedDelta
+end</code></pre>
+
 If you've never used delta indices before, you'll want to add the boolean column named delta to each model that is using the approach. It probably doesn't hurt to add an index to that column as well.
 
 <pre><code>add_column :books, :delta, :boolean, :default => true, :null => false
@@ -34,10 +42,6 @@ And that's pretty much it. Make sure Delayed Job is running, and it'll take care
 
 Please keep in mind that you need to run the Delayed Job workers on the same machine as Sphinx, as direct access to Sphinx files (and the Sphinx command-line tools) is essential.
 
-h2. Limitations
-
-This version of the gem is built for Ruby 1.9 and Rails 3.1 or newer, just like Thinking Sphinx 3.
-
 h2. Contributing
 
 Contributions are very much welcome - but keep in mind the following:

data/lib/thinking_sphinx/deltas/delayed_delta.rb

@@ -14,11 +14,6 @@ require 'thinking_sphinx'
 class ThinkingSphinx::Deltas::DelayedDelta <
   ThinkingSphinx::Deltas::DefaultDelta
 
-  CONFIGURATIONS_MAP = {
-    :priority => :delayed_job_priority,
-    :queue    => :delayed_job_queue
-  }
-
   def self.cancel_jobs
     Delayed::Job.delete_all([
       "handler LIKE (?) AND locked_at IS NULL AND locked_by IS NULL AND failed_at IS NULL", "--- !ruby/object:ThinkingSphinx::Deltas::%"
@@ -43,22 +38,23 @@ class ThinkingSphinx::Deltas::DelayedDelta <
     if Gem.loaded_specs['delayed_job'].version.to_s.match(/^2\.0\./)
       # Fallback for compatibility with old release 2.0.x of DJ
       # Only priority option is supported for these versions
-      set_job_options(:delayed_job_priority)
+      ThinkingSphinx::Configuration.instance.delayed_job_priority || 0
     else
-      CONFIGURATIONS_MAP.inject({}) do |job_mapper, configuration_entity|
-        job_mapper.merge(configuration_entity[0] => set_job_options(configuration_entity[1]))
-      end
+      {
+        :priority => job_option(:delayed_job_priority, 0),
+        :queue    => job_option(:delayed_job_queue)
+      }
     end
   end
 
-  def self.set_job_options(setting)
+  def self.job_option(setting, default = nil)
     configuration = ThinkingSphinx::Configuration.instance
     if configuration.respond_to? setting
       configuration.send(setting)
     elsif configuration.respond_to? :settings
-      configuration.settings[setting.to_s]
+      configuration.settings[setting.to_s] || default
     else
-      nil
+      default
     end
   end
 

data/ts-delayed-delta.gemspec

@@ -3,7 +3,7 @@ $:.push File.expand_path('../lib', __FILE__)
 
 Gem::Specification.new do |s|
   s.name        = 'ts-delayed-delta'
-  s.version     = '2.0.1'
+  s.version     = '2.0.2'
   s.platform    = Gem::Platform::RUBY
   s.authors     = ['Pat Allan']
   s.email       = ['pat@freelancing-gods.com']
@@ -20,7 +20,7 @@ Gem::Specification.new do |s|
   }
   s.require_paths = ['lib']
 
-  s.add_runtime_dependency 'thinking-sphinx'
+  s.add_runtime_dependency 'thinking-sphinx',               '>= 1.5.0'
   s.add_runtime_dependency 'delayed_job'
 
   s.add_development_dependency 'appraisal',                 '~> 0.5.2'

metadata

@@ -1,125 +1,162 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: ts-delayed-delta
-version: !ruby/object:Gem::Version 
-  version: 2.0.1
+version: !ruby/object:Gem::Version
+  version: 2.0.2
 platform: ruby
-authors: 
+authors:
 - Pat Allan
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2014-04-10 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  requirement: &id001 !ruby/object:Gem::Requirement 
-    requirements: 
-    - &id002 
-      - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
-  version_requirements: *id001
-  type: :runtime
-  prerelease: false
+date: 2014-04-21 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: thinking-sphinx
-- !ruby/object:Gem::Dependency 
-  requirement: &id003 !ruby/object:Gem::Requirement 
-    requirements: 
-    - *id002
-  version_requirements: *id003
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: 1.5.0
   type: :runtime
   prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: 1.5.0
+- !ruby/object:Gem::Dependency
   name: delayed_job
-- !ruby/object:Gem::Dependency 
-  requirement: &id004 !ruby/object:Gem::Requirement 
-    requirements: 
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: appraisal
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
+      - !ruby/object:Gem::Version
         version: 0.5.2
-  version_requirements: *id004
   type: :development
   prerelease: false
-  name: appraisal
-- !ruby/object:Gem::Dependency 
-  requirement: &id005 !ruby/object:Gem::Requirement 
-    requirements: 
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.5.2
+- !ruby/object:Gem::Dependency
+  name: combustion
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
+      - !ruby/object:Gem::Version
         version: 0.4.0
-  version_requirements: *id005
   type: :development
   prerelease: false
-  name: combustion
-- !ruby/object:Gem::Dependency 
-  requirement: &id006 !ruby/object:Gem::Requirement 
-    requirements: 
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
+      - !ruby/object:Gem::Version
+        version: 0.4.0
+- !ruby/object:Gem::Dependency
+  name: database_cleaner
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
         version: 0.7.1
-  version_requirements: *id006
   type: :development
   prerelease: false
-  name: database_cleaner
-- !ruby/object:Gem::Dependency 
-  requirement: &id007 !ruby/object:Gem::Requirement 
-    requirements: 
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
+      - !ruby/object:Gem::Version
+        version: 0.7.1
+- !ruby/object:Gem::Dependency
+  name: delayed_job_active_record
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
         version: 0.4.4
-  version_requirements: *id007
   type: :development
   prerelease: false
-  name: delayed_job_active_record
-- !ruby/object:Gem::Dependency 
-  requirement: &id008 !ruby/object:Gem::Requirement 
-    requirements: 
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
+      - !ruby/object:Gem::Version
+        version: 0.4.4
+- !ruby/object:Gem::Dependency
+  name: mysql2
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
         version: 0.3.12b4
-  version_requirements: *id008
   type: :development
   prerelease: false
-  name: mysql2
-- !ruby/object:Gem::Dependency 
-  requirement: &id009 !ruby/object:Gem::Requirement 
-    requirements: 
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
+      - !ruby/object:Gem::Version
+        version: 0.3.12b4
+- !ruby/object:Gem::Dependency
+  name: pg
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
         version: 0.11.0
-  version_requirements: *id009
   type: :development
   prerelease: false
-  name: pg
-- !ruby/object:Gem::Dependency 
-  requirement: &id010 !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.11.0
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
         version: 0.9.2
-  version_requirements: *id010
   type: :development
   prerelease: false
-  name: rake
-- !ruby/object:Gem::Dependency 
-  requirement: &id011 !ruby/object:Gem::Requirement 
-    requirements: 
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: 0.9.2
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
+      - !ruby/object:Gem::Version
         version: 2.11.0
-  version_requirements: *id011
   type: :development
   prerelease: false
-  name: rspec
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 2.11.0
 description: Manage delta indexes via Delayed Job for Thinking Sphinx
-email: 
+email:
 - pat@freelancing-gods.com
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - .gitignore
 - .travis.yml
 - Appraisals
@@ -149,28 +186,28 @@ files:
 - ts-delayed-delta.gemspec
 homepage: http://github.com/pat/ts-delayed-delta
 licenses: []
-
 metadata: {}
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
-  requirements: 
-  - *id002
-required_rubygems_version: !ruby/object:Gem::Requirement 
-  requirements: 
-  - *id002
+required_ruby_version: !ruby/object:Gem::Requirement
+  requirements:
+  - - '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements:
+  - - '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: ts-delayed-delta
-rubygems_version: 2.1.0
+rubygems_version: 2.0.14
 signing_key: 
 specification_version: 4
 summary: Thinking Sphinx - Delayed Deltas
-test_files: 
+test_files:
 - spec/acceptance/delayed_job_deltas_spec.rb
 - spec/acceptance/spec_helper.rb
 - spec/acceptance/support/database_cleaner.rb