elastic_searchable 1.1.2 → 1.1.3

data/lib/elastic_searchable/active_record_extensions.rb

@@ -26,7 +26,7 @@ module ElasticSearchable
     # use the "percolations" instance method from within callback to inspect what percolations were returned
     def elastic_searchable(options = {})
       cattr_accessor :elastic_options
-      self.elastic_options = options.symbolize_keys
+      self.elastic_options = options.symbolize_keys.merge(:unless => Array.wrap(options[:unless]).push(:elasticsearch_offline?))
 
       extend ElasticSearchable::Indexing::ClassMethods
       extend ElasticSearchable::Queries
@@ -41,8 +41,8 @@ module ElasticSearchable
 
       attr_accessor :index_lifecycle, :percolations
       define_model_callbacks :index, :percolate, :only => :after
-      after_commit :update_index_on_create_backgrounded, :if => :should_index?, :unless => :elasticsearch_offline?, :on => :create
-      after_commit :update_index_on_update_backgrounded, :if => :should_index?, :unless => :elasticsearch_offline?, :on => :update
+      after_commit :update_index_on_create_backgrounded, :if => :should_index?, :on => :create
+      after_commit :update_index_on_update_backgrounded, :if => :should_index?, :on => :update
       after_commit :delete_from_index, :unless => :elasticsearch_offline?, :on => :destroy
 
       class_eval do

data/lib/elastic_searchable/version.rb

@@ -1,4 +1,4 @@
 module ElasticSearchable
-  VERSION = '1.1.2'
+  VERSION = '1.1.3'
 end
 

data/test/test_elastic_searchable.rb

@@ -104,9 +104,10 @@ class TestElasticSearchable < Test::Unit::TestCase
 
   context 'Model.update' do
     setup do
-      Post.create! :title => 'foo'
+      Post.create :title => 'foo', :body => 'bar'
       @post = Post.last
-      @post.update_attribute :title, 'bar'
+      @post.title = 'baz'
+      @post.save
     end
     should 'have fired after_index callback' do
       assert @post.indexed?
@@ -121,12 +122,10 @@ class TestElasticSearchable < Test::Unit::TestCase
 
   context 'Model.create within ElasticSearchable.offline block' do
     setup do
-      Post.any_instance.expects(:update_index_on_create).never
       ElasticSearchable.offline do
         @post = Post.create :title => 'foo', :body => "bar"
       end
     end
-    should 'not have triggered indexing behavior' do end #see expectations
     should 'not have fired after_index callback' do
       assert !@post.indexed?
     end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: elastic_searchable
 version: !ruby/object:Gem::Version 
-  hash: 23
+  hash: 21
   prerelease: 
   segments: 
   - 1
   - 1
-  - 2
-  version: 1.1.2
+  - 3
+  version: 1.1.3
 platform: ruby
 authors: 
 - Ryan Sonnek
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-28 00:00:00 Z
+date: 2011-05-04 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: activerecord