thermos 0.4.1 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e8a6fdb2b9baf6513ed750de28354540a73231dad66cf99d6de39ccfd74debc7
-  data.tar.gz: 0a5de531cb59a1c4b9b86e3875fffd78df0b1bb242fc2ec39ac1b740772cc360
+  metadata.gz: 87ceed3d0f1b54b2cd9e9b0afde15e90252fcbc9f575c5bf11a66e414045c5d5
+  data.tar.gz: dc3bc76cd808f474b80676c5f2d1f2e50681c6028c09412e12eb565b4494cfc4
 SHA512:
-  metadata.gz: b1b7efff2c5be5ed8f93c5a7649f4804c8f3fca74a8a77e6a64065017545bec2f22ade70ebdbe41bb548c419179b3e6755877341a172a078ed8466ca3dcf7dd2
-  data.tar.gz: 2c09712783766bdfb3960660af31ee5a9806e707e49080fc4b677c3d8566cb1e01f582b37cd263023c9b0dcf4be7b2641248f9d6a8cb43450545a00fd177ca7a
+  metadata.gz: d86ada3f6a3b07ed8bbf35c481e73ac4563a0aced184f6e47a986847287f0bf4a3c02c42e5d7600db1f5d8c2358f5ba4975fd20c4ccceee8fc3ec0cfcaae7811
+  data.tar.gz: 51f90cb754d381d81293e433261e09cb4e184dc1dcddd05fbfcbf7baacb577330f6a4cc6a0621cc8cd9964d7677e499554a8dd533d65762adb421d56cef58458

data/lib/thermos/beverage.rb

@@ -9,9 +9,7 @@ module Thermos
       @model = model
       @lookup_key = lookup_key || :id
       @filter = filter || nil
-      @deps = deps.map do |dep|
-        Dependency.new(model: model, association: dep)
-      end
+      @deps = generate_deps(model, deps)
       @action = action
 
       set_observers
@@ -21,7 +19,7 @@ module Thermos
       @deps.select do |dep|
         dep.klass == dep_model.class
       end.flat_map do |dep|
-        @model.joins(dep.association)
+        @model.joins(dep.path)
               .where(dep.table => { id: dep_model.id })
               .pluck(@lookup_key)
       end.uniq
@@ -41,5 +39,34 @@ module Thermos
     def observe(model)
       model.include(Notifier) unless model.included_modules.include?(Notifier)
     end
+
+    def generate_deps(model, deps, root = nil, path = nil)
+      deps.reduce([]) do |acc, dep|
+        if dep.is_a? Symbol
+          acc << Dependency.new(
+            model: root || model, 
+            ref: model.reflect_on_association(dep), 
+            path: path || dep)
+        elsif dep.is_a? Array
+          dep.each do |d| 
+            acc << Dependency.new(
+              model: root || model, 
+              ref: model.reflect_on_association(d), 
+              path: path || d)
+          end
+        elsif dep.is_a? Hash
+          dep.each do |k,v|
+            ref = model.reflect_on_association(k)
+            acc << Dependency.new(
+              model: root || model, 
+              ref: ref, 
+              path: path || k
+            )
+            acc.concat(generate_deps(ref.class_name.constantize, v, model, dep))
+          end
+        end
+        acc
+      end
+    end
   end
 end

data/lib/thermos/dependency.rb

@@ -2,14 +2,13 @@
 
 module Thermos
   class Dependency
-    attr_reader :model, :association, :klass, :table
+    attr_reader :model, :path, :klass, :table
 
-    def initialize(model:, association:)
+    def initialize(model:, ref:, path: nil)
       @model = model
-      @association = association
-      reflection = @model.reflections[@association.to_s]
-      @table = reflection.table_name
-      @klass = reflection.class_name.constantize
+      @path = path
+      @table = ref.table_name
+      @klass = ref.class_name.constantize
     end
   end
 end

data/lib/thermos/version.rb

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

data/test/thermos_test.rb

@@ -331,6 +331,30 @@ class ThermosTest < ActiveSupport::TestCase
     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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: thermos
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.5.0
 platform: ruby
 authors:
 - Andrew Thal