elastic_searchable 0.1.4 → 0.1.5

data/VERSION

@@ -1 +1 @@
-0.1.4
+0.1.5

data/elastic_searchable.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{elastic_searchable}
-  s.version = "0.1.4"
+  s.version = "0.1.5"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Ryan Sonnek"]

data/lib/elastic_searchable/active_record.rb

@@ -50,6 +50,32 @@ module ElasticSearchable
         self.run_callbacks("after_index_on_#{lifecycle}".to_sym) if lifecycle
         self.run_callbacks(:after_index)
       end
+      def should_index?
+        [self.class.elastic_options[:if]].flatten.compact.all? { |a| evaluate_method(a, *args) } &&
+        ![self.class.elastic_options[:unless]].flatten.compact.any? { |a| evaluate_method(a, *args) }
+      end
+
+      private
+      #ripped from activesupport
+      def evaluate_method(method, *args, &block)
+        case method
+          when Symbol
+            object = args.shift
+            object.send(method, *args, &block)
+          when String
+            eval(method, args.first.instance_eval { binding })
+          when Proc, Method
+            method.call(*args, &block)
+          else
+            if method.respond_to?(kind)
+              method.send(kind, *args, &block)
+            else
+              raise ArgumentError,
+                "Callbacks must be a symbol denoting the method to call, a string to be evaluated, " +
+                "a block to be invoked, or an object responding to the callback method."
+            end
+        end
+      end
     end
   end
 end

data/lib/elastic_searchable/callbacks.rb

@@ -11,10 +11,9 @@ module ElasticSearchable
           backgrounded :delete_id_from_index => {:queue => 'searchindex'}
         end
 
-        callback_options = self.elastic_options.slice :if, :unless
         define_callbacks :after_index_on_create, :after_index_on_update, :after_index
-        after_commit_on_create :update_index_on_create_backgrounded, callback_options
-        after_commit_on_update :update_index_on_update_backgrounded, callback_options
+        after_commit_on_create :update_index_on_create_backgrounded, :if => :should_index?
+        after_commit_on_update :update_index_on_update_backgrounded, :if => :should_index?
         after_commit_on_destroy Proc.new {|o| o.class.delete_id_from_index_backgrounded(o.id) }
       end
     end

data/lib/elastic_searchable/index.rb

@@ -9,7 +9,7 @@ module ElasticSearchable
         end
 
         self.find_each do |record|
-          record.run_callbacks :after_commit_on_update
+          record.index_in_elastic_search if record.should_index?
         end
         self.refresh_index
       end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: elastic_searchable
 version: !ruby/object:Gem::Version 
-  hash: 19
+  hash: 17
   prerelease: 
   segments: 
   - 0
   - 1
-  - 4
-  version: 0.1.4
+  - 5
+  version: 0.1.5
 platform: ruby
 authors: 
 - Ryan Sonnek