thermos 0.5.2 → 1.0.0

data/test/thermos_test.rb

@@ -1,20 +1,13 @@
-require 'test_helper'
+require "test_helper"
 
 class ThermosTest < ActiveSupport::TestCase
-  ActiveSupport.test_order = :random
   self.use_transactional_tests = true
-
-  def teardown
-    Thermos::BeverageStorage.instance.empty
-    Rails.cache.clear
-  end
+  teardown :clear_cache
 
   test "keeps the cache warm using fill / drink" do
     mock = Minitest::Mock.new
 
-    Thermos.fill(key: "key", model: Category) do |id|
-      mock.call(id)
-    end
+    Thermos.fill(key: "key", model: Category) { |id| mock.call(id) }
 
     mock.expect(:call, 1, [1])
     assert_equal 1, Thermos.drink(key: "key", id: 1)
@@ -29,28 +22,28 @@ class ThermosTest < ActiveSupport::TestCase
     mock = Minitest::Mock.new
 
     mock.expect(:call, 1, [1])
-    response = Thermos.keep_warm(key: "key", model: Category, id: 1) do |id|
-      mock.call(id)
-    end
+    response =
+      Thermos.keep_warm(key: "key", model: Category, id: 1) do |id|
+        mock.call(id)
+      end
     assert_equal 1, response
     mock.verify
 
     mock.expect(:call, 2, [1])
-    response = Thermos.keep_warm(key: "key", model: Category, id: 1) do |id|
-      mock.call(id)
-    end
+    response =
+      Thermos.keep_warm(key: "key", model: Category, id: 1) do |id|
+        mock.call(id)
+      end
     assert_equal 1, response
     assert_raises(MockExpectationError) { mock.verify }
   end
 
-# primary model changes
+  # primary model changes
   test "rebuilds the cache on primary model change" do
     mock = Minitest::Mock.new
     category = categories(:baseball)
 
-    Thermos.fill(key: "key", model: Category) do |id|
-      mock.call(id)
-    end
+    Thermos.fill(key: "key", model: Category) { |id| mock.call(id) }
 
     mock.expect(:call, 1, [category.id])
     assert_equal 1, Thermos.drink(key: "key", id: category.id)
@@ -69,9 +62,7 @@ class ThermosTest < ActiveSupport::TestCase
     mock = Minitest::Mock.new
     category = categories(:baseball)
 
-    Thermos.fill(key: "key", model: Category) do |id|
-      mock.call(id)
-    end
+    Thermos.fill(key: "key", model: Category) { |id| mock.call(id) }
 
     mock.expect(:call, 1, [category.id])
     assert_equal 1, Thermos.drink(key: "key", id: category.id)
@@ -94,9 +85,7 @@ class ThermosTest < ActiveSupport::TestCase
     category = categories(:baseball)
     other_category = Category.create!(name: "bar")
 
-    Thermos.fill(key: "key", model: Category) do |id|
-      mock.call(id)
-    end
+    Thermos.fill(key: "key", model: Category) { |id| mock.call(id) }
 
     mock.expect(:call, 2, [other_category.id])
     assert_equal 2, Thermos.drink(key: "key", id: other_category.id)
@@ -115,9 +104,7 @@ class ThermosTest < ActiveSupport::TestCase
     mock = Minitest::Mock.new
     category = categories(:baseball)
 
-    Thermos.fill(key: "key", model: Category) do |id|
-      mock.call(id)
-    end
+    Thermos.fill(key: "key", model: Category) { |id| mock.call(id) }
 
     mock.expect(:call, 1, [category.id])
     assert_equal 1, Thermos.drink(key: "key", id: category.id)
@@ -143,345 +130,12 @@ class ThermosTest < ActiveSupport::TestCase
     assert_equal 1, Thermos.drink(key: "key", id: "foo")
     assert_raises(MockExpectationError) { mock.verify }
   end
-  
-  test "allows filtering for which records should be rebuilt" do
-    mock = Minitest::Mock.new
-    category = categories(:baseball)
-    filter = ->(model) { model.name.match("ball") }
-    Thermos.fill(key: "key", model: Category, lookup_key: "name", filter: filter) do |name|
-      mock.call(name)
-    end
-
-    mock.expect(:call, 1, ["basketball"])
-    category.update!(name: "basketball")
-    mock.verify
-
-    mock.expect(:call, 1, ["hockey"])
-    category.update!(name: "hockey")
-    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
-    category = categories(:baseball)
-    category_item = category_items(:baseball_glove)
-
-    Thermos.fill(key: "key", model: Category, deps: [:category_items]) do |id|
-      mock.call(id)
-    end
-
-    mock.expect(:call, 1, [category.id])
-    assert_equal 1, Thermos.drink(key: "key", id: category.id)
-    mock.verify
-
-    mock.expect(:call, 2, [category.id])
-    category_item.update!(name: "foo")
-    mock.verify
-
-    mock.expect(:call, 3, [category.id])
-    assert_equal 2, Thermos.drink(key: "key", id: category.id)
-    assert_raises(MockExpectationError) { mock.verify }
-  end
-
-  test "does not rebuild the cache for an unrelated has_many model change" do
-    mock = Minitest::Mock.new
-    category = categories(:baseball)
-    category_item = CategoryItem.create(category: nil)
-
-    Thermos.fill(key: "key", model: Category, deps: [:category_items]) do |id|
-      mock.call(id)
-    end
-
-    mock.expect(:call, 1, [category.id])
-    assert_equal 1, Thermos.drink(key: "key", id: category.id)
-    mock.verify
-
-    mock.expect(:call, 2, [category.id])
-    category_item.update!(name: "foo")
-    assert_raises(MockExpectationError) { mock.verify }
-
-    mock.expect(:call, 3, [category.id])
-    assert_equal 1, Thermos.drink(key: "key", id: category.id)
-    assert_raises(MockExpectationError) { mock.verify }
-  end
-
-  test "re-builds the cache for new has_many records" do
-    mock = Minitest::Mock.new
-    category = categories(:baseball)
-
-    Thermos.fill(key: "key", model: Category, deps: [:category_items]) do |id|
-      mock.call(id)
-    end
-
-    mock.expect(:call, 1, [category.id])
-    CategoryItem.create!(category: category)
-    mock.verify
-
-    mock.expect(:call, 2, [category.id])
-    assert_equal 1, Thermos.drink(key: "key", id: category.id)
-    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
-    category = categories(:baseball)
-    store = stores(:sports)
-
-    Thermos.fill(key: "key", model: Category, deps: [:store]) do |id|
-      mock.call(id)
-    end
-
-    mock.expect(:call, 1, [category.id])
-    assert_equal 1, Thermos.drink(key: "key", id: category.id)
-    mock.verify
-
-    mock.expect(:call, 2, [category.id])
-    store.update!(name: "foo")
-    mock.verify
-
-    mock.expect(:call, 3, [category.id])
-    assert_equal 2, Thermos.drink(key: "key", id: category.id)
-    assert_raises(MockExpectationError) { mock.verify }
-  end
-
-  test "does not rebuild the cache for an unrelated belongs_to model change" do
-    mock = Minitest::Mock.new
-    category = categories(:baseball)
-    store = Store.create!
-
-    Thermos.fill(key: "key", model: Category, deps: [:store]) do |id|
-      mock.call(id)
-    end
-
-    mock.expect(:call, 1, [category.id])
-    assert_equal 1, Thermos.drink(key: "key", id: category.id)
-    mock.verify
-
-    mock.expect(:call, 2, [category.id])
-    store.update!(name: "foo")
-    assert_raises(MockExpectationError) { mock.verify }
-
-    mock.expect(:call, 3, [category.id])
-    assert_equal 1, Thermos.drink(key: "key", id: category.id)
-    assert_raises(MockExpectationError) { mock.verify }
-  end
-
-  test "re-builds the cache for new belongs_to records" do
-    mock = Minitest::Mock.new
-    category = categories(:baseball)
-
-    Thermos.fill(key: "key", model: Category, deps: [:store]) 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
-
-    mock.expect(:call, 2, [category.id])
-    assert_equal 1, Thermos.drink(key: "key", id: category.id)
-    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
-    category = categories(:baseball)
-    product = products(:glove)
-
-    Thermos.fill(key: "key", model: Category, deps: [:products]) do |id|
-      mock.call(id)
-    end
-
-    mock.expect(:call, 1, [category.id])
-    assert_equal 1, Thermos.drink(key: "key", id: category.id)
-    mock.verify
-
-    mock.expect(:call, 2, [category.id])
-    product.update!(name: "foo")
-    mock.verify
-
-    mock.expect(:call, 3, [category.id])
-    assert_equal 2, Thermos.drink(key: "key", id: category.id)
-    assert_raises(MockExpectationError) { mock.verify }
-  end
-
-  test "does not rebuild the cache for an unrelated has_many through model change" do
-    mock = Minitest::Mock.new
-    category = categories(:baseball)
-    product = Product.create!
-
-    Thermos.fill(key: "key", model: Category, deps: [:products]) do |id|
-      mock.call(id)
-    end
-
-    mock.expect(:call, 1, [category.id])
-    assert_equal 1, Thermos.drink(key: "key", id: category.id)
-    mock.verify
-
-    mock.expect(:call, 2, [category.id])
-    product.update!(name: "foo")
-    assert_raises(MockExpectationError) { mock.verify }
-
-    mock.expect(:call, 3, [category.id])
-    assert_equal 1, Thermos.drink(key: "key", id: category.id)
-    assert_raises(MockExpectationError) { mock.verify }
-  end
-
-  test "re-builds the cache for new has_many through records" do
-    mock = Minitest::Mock.new
-    category = categories(:baseball)
-
-    Thermos.fill(key: "key", model: Category, deps: [:products]) do |id|
-      mock.call(id)
-    end
-
-    mock.expect(:call, 1, [category.id])
-    Product.create!(categories: [category])
-    mock.verify
-
-    mock.expect(:call, 2, [category.id])
-    assert_equal 1, Thermos.drink(key: "key", id: category.id)
-    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)
-    store = category.store
-
-    Thermos.fill(key: "key", model: Store, deps: [categories: [:products]]) do |id|
-      mock.call(id)
-    end
-
-    mock.expect(:call, 1, [store.id])
-    category.update!(name: "foo")
-    mock.verify
-  
-    mock.expect(:call, 2, [store.id])
-    assert_equal 1, Thermos.drink(key: "key", id: store.id)
-    assert_raises(MockExpectationError) { mock.verify }
-    Product.create!(categories: [category])
-    mock.verify
-    
-    mock.expect(:call, 3, [store.id])
-    assert_equal 2, Thermos.drink(key: "key", id: store.id)
-    assert_raises(MockExpectationError) { mock.verify }
-  end
-
-  test "only rebuilds cache for stated dependencies, even if another cache has an associated model of the primary" do
-    category_mock = Minitest::Mock.new
-    product_mock = Minitest::Mock.new
-    category = categories(:baseball)
-    product = products(:glove)
-
-    Thermos.fill(key: "category_key", model: Category) do |id|
-      category_mock.call(id)
-    end
-
-    Thermos.fill(key: "product_key", model: Product) do |id|
-      product_mock.call(id)
-    end
-
-    category_mock.expect(:call, 2, [category.id])
-    product_mock.expect(:call, 2, [product.id])
-    product.update!(name: "foo")
-    assert_raises(MockExpectationError) { category_mock.verify }
-    product_mock.verify
-  end
 
   test "accepts and can rebuild off of an id other than the 'id'" do
     mock = Minitest::Mock.new
     category = categories(:baseball)
-    product = products(:glove)
 
-    Thermos.fill(key: "key", model: Category, deps: [:products], lookup_key: :name) do |id|
+    Thermos.fill(key: "key", model: Category, lookup_key: :name) do |id|
       mock.call(id)
     end
 
@@ -494,11 +148,7 @@ class ThermosTest < ActiveSupport::TestCase
     mock.verify
 
     mock.expect(:call, 3, [category.name])
-    product.update!(name: "foo")
-    mock.verify
-
-    mock.expect(:call, 4, [category.name])
-    assert_equal 3, Thermos.drink(key: "key", id: category.name)
+    assert_equal 2, Thermos.drink(key: "key", id: category.name)
     assert_raises(MockExpectationError) { mock.verify }
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: thermos
 version: !ruby/object:Gem::Version
-  version: 0.5.2
+  version: 1.0.0
 platform: ruby
 authors:
 - Andrew Thal
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-09-27 00:00:00.000000000 Z
+date: 2023-01-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -16,20 +16,20 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 5.2.4
+        version: 6.0.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: 6.2.0
+        version: 7.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 5.2.4
+        version: 6.0.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: 6.2.0
+        version: 7.1.0
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -58,6 +58,34 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: prettier
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: psych
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 4.0.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 4.0.0
 description: |
   Thermos is a library for caching in rails that re-warms caches
   in the background based on model changes.
@@ -77,6 +105,7 @@ files:
 - lib/thermos/rebuild_cache_job.rb
 - lib/thermos/refill_job.rb
 - lib/thermos/version.rb
+- test/dependencies_test.rb
 - test/dummy/README.rdoc
 - test/dummy/Rakefile
 - test/dummy/app/assets/config/manifest.js
@@ -121,10 +150,12 @@ files:
 - test/dummy/public/422.html
 - test/dummy/public/500.html
 - test/dummy/public/favicon.ico
+- test/filter_test.rb
 - test/fixtures/categories.yml
 - test/fixtures/category_items.yml
 - test/fixtures/products.yml
 - test/fixtures/stores.yml
+- test/queue_test.rb
 - test/test_helper.rb
 - test/thermos_test.rb
 homepage: https://github.com/athal7/thermos
@@ -139,68 +170,71 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.5.0
+      version: 2.7.0
   - - "<"
     - !ruby/object:Gem::Version
-      version: 2.8.0
+      version: 3.2.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3.1
+rubygems_version: 3.1.6
 signing_key: 
 specification_version: 4
 summary: Always-warm, auto-rebuilding rails caching without timers or touching.
 test_files:
-- test/fixtures/category_items.yml
+- test/test_helper.rb
+- test/dependencies_test.rb
+- test/thermos_test.rb
+- test/queue_test.rb
 - test/fixtures/stores.yml
 - test/fixtures/categories.yml
 - test/fixtures/products.yml
-- test/dummy/README.rdoc
-- test/dummy/public/404.html
-- test/dummy/public/422.html
-- test/dummy/public/500.html
-- test/dummy/public/favicon.ico
-- test/dummy/Rakefile
-- test/dummy/config/application.rb
-- test/dummy/config/routes.rb
-- test/dummy/config/environments/production.rb
-- test/dummy/config/environments/test.rb
-- test/dummy/config/environments/development.rb
+- test/fixtures/category_items.yml
+- test/dummy/db/schema.rb
+- test/dummy/db/migrate/20160325214744_create_categories.rb
+- test/dummy/db/migrate/20160326174530_create_stores.rb
+- test/dummy/db/migrate/20160325214849_create_products.rb
+- test/dummy/db/migrate/20160325220006_create_category_items.rb
 - test/dummy/config/database.yml
 - test/dummy/config/initializers/backtrace_silencers.rb
 - test/dummy/config/initializers/assets.rb
 - test/dummy/config/initializers/wrap_parameters.rb
-- test/dummy/config/initializers/filter_parameter_logging.rb
-- test/dummy/config/initializers/session_store.rb
-- test/dummy/config/initializers/inflections.rb
 - test/dummy/config/initializers/mime_types.rb
+- test/dummy/config/initializers/inflections.rb
+- test/dummy/config/initializers/session_store.rb
+- test/dummy/config/initializers/filter_parameter_logging.rb
 - test/dummy/config/initializers/cookies_serializer.rb
-- test/dummy/config/locales/en.yml
 - test/dummy/config/environment.rb
-- test/dummy/config/secrets.yml
+- test/dummy/config/locales/en.yml
 - test/dummy/config/boot.rb
+- test/dummy/config/environments/test.rb
+- test/dummy/config/environments/production.rb
+- test/dummy/config/environments/development.rb
+- test/dummy/config/application.rb
+- test/dummy/config/secrets.yml
+- test/dummy/config/routes.rb
+- test/dummy/README.rdoc
+- test/dummy/config.ru
+- test/dummy/app/helpers/application_helper.rb
+- test/dummy/app/controllers/application_controller.rb
+- test/dummy/app/models/product.rb
 - test/dummy/app/models/category_item.rb
-- test/dummy/app/models/category.rb
 - test/dummy/app/models/store.rb
-- test/dummy/app/models/product.rb
+- test/dummy/app/models/category.rb
 - test/dummy/app/views/layouts/application.html.erb
-- test/dummy/app/assets/javascripts/application.js
 - test/dummy/app/assets/stylesheets/application.css
+- test/dummy/app/assets/javascripts/application.js
 - test/dummy/app/assets/config/manifest.js
-- test/dummy/app/controllers/application_controller.rb
-- test/dummy/app/helpers/application_helper.rb
-- test/dummy/config.ru
-- test/dummy/db/migrate/20160325214849_create_products.rb
-- test/dummy/db/migrate/20160325220006_create_category_items.rb
-- test/dummy/db/migrate/20160326174530_create_stores.rb
-- test/dummy/db/migrate/20160325214744_create_categories.rb
-- test/dummy/db/schema.rb
+- test/dummy/Rakefile
+- test/dummy/public/500.html
+- test/dummy/public/404.html
+- test/dummy/public/favicon.ico
+- test/dummy/public/422.html
 - test/dummy/bin/rails
 - test/dummy/bin/rake
-- test/dummy/bin/bundle
 - test/dummy/bin/setup
-- test/thermos_test.rb
-- test/test_helper.rb
+- test/dummy/bin/bundle
+- test/filter_test.rb