sunspot-queue 0.9.0 → 0.9.1

data/README.md

@@ -6,6 +6,21 @@ Background search indexing using existing worker systems.
 
     $ gem install sunspot-queue
 
+## Usage with Rails (or without)
+
+In your Gemfile
+
+    gem "sunspot-queue"
+    gem "resque"
+
+In config/initializers/sunspot.rb
+
+    Sunspot.session = Sunspot::Queue::SessionProxy.new(Sunspot.session)
+
+Start Resque
+
+    $ QUEUE=sunspot rake resque:work
+
 ## Note on Patches/Pull Requests
 
 * Fork the project.
@@ -13,7 +28,7 @@ Background search indexing using existing worker systems.
 * Make your feature addition or bug fix.
 * Send me a pull request. Bonus points for topic branches.
 
-Please don't make changes to the Rakefile, version, or history. 
+Please don't make changes to the Rakefile, version, or history.
 
 ## Development
 

data/lib/sunspot/queue.rb

@@ -2,11 +2,10 @@ module Sunspot
   module Queue
     class Error < StandardError; end
     class NotPersistedError < Error; end
-
-    VERSION = "0.9.0"
   end
 end
 
+require "sunspot/queue/version"
 require "sunspot/queue/session_proxy"
 require "sunspot/queue/index_job"
 require "sunspot/queue/removal_job"

data/lib/sunspot/queue/helpers.rb

@@ -3,21 +3,18 @@ require "sunspot/queue/session_proxy"
 module Sunspot::Queue
   module Helpers
     def without_proxy
+      proxy = nil
+
       # Pop off the queueing proxy for the block if it's in place so we don't
       # requeue the same job multiple times.
       if Sunspot.session.instance_of?(SessionProxy)
         proxy = Sunspot.session
         Sunspot.session = proxy.session
-
-        begin
-          yield
-        ensure
-          Sunspot.commit rescue nil
-          Sunspot.session = proxy
-        end
-      else
-        yield
       end
+
+      yield
+    ensure
+      Sunspot.session = proxy if proxy
     end
   end
 end

data/lib/sunspot/queue/index_job.rb

@@ -10,9 +10,7 @@ module Sunspot::Queue
 
     def self.perform(klass, id)
       without_proxy do
-        record = ::Resque.constantize(klass).find(id)
-
-        Sunspot.index!(record)
+        ::Resque.constantize(klass).find(id).solr_index
       end
     end
   end

data/lib/sunspot/queue/version.rb

@@ -0,0 +1,5 @@
+module Sunspot
+  module Queue
+    VERSION = "0.9.1"
+  end
+end

data/spec/index_job_spec.rb

@@ -8,6 +8,7 @@ describe Sunspot::Queue::IndexJob do
 
       expect do
         Sunspot::Queue::IndexJob.perform(Person, person.id)
+        commit
       end.to change { Person.search.hits.size }.by(1)
 
       results = Person.search { fulltext "grandson" }.results
@@ -25,5 +26,17 @@ describe Sunspot::Queue::IndexJob do
         Sunspot::Queue::IndexJob.perform(Person, 404) rescue nil
       end.to_not change { Sunspot.session }
     end
+
+    it "does not commit changes to the index" do
+      person = Person.create(:name => "The Grandson")
+
+      expect do
+        Sunspot::Queue::IndexJob.perform(Person, person.id)
+      end.to_not change { Person.search.hits.size }
+
+      expect do
+        commit
+      end.to change { Person.search.hits.size }
+    end
   end
 end

data/spec/integration/indexing_spec.rb

@@ -1,21 +1,23 @@
 require "spec_helper"
-require "sunspot/queue/helpers"
 
 describe "Queued Indexing" do
-  include Sunspot::Queue::Helpers
-
   # Given an active record model
   # When I save the model
   # Then the record should not be in solr
+  # And a job should be enqueued in resque
   #
   # When resque jobs are run
+  # And the sunspot queue has been committed
   # Then the record should be in solr
   it "queues indexing of ActiveRecord models using resque" do
     person = Person.create(:name => "Inigo Montoya")
     Person.search.results.should be_empty
 
+    ResqueSpec.queue_by_name(:sunspot).size.should == 1
+
     expect do
       ResqueSpec.perform_all(:sunspot)
+      commit
     end.to change { Person.search.hits.size }.by(1)
 
     results = Person.search { fulltext "Montoya" }.results
@@ -29,8 +31,13 @@ describe "Queued Indexing" do
   # When resque jobs are run
   # Then the record should not be in solr
   it "queues removal of ActiveRecord models using Resque" do
-    person = Person.create(:name => "Fezzik")
-    ResqueSpec.perform_all(:sunspot)
+    person =
+      without_proxy do
+        Person.create(:name => "Fezzik").tap do
+          commit
+        end
+      end
+
     Person.search.hits.size.should == 1
 
     expect do
@@ -39,6 +46,7 @@ describe "Queued Indexing" do
 
     expect do
       ResqueSpec.perform_all(:sunspot)
+      commit
     end.to change { Person.search.hits.size }.by(-1)
   end
 end

data/spec/removal_job_spec.rb

@@ -2,18 +2,19 @@ require "spec_helper"
 require "sunspot/queue/helpers"
 
 describe Sunspot::Queue::IndexJob do
-  include Sunspot::Queue::Helpers
-
   it "removes a job from the search index" do
     person = 
       without_proxy do
-        Person.create(:name => "The Albino")
+        Person.create(:name => "The Albino").tap do
+          commit
+        end
       end
 
     Person.search.hits.size.should == 1
 
     expect do
       Sunspot::Queue::RemovalJob.perform(Person, person.id)
+      commit
     end.to change { Person.search.hits.size }.by(-1)
   end
 end

data/spec/spec_helper.rb

@@ -1,4 +1,5 @@
 require "sunspot/queue"
+require "sunspot/queue/helpers"
 
 require "socket"
 require "active_record"
@@ -36,6 +37,15 @@ RSpec.configure do |config|
   config.run_all_when_everything_filtered = true
   config.filter_run :focus
 
+  config.include(Sunspot::Queue::Helpers)
+  config.include(
+    Module.new do
+      def commit
+        without_proxy { Sunspot.commit }
+      end
+    end
+  )
+
   # Original sunspot session not wrapped in our proxy object
   session = Sunspot.session
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sunspot-queue
 version: !ruby/object:Gem::Version
-  version: 0.9.0
+  version: 0.9.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-31 00:00:00.000000000 Z
+date: 2012-06-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: resque
@@ -43,22 +43,6 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 1.3.0
-- !ruby/object:Gem::Dependency
-  name: rake
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -198,6 +182,7 @@ files:
 - lib/sunspot/queue/index_job.rb
 - lib/sunspot/queue/removal_job.rb
 - lib/sunspot/queue/session_proxy.rb
+- lib/sunspot/queue/version.rb
 - lib/sunspot/queue.rb
 - lib/sunspot-queue.rb
 - spec/index_job_spec.rb
@@ -219,18 +204,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -3459963560005130599
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -3459963560005130599
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24