forest_admin_datasource_toolkit 1.35.1 → 1.35.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8c5ec5878f6804365a3afd192c9bfc37f35ba891be075dfcd98c93171f85dc35
-  data.tar.gz: fdf3bae9671d6218ab3400aa2e74e999011401fac65476ab49e1a3ddd8af6108
+  metadata.gz: 04afc83d5bf8d65975d510deb44f1ae0a25f46b97fedbd93300af0af21aec01d
+  data.tar.gz: efea482ddc3b86bda063061f2a782634ea85a5ce4cf03ced74bff2be34a4c315
 SHA512:
-  metadata.gz: 52e88051287d0af7d800ff6f6f604c1b83e59b65f804e3e2a645080097219ccbbec0aded2e5db65156159effd4f66ffdc2fcf13e08c8f53fe4befce5f4ff4c5a
-  data.tar.gz: '09139e23a0af57bc243295ddb7f6678a677887c1e4f1f217dab054cb2caa2bb2f3f4e691f2b260d723f815a85f754e3dec9cff0059730506c081edf56da7b18a'
+  metadata.gz: '0777584d61d8cbbe819988cc3d614f92270dbc8c8c2a23f2ad5711bfd590d9abacc86d31986045b5f316922b1d88e4d1a548ac0106ba074ca71d9c784a8464d2'
+  data.tar.gz: 56f71ed391ff0a898ebaee498d9903d1643e4f4c7f7d234aef11b410b562cb9c9e001adcb3ccc469b71bbef0b8d38cbaa8b31ba07b8de145345a55a8fd470fec

data/lib/forest_admin_datasource_toolkit/decorators/collection_decorator.rb

@@ -28,7 +28,9 @@ module ForestAdminDatasourceToolkit
       end
 
       def name
-        @child_collection.name
+        # `@name` is taken by the base Collection (set via the mis-ordered `super` in initialize),
+        # so memoize under a dedicated ivar.
+        @memoized_name ||= @child_collection.name # rubocop:disable Naming/MemoizedInstanceVariableName
       end
 
       def execute(caller, name, data, filter = nil)

data/lib/forest_admin_datasource_toolkit/decorators/datasource_decorator.rb

@@ -22,12 +22,11 @@ module ForestAdminDatasourceToolkit
       end
 
       def get_collection(name)
-        collection = @child_datasource.get_collection(name)
-        unless @decorators.key?(collection.name)
-          @decorators[collection.name] = @collection_decorator_class.new(collection, self)
+        @collections_by_name ||= {}
+        @collections_by_name[name] ||= begin
+          collection = @child_datasource.get_collection(name)
+          @decorators[collection.name] ||= @collection_decorator_class.new(collection, self)
         end
-
-        @decorators[collection.name]
       end
 
       def render_chart(caller, name, parameters = {})

data/lib/forest_admin_datasource_toolkit/version.rb

@@ -1,3 +1,3 @@
 module ForestAdminDatasourceToolkit
-  VERSION = "1.35.1"
+  VERSION = "1.35.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: forest_admin_datasource_toolkit
 version: !ruby/object:Gem::Version
-  version: 1.35.1
+  version: 1.35.2
 platform: ruby
 authors:
 - Matthieu