ts-resque-delta 1.1.4 → 1.1.5

data/features/resque_deltas.feature

@@ -1,7 +1,7 @@
 Feature: Resque Delta Indexing
   In order to have delta indexing on frequently-updated sites
   Developers
-  Should be able to use Resque to handle delta indexes to lower system load
+  Should be able to use Resque to handle delta indices to lower system load
 
   Background:
     Given Sphinx is running

data/features/thinking_sphinx/db/migrations/create_delayed_betas.rb

@@ -1,4 +1,4 @@
-ActiveRecord::Base.connection.create_table :delayed_beta, :force => true do |t|
+ActiveRecord::Base.connection.create_table :delayed_betas, :force => true do |t|
   t.column  :name, :string,  :null => false
   t.column :delta, :boolean, :null => false, :default => false
 end

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

@@ -13,11 +13,11 @@ class ThinkingSphinx::Deltas::ResqueDelta::DeltaJob
   #
   # @param [String] index the name of the Sphinx index
   #
-  def self.perform(indexes)
-    return if skip?(indexes)
+  def self.perform(indices)
+    return if skip?(indices)
 
     config = ThinkingSphinx::Configuration.instance
-    output = `#{config.bin_path}#{config.indexer_binary_name} --config #{config.config_file} --rotate #{indexes.join(' ')}`
+    output = `#{config.bin_path}#{config.indexer_binary_name} --config #{config.config_file} --rotate #{indices.join(' ')}`
     puts output unless ThinkingSphinx.suppress_delta_output?
   end
 
@@ -26,7 +26,7 @@ class ThinkingSphinx::Deltas::ResqueDelta::DeltaJob
     Resque.enqueue(self, *args)
   end
 
-  # Run only one DeltaJob at a time regardless of indexes.
+  # Run only one DeltaJob at a time regardless of indices.
   def self.identifier(*args)
     nil
   end
@@ -56,8 +56,8 @@ class ThinkingSphinx::Deltas::ResqueDelta::DeltaJob
 
   protected
 
-  def self.skip?(indexes)
-    indexes.any? do |index|
+  def self.skip?(indices)
+    indices.any? do |index|
       ThinkingSphinx::Deltas::ResqueDelta.locked?(index)
     end
   end

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

@@ -14,14 +14,14 @@ class ThinkingSphinx::Deltas::ResqueDelta::FlagAsDeletedJob
   # situation to avoid old values in the core index and just use the new
   # values in the delta index as a reference point.
   #
-  # @param [Array] indexes An array of index names
+  # @param [Array] indices An array of index names
   # @param [Integer] document_id The document id
   #
   # @return [Boolean] true
   #
-  def self.perform(indexes, document_id)
+  def self.perform(indices, document_id)
     config = ThinkingSphinx::Configuration.instance
-    indexes.each do |index|
+    indices.each do |index|
       if ThinkingSphinx.sphinx_running? && ThinkingSphinx.search_for_id(document_id, index)
         config.client.update(index, ['sphinx_deleted'], {document_id => [1]})
       end

data/lib/thinking_sphinx/deltas/resque_delta/tasks.rb

@@ -3,18 +3,18 @@ require 'thinking_sphinx/deltas/resque_delta'
 namespace :thinking_sphinx do
 
   # Return a list of index prefixes (i.e. without "_core"/"_delta").
-  def sphinx_indexes
-    unless @sphinx_indexes
+  def sphinx_indices
+    unless @sphinx_indices
       @ts_config ||= ThinkingSphinx::Configuration.instance
       @ts_config.generate
-      @sphinx_indexes = @ts_config.configuration.indexes.collect { |i| i.name }
-      # The collected indexes look like:
+      @sphinx_indices = @ts_config.configuration.indices.collect { |i| i.name }
+      # The collected indices look like:
       # ["foo_core", "foo_delta", "foo", "bar_core", "bar_delta", "bar"]
-      @sphinx_indexes.reject! { |i| i =~ /_(core|delta)$/}
+      @sphinx_indices.reject! { |i| i =~ /_(core|delta)$/}
       # Now we have:
       # ["foo", "bar"]
     end
-    @sphinx_indexes
+    @sphinx_indices
   end
 
   def lock_delta(index_name)
@@ -25,14 +25,14 @@ namespace :thinking_sphinx do
     ThinkingSphinx::Deltas::ResqueDelta.unlock("#{index_name}_delta")
   end
 
-  desc 'Lock all delta indexes (Resque will not run indexer or place new jobs on the :ts_delta queue).'
+  desc 'Lock all delta indices (Resque will not run indexer or place new jobs on the :ts_delta queue).'
   task :lock_deltas do
-    sphinx_indexes.each { |index_name| lock_delta(index_name) }
+    sphinx_indices.each { |index_name| lock_delta(index_name) }
   end
 
-  desc 'Unlock all delta indexes.'
+  desc 'Unlock all delta indices.'
   task :unlock_deltas do
-    sphinx_indexes.each { |index_name| unlock_delta(index_name) }
+    sphinx_indices.each { |index_name| unlock_delta(index_name) }
   end
 
   desc 'Like `rake thinking_sphinx:index`, but locks one index at a time.'
@@ -46,7 +46,7 @@ namespace :thinking_sphinx do
     FileUtils.mkdir_p(@ts_config.searchd_file_path)
 
     # Index each core, one at a time. Wrap with delta locking logic.
-    sphinx_indexes.each do |index_name|
+    sphinx_indices.each do |index_name|
       lock_delta(index_name)
       @ts_config.controller.index("#{index_name}_core", :verbose => true)
       ret = $?

data/lib/thinking_sphinx/deltas/resque_delta/version.rb

@@ -1,7 +1,7 @@
 module ThinkingSphinx
   module Deltas
     class ResqueDeltaInfo
-      VERSION = "1.1.4"
+      VERSION = "1.1.5"
     end
   end
 end

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

@@ -24,7 +24,7 @@ describe ThinkingSphinx::Deltas::ResqueDelta::DeltaJob do
       )
     end
 
-    it "should process just the requested indexes" do
+    it "should process just the requested indices" do
       ThinkingSphinx::Deltas::ResqueDelta::DeltaJob.should_receive(:`) do |c|
         c.should match(/foo_delta/)
         c.should_not match(/--all/)
@@ -34,8 +34,8 @@ describe ThinkingSphinx::Deltas::ResqueDelta::DeltaJob do
       )
     end
 
-    context 'multiple indexes' do
-      it "should process all requested indexes" do
+    context 'multiple indices' do
+      it "should process all requested indices" do
         ThinkingSphinx::Deltas::ResqueDelta::DeltaJob.should_receive(:`) do |c|
           c.should match(/foo_delta bar_delta/)
         end
@@ -59,7 +59,7 @@ describe ThinkingSphinx::Deltas::ResqueDelta::DeltaJob do
         )
       end
 
-      it "should not start the indexer for multiple indexes" do
+      it "should not start the indexer for multiple indices" do
         ThinkingSphinx::Deltas::ResqueDelta::DeltaJob.should_not_receive(:`)
         ThinkingSphinx::Deltas::ResqueDelta::DeltaJob.perform(
           ['bar_delta', 'foo_delta']

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

@@ -29,7 +29,7 @@ describe ThinkingSphinx::Deltas::ResqueDelta::FlagAsDeletedJob do
       ThinkingSphinx::Deltas::ResqueDelta::FlagAsDeletedJob.perform(['foo_core'], 12)
     end
 
-    it "should update all specified indexes" do
+    it "should update all specified indices" do
       @client.should_receive(:update).with('foo_core', anything, anything)
       @client.should_receive(:update).with('bar_core', anything, anything)
       ThinkingSphinx::Deltas::ResqueDelta::FlagAsDeletedJob.perform(['foo_core', 'bar_core'], 12)

data/ts-resque-delta.gemspec

@@ -20,6 +20,7 @@ Gem::Specification.new do |s|
   s.require_paths = ["lib"]
 
   s.add_dependency "thinking-sphinx", ">= 1.4.1"
+  s.add_dependency "riddle", ">= 1.5"
   s.add_dependency "resque", "~> 1.10"
   s.add_dependency "resque-lock-timeout", "~> 0.3.1"
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: ts-resque-delta
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 25
   prerelease: 
   segments: 
   - 1
   - 1
-  - 4
-  version: 1.1.4
+  - 5
+  version: 1.1.5
 platform: ruby
 authors: 
 - Aaron Gibralter
@@ -15,12 +15,10 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-10-28 00:00:00 Z
+date: 2011-11-09 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: thinking-sphinx
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  version_requirements: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -31,12 +29,27 @@ dependencies:
         - 4
         - 1
         version: 1.4.1
+  requirement: *id001
+  prerelease: false
+  name: thinking-sphinx
   type: :runtime
-  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  name: resque
+  version_requirements: &id002 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 5
+        segments: 
+        - 1
+        - 5
+        version: "1.5"
+  requirement: *id002
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  name: riddle
+  type: :runtime
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -46,12 +59,12 @@ dependencies:
         - 1
         - 10
         version: "1.10"
+  requirement: *id003
+  prerelease: false
+  name: resque
   type: :runtime
-  version_requirements: *id002
 - !ruby/object:Gem::Dependency 
-  name: resque-lock-timeout
-  prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -62,12 +75,12 @@ dependencies:
         - 3
         - 1
         version: 0.3.1
+  requirement: *id004
+  prerelease: false
+  name: resque-lock-timeout
   type: :runtime
-  version_requirements: *id003
 - !ruby/object:Gem::Dependency 
-  name: rspec
-  prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -77,12 +90,12 @@ dependencies:
         - 1
         - 0
         version: "1.0"
+  requirement: *id005
+  prerelease: false
+  name: rspec
   type: :development
-  version_requirements: *id004
 - !ruby/object:Gem::Dependency 
-  name: cucumber
-  prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  version_requirements: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -91,12 +104,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
+  requirement: *id006
+  prerelease: false
+  name: cucumber
   type: :development
-  version_requirements: *id005
 - !ruby/object:Gem::Dependency 
-  name: database_cleaner
-  prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  version_requirements: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -107,12 +120,12 @@ dependencies:
         - 5
         - 2
         version: 0.5.2
+  requirement: *id007
+  prerelease: false
+  name: database_cleaner
   type: :development
-  version_requirements: *id006
 - !ruby/object:Gem::Dependency 
-  name: mysql2
-  prerelease: false
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  version_requirements: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -123,12 +136,12 @@ dependencies:
         - 2
         - 7
         version: 0.2.7
+  requirement: *id008
+  prerelease: false
+  name: mysql2
   type: :development
-  version_requirements: *id007
 - !ruby/object:Gem::Dependency 
-  name: rake
-  prerelease: false
-  requirement: &id008 !ruby/object:Gem::Requirement 
+  version_requirements: &id009 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
@@ -139,12 +152,12 @@ dependencies:
         - 8
         - 7
         version: 0.8.7
+  requirement: *id009
+  prerelease: false
+  name: rake
   type: :development
-  version_requirements: *id008
 - !ruby/object:Gem::Dependency 
-  name: activerecord
-  prerelease: false
-  requirement: &id009 !ruby/object:Gem::Requirement 
+  version_requirements: &id010 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -155,12 +168,12 @@ dependencies:
         - 3
         - 11
         version: 2.3.11
+  requirement: *id010
+  prerelease: false
+  name: activerecord
   type: :development
-  version_requirements: *id009
 - !ruby/object:Gem::Dependency 
-  name: flying-sphinx
-  prerelease: false
-  requirement: &id010 !ruby/object:Gem::Requirement 
+  version_requirements: &id011 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -171,8 +184,10 @@ dependencies:
         - 5
         - 1
         version: 0.5.1
+  requirement: *id011
+  prerelease: false
+  name: flying-sphinx
   type: :development
-  version_requirements: *id010
 description: Manage delta indexes via Resque for Thinking Sphinx
 email: 
 - aaron.gibralter@gmail.com