outoftime-sunspot 0.7.1 → 0.7.2

data/VERSION.yml

@@ -1,4 +1,4 @@
 --- 
-:patch: 1
+:patch: 2
 :major: 0
 :minor: 7

data/lib/sunspot/session.rb

@@ -19,6 +19,7 @@ module Sunspot
       @config = config
       yield(@config) if block_given?
       @connection = connection
+      @updates = 0
     end
 
     #
@@ -34,6 +35,7 @@ module Sunspot
     #
     def index(*objects)
       objects.flatten!
+      @updates += objects.length
       for object in objects
         setup_for(object).indexer(connection).add(object)
       end
@@ -51,6 +53,7 @@ module Sunspot
     # See Sunspot.commit!
     #
     def commit
+      @updates = 0
       connection.commit
     end
 
@@ -59,6 +62,7 @@ module Sunspot
     #
     def remove(*objects)
       objects.flatten!
+      @updates += objects.length
       for object in objects
         setup_for(object).indexer(connection).remove(object)
       end
@@ -70,14 +74,30 @@ module Sunspot
     def remove_all(*classes)
       classes.flatten!
       if classes.empty?
+        @updates += 1
         Indexer.remove_all(connection)
       else
+        @updates += classes.length
         for clazz in classes
           Setup.for(clazz).indexer(connection).remove_all
         end
       end
     end
 
+    # 
+    # See Sunspot.dirty?
+    #
+    def dirty?
+      @updates > 0
+    end
+
+    # 
+    # See Sunspot.commit_if_dirty
+    #
+    def commit_if_dirty
+      commit if dirty?
+    end
+
     private
 
     # 

data/lib/sunspot.rb

@@ -243,6 +243,25 @@ module Sunspot
       session.remove_all(*classes)
     end
 
+    #
+    # True if documents have been added, updated, or removed since the last
+    # commit.
+    #
+    # ==== Returns
+    #
+    # Boolean:: Whether there have been any updates since the last commit
+    #
+    def dirty?
+      session.dirty?
+    end
+
+    # 
+    # Sends a commit if the session is dirty (see #dirty?).
+    #
+    def commit_if_dirty
+      session.commit_if_dirty
+    end
+    
     # Returns the configuration associated with the singleton session. See
     # Sunspot::Configuration for details.
     #

data/spec/api/session_spec.rb

@@ -46,6 +46,56 @@ describe 'Session' do
     end
   end
 
+  context 'dirty sessions' do
+    before :each do
+      connection.stub!(:add)
+      connection.stub!(:commit)
+      Solr::Connection.stub!(:new).and_return(connection)
+      @session = Sunspot::Session.new
+    end
+
+    it 'should start out not dirty' do
+      @session.dirty?.should be_false
+    end
+
+    it 'should be dirty after adding an item' do
+      @session.index(Post.new)
+      @session.dirty?.should be_true
+    end
+
+    it 'should be dirty after deleting an item' do
+      @session.remove(Post.new)
+      @session.dirty?.should be_true
+    end
+
+    it 'should be dirty after a remove_all for a class' do
+      @session.remove_all(Post)
+      @session.dirty?.should be_true
+    end
+
+    it 'should be dirty after a global remove_all' do
+      @session.remove_all
+      @session.dirty?.should be_true
+    end
+
+    it 'should not be dirty after a commit' do
+      @session.index(Post.new)
+      @session.commit
+      @session.dirty?.should be_false
+    end
+
+    it 'should not commit when commit_if_dirty called on clean session' do
+      connection.should_not_receive(:commit)
+      @session.commit_if_dirty
+    end
+
+    it 'should commit when commit_if_dirty called on dirty session' do
+      connection.should_receive(:commit)
+      @session.index(Post.new)
+      @session.commit_if_dirty
+    end
+  end
+
   def connection
     @connection ||= mock('Connection').as_null_object
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: outoftime-sunspot
 version: !ruby/object:Gem::Version 
-  version: 0.7.1
+  version: 0.7.2
 platform: ruby
 authors: 
 - Mat Brown