thermos 0.5.1 → 0.5.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: caef41475321f2d1d3286a253267f0138396addb93dda96774f3ce29502e42d4
-  data.tar.gz: 0b347ad89c7cbd0082c801537270d5efd140db676131985f0c65625d27f3669f
+  metadata.gz: 69d08a67a8ad98400b2b0eda1e63af9b22cb127e82d72117c6dbb8fecb71a808
+  data.tar.gz: 8a8369af0507aae7ef1c81ddf0bc7833adea0bd5941708c183c8c011b3e7db22
 SHA512:
-  metadata.gz: b2fcf8764757cbc90257a1b2f1a2c96aa2d39b117702b399ac9d44527e62a9bf14cf394344ffe3300d3513d88b0a9a18063696d299e282794edbcadf5d2bac9d
-  data.tar.gz: 2c20039b4fe427402c3ab8dbfacc83266530c0d63e169055f574ae6a433d69a772a9b4d8aa097988bced9ebb6f0c5c532963f7b0ef85f57003dbc7eb1c5e6bd7
+  metadata.gz: 0c9f06c52aa92a34a3beacd1384b8f4de92318484a536d657a1a8c3b5a5017ec09d42f6b99b95966b8e3572fdaf57d8c01dd2a0c8ec6b9eb99490ac413e1ca88
+  data.tar.gz: 3215b079c3890c74045ff902bcf259dc83d1d40e4ff5ee0c69be0833a959aa4e25dd7e92fbe9738fd18352223a6c050810d2065a9ab4bf25d45e0d87003d2889

data/lib/thermos/beverage.rb

@@ -19,9 +19,15 @@ module Thermos
       @deps.select do |dep|
         dep.klass == dep_model.class
       end.flat_map do |dep|
+        lookup_keys = []
+
         @model.joins(dep.path)
               .where(dep.table => { id: dep_model.id })
-              .pluck(@lookup_key)
+              .find_each do |model|
+                lookup_keys << model.send(@lookup_key) if should_fill?(model)
+              end
+
+        lookup_keys
       end.uniq
     end
 

data/lib/thermos/refill_job.rb

@@ -17,10 +17,8 @@ module Thermos
 
     def refill_dependency_caches(model)
       BeverageStorage.instance.beverages.each do |beverage|
-        if beverage.should_fill?(model)
-          beverage.lookup_keys_for_dep_model(model).each do |lookup_key|
-            Thermos::RebuildCacheJob.perform_later(beverage.key, lookup_key)
-          end
+        beverage.lookup_keys_for_dep_model(model).each do |lookup_key|
+          Thermos::RebuildCacheJob.perform_later(beverage.key, lookup_key)
         end
       end
     end

data/lib/thermos/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Thermos
-  VERSION = '0.5.1'
+  VERSION = '0.5.2'
 end

data/test/dummy/app/models/category.rb

@@ -3,6 +3,10 @@ class Category < ActiveRecord::Base
   has_many :products, through: :category_items
   belongs_to :store
 
+  def ball?
+    name.match("ball")
+  end
+
   def as_json(*args)
     {
       name: name,

data/test/fixtures/stores.yml

@@ -1,2 +1,4 @@
 sports:
   name: sports store
+supermarket:
+  name: supermarket store

data/test/thermos_test.rb

@@ -161,6 +161,28 @@ class ThermosTest < ActiveSupport::TestCase
     assert_raises(MockExpectationError) { mock.verify }
   end
 
+  test "allows filtering based on the beverage when multiple beverages are configured and only one of them has a filter" do
+    mock = Minitest::Mock.new
+    store = stores(:supermarket)
+    category = categories(:baseball)
+    # filter method specific to one model
+    # store.ball? doesn't exist
+    filter = ->(model) { model.ball? }
+
+    Thermos.fill(key: "key", model: Category, lookup_key: "name", filter: filter) do |name|
+      mock.call(name)
+    end
+
+    Thermos.fill(key: "key_2", model: Store, lookup_key: "name") do |name|
+      mock.call(name)
+    end
+
+    mock.expect(:call, 1, ["groceries"])
+    store.update!(name: "groceries")
+    assert_equal 1, Thermos.drink(key: "key_2", id: "groceries")
+    mock.verify
+  end
+
 # has_many model changes
   test "rebuilds the cache on has_many model change" do
     mock = Minitest::Mock.new
@@ -223,6 +245,26 @@ class ThermosTest < ActiveSupport::TestCase
     assert_raises(MockExpectationError) { mock.verify }
   end
 
+  test "re-builds the cache for has_many record changes when filter condition is met" do
+    mock = Minitest::Mock.new
+    category = categories(:baseball)
+    filter = ->(model) { model.ball? }
+
+    Thermos.fill(key: "key", model: Category, deps: [:category_items], filter: filter) do |id|
+      mock.call(id)
+    end
+
+    mock.expect(:call, 1, [category.id])
+    CategoryItem.create!(category: category)
+    mock.verify
+
+    category.update!(name: "hockey")
+
+    mock.expect(:call, 1, [category.id])
+    CategoryItem.create!(category: category)
+    assert_raises(MockExpectationError) { mock.verify }
+  end
+
 # belongs_to model changes
   test "rebuilds the cache on belongs_to model change" do
     mock = Minitest::Mock.new
@@ -286,6 +328,27 @@ class ThermosTest < ActiveSupport::TestCase
     assert_raises(MockExpectationError) { mock.verify }
   end
 
+  test "re-builds the cache for belongs_to record changes when filter condition is met" do
+    mock = Minitest::Mock.new
+    category = categories(:baseball)
+    filter = ->(model) { model.ball? }
+
+    Thermos.fill(key: "key", model: Category, deps: [:store], filter: filter) do |id|
+      mock.call(id)
+    end
+
+    mock.expect(:call, 1, [category.id])
+    mock.expect(:call, 1, [category.id])
+    Store.create!(name: "foo", categories: [category])
+    mock.verify
+
+    category.update!(name: "hockey")
+
+    mock.expect(:call, 2, [category.id])
+    Store.create!(name: "bar", categories: [category])
+    assert_raises(MockExpectationError) { mock.verify }
+  end
+
 # has_many through model changes
   test "rebuilds the cache on has_many through model change" do
     mock = Minitest::Mock.new
@@ -348,6 +411,26 @@ class ThermosTest < ActiveSupport::TestCase
     assert_raises(MockExpectationError) { mock.verify }
   end
 
+  test "re-builds the cache for has_many through record changes when filter condition is met" do
+    mock = Minitest::Mock.new
+    category = categories(:baseball)
+    filter = ->(model) { model.ball? }
+
+    Thermos.fill(key: "key", model: Category, deps: [:products], filter: filter) do |id|
+      mock.call(id)
+    end
+
+    mock.expect(:call, 1, [category.id])
+    Product.create!(categories: [category])
+    mock.verify
+
+    category.update!(name: "hockey")
+
+    mock.expect(:call, 2, [category.id])
+    Product.create!(categories: [category])
+    assert_raises(MockExpectationError) { mock.verify }
+  end
+
   test "handles indirect associations" do
     mock = Minitest::Mock.new
     category = categories(:baseball)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: thermos
 version: !ruby/object:Gem::Version
-  version: 0.5.1
+  version: 0.5.2
 platform: ruby
 authors:
 - Andrew Thal
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-09-24 00:00:00.000000000 Z
+date: 2021-09-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails