ts-resque-delta 1.0.0 → 1.1.0

data/lib/flying_sphinx/resque_delta.rb

@@ -0,0 +1,38 @@
+require 'thinking_sphinx/deltas/resque_delta'
+
+class FlyingSphinx::ResqueDelta < ThinkingSphinx::Deltas::ResqueDelta
+  def self.job_types
+    [
+      FlyingSphinx::ResqueDelta::DeltaJob,
+      FlyingSphinx::ResqueDelta::FlagAsDeletedJob
+    ]
+  end
+  
+  def self.job_prefix
+    'fs-delta'
+  end
+  
+  def index(model, instance = nil)
+    return true if skip?(instance)
+    
+    model.delta_index_names.each do |delta|
+      next if self.class.locked?(delta)
+      
+      Resque.enqueue(
+        FlyingSphinx::ResqueDelta::DeltaJob,
+        [delta]
+      )
+    end
+    
+    Resque.enqueue(
+      FlyingSphinx::ResqueDelta::FlagAsDeletedJob,
+      model.core_index_names,
+      instance.sphinx_document_id
+    ) if instance
+    
+    true
+  end
+end
+
+require 'flying_sphinx/resque_delta/delta_job'
+require 'flying_sphinx/resque_delta/flag_as_deleted_job'

data/lib/flying_sphinx/resque_delta/delta_job.rb

@@ -0,0 +1,14 @@
+class FlyingSphinx::ResqueDelta::DeltaJob < ThinkingSphinx::Deltas::ResqueDelta::DeltaJob
+  @queue = :fs_delta
+  
+  # Runs Sphinx's indexer tool to process the index. Currently assumes Sphinx
+  # is running.
+  #
+  # @param [String] index the name of the Sphinx index
+  #
+  def self.perform(indices)
+    return if skip?(indices)
+
+    FlyingSphinx::IndexRequest.new(indices).perform
+  end
+end

data/lib/flying_sphinx/resque_delta/flag_as_deleted_job.rb

@@ -0,0 +1,7 @@
+class FlyingSphinx::ResqueDelta::FlagAsDeletedJob
+  @queue = :fs_delta
+  
+  def self.perform(indices, document_id)
+    FlyingSphinx::FlagAsDeletedJob.new(indices, document_id).perform
+  end
+end

data/lib/thinking_sphinx/deltas/resque_delta.rb

@@ -12,29 +12,36 @@ require 'thinking_sphinx'
 # @see http://ts.freelancing-gods.com Thinking Sphinx
 #
 class ThinkingSphinx::Deltas::ResqueDelta < ThinkingSphinx::Deltas::DefaultDelta
-
-  # LTRIM + LPOP deletes all items from the Resque queue without loading it
-  # into client memory (unlike Resque.dequeue).
-  def self.cancel_thinking_sphinx_jobs
+  def self.job_types
     [
       ThinkingSphinx::Deltas::ResqueDelta::DeltaJob,
       ThinkingSphinx::Deltas::ResqueDelta::FlagAsDeletedJob
-    ].collect { |c| c.instance_variable_get(:@queue) }.uniq.each do |q|
+    ]
+  end
+  
+  def self.job_prefix
+    'ts-delta'
+  end
+  
+  # LTRIM + LPOP deletes all items from the Resque queue without loading it
+  # into client memory (unlike Resque.dequeue).
+  def self.cancel_thinking_sphinx_jobs
+    job_types.collect { |c| c.instance_variable_get(:@queue) }.uniq.each do |q|
       Resque.redis.ltrim("queue:#{q}", 0, 0)
       Resque.redis.lpop("queue:#{q}")
     end
   end
 
   def self.lock(index_name)
-    Resque.redis.set("ts-delta:index:#{index_name}:locked", 'true')
+    Resque.redis.set("#{job_prefix}:index:#{index_name}:locked", 'true')
   end
 
   def self.unlock(index_name)
-    Resque.redis.del("ts-delta:index:#{index_name}:locked")
+    Resque.redis.del("#{job_prefix}:index:#{index_name}:locked")
   end
 
   def self.locked?(index_name)
-    Resque.redis.get("ts-delta:index:#{index_name}:locked") == 'true'
+    Resque.redis.get("#{job_prefix}:index:#{index_name}:locked") == 'true'
   end
 
   # Adds a job to the queue for processing the given model's delta index. A job

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

@@ -1,7 +1,7 @@
 module ThinkingSphinx
   module Deltas
     class ResqueDeltaInfo
-      VERSION = "1.0.0"
+      VERSION = "1.1.0"
     end
   end
 end

data/spec/flying_sphinx/resque_delta/delta_job_spec.rb

@@ -0,0 +1,32 @@
+require 'spec_helper'
+
+describe FlyingSphinx::ResqueDelta::DeltaJob do
+  describe '@queue' do
+    it "uses the fs_delta queue" do
+      FlyingSphinx::ResqueDelta::DeltaJob.instance_variable_get(:@queue).
+        should == :fs_delta
+    end
+  end
+  
+  describe '.perform' do
+    it "doesn't create an index request when skipping" do
+      FlyingSphinx::ResqueDelta::DeltaJob.stub!(:skip? => true)
+      
+      FlyingSphinx::IndexRequest.should_not_receive(:new)
+      
+      FlyingSphinx::ResqueDelta::DeltaJob.perform ['foo_delta']
+    end
+    
+    it "performs an index request when not skipping" do
+      request = double('index request', :perform => true)
+      FlyingSphinx::ResqueDelta::DeltaJob.stub!(:skip? => false)
+      
+      FlyingSphinx::IndexRequest.should_receive(:new).
+        with(['foo_delta']).
+        and_return(request)
+      request.should_receive(:perform)
+      
+      FlyingSphinx::ResqueDelta::DeltaJob.perform ['foo_delta']
+    end
+  end
+end

data/spec/flying_sphinx/resque_delta/flag_as_deleted_job_spec.rb

@@ -0,0 +1,23 @@
+require 'spec_helper'
+
+describe FlyingSphinx::ResqueDelta::FlagAsDeletedJob do
+  describe '@queue' do
+    it "uses the fs_delta queue" do
+      FlyingSphinx::ResqueDelta::FlagAsDeletedJob.
+        instance_variable_get(:@queue).should == :fs_delta
+    end
+  end
+  
+  describe '.perform' do
+    it "performs a flag-as-deleted job" do
+      job = double('flag as deleted job', :perform => true)
+      
+      FlyingSphinx::FlagAsDeletedJob.should_receive(:new).
+        with(['foo_core'], 5).
+        and_return(job)
+      job.should_receive(:perform)
+      
+      FlyingSphinx::ResqueDelta::FlagAsDeletedJob.perform ['foo_core'], 5
+    end
+  end
+end

data/spec/flying_sphinx/resque_delta_spec.rb

@@ -0,0 +1,131 @@
+require 'spec_helper'
+
+describe FlyingSphinx::ResqueDelta do
+  describe '.job_types' do
+    it "contains just the Flying Sphinx delta and delete jobs" do
+      FlyingSphinx::ResqueDelta.job_types.should == [
+        FlyingSphinx::ResqueDelta::DeltaJob,
+        FlyingSphinx::ResqueDelta::FlagAsDeletedJob
+      ]
+    end
+  end
+  
+  describe '.job_prefix' do
+    it "is fs-delta" do
+      FlyingSphinx::ResqueDelta.job_prefix.should == 'fs-delta'
+    end
+  end
+  
+  describe '#index' do
+    before :each do
+      ThinkingSphinx.updates_enabled = true
+      ThinkingSphinx.deltas_enabled  = true
+
+      Resque.stub(:enqueue => true)
+
+      @delayed_delta = FlyingSphinx::ResqueDelta.new(
+        stub('instance'), {}
+      )
+      @delayed_delta.stub(:toggled).and_return(true)
+
+      FlyingSphinx::ResqueDelta.stub(:lock)
+      FlyingSphinx::ResqueDelta.stub(:unlock)
+      FlyingSphinx::ResqueDelta.stub(:locked?).and_return(false)
+
+      @model = stub('foo')
+      @model.stub(:core_index_names  => ['foo_core'])
+      @model.stub(:delta_index_names => ['foo_delta'])
+
+      @instance = stub('instance')
+      @instance.stub(:sphinx_document_id => 42)
+    end
+
+    context 'updates disabled' do
+      before :each do
+        ThinkingSphinx.updates_enabled = false
+      end
+
+      it "should not enqueue a delta job" do
+        Resque.should_not_receive(:enqueue)
+        @delayed_delta.index(@model)
+      end
+
+      it "should not enqueue a flag as deleted job" do
+        Resque.should_not_receive(:enqueue)
+        @delayed_delta.index(@model)
+      end
+    end
+
+    context 'deltas disabled' do
+      before :each do
+        ThinkingSphinx.deltas_enabled = false
+      end
+
+      it "should not enqueue a delta job" do
+        Resque.should_not_receive(:enqueue)
+        @delayed_delta.index(@model)
+      end
+
+      it "should not enqueue a flag as deleted job" do
+        Resque.should_not_receive(:enqueue)
+        @delayed_delta.index(@model)
+      end
+    end
+
+    context "instance isn't toggled" do
+      before :each do
+        @delayed_delta.stub(:toggled => false)
+      end
+
+      it "should not enqueue a delta job" do
+        Resque.should_not_receive(:enqueue)
+        @delayed_delta.index(@model, @instance)
+      end
+
+      it "should not enqueue a flag as deleted job" do
+        Resque.should_not_receive(:enqueue)
+        @delayed_delta.index(@model, @instance)
+      end
+    end
+
+    it "should enqueue a delta job" do
+      Resque.should_receive(:enqueue).at_least(:once).with(
+        FlyingSphinx::ResqueDelta::DeltaJob,
+        ['foo_delta']
+      )
+      @delayed_delta.index(@model)
+    end
+
+    it "should enqueue a flag-as-deleted job" do
+      Resque.should_receive(:enqueue).at_least(:once).with(
+        FlyingSphinx::ResqueDelta::FlagAsDeletedJob,
+        ['foo_core'],
+        42
+      )
+      @delayed_delta.index(@model, @instance)
+    end
+
+    context "delta index is locked" do
+      before :each do
+        FlyingSphinx::ResqueDelta.stub(:locked?).and_return(true)
+      end
+
+      it "should not enqueue a delta job" do
+        Resque.should_not_receive(:enqueue).with(
+          FlyingSphinx::ResqueDelta::DeltaJob,
+          ['foo_delta']
+        )
+        @delayed_delta.index(@model, @instance)
+      end
+
+      it "should enqueue a flag-as-deleted job" do
+        Resque.should_receive(:enqueue).at_least(:once).with(
+          FlyingSphinx::ResqueDelta::FlagAsDeletedJob,
+          ['foo_core'],
+          42
+        )
+        @delayed_delta.index(@model, @instance)
+      end
+    end
+  end
+end

data/spec/spec_helper.rb

@@ -5,3 +5,5 @@ require 'spec/autorun'
 
 require 'thinking_sphinx'
 require 'thinking_sphinx/deltas/resque_delta'
+require 'flying_sphinx'
+require 'flying_sphinx/resque_delta'

data/ts-resque-delta.gemspec

@@ -21,14 +21,15 @@ Gem::Specification.new do |s|
 
   s.add_dependency "thinking-sphinx", ">= 1.3.6"
   s.add_dependency "resque", "~> 1.10"
-  s.add_dependency "resque-lock-timeout", "~> 0.2.1"
+  s.add_dependency "resque-lock-timeout", "~> 0.3.1"
 
   s.add_development_dependency "rspec", "~> 1"
   s.add_development_dependency "cucumber", ">= 0"
   s.add_development_dependency "database_cleaner", ">= 0.5.2"
-  s.add_development_dependency "mysql"
+  s.add_development_dependency "mysql2", "~> 0.2.7"
   s.add_development_dependency "SystemTimer"
   s.add_development_dependency "rake", "0.8.7"
   s.add_development_dependency "ruby-debug"
   s.add_development_dependency "activerecord", "~> 2.3.11"
+  s.add_development_dependency "flying-sphinx", ">= 0.5.1"
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: ts-resque-delta
 version: !ruby/object:Gem::Version 
-  hash: 23
+  hash: 19
   prerelease: 
   segments: 
   - 1
+  - 1
   - 0
-  - 0
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors: 
 - Aaron Gibralter
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-31 00:00:00 Z
+date: 2011-08-29 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: thinking-sphinx
@@ -56,12 +56,12 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 21
+        hash: 17
         segments: 
         - 0
-        - 2
+        - 3
         - 1
-        version: 0.2.1
+        version: 0.3.1
   type: :runtime
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
@@ -109,17 +109,19 @@ dependencies:
   type: :development
   version_requirements: *id006
 - !ruby/object:Gem::Dependency 
-  name: mysql
+  name: mysql2
   prerelease: false
   requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
-        hash: 3
+        hash: 25
         segments: 
         - 0
-        version: "0"
+        - 2
+        - 7
+        version: 0.2.7
   type: :development
   version_requirements: *id007
 - !ruby/object:Gem::Dependency 
@@ -182,6 +184,22 @@ dependencies:
         version: 2.3.11
   type: :development
   version_requirements: *id011
+- !ruby/object:Gem::Dependency 
+  name: flying-sphinx
+  prerelease: false
+  requirement: &id012 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 9
+        segments: 
+        - 0
+        - 5
+        - 1
+        version: 0.5.1
+  type: :development
+  version_requirements: *id012
 description: Manage delta indexes via Resque for Thinking Sphinx
 email: 
 - aaron.gibralter@gmail.com
@@ -206,11 +224,17 @@ files:
 - features/thinking_sphinx/database.example.yml
 - features/thinking_sphinx/db/migrations/create_delayed_betas.rb
 - features/thinking_sphinx/models/delayed_beta.rb
+- lib/flying_sphinx/resque_delta.rb
+- lib/flying_sphinx/resque_delta/delta_job.rb
+- lib/flying_sphinx/resque_delta/flag_as_deleted_job.rb
 - lib/thinking_sphinx/deltas/resque_delta.rb
 - lib/thinking_sphinx/deltas/resque_delta/delta_job.rb
 - lib/thinking_sphinx/deltas/resque_delta/flag_as_deleted_job.rb
 - lib/thinking_sphinx/deltas/resque_delta/tasks.rb
 - lib/thinking_sphinx/deltas/resque_delta/version.rb
+- spec/flying_sphinx/resque_delta/delta_job_spec.rb
+- spec/flying_sphinx/resque_delta/flag_as_deleted_job_spec.rb
+- spec/flying_sphinx/resque_delta_spec.rb
 - spec/spec.opts
 - spec/spec_helper.rb
 - spec/thinking_sphinx/deltas/resque_delta/delta_job_spec.rb
@@ -248,7 +272,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: ts-resque-delta
-rubygems_version: 1.7.2
+rubygems_version: 1.8.9
 signing_key: 
 specification_version: 3
 summary: Thinking Sphinx - Resque Deltas
@@ -261,9 +285,11 @@ test_files:
 - features/thinking_sphinx/database.example.yml
 - features/thinking_sphinx/db/migrations/create_delayed_betas.rb
 - features/thinking_sphinx/models/delayed_beta.rb
+- spec/flying_sphinx/resque_delta/delta_job_spec.rb
+- spec/flying_sphinx/resque_delta/flag_as_deleted_job_spec.rb
+- spec/flying_sphinx/resque_delta_spec.rb
 - spec/spec.opts
 - spec/spec_helper.rb
 - spec/thinking_sphinx/deltas/resque_delta/delta_job_spec.rb
 - spec/thinking_sphinx/deltas/resque_delta/flag_as_deleted_job_spec.rb
 - spec/thinking_sphinx/deltas/resque_delta_spec.rb
-has_rdoc: