iknow_view_models 3.2.1 → 3.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2fa0ab7a6ce71bd40dbb00eea4f73c33a1c3f442ccf349626154c6bf2974088e
-  data.tar.gz: 298c6f0483d477bf48f849ad380c9b7bd6eb7d4a55763ba10d1639c2d2181103
+  metadata.gz: a86b2b9fdc89ee421bcb155ae29e3ac4f2c809be4d40e483a405337f8729a7f9
+  data.tar.gz: 8fd1c498264a0eefe30d9c3c6a35c4f005a94aaf71b03d37044a23212cb90eb4
 SHA512:
-  metadata.gz: 54c754abf844d1a4a62124df1476c3870f487b56de1108acabdb0b57acca108581817df170c318cd9d8edd0930314286d498a3d1ba9e8b68ae87a928dbfa73e9
-  data.tar.gz: 905754efd90b6176b5f7271b1cd997df974ac35dde9afdbaa7612e4a5ec722c942b1021fb565e693efac6df30aa67205d39b6adc9ba3fa64d0db401ce99d7915
+  metadata.gz: c2a2fd321cf605709eb398771cd6cc475869e80c59d5a4934a2cf5429cfa3e1a6a5e3e74f358227793ff2cc7ce10a1eff46fe3c4db20e859d49d54be306b4afb
+  data.tar.gz: cfb7009b02acbebce85d3ad41205549430370710633d51176ac8596acf6a83fb98f0e76132bf850baf37da36acfe402afc21d00c8996f66ca2a98f62a9380dc1

data/lib/iknow_view_models/version.rb

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

data/lib/view_model/active_record/controller.rb

@@ -17,6 +17,8 @@ module ViewModel::ActiveRecord::Controller
   include ViewModel::ActiveRecord::CollectionNestedController
   include ViewModel::ActiveRecord::SingularNestedController
 
+  MIGRATION_VERSION_HEADER = 'X-ViewModel-Versions'
+
   def show(scope: nil, viewmodel_class: self.viewmodel_class, serialize_context: new_serialize_context(viewmodel_class: viewmodel_class))
     view = nil
     pre_rendered = viewmodel_class.transaction do
@@ -96,11 +98,24 @@ module ViewModel::ActiveRecord::Controller
   def migration_versions
     @migration_versions ||=
       begin
-        versions = parse_param(
-          :versions,
-          default: {},
-          with: IknowParams::Serializer::HashOf.new(
-            IknowParams::Serializer::String, IknowParams::Serializer::Integer))
+        version_spec =
+          if params.include?(:versions)
+            params[:versions]
+          elsif request.headers.include?(MIGRATION_VERSION_HEADER)
+            begin
+              JSON.parse(request.headers[MIGRATION_VERSION_HEADER])
+            rescue JSON::ParserError
+              raise ViewModel::Error.new(status: 400, detail: "Invalid JSON in #{MIGRATION_VERSION_HEADER}")
+            end
+          else
+            {}
+          end
+
+        versions =
+          IknowParams::Parser.parse_value(
+            version_spec,
+            with: IknowParams::Serializer::HashOf.new(
+              IknowParams::Serializer::String, IknowParams::Serializer::Integer))
 
         migration_versions = {}
 

data/test/helpers/controller_test_helpers.rb

@@ -7,6 +7,8 @@ require 'view_model/active_record/controller'
 require_relative '../helpers/arvm_test_utilities'
 require_relative '../helpers/arvm_test_models'
 
+require 'action_controller'
+
 require 'acts_as_manual_list'
 
 # models for ARVM controller test
@@ -145,11 +147,11 @@ end
 
 ## Dummy Rails Controllers
 class DummyController
-  attr_reader :params, :status
+  attr_reader :params, :headers, :status
 
-  def initialize(**params)
-    # in Rails 5, this will not be a hash, which weakens the value of the test.
-    @params = params.with_indifferent_access
+  def initialize(headers: {}, params: {})
+    @params = ActionController::Parameters.new(params)
+    @headers = ActionDispatch::Http::Headers.from_hash({}).merge!(headers)
     @status = 200
   end
 
@@ -192,6 +194,11 @@ class DummyController
     JSON.parse(json_response)
   end
 
+  # for request.params and request.headers
+  def request
+    self
+  end
+
   class << self
     def inherited(subclass)
       subclass.initialize_rescue_blocks

data/test/unit/view_model/active_record/controller_test.rb

@@ -98,7 +98,7 @@ class ViewModel::ActiveRecord::ControllerTest < ActiveSupport::TestCase
   end
 
   def test_show
-    parentcontroller = ParentController.new(id: @parent.id)
+    parentcontroller = ParentController.new(params: { id: @parent.id })
     parentcontroller.invoke(:show)
 
     assert_equal({ 'data' => @parent_view.to_hash },
@@ -110,7 +110,10 @@ class ViewModel::ActiveRecord::ControllerTest < ActiveSupport::TestCase
   end
 
   def test_migrated_show
-    parentcontroller = ParentController.new(id: @parent.id, versions: { ParentView.view_name => 1 })
+    parentcontroller = ParentController.new(
+      params: { id: @parent.id },
+      headers: { 'X-ViewModel-Versions' => { ParentView.view_name => 1 }.to_json })
+
     parentcontroller.invoke(:show)
 
     expected_view = @parent_view.to_hash
@@ -127,6 +130,18 @@ class ViewModel::ActiveRecord::ControllerTest < ActiveSupport::TestCase
     assert_all_hooks_nested_inside_parent_hook(parentcontroller.hook_trace)
   end
 
+  def test_invalid_migration_header
+    parentcontroller = ParentController.new(
+      params: { id: @parent.id },
+      headers: { 'X-ViewModel-Versions' => 'not a json' })
+
+    parentcontroller.invoke(:show)
+    assert_equal(400, parentcontroller.status)
+    assert_match(/Invalid JSON/i,
+                 parentcontroller.hash_response['error']['detail'],
+                 'json error propagated')
+  end
+
   def test_index
     p2      = Parent.create(name: 'p2')
     p2_view = ParentView.new(p2)
@@ -152,7 +167,7 @@ class ViewModel::ActiveRecord::ControllerTest < ActiveSupport::TestCase
                        { '_type' => 'Child', 'name' => 'c2' },],
     }
 
-    parentcontroller = ParentController.new(data: data)
+    parentcontroller = ParentController.new(params: { data: data })
     parentcontroller.invoke(:create)
 
     assert_equal(200, parentcontroller.status)
@@ -173,7 +188,7 @@ class ViewModel::ActiveRecord::ControllerTest < ActiveSupport::TestCase
       'old_name' => 'p2',
     }
 
-    parentcontroller = ParentController.new(data: data, versions: { ParentView.view_name => 1 })
+    parentcontroller = ParentController.new(params: { data: data, versions: { ParentView.view_name => 1 } })
     parentcontroller.invoke(:create)
 
     assert_equal(200, parentcontroller.status)
@@ -183,14 +198,14 @@ class ViewModel::ActiveRecord::ControllerTest < ActiveSupport::TestCase
   end
 
   def test_create_empty
-    parentcontroller = ParentController.new(data: [])
+    parentcontroller = ParentController.new(params: { data: [] })
     parentcontroller.invoke(:create)
 
     assert_equal(400, parentcontroller.status)
   end
 
   def test_create_invalid
-    parentcontroller = ParentController.new(data: 42)
+    parentcontroller = ParentController.new(params: { data: 42 })
     parentcontroller.invoke(:create)
 
     assert_equal(400, parentcontroller.status)
@@ -201,7 +216,7 @@ class ViewModel::ActiveRecord::ControllerTest < ActiveSupport::TestCase
              '_type' => 'Parent',
              'name'  => 'new' }
 
-    parentcontroller = ParentController.new(id: @parent.id, data: data)
+    parentcontroller = ParentController.new(params: { id: @parent.id, data: data })
     parentcontroller.invoke(:create)
 
     assert_equal(200, parentcontroller.status)
@@ -216,7 +231,7 @@ class ViewModel::ActiveRecord::ControllerTest < ActiveSupport::TestCase
   end
 
   def test_destroy
-    parentcontroller = ParentController.new(id: @parent.id)
+    parentcontroller = ParentController.new(params: { id: @parent.id })
     parentcontroller.invoke(:destroy)
 
     assert_equal(200, parentcontroller.status)
@@ -230,7 +245,7 @@ class ViewModel::ActiveRecord::ControllerTest < ActiveSupport::TestCase
   end
 
   def test_show_missing
-    parentcontroller = ParentController.new(id: 9999)
+    parentcontroller = ParentController.new(params: { id: 9999 })
     parentcontroller.invoke(:show)
 
     assert_equal(404, parentcontroller.status)
@@ -252,7 +267,7 @@ class ViewModel::ActiveRecord::ControllerTest < ActiveSupport::TestCase
              'children' => [{ '_type' => 'Child',
                               'age'   => 42 }] }
 
-    parentcontroller = ParentController.new(data: data)
+    parentcontroller = ParentController.new(params: { data: data })
     parentcontroller.invoke(:create)
 
     assert_equal({ 'error' => {
@@ -275,7 +290,7 @@ class ViewModel::ActiveRecord::ControllerTest < ActiveSupport::TestCase
     data = { '_type'    => 'Parent',
              'children' => [{ '_type' => 'Child',
                               'age'   => 1 }] }
-    parentcontroller = ParentController.new(data: data)
+    parentcontroller = ParentController.new(params: { data: data })
     parentcontroller.invoke(:create)
 
     assert_equal(400, parentcontroller.status)
@@ -285,7 +300,7 @@ class ViewModel::ActiveRecord::ControllerTest < ActiveSupport::TestCase
   end
 
   def test_destroy_missing
-    parentcontroller = ParentController.new(id: 9999)
+    parentcontroller = ParentController.new(params: { id: 9999 })
     parentcontroller.invoke(:destroy)
 
     assert_equal({ 'error' => {
@@ -307,7 +322,7 @@ class ViewModel::ActiveRecord::ControllerTest < ActiveSupport::TestCase
   def test_nested_collection_index_associated
     _distractor = Parent.create(name: 'p2', children: [Child.new(name: 'c3', position: 1)])
 
-    childcontroller = ChildController.new(parent_id: @parent.id)
+    childcontroller = ChildController.new(params: { parent_id: @parent.id })
     childcontroller.invoke(:index_associated)
 
     assert_equal(200, childcontroller.status)
@@ -334,7 +349,7 @@ class ViewModel::ActiveRecord::ControllerTest < ActiveSupport::TestCase
 
   def test_nested_collection_append_one
     data = { '_type' => 'Child', 'name' => 'c3' }
-    childcontroller = ChildController.new(parent_id: @parent.id, data: data)
+    childcontroller = ChildController.new(params: { parent_id: @parent.id, data: data })
 
     childcontroller.invoke(:append)
 
@@ -353,7 +368,7 @@ class ViewModel::ActiveRecord::ControllerTest < ActiveSupport::TestCase
     data = [{ '_type' => 'Child', 'name' => 'c3' },
             { '_type' => 'Child', 'name' => 'c4' },]
 
-    childcontroller = ChildController.new(parent_id: @parent.id, data: data)
+    childcontroller = ChildController.new(params: { parent_id: @parent.id, data: data })
     childcontroller.invoke(:append)
 
     assert_equal(200, childcontroller.status, childcontroller.hash_response)
@@ -376,7 +391,7 @@ class ViewModel::ActiveRecord::ControllerTest < ActiveSupport::TestCase
     data = [{ '_type' => 'Child', 'name' => 'newc1' },
             { '_type' => 'Child', 'name' => 'newc2' },]
 
-    childcontroller = ChildController.new(parent_id: @parent.id, data: data)
+    childcontroller = ChildController.new(params: { parent_id: @parent.id, data: data })
     childcontroller.invoke(:replace)
 
     assert_equal(200, childcontroller.status, childcontroller.hash_response)
@@ -391,7 +406,7 @@ class ViewModel::ActiveRecord::ControllerTest < ActiveSupport::TestCase
 
   def test_nested_collection_replace_bad_data
     data = [{ 'name' => 'nc' }]
-    childcontroller = ChildController.new(parent_id: @parent.id, data: data)
+    childcontroller = ChildController.new(params: { parent_id: @parent.id, data: data })
 
     childcontroller.invoke(:replace)
 
@@ -402,7 +417,7 @@ class ViewModel::ActiveRecord::ControllerTest < ActiveSupport::TestCase
 
   def test_nested_collection_disassociate_one
     old_child = @parent.children.first
-    childcontroller = ChildController.new(parent_id: @parent.id, id: old_child.id)
+    childcontroller = ChildController.new(params: { parent_id: @parent.id, id: old_child.id })
     childcontroller.invoke(:disassociate)
 
     assert_equal(200, childcontroller.status, childcontroller.hash_response)
@@ -418,7 +433,7 @@ class ViewModel::ActiveRecord::ControllerTest < ActiveSupport::TestCase
   def test_nested_collection_disassociate_many
     old_children = @parent.children
 
-    childcontroller = ChildController.new(parent_id: @parent.id)
+    childcontroller = ChildController.new(params: { parent_id: @parent.id })
     childcontroller.invoke(:disassociate_all)
 
     assert_equal(200, childcontroller.status, childcontroller.hash_response)
@@ -434,7 +449,7 @@ class ViewModel::ActiveRecord::ControllerTest < ActiveSupport::TestCase
   # direct methods on nested controller
   def test_nested_collection_destroy
     old_child = @parent.children.first
-    childcontroller = ChildController.new(id: old_child.id)
+    childcontroller = ChildController.new(params: { id: old_child.id })
     childcontroller.invoke(:destroy)
 
     assert_equal(200, childcontroller.status, childcontroller.hash_response)
@@ -452,7 +467,7 @@ class ViewModel::ActiveRecord::ControllerTest < ActiveSupport::TestCase
              '_type' => 'Child',
              'name' => 'new_name' }
 
-    childcontroller = ChildController.new(data: data)
+    childcontroller = ChildController.new(params: { data: data })
     childcontroller.invoke(:create)
 
     assert_equal(200, childcontroller.status, childcontroller.hash_response)
@@ -467,7 +482,7 @@ class ViewModel::ActiveRecord::ControllerTest < ActiveSupport::TestCase
   def test_nested_collection_show
     old_child = @parent.children.first
 
-    childcontroller = ChildController.new(id: old_child.id)
+    childcontroller = ChildController.new(params: { id: old_child.id })
     childcontroller.invoke(:show)
 
     assert_equal({ 'data' => ChildView.new(old_child).to_hash },
@@ -482,7 +497,7 @@ class ViewModel::ActiveRecord::ControllerTest < ActiveSupport::TestCase
     old_label = @parent.label
 
     data = { '_type' => 'Label', 'text' => 'new label' }
-    labelcontroller = LabelController.new(parent_id: @parent.id, data: data)
+    labelcontroller = LabelController.new(params: { parent_id: @parent.id, data: data })
     labelcontroller.invoke(:create_associated)
 
     assert_equal(200, labelcontroller.status, labelcontroller.hash_response)
@@ -504,7 +519,7 @@ class ViewModel::ActiveRecord::ControllerTest < ActiveSupport::TestCase
   def test_nested_singular_show_from_parent
     old_label = @parent.label
 
-    labelcontroller = LabelController.new(parent_id: @parent.id)
+    labelcontroller = LabelController.new(params: { parent_id: @parent.id })
     labelcontroller.invoke(:show_associated)
 
     assert_equal(200, labelcontroller.status, labelcontroller.hash_response)
@@ -518,7 +533,7 @@ class ViewModel::ActiveRecord::ControllerTest < ActiveSupport::TestCase
   def test_nested_singular_destroy_from_parent
     old_label = @parent.label
 
-    labelcontroller = LabelController.new(parent_id: @parent.id)
+    labelcontroller = LabelController.new(params: { parent_id: @parent.id })
     labelcontroller.invoke(:destroy_associated)
 
     @parent.reload
@@ -536,7 +551,7 @@ class ViewModel::ActiveRecord::ControllerTest < ActiveSupport::TestCase
     old_label = @parent.label
 
     data = { '_type' => 'Label', 'id' => old_label.id, 'text' => 'new label' }
-    labelcontroller = LabelController.new(parent_id: @parent.id, data: data)
+    labelcontroller = LabelController.new(params: { parent_id: @parent.id, data: data })
     labelcontroller.invoke(:create_associated)
 
     assert_equal(200, labelcontroller.status, labelcontroller.hash_response)
@@ -553,7 +568,7 @@ class ViewModel::ActiveRecord::ControllerTest < ActiveSupport::TestCase
   def test_nested_singular_show_from_id
     old_label = @parent.label
 
-    labelcontroller = LabelController.new(id: old_label.id)
+    labelcontroller = LabelController.new(params: { id: old_label.id })
     labelcontroller.invoke(:show)
 
     assert_equal(200, labelcontroller.status, labelcontroller.hash_response)
@@ -567,7 +582,7 @@ class ViewModel::ActiveRecord::ControllerTest < ActiveSupport::TestCase
     # foreign key violation. Destroy target instead.
     old_target = @parent.target
 
-    targetcontroller = TargetController.new(id: old_target.id)
+    targetcontroller = TargetController.new(params: { id: old_target.id })
     targetcontroller.invoke(:destroy)
 
     @parent.reload
@@ -583,7 +598,7 @@ class ViewModel::ActiveRecord::ControllerTest < ActiveSupport::TestCase
     old_label = @parent.label
 
     data = { '_type' => 'Label', 'id' => old_label.id, 'text' => 'new label' }
-    labelcontroller = LabelController.new(data: data)
+    labelcontroller = LabelController.new(params: { data: data })
     labelcontroller.invoke(:create)
 
     assert_equal(200, labelcontroller.status, labelcontroller.hash_response)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: iknow_view_models
 version: !ruby/object:Gem::Version
-  version: 3.2.1
+  version: 3.2.2
 platform: ruby
 authors:
 - iKnow Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-10-08 00:00:00.000000000 Z
+date: 2020-10-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord