search_and_resque 0.3.3 → 0.3.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 14e1917d878751695a81ce42fc5f4a7c84e93cbb
-  data.tar.gz: 43c77852df71b3b78b8321e27292df2a869e1cfd
+  metadata.gz: 8575aca9094955ecb328163636e194afe5c44aab
+  data.tar.gz: d5fff4dda4b734eb3c520b8d7cdfc591546e11f5
 SHA512:
-  metadata.gz: 52a576f22fa66340ee197449fa30a7652c38e750399821da9e20ea59f37ed4c8750c56eff57e7331c35f94bc2cd6a72dae5b12f4181d1a869928430407f91605
-  data.tar.gz: 678a8f74ea6d075f340ff94f089314c9688caf201fb33db51e1d767a165176cdf752707eb7150afe149e7a04295f7caa8b4b6f484be582d131e2698f35dd16a5
+  metadata.gz: dc66289fcd27861e15e201efbbfb879f79435cdf909578e3baac2a78961de84249cbd0ef9578d9ed25968961863e185282f0538de2d61b2cd88c61677813b686
+  data.tar.gz: dd0033c82068f3fc4ac43f62f8f6fa3bc7d649f3ea7b75927df001d2fc34a588c4cca0712e9f5e23d702cf92cfd859bfa9979c8d7240e71c7b5fc56a93263ed6

data/lib/search_and_resque/callbacks.rb

@@ -2,14 +2,6 @@ module SearchAndResque
   module Callbacks
     extend ActiveSupport::Concern
 
-    included do
-      class << self
-        attr_accessor :elastic_search_type
-      end
-      after_save :enqueue_elastic_search_update
-      after_destroy :enqueue_elastic_search_delete
-    end
-
     module ClassMethods
       def enqueue_elastic_search_update(ids)
         ids = Array(ids).map{ |x| x.is_a?(ActiveRecord::Base) ? x.id : x }
@@ -23,11 +15,13 @@ module SearchAndResque
     end
 
     def enqueue_elastic_search_update
-      self.class.enqueue_elastic_search_update(id) if should_update_elastic_search?
+      if should_update_elastic_search?
+        self.class.enqueue_elastic_search_update(elastic_search_id)
+      end
     end
 
     def enqueue_elastic_search_delete
-      self.class.enqueue_elastic_search_delete(id)
+      self.class.enqueue_elastic_search_delete(elastic_search_id)
     end
 
     # e.g.

data/lib/search_and_resque/version.rb

@@ -1,3 +1,3 @@
 module SearchAndResque
-  VERSION = "0.3.3"
+  VERSION = "0.3.4"
 end

data/lib/search_and_resque.rb

@@ -31,12 +31,24 @@ module SearchAndResque
   module ClassMethods
     def search_and_resque(type_name, options={})
       unless included_modules.include?(SearchAndResque::Callbacks)
-        options[:if] ||= ->{ true }
-        define_method(:should_update_elastic_search?, &options[:if])
-
         @elastic_search_type = "#{type_name}"
+        class << self
+          attr_accessor :elastic_search_type
+        end
 
         include SearchAndResque::Callbacks
+        after_save :enqueue_elastic_search_update
+        if options[:id]
+          after_destroy :enqueue_elastic_search_update
+        else
+          after_destroy :enqueue_elastic_search_delete
+        end
+
+        options[:if] ||= ->{ true }
+        define_method(:should_update_elastic_search?, &options[:if])
+
+        options[:id] ||= ->{ id }
+        define_method(:elastic_search_id, &options[:id])
       end
     end
   end

data/test/search_and_resque_test.rb

@@ -20,8 +20,9 @@ end
 
 def setup!
   connect!
-  ActiveRecord::Base.connection.execute 'CREATE TABLE books (id INTEGER NOT NULL PRIMARY KEY, deleted_at DATETIME, title STRING)'
-  ActiveRecord::Base.connection.execute 'CREATE TABLE films (id INTEGER NOT NULL PRIMARY KEY, deleted_at DATETIME, title STRING, director STRING)'
+  ActiveRecord::Base.connection.execute 'CREATE TABLE books (id INTEGER NOT NULL PRIMARY KEY, title STRING)'
+  ActiveRecord::Base.connection.execute 'CREATE TABLE films (id INTEGER NOT NULL PRIMARY KEY, title STRING, director STRING)'
+  ActiveRecord::Base.connection.execute 'CREATE TABLE scores (id INTEGER NOT NULL PRIMARY KEY, film_id INTEGER NOT NULL, composer STRING)'
 end
 
 setup!
@@ -31,9 +32,15 @@ class Book < ActiveRecord::Base
 end
 
 class Film < ActiveRecord::Base
+  has_one :score
   search_and_resque :films, :if => ->{ title_changed? }
 end
 
+class Score < ActiveRecord::Base
+  belongs_to :film
+  search_and_resque :films, id: ->{ film_id }
+end
+
 class SearchAndResqueTestIndex < Chewy::Index
   define_type Book, :name => 'books' do
     field :title
@@ -42,6 +49,7 @@ class SearchAndResqueTestIndex < Chewy::Index
   define_type Film, :name => 'films' do
     field :title
     field :director
+    field :score_composer, value: ->{ score.try(:composer) }
   end
 end
 
@@ -91,4 +99,14 @@ class SearchAndResqueTest < test_framework
     film.update_attributes(:title => 'three', :director => 'four')
     assert_equal 'four', SearchAndResqueTestIndex::Films.filter(:ids => {:values => [film.id]}).first.director
   end
+
+  def test_cross_type_update_and_delete
+    film = Film.create(:title => 'one', :director => 'two')
+
+    score = film.create_score(composer: 'Howard Shore')
+    assert_equal 'Howard Shore', SearchAndResqueTestIndex::Films.filter(:ids => {values: [film.id]}).first.score_composer
+
+    score.destroy
+    assert_equal nil, SearchAndResqueTestIndex::Films.filter(:ids => {values: [film.id]}).first.score_composer
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: search_and_resque
 version: !ruby/object:Gem::Version
-  version: 0.3.3
+  version: 0.3.4
 platform: ruby
 authors:
 - Peter Woo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-05 00:00:00.000000000 Z
+date: 2015-05-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler