iknow_view_models 3.0.1 → 3.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f9bbcabccc02d9109e4709f5cfd153eb3846816cefb115aef1d81495d799e55d
-  data.tar.gz: f2de8f5c69cffbfe4a7a5009fa68f0bdb44890ea5febb00510b2e8de5e24ca33
+  metadata.gz: 4f643ac9a59994324e3222f51732f5b7a3c34acefebb1e92cbbd9fff8dfb9d51
+  data.tar.gz: d4bcb2bf851d386b3ec65d88698fc080f8e7f53480c330ac5fe1771f10b27ebc
 SHA512:
-  metadata.gz: 118da3d69ff9ad1a54374b2107dfe9279c51aa3338c66ef3be1c42935d3cd8d9e16aff174afeebe566e4e523d8d2bc62ff40a79d49e398aceaedea80b0c81b65
-  data.tar.gz: 511e16514e4a8320a0e56e028f36b9980666ac677f0f3bafcce87a08c80e15d133b6e21b63ca186f390f496d195a9e553c1a5c41214a0962a33919bce8a2aee0
+  metadata.gz: 63bf32f6ed28bd025937eb83d6135f73af4d0070dc747d2da6cc624bdb55e674721fecc11ffbb6c52b427a3d5115fe02853cc4917c3a1ba1ae3d3476f80fddd2
+  data.tar.gz: 872bda8c032763f2e4ff052f439b8396a01abe7264479dd06b45d1209f711cb2a88ed9671499bc56759778797892652035e919d146d6a081a37b9131208fbf66

data/lib/iknow_view_models/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module IknowViewModels
-  VERSION = '3.0.1'
+  VERSION = '3.0.2'
 end

data/lib/view_model/active_record/collection_nested_controller.rb

@@ -22,14 +22,14 @@ module ViewModel::ActiveRecord::CollectionNestedController
   extend ActiveSupport::Concern
   include ViewModel::ActiveRecord::NestedControllerBase
 
-  def index_associated(scope: nil, serialize_context: new_serialize_context)
-    show_association(scope: scope, serialize_context: serialize_context)
+  def index_associated(scope: nil, serialize_context: new_serialize_context, &block)
+    show_association(scope: scope, serialize_context: serialize_context, &block)
   end
 
   # Deserialize items of the associated type and associate them with the owner,
   # replacing previously associated items.
-  def replace(serialize_context: new_serialize_context, deserialize_context: new_deserialize_context)
-    write_association(serialize_context: serialize_context, deserialize_context: deserialize_context)
+  def replace(serialize_context: new_serialize_context, deserialize_context: new_deserialize_context, &block)
+    write_association(serialize_context: serialize_context, deserialize_context: deserialize_context, &block)
   end
 
   def disassociate_all(serialize_context: new_serialize_context, deserialize_context: new_deserialize_context)
@@ -61,6 +61,7 @@ module ViewModel::ActiveRecord::CollectionNestedController
       ViewModel::Callbacks.wrap_serialize(owner_view, context: serialize_context) do
         child_context = owner_view.context_for_child(association_name, context: serialize_context)
         ViewModel.preload_for_serialization(assoc_view, serialize_context: child_context)
+        assoc_view = yield(assoc_view) if block_given?
         prerender_viewmodel(assoc_view, serialize_context: child_context)
       end
     end

data/lib/view_model/active_record/controller.rb

@@ -45,10 +45,8 @@ module ViewModel::ActiveRecord::Controller
     view = nil
     pre_rendered = viewmodel_class.transaction do
       view = viewmodel_class.deserialize_from_view(update_hash, references: refs, deserialize_context: deserialize_context)
-
-      view = yield(view) if block_given?
-
       ViewModel.preload_for_serialization(view, serialize_context: serialize_context)
+      view = yield(view) if block_given?
       prerender_viewmodel(view, serialize_context: serialize_context)
     end
     render_json_string(pre_rendered)

data/lib/view_model/active_record/nested_controller_base.rb

@@ -41,6 +41,7 @@ module ViewModel::ActiveRecord::NestedControllerBase
       ViewModel::Callbacks.wrap_serialize(owner_view, context: serialize_context) do
         child_context = owner_view.context_for_child(association_name, context: serialize_context)
         ViewModel.preload_for_serialization(association_view, serialize_context: child_context)
+        association_view = yield(association_view) if block_given?
         prerender_viewmodel(association_view, serialize_context: child_context)
       end
     end

data/lib/view_model/active_record/singular_nested_controller.rb

@@ -20,12 +20,12 @@ module ViewModel::ActiveRecord::SingularNestedController
   extend ActiveSupport::Concern
   include ViewModel::ActiveRecord::NestedControllerBase
 
-  def show_associated(scope: nil, serialize_context: new_serialize_context, deserialize_context: new_deserialize_context)
-    show_association(scope: scope, serialize_context: serialize_context)
+  def show_associated(scope: nil, serialize_context: new_serialize_context, deserialize_context: new_deserialize_context, &block)
+    show_association(scope: scope, serialize_context: serialize_context, &block)
   end
 
-  def create_associated(serialize_context: new_serialize_context, deserialize_context: new_deserialize_context)
-    write_association(serialize_context: serialize_context, deserialize_context: deserialize_context)
+  def create_associated(serialize_context: new_serialize_context, deserialize_context: new_deserialize_context, &block)
+    write_association(serialize_context: serialize_context, deserialize_context: deserialize_context, &block)
   end
 
   def destroy_associated(serialize_context: new_serialize_context, deserialize_context: new_deserialize_context)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: iknow_view_models
 version: !ruby/object:Gem::Version
-  version: 3.0.1
+  version: 3.0.2
 platform: ruby
 authors:
 - iKnow Team