iknow_view_models 3.4.3 → 3.4.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3560a98616dd2f0548ac7e663827e68d86fa9991969ac6ee49633a0090e7d628
-  data.tar.gz: deec44e5132f91dfc1deef0dd889ee20c1b01c6d5d7791d356f1e9dc99ec1c8a
+  metadata.gz: 2845e303fc1acc67f0241e30586c39276f08720a824104f71416a5b9d63a8989
+  data.tar.gz: ae89dde77c602debb67793bc36a120739c6692802e227d1835f972b0d72f542f
 SHA512:
-  metadata.gz: 5af2b38b2e8fb8805480bd665ea24e7ad4b489951c8b72660e502a053a945798f18269b60991eb416ab6959fc46e4831a911a15005810b57e288e2eeaaf37fd5
-  data.tar.gz: 5a73108237e3ffae5751f50a6e693e8fd737a4d1936f087095138ec2db47cbd7ec852f81e6ef881f794a38d67ba85429825b2393a850c149f363121f321adf30
+  metadata.gz: 808e3772112084fb81efeb7b0229ec461d4318b2f74460e01e94cd4c57c197b6c10b1fe6b0c02f0efa995d9b27209d08de8a98ed2991b270387cdc2b7a6520b4
+  data.tar.gz: 6ffed3458c0a92ddc8a49580073bbc6827eed7be49b1c605ed7708fc995185c825df57d583fd27305d45b4425b806faf0655a81a3eb7be5f9f64cdec9d09dedc

data/iknow_view_models.gemspec

@@ -8,7 +8,7 @@ Gem::Specification.new do |spec|
   spec.name          = 'iknow_view_models'
   spec.version       = IknowViewModels::VERSION
   spec.authors       = ['iKnow Team']
-  spec.email         = ['edge@iknow.jp']
+  spec.email         = ['systems@iknow.jp']
   spec.summary       = 'ViewModels provide a means of encapsulating a collection of related data and specifying its JSON serialization.'
   spec.description   = ''
   spec.homepage      = 'https://github.com/iknow/cerego_view_models'

data/lib/iknow_view_models/version.rb

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

data/lib/view_model/active_record/association_manipulation.rb

@@ -395,10 +395,10 @@ module ViewModel::ActiveRecord::AssociationManipulation
   def check_association_type!(association_data, type)
     if type && !association_data.accepts?(type)
       raise ViewModel::SerializationError.new(
-              "Type error: association '#{direct_reflection.name}' can't refer to viewmodel #{type.view_name}")
+              "Type error: association '#{association_data.association_name}' can't refer to viewmodel #{type.view_name}")
     elsif association_data.polymorphic? && !type
       raise ViewModel::SerializationError.new(
-              "Need to specify target viewmodel type for polymorphic association '#{direct_reflection.name}'")
+              "Need to specify target viewmodel type for polymorphic association '#{association_data.association_name}'")
     end
   end
 end

data/lib/view_model/active_record/cloner.rb

@@ -52,22 +52,23 @@ class ViewModel::ActiveRecord::Cloner
           new_associated = associated
         else
           # Otherwise descend into the child, and attach the result
-          vm_class =
-            case
-            when association_data.through?
-              # descend into the synthetic join table viewmodel
-              association_data.direct_viewmodel
-            when association_data.collection?
-              association_data.viewmodel_class
-            else
-              association_data.viewmodel_class_for_model!(associated.class)
-            end
+          build_vm = ->(model) do
+            vm_class =
+              if association_data.through?
+                # descend into the synthetic join table viewmodel
+                association_data.direct_viewmodel
+              else
+                association_data.viewmodel_class_for_model!(model.class)
+              end
+
+            vm_class.new(model)
+          end
 
           new_associated =
             if ViewModel::Utils.array_like?(associated)
-              associated.map { |m| clone(vm_class.new(m)) }.compact
+              associated.map { |m| clone(build_vm.(m)) }.compact
             else
-              clone(vm_class.new(associated))
+              clone(build_vm.(associated))
             end
         end
       end

data/lib/view_model/controller.rb

@@ -75,8 +75,13 @@ module ViewModel::Controller
   protected
 
   def parse_viewmodel_updates
-    update_hash = _extract_update_data(params.fetch(:data))
-    refs        = _extract_param_hash(params.fetch(:references, {}))
+    data_param = params.fetch(:data) do
+      raise ViewModel::Error.new(status: 400, detail: "Missing 'data' parameter")
+    end
+    refs_param = params.fetch(:references, {})
+
+    update_hash = _extract_update_data(data_param)
+    refs        = _extract_param_hash(refs_param)
 
     return update_hash, refs
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: iknow_view_models
 version: !ruby/object:Gem::Version
-  version: 3.4.3
+  version: 3.4.4
 platform: ruby
 authors:
 - iKnow Team
@@ -362,7 +362,7 @@ dependencies:
         version: '0'
 description: ''
 email:
-- edge@iknow.jp
+- systems@iknow.jp
 executables: []
 extensions: []
 extra_rdoc_files: []