flying-sphinx 0.8.2 → 0.8.3

data/HISTORY

@@ -1,3 +1,8 @@
+0.8.3 - 17th September 2012
+* Requires Rails 3 or better (if you're using Rails).
+* Load Rails when configuring.
+* Don't check whether a document exists before marking it as deleted - Sphinx handles this gracefully anyway.
+
 0.8.2 - 28th August 2012
 * Don't presume there is a Time.zone method (for Rails 2.3).
 * Set client key as part of the configuration generation process (for Rails 2.3).

data/lib/flying_sphinx/cli.rb

@@ -28,7 +28,7 @@ class FlyingSphinx::CLI
 
   def configure
     if @arguments.empty?
-      require 'thinking_sphinx'
+      load_rails
       FlyingSphinx::SphinxConfiguration.new.upload_to configuration.api
       FlyingSphinx::SettingFiles.new.upload_to configuration.api
     else
@@ -50,6 +50,14 @@ class FlyingSphinx::CLI
     true
   end
 
+  def load_rails
+    return unless ENV['RAILS_ENV']
+
+    require File.expand_path('config/boot', Dir.pwd)
+    require File.expand_path('config/application', Dir.pwd)
+    Rails.application.require_environment!
+  end
+
   def start
     if configuration.start_sphinx
       puts "Started Sphinx"

data/lib/flying_sphinx/flag_as_deleted_job.rb

@@ -1,44 +1,40 @@
 # A simple job for flagging a specified Sphinx document in a given index as
 # 'deleted'.
-#  
+#
 class FlyingSphinx::FlagAsDeletedJob
   attr_accessor :indices, :document_id
-  
+
   # Initialises the object with an index name and document id. Please note that
   # the document id is Sphinx's unique identifier, and will almost certainly not
   # be the model instance's primary key value.
-  # 
+  #
   # @param [String] index The index name
   # @param [Integer] document_id The document id
-  # 
+  #
   def initialize(indices, document_id)
     @indices, @document_id = indices, document_id
   end
-  
+
   # Updates the sphinx_deleted attribute for the given document, setting the
   # value to 1 (true). This is not a special attribute in Sphinx, but is used
   # by Thinking Sphinx to ignore deleted values between full re-indexing. It's
   # particularly useful in this situation to avoid old values in the core index
   # and just use the new values in the delta index as a reference point.
-  # 
+  #
   # @return [Boolean] true
-  # 
+  #
   def perform
     indices.each do |index|
-      client.update(
-        index,
-        ['sphinx_deleted'],
-        {@document_id => [1]}
-      ) if ThinkingSphinx.search_for_id(@document_id, index)
+      client.update index, ['sphinx_deleted'], {@document_id => [1]}
     end
   rescue Riddle::ConnectionError
     # If it fails here, so be it.
   ensure
     true
   end
-  
+
   private
-  
+
   def client
     @client ||= ThinkingSphinx::Configuration.instance.client
   end

data/lib/flying_sphinx/version.rb

@@ -1,3 +1,3 @@
 module FlyingSphinx
-  Version = '0.8.2'
+  Version = '0.8.3'
 end

data/spec/specs/flag_as_deleted_job_spec.rb

@@ -5,64 +5,40 @@ describe FlyingSphinx::FlagAsDeletedJob do
     let(:config) { ThinkingSphinx::Configuration.instance }
     let(:client) { stub('client', :update => true) }
     let(:job)    { FlyingSphinx::FlagAsDeletedJob.new(['foo_core'], 12) }
-    
+
     before :each do
       config.stub!(:client => client)
-      ThinkingSphinx.stub!(:search_for_id => true)
-    end
-    
-    it "should not update if the document isn't in the index" do
-      ThinkingSphinx.stub!(:search_for_id => false)
-      client.should_not_receive(:update)
-      
-      job.perform
     end
-    
+
     it "should update the specified index" do
       client.should_receive(:update) do |index, attributes, values|
         index.should == 'foo_core'
       end
-      
+
       job.perform
     end
-    
+
     it "should update all specified indexes" do
       job.indices = ['foo_core', 'bar_core']
       client.should_receive(:update).with('foo_core', anything, anything)
       client.should_receive(:update).with('bar_core', anything, anything)
-      
+
       job.perform
     end
-    
+
     it "should update the sphinx_deleted attribute" do
       client.should_receive(:update) do |index, attributes, values|
         attributes.should == ['sphinx_deleted']
       end
-      
+
       job.perform
     end
-    
+
     it "should set sphinx_deleted for the given document to true" do
       client.should_receive(:update) do |index, attributes, values|
         values[12].should == [1]
       end
-      
-      job.perform
-    end
-    
-    it "should check for the existence of the document in the specified index" do
-      ThinkingSphinx.should_receive(:search_for_id) do |id, index|
-        index.should == 'foo_core'
-      end
-      
-      job.perform
-    end
-    
-    it "should check for the existence of the given document id" do
-      ThinkingSphinx.should_receive(:search_for_id) do |id, index|
-        id.should == 12
-      end
-      
+
       job.perform
     end
   end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: flying-sphinx
 version: !ruby/object:Gem::Version 
-  hash: 59
+  hash: 57
   prerelease: 
   segments: 
   - 0
   - 8
-  - 2
-  version: 0.8.2
+  - 3
+  version: 0.8.3
 platform: ruby
 authors: 
 - Pat Allan
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-08-28 00:00:00 Z
+date: 2012-09-17 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: thinking-sphinx