ts-delayed-delta 2.0.0 → 2.0.1

checksums.yaml

@@ -0,0 +1,7 @@
+--- 
+SHA1: 
+  metadata.gz: e3c39830b3c7c1b99120c3b5e194166de5aa3170
+  data.tar.gz: e46cb87b4ea21830a05e97f69555ae66a168e6b2
+SHA512: 
+  metadata.gz: 12980e2228f8c7b78e1157f288126cf28100b2c092381f5a79bb01c7c3ae12d7582fef3bd9d77de46885a9d3675f7d85e756250f3949139d762fe4f63883eccf
+  data.tar.gz: 7674ba0bc569432a17be263d46b3ae88486f1d779a44e12a7a08e67f4528465f11d1bf41045e288371291ec7b6a36b9b9e36d7f38d66ef775406e34e792fa8ed

data/.travis.yml

@@ -1,18 +1,15 @@
 language: ruby
 rvm:
-  - 1.9.2
   - 1.9.3
 before_install:
   - gem update --system
   - gem install bundler --no-ri --no-rdoc
-  - curl -O http://fs-packages.s3.amazonaws.com/fs-sphinx-2.0.6_x86_64_12.04.deb
-  - sudo dpkg -i fs-sphinx-2.0.6_x86_64_12.04.deb
   - bundle 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.6/bin/ SPHINX_VERSION=2.0.6 DATABASE=mysql2
-  - SPHINX_BIN=/usr/local/sphinx-2.0.6/bin/ SPHINX_VERSION=2.0.6 DATABASE=postgresql
+  - 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"

data/README.textile

@@ -6,13 +6,13 @@ This version requires Thinking Sphinx 3.x (currently the edge branch) and Delaye
 
 In your @Gemfile@, it'll likely look something like this:
 
-<pre><code>gem 'ts-delayed-delta', '~> 2.0.0'</code></pre>
+<pre><code>gem 'ts-delayed-delta', '~> 2.0.1'</code></pre>
 
 Or, if you're referring directly to the git repository:
 
 <pre><code>gem 'ts-delayed-delta',
   :git    => 'git://github.com/pat/ts-delayed-delta.git',
-  :branch => 'edge',
+  :branch => 'master',
   :ref    => 'use-latest-commit-here'</code></pre>
 
 And given this gem's built for Delayed Job, we're presuming you've got that set up (with the database table), and you know how to run it. This gem no longer provides a custom task for that purpose - there's no need.
@@ -59,7 +59,8 @@ h2. Contributors
 * "Jonathan Viney":https://github.com/jviney and "James Healy":http://yob.id.au/ (Rails 3.2 deprecation fixes)
 * "Georg Ledermann":http://www.georg-ledermann.de (DJ 2.0.x backwards compatibility)
 * "Jonathan Lim":http://snowblink.co.uk (Cleaning up version references)
+* "Manjunath Manohar":https://github.com/manjunath-nm89 (Allow setting of job queue, smarter cleaning up of jobs)
 
 h2. Copyright
 
-Copyright (c) 2009-2012, Thinking Sphinx Delayed Deltas (ts-delayed-delta) is developed and maintained by Pat Allan, and is released under the open MIT Licence. Many thanks to "all who have contributed patches":https://github.com/pat/ts-delayed-delta/contributors.
+Copyright (c) 2009-2014, Thinking Sphinx Delayed Deltas (ts-delayed-delta) is developed and maintained by Pat Allan, and is released under the open MIT Licence. Many thanks to "all who have contributed patches":https://github.com/pat/ts-delayed-delta/contributors.

data/lib/thinking_sphinx/deltas/delayed_delta.rb

@@ -14,10 +14,15 @@ 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 '--- !ruby/object:ThinkingSphinx::Deltas::%'"
-    )
+    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::%"
+    ])
   end
 
   def self.enqueue_unless_duplicates(object)
@@ -31,24 +36,29 @@ class ThinkingSphinx::Deltas::DelayedDelta <
       ) > 0
     end
 
-    Delayed::Job.enqueue object, priority_option
+    Delayed::Job.enqueue object, job_options
   end
 
-  def self.priority_option
+  def self.job_options
     if Gem.loaded_specs['delayed_job'].version.to_s.match(/^2\.0\./)
       # Fallback for compatibility with old release 2.0.x of DJ
-      priority
+      # Only priority option is supported for these versions
+      set_job_options(:delayed_job_priority)
     else
-      {:priority => priority}
+      CONFIGURATIONS_MAP.inject({}) do |job_mapper, configuration_entity|
+        job_mapper.merge(configuration_entity[0] => set_job_options(configuration_entity[1]))
+      end
     end
   end
 
-  def self.priority
+  def self.set_job_options(setting)
     configuration = ThinkingSphinx::Configuration.instance
-    if configuration.respond_to? :delayed_job_priority
-      configuration.delayed_job_priority
+    if configuration.respond_to? setting
+      configuration.send(setting)
+    elsif configuration.respond_to? :settings
+      configuration.settings[setting.to_s]
     else
-      configuration.settings['delayed_job_priority'] || 0
+      nil
     end
   end
 
@@ -79,7 +89,7 @@ class ThinkingSphinx::Deltas::DelayedDelta <
       Delayed::Job.enqueue(
         ThinkingSphinx::Deltas::DelayedDelta::FlagAsDeletedJob.new(
           model.core_index_names, instance.sphinx_document_id
-        ), self.class.priority_option
+        ), self.class.job_options
       ) if instance
 
       true
@@ -105,7 +115,7 @@ class ThinkingSphinx::Deltas::DelayedDelta <
       Delayed::Job.enqueue(
         ThinkingSphinx::Deltas::DelayedDelta::FlagAsDeletedJob.new(
           index.name, index.document_id_for_key(instance.id)
-        ), self.class.priority_option
+        ), self.class.job_options
       )
     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.0'
+  s.version     = '2.0.1'
   s.platform    = Gem::Platform::RUBY
   s.authors     = ['Pat Allan']
   s.email       = ['pat@freelancing-gods.com']

metadata

@@ -1,13 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: ts-delayed-delta
 version: !ruby/object:Gem::Version 
-  hash: 15
-  prerelease: 
-  segments: 
-  - 2
-  - 0
-  - 0
-  version: 2.0.0
+  version: 2.0.1
 platform: ruby
 authors: 
 - Pat Allan
@@ -15,167 +9,107 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2013-05-07 00:00:00 -07:00
-default_executable: 
+date: 2014-04-10 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   requirement: &id001 !ruby/object:Gem::Requirement 
-    none: false
     requirements: 
-    - - ">="
+    - &id002 
+      - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
         version: "0"
   version_requirements: *id001
-  name: thinking-sphinx
-  prerelease: false
   type: :runtime
-- !ruby/object:Gem::Dependency 
-  requirement: &id002 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  version_requirements: *id002
-  name: delayed_job
   prerelease: false
-  type: :runtime
+  name: thinking-sphinx
 - !ruby/object:Gem::Dependency 
   requirement: &id003 !ruby/object:Gem::Requirement 
-    none: false
     requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 15
-        segments: 
-        - 0
-        - 5
-        - 2
-        version: 0.5.2
+    - *id002
   version_requirements: *id003
-  name: appraisal
+  type: :runtime
   prerelease: false
-  type: :development
+  name: delayed_job
 - !ruby/object:Gem::Dependency 
   requirement: &id004 !ruby/object:Gem::Requirement 
-    none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 15
-        segments: 
-        - 0
-        - 4
-        - 0
-        version: 0.4.0
+        version: 0.5.2
   version_requirements: *id004
-  name: combustion
-  prerelease: false
   type: :development
+  prerelease: false
+  name: appraisal
 - !ruby/object:Gem::Dependency 
   requirement: &id005 !ruby/object:Gem::Requirement 
-    none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 1
-        segments: 
-        - 0
-        - 7
-        - 1
-        version: 0.7.1
+        version: 0.4.0
   version_requirements: *id005
-  name: database_cleaner
-  prerelease: false
   type: :development
+  prerelease: false
+  name: combustion
 - !ruby/object:Gem::Dependency 
   requirement: &id006 !ruby/object:Gem::Requirement 
-    none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 7
-        segments: 
-        - 0
-        - 4
-        - 4
-        version: 0.4.4
+        version: 0.7.1
   version_requirements: *id006
-  name: delayed_job_active_record
-  prerelease: false
   type: :development
+  prerelease: false
+  name: database_cleaner
 - !ruby/object:Gem::Dependency 
   requirement: &id007 !ruby/object:Gem::Requirement 
-    none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 3357009125
-        segments: 
-        - 0
-        - 3
-        - 12
-        - b
-        - 4
-        version: 0.3.12b4
+        version: 0.4.4
   version_requirements: *id007
-  name: mysql2
-  prerelease: false
   type: :development
+  prerelease: false
+  name: delayed_job_active_record
 - !ruby/object:Gem::Dependency 
   requirement: &id008 !ruby/object:Gem::Requirement 
-    none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 51
-        segments: 
-        - 0
-        - 11
-        - 0
-        version: 0.11.0
+        version: 0.3.12b4
   version_requirements: *id008
-  name: pg
-  prerelease: false
   type: :development
+  prerelease: false
+  name: mysql2
 - !ruby/object:Gem::Dependency 
   requirement: &id009 !ruby/object:Gem::Requirement 
-    none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
-        hash: 63
-        segments: 
-        - 0
-        - 9
-        - 2
-        version: 0.9.2
+        version: 0.11.0
   version_requirements: *id009
-  name: rake
-  prerelease: false
   type: :development
+  prerelease: false
+  name: pg
 - !ruby/object:Gem::Dependency 
   requirement: &id010 !ruby/object:Gem::Requirement 
-    none: false
     requirements: 
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version 
-        hash: 35
-        segments: 
-        - 2
-        - 11
-        - 0
-        version: 2.11.0
+        version: 0.9.2
   version_requirements: *id010
-  name: rspec
+  type: :development
   prerelease: false
+  name: rake
+- !ruby/object:Gem::Dependency 
+  requirement: &id011 !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        version: 2.11.0
+  version_requirements: *id011
   type: :development
+  prerelease: false
+  name: rspec
 description: Manage delta indexes via Delayed Job for Thinking Sphinx
 email: 
 - pat@freelancing-gods.com
@@ -213,39 +147,28 @@ files:
 - spec/spec.opts
 - spec/spec_helper.rb
 - ts-delayed-delta.gemspec
-has_rdoc: true
 homepage: http://github.com/pat/ts-delayed-delta
 licenses: []
 
+metadata: {}
+
 post_install_message: 
 rdoc_options: []
 
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
-  none: false
   requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  - *id002
 required_rubygems_version: !ruby/object:Gem::Requirement 
-  none: false
   requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  - *id002
 requirements: []
 
 rubyforge_project: ts-delayed-delta
-rubygems_version: 1.6.2
+rubygems_version: 2.1.0
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Thinking Sphinx - Delayed Deltas
 test_files: 
 - spec/acceptance/delayed_job_deltas_spec.rb