elastic_searchable 0.7.1 → 0.7.2

data/lib/elastic_searchable/active_record_extensions.rb

@@ -16,9 +16,8 @@ module ElasticSearchable
     # :unless (optional) reference symbol/proc condition to skip indexing when condition is true
     # :json (optional) configure the json document to be indexed (see http://api.rubyonrails.org/classes/ActiveModel/Serializers/JSON.html#method-i-as_json for available options)
     def elastic_searchable(options = {})
-      options.symbolize_keys!
       cattr_accessor :elastic_options
-      self.elastic_options = options.merge(:unless => Array.wrap(options[:unless]).push(&:elasticsearch_offline?))
+      self.elastic_options = options.symbolize_keys.merge(:unless => Array.wrap(options[:unless]).push(:elasticsearch_offline?))
 
       extend ElasticSearchable::Indexing::ClassMethods
       extend ElasticSearchable::Queries

data/lib/elastic_searchable/version.rb

@@ -1,4 +1,4 @@
 module ElasticSearchable
-  VERSION = '0.7.1'
+  VERSION = '0.7.2'
 end
 

data/lib/elastic_searchable.rb

@@ -14,13 +14,13 @@ module ElasticSearchable
 
     # execute a block of work without reindexing objects
     def offline(&block)
-      offline = true
+      @offline = true
       yield
     ensure
-      offline = false
+      @offline = false
     end
     def offline?
-      !!offline
+      !!@offline
     end
     # encapsulate encoding hash into json string
     # support Yajl encoder if installed

data/test/test_elastic_searchable.rb

@@ -82,31 +82,32 @@ class TestElasticSearchable < Test::Unit::TestCase
     should 'not have fired after_index_on_update callback' do
       assert !@post.indexed_on_update?
     end
-    context 'Model.update' do
-      setup do
-        @post.title = 'baz'
-        @post.save
-      end
-      should 'have fired after_index callback' do
-        assert @post.indexed?
-      end
-      should 'not have fired after_index_on_create callback' do
-        assert !@post.indexed_on_create?
-      end
-      should 'have fired after_index_on_update callback' do
-        assert @post.indexed_on_update?
-      end
+  end
+
+  context 'Model.update' do
+    setup do
+      Post.create :title => 'foo', :body => 'bar'
+      @post = Post.last
+      @post.title = 'baz'
+      @post.save
+    end
+    should 'have fired after_index callback' do
+      assert @post.indexed?
+    end
+    should 'not have fired after_index_on_create callback' do
+      assert !@post.indexed_on_create?
+    end
+    should 'have fired after_index_on_update callback' do
+      assert @post.indexed_on_update?
     end
   end
 
   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: 1
+  hash: 7
   prerelease: 
   segments: 
   - 0
   - 7
-  - 1
-  version: 0.7.1
+  - 2
+  version: 0.7.2
 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