iknow_view_models 3.14.3 → 3.14.5

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (46) hide show
  1. checksums.yaml +4 -4
  2. data/.github/workflows/test.yml +1 -3
  3. data/Appraisals +7 -15
  4. data/iknow_view_models.gemspec +3 -0
  5. data/lib/iknow_view_models/version.rb +1 -1
  6. data/lib/view_model/config.rb +1 -0
  7. data/lib/view_model/controller/migration_versions.rb +13 -3
  8. data/lib/view_model/deserialization_error.rb +30 -1
  9. data/lib/view_model/migration/strict_migration_error.rb +23 -0
  10. data/lib/view_model/migration.rb +1 -0
  11. data/lib/view_model/migrator.rb +13 -2
  12. data/test/helpers/arvm_test_utilities.rb +0 -1
  13. data/test/helpers/match_enumerator.rb +3 -3
  14. data/test/helpers/viewmodel_spec_helpers.rb +1 -2
  15. data/test/test_helper.rb +28 -0
  16. data/test/unit/view_model/access_control_test.rb +2 -5
  17. data/test/unit/view_model/active_record/alias_test.rb +2 -2
  18. data/test/unit/view_model/active_record/belongs_to_test.rb +2 -2
  19. data/test/unit/view_model/active_record/cache_test.rb +1 -3
  20. data/test/unit/view_model/active_record/cloner_test.rb +2 -4
  21. data/test/unit/view_model/active_record/controller_nested_test.rb +4 -6
  22. data/test/unit/view_model/active_record/controller_test.rb +4 -6
  23. data/test/unit/view_model/active_record/counter_test.rb +2 -2
  24. data/test/unit/view_model/active_record/customization_test.rb +2 -2
  25. data/test/unit/view_model/active_record/has_many_test.rb +2 -2
  26. data/test/unit/view_model/active_record/has_many_through_poly_test.rb +2 -2
  27. data/test/unit/view_model/active_record/has_many_through_test.rb +2 -2
  28. data/test/unit/view_model/active_record/has_one_test.rb +2 -2
  29. data/test/unit/view_model/active_record/migration_test.rb +75 -4
  30. data/test/unit/view_model/active_record/namespacing_test.rb +1 -3
  31. data/test/unit/view_model/active_record/poly_test.rb +2 -2
  32. data/test/unit/view_model/active_record/shared_test.rb +2 -2
  33. data/test/unit/view_model/active_record/version_test.rb +2 -2
  34. data/test/unit/view_model/active_record_test.rb +2 -3
  35. data/test/unit/view_model/callbacks_test.rb +2 -2
  36. data/test/unit/view_model/controller_test.rb +1 -3
  37. data/test/unit/view_model/deserialization_error/database_constraint_test.rb +37 -0
  38. data/test/unit/view_model/deserialization_error/unique_violation_test.rb +1 -3
  39. data/test/unit/view_model/error_wrapping_test.rb +35 -4
  40. data/test/unit/view_model/garbage_collection_test.rb +1 -2
  41. data/test/unit/view_model/record_test.rb +2 -3
  42. data/test/unit/view_model/registry_test.rb +1 -3
  43. data/test/unit/view_model/traversal_context_test.rb +1 -3
  44. data/test/unit/view_model_test.rb +1 -4
  45. metadata +50 -7
  46. data/gemfiles/rails_6_1.gemfile +0 -10
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 32034ee1a16051289f76e317a76a7356f32093fd4439aa75503ffa00ab1f8b95
4
- data.tar.gz: cb8a4669e79d68888c14d76b9ed718c4f2d8336da0989a22a7eafc779aff3bca
3
+ metadata.gz: b22d72f47ed8a1192f131bd4acce1a62ded93bac8dac0d17044d44cbb0b5e445
4
+ data.tar.gz: 4fb0a382d2cb24a99a2df2ef6aacd492743fd4ff6a496cfde48b77e291afa178
5
5
  SHA512:
6
- metadata.gz: 8effb32744fe38236249ff4a483ff9a778efdd92ca00693eb8c3f00546fedfc4de7792456fcbd04d652659a713a4ecd8d3efefde43633bd9d19a666c93e930fb
7
- data.tar.gz: 3915fbdfa63db615439e186da904c7c2899727e66a0326abf31b6d7398423761dd79db1c544ae69ba5983200d91d5ed1929449307cf961da2073cc02e3909307
6
+ metadata.gz: da7f91b5d04c4042cf0b959f65610da12bb0eaf54ffef78e8469c0637b0e9274813b8e04f2bb0c4b1e8cb47bccc3a3d0a7febf9e2a34b3405220d8ba8f3bbe66
7
+ data.tar.gz: ad2db4486ea34a6a0b4790d1d620784fccf3887a46bee02d6f25f80983adf81cc4229ef5cf2f10d79a7d0d05f15a7ee16ad1a46d52097073b049497046801149
@@ -26,10 +26,8 @@ jobs:
26
26
  strategy:
27
27
  fail-fast: false
28
28
  matrix:
29
- ruby-version: ['3.1', '3.2', '3.3']
29
+ ruby-version: ['3.2', '3.3']
30
30
  include:
31
- - ruby-version: '3.1'
32
- bundle-gemfile: gemfiles/rails_6_1.gemfile
33
31
  - ruby-version: '3.2'
34
32
  bundle-gemfile: gemfiles/rails_7_0.gemfile
35
33
  - ruby-version: '3.3'
data/Appraisals CHANGED
@@ -1,19 +1,11 @@
1
- appraise 'rails-5-2' do
2
- gem 'activerecord', '~> 5.2.0'
3
- gem 'activesupport', '~> 5.2.0'
4
- end
5
-
6
- appraise 'rails-6-0' do
7
- gem 'activerecord', '~> 6.0.0'
8
- gem 'activesupport', '~> 6.0.0'
9
- end
10
-
11
- appraise 'rails-6-1' do
12
- gem 'activerecord', '~> 6.1.0'
13
- gem 'activesupport', '~> 6.1.0'
14
- end
15
-
16
1
  appraise 'rails-7-0' do
2
+ gem 'minitest-ci'
17
3
  gem 'activerecord', '~> 7.0.0'
18
4
  gem 'activesupport', '~> 7.0.0'
19
5
  end
6
+
7
+ appraise 'rails-7-1' do
8
+ gem 'minitest-ci'
9
+ gem 'activerecord', '~> 7.1.0'
10
+ gem 'activesupport', '~> 7.1.0'
11
+ end
@@ -44,7 +44,10 @@ Gem::Specification.new do |spec|
44
44
  spec.add_development_dependency 'bundler'
45
45
  spec.add_development_dependency 'byebug'
46
46
  spec.add_development_dependency 'method_source'
47
+ spec.add_development_dependency 'minitest', '~> 6.0.0'
47
48
  spec.add_development_dependency 'minitest-hooks'
49
+ spec.add_development_dependency 'minitest-mock'
50
+ spec.add_development_dependency 'minitest-reporters'
48
51
  spec.add_development_dependency 'pg'
49
52
  spec.add_development_dependency 'pry'
50
53
  spec.add_development_dependency 'rake'
@@ -1,5 +1,5 @@
1
1
  # frozen_string_literal: true
2
2
 
3
3
  module IknowViewModels
4
- VERSION = '3.14.3'
4
+ VERSION = '3.14.5'
5
5
  end
@@ -6,6 +6,7 @@ require 'keyword_builder'
6
6
  ViewModel::Config = Value.new(
7
7
  show_cause_in_error_view: false,
8
8
  debug_deserialization: false,
9
+ strict_migration_versions: false,
9
10
  )
10
11
 
11
12
  class ViewModel::Config
@@ -8,9 +8,19 @@ module ViewModel::Controller::MigrationVersions
8
8
  def migration_versions
9
9
  @migration_versions ||=
10
10
  begin
11
- specified_migration_versions.reject do |viewmodel_class, required_version|
12
- viewmodel_class.schema_version == required_version
13
- end.freeze
11
+ versions = specified_migration_versions.dup
12
+
13
+ unless ViewModel::Config.strict_migration_versions
14
+ # Ignore the current version. This allows skipping migrations if only
15
+ # current versions are requested. Can't be ignored when strict
16
+ # migrations are enabled, since we need to walk the tree to assert
17
+ # that all visited types are mentioned.
18
+ versions.reject! do |viewmodel_class, required_version|
19
+ viewmodel_class.schema_version == required_version
20
+ end
21
+ end
22
+
23
+ versions.freeze
14
24
  end
15
25
  end
16
26
 
@@ -377,7 +377,36 @@ class ViewModel
377
377
  when PG::UniqueViolation, PG::ExclusionViolation
378
378
  UniqueViolation.from_postgres_error(exception.cause, nodes)
379
379
  else
380
- self.new(exception.message, nodes)
380
+ self.new(redact_failing_row(exception), nodes)
381
+ end
382
+ end
383
+
384
+ class << self
385
+ FAILING_ROW_PREFIX = 'Failing row contains '
386
+ REDACTED_FAILING_ROW = 'Failing row contains (redacted).'
387
+
388
+ private
389
+
390
+ # Postgres reports CHECK and NOT NULL violations with "Failing row
391
+ # contains (...)" including every column of the row being written.
392
+ # Redact them.
393
+ def redact_failing_row(exception)
394
+ message = exception.message
395
+
396
+ pg_error = exception.cause
397
+ row_detail = pg_error.result&.error_field(PG::PG_DIAG_MESSAGE_DETAIL) if pg_error.is_a?(PG::Error)
398
+
399
+ if row_detail&.start_with?(FAILING_ROW_PREFIX) && message.include?(row_detail)
400
+ # With a structured error, replace the exact detail reported by
401
+ # Postgres rather than parsing the message.
402
+ message.sub(row_detail) { REDACTED_FAILING_ROW }
403
+ elsif (index = message.index(FAILING_ROW_PREFIX))
404
+ # Without a structured error we can't find the end of the message,
405
+ # so drop everything after it.
406
+ message[0, index] + REDACTED_FAILING_ROW
407
+ else
408
+ message
409
+ end
381
410
  end
382
411
  end
383
412
  end
@@ -0,0 +1,23 @@
1
+ # frozen_string_literal: true
2
+
3
+ class ViewModel::Migration::StrictMigrationError < ViewModel::AbstractError
4
+ attr_reader :vm_name
5
+
6
+ status 400
7
+ code 'Migration.StrictMigrationError'
8
+
9
+ def initialize(vm_name)
10
+ @vm_name = vm_name
11
+ super()
12
+ end
13
+
14
+ def detail
15
+ "No version was provided for the view #{vm_name}"
16
+ end
17
+
18
+ def meta
19
+ {
20
+ viewmodel: vm_name,
21
+ }
22
+ end
23
+ end
@@ -4,6 +4,7 @@ class ViewModel::Migration
4
4
  require 'view_model/migration/no_path_error'
5
5
  require 'view_model/migration/one_way_error'
6
6
  require 'view_model/migration/unspecified_version_error'
7
+ require 'view_model/migration/strict_migration_error'
7
8
 
8
9
  REFERENCE_ONLY_KEYS = [
9
10
  ViewModel::TYPE_ATTRIBUTE,
@@ -26,6 +26,10 @@ class ViewModel
26
26
  MigrationPlan = Struct.new(:path, :required_version, :current_version, :viewmodel_class)
27
27
 
28
28
  def initialize(required_versions)
29
+ # If strict migrations are enabled, a version must be explicitly specified
30
+ # for every view used
31
+ @strict_permitted_views = required_versions.each_key.to_set(&:view_name)
32
+
29
33
  @plans = required_versions.each_with_object({}) do |(viewmodel_class, required_version), h|
30
34
  current_version = viewmodel_class.schema_version
31
35
  next if required_version == current_version
@@ -68,6 +72,13 @@ class ViewModel
68
72
 
69
73
  private
70
74
 
75
+ def fetch_plan(view_name)
76
+ if ViewModel::Config.strict_migration_versions && !@strict_permitted_views.include?(view_name)
77
+ raise ViewModel::Migration::StrictMigrationError.new(view_name)
78
+ end
79
+ @plans[view_name]
80
+ end
81
+
71
82
  def migrate_tree!(node, references:)
72
83
  case node
73
84
  when Hash
@@ -127,7 +138,7 @@ class ViewModel
127
138
  end
128
139
 
129
140
  def migrate_viewmodel!(view_name, source_version, view_hash, references)
130
- plan = @plans[view_name]
141
+ plan = fetch_plan(view_name)
131
142
  return false unless plan
132
143
 
133
144
  return false if source_version == plan.current_version
@@ -154,7 +165,7 @@ class ViewModel
154
165
  private
155
166
 
156
167
  def migrate_viewmodel!(view_name, source_version, view_hash, references)
157
- plan = @plans[view_name]
168
+ plan = fetch_plan(view_name)
158
169
  return false unless plan
159
170
 
160
171
  # In a serialized output, the source version should always be the present
@@ -2,7 +2,6 @@
2
2
 
3
3
  require 'logger'
4
4
  require 'active_support'
5
- require 'minitest/hooks'
6
5
 
7
6
  require 'view_model'
8
7
  require 'view_model/test_helpers'
@@ -1,7 +1,7 @@
1
1
  # frozen_string_literal: true
2
2
 
3
3
  # From https://stackoverflow.com/a/41293357
4
- module MiniTest::Assertions
4
+ module Minitest::Assertions
5
5
  class MatchEnumerator
6
6
  def initialize(expected, actual)
7
7
  @expected = expected
@@ -54,6 +54,6 @@ module MiniTest::Assertions
54
54
  result, message = MatchEnumerator.new(expected, actual).match
55
55
  assert result, message
56
56
  end
57
- end # MiniTest::Assertions
57
+ end # Minitest::Assertions
58
58
 
59
- Enumerator.infect_an_assertion :assert_match_enumerator, :must_contain_exactly
59
+ Minitest::Expectation.infect_an_assertion :assert_match_enumerator, :must_contain_exactly
@@ -3,8 +3,7 @@
3
3
  require 'view_model'
4
4
  require 'view_model/test_helpers'
5
5
 
6
- require 'minitest/unit'
7
- require 'minitest/hooks'
6
+ require 'minitest'
8
7
 
9
8
  module ViewModelSpecHelpers
10
9
  module Base
@@ -0,0 +1,28 @@
1
+ # frozen_string_literal: true
2
+
3
+ require 'bundler/setup'
4
+
5
+ require 'minitest'
6
+ Minitest.load_plugins
7
+
8
+ require 'minitest/hooks/default'
9
+ require 'minitest/hooks/test'
10
+ require 'minitest/mock'
11
+ require 'minitest/reporters'
12
+ require 'minitest/reporters/junit_reporter'
13
+
14
+ require 'rspec/expectations'
15
+ require 'rspec/expectations/minitest_integration'
16
+
17
+ FileUtils.mkdir_p('test/reports')
18
+ Minitest::Reporters.use!(
19
+ [
20
+ Minitest::Reporters::DefaultReporter.new,
21
+ Minitest::Reporters::JUnitReporter.new(
22
+ 'test/reports',
23
+ single_file: false,
24
+ ),
25
+ ],
26
+ )
27
+
28
+ require 'minitest/autorun'
@@ -1,14 +1,11 @@
1
1
  # frozen_string_literal: true
2
2
 
3
+ require_relative '../../test_helper'
4
+
3
5
  require_relative '../../helpers/arvm_test_utilities'
4
6
  require_relative '../../helpers/arvm_test_models'
5
7
  require_relative '../../helpers/viewmodel_spec_helpers'
6
8
 
7
- require 'minitest/autorun'
8
- require 'minitest/unit'
9
-
10
- require 'rspec/expectations/minitest_integration'
11
-
12
9
  require 'view_model/active_record'
13
10
 
14
11
  class ViewModel::AccessControlTest < ActiveSupport::TestCase
@@ -1,11 +1,11 @@
1
1
  # frozen_string_literal: true
2
2
 
3
+ require_relative '../../../test_helper'
4
+
3
5
  require_relative '../../../helpers/arvm_test_utilities'
4
6
  require_relative '../../../helpers/arvm_test_models'
5
7
  require_relative '../../../helpers/viewmodel_spec_helpers'
6
8
 
7
- require 'minitest/autorun'
8
-
9
9
  require 'view_model/active_record'
10
10
 
11
11
  class ViewModel::ActiveRecord::Alias < ActiveSupport::TestCase
@@ -1,11 +1,11 @@
1
1
  # frozen_string_literal: true
2
2
 
3
+ require_relative '../../../test_helper'
4
+
3
5
  require_relative '../../../helpers/arvm_test_utilities'
4
6
  require_relative '../../../helpers/arvm_test_models'
5
7
  require_relative '../../../helpers/viewmodel_spec_helpers'
6
8
 
7
- require 'minitest/autorun'
8
-
9
9
  require 'view_model/active_record'
10
10
 
11
11
  class ViewModel::ActiveRecord::BelongsToTest < ActiveSupport::TestCase
@@ -1,8 +1,6 @@
1
1
  # frozen_string_literal: true
2
2
 
3
- require 'minitest/autorun'
4
- require 'minitest/unit'
5
- require 'minitest/hooks'
3
+ require_relative '../../../test_helper'
6
4
 
7
5
  require_relative '../../../helpers/arvm_test_models'
8
6
  require_relative '../../../helpers/arvm_test_utilities'
@@ -1,13 +1,11 @@
1
1
  # frozen_string_literal: true
2
2
 
3
- require 'minitest/autorun'
4
- require 'minitest/unit'
5
- require 'minitest/hooks'
3
+ require_relative '../../../test_helper'
6
4
 
7
5
  require_relative '../../../helpers/arvm_test_models'
8
6
  require_relative '../../../helpers/viewmodel_spec_helpers'
9
7
 
10
- # MiniTest::Spec.register_spec_type(/./, Minitest::HooksSpec)
8
+ # Minitest::Spec.register_spec_type(/./, Minitest::HooksSpec)
11
9
 
12
10
  require 'view_model'
13
11
  require 'view_model/active_record'
@@ -1,15 +1,13 @@
1
1
  # frozen_string_literal: true
2
2
 
3
- require 'minitest/autorun'
4
- require 'minitest/unit'
5
- require 'minitest/hooks'
6
-
7
- require 'view_model'
8
- require 'view_model/active_record'
3
+ require_relative '../../../test_helper'
9
4
 
10
5
  require_relative '../../../helpers/controller_test_helpers'
11
6
  require_relative '../../../helpers/callback_tracer'
12
7
 
8
+ require 'view_model'
9
+ require 'view_model/active_record'
10
+
13
11
  class ViewModel::ActiveRecord::ControllerNestedTest < ActiveSupport::TestCase
14
12
  include ARVMTestUtilities
15
13
  include ControllerTestModels
@@ -1,15 +1,13 @@
1
1
  # frozen_string_literal: true
2
2
 
3
- require 'minitest/autorun'
4
- require 'minitest/unit'
5
- require 'minitest/hooks'
6
-
7
- require 'view_model'
8
- require 'view_model/active_record'
3
+ require_relative '../../../test_helper'
9
4
 
10
5
  require_relative '../../../helpers/controller_test_helpers'
11
6
  require_relative '../../../helpers/callback_tracer'
12
7
 
8
+ require 'view_model'
9
+ require 'view_model/active_record'
10
+
13
11
  class ViewModel::ActiveRecord::ControllerTest < ActiveSupport::TestCase
14
12
  include ARVMTestUtilities
15
13
  include ControllerTestModels
@@ -1,10 +1,10 @@
1
1
  # frozen_string_literal: true
2
2
 
3
+ require_relative '../../../test_helper'
4
+
3
5
  require_relative '../../../helpers/arvm_test_utilities'
4
6
  require_relative '../../../helpers/arvm_test_models'
5
7
 
6
- require 'minitest/autorun'
7
-
8
8
  require 'view_model/active_record'
9
9
 
10
10
  class ViewModel::ActiveRecord::CounterTest < ActiveSupport::TestCase
@@ -1,10 +1,10 @@
1
1
  # frozen_string_literal: true
2
2
 
3
+ require_relative '../../../test_helper'
4
+
3
5
  require_relative '../../../helpers/arvm_test_utilities'
4
6
  require_relative '../../../helpers/arvm_test_models'
5
7
 
6
- require 'minitest/autorun'
7
-
8
8
  require 'view_model/active_record'
9
9
 
10
10
  require 'renum'
@@ -1,11 +1,11 @@
1
1
  # frozen_string_literal: true
2
2
 
3
+ require_relative '../../../test_helper'
4
+
3
5
  require_relative '../../../helpers/arvm_test_utilities'
4
6
  require_relative '../../../helpers/arvm_test_models'
5
7
  require_relative '../../../helpers/viewmodel_spec_helpers'
6
8
 
7
- require 'minitest/autorun'
8
-
9
9
  require 'view_model/active_record'
10
10
 
11
11
  class ViewModel::ActiveRecord::HasManyTest < ActiveSupport::TestCase
@@ -1,10 +1,10 @@
1
1
  # frozen_string_literal: true
2
2
 
3
+ require_relative '../../../test_helper'
4
+
3
5
  require_relative '../../../helpers/arvm_test_utilities'
4
6
  require_relative '../../../helpers/arvm_test_models'
5
7
 
6
- require 'minitest/autorun'
7
-
8
8
  require 'view_model/active_record'
9
9
 
10
10
  class ViewModel::ActiveRecord::HasManyThroughPolyTest < ActiveSupport::TestCase
@@ -1,10 +1,10 @@
1
1
  # frozen_string_literal: true
2
2
 
3
+ require_relative '../../../test_helper'
4
+
3
5
  require_relative '../../../helpers/arvm_test_utilities'
4
6
  require_relative '../../../helpers/arvm_test_models'
5
7
 
6
- require 'minitest/autorun'
7
-
8
8
  require 'view_model/active_record'
9
9
 
10
10
  class ViewModel::ActiveRecord::HasManyThroughTest < ActiveSupport::TestCase
@@ -1,11 +1,11 @@
1
1
  # frozen_string_literal: true
2
2
 
3
+ require_relative '../../../test_helper'
4
+
3
5
  require_relative '../../../helpers/arvm_test_utilities'
4
6
  require_relative '../../../helpers/arvm_test_models'
5
7
  require_relative '../../../helpers/viewmodel_spec_helpers'
6
8
 
7
- require 'minitest/autorun'
8
-
9
9
  require 'view_model/active_record'
10
10
 
11
11
  class ViewModel::ActiveRecord::HasOneTest < ActiveSupport::TestCase
@@ -1,11 +1,11 @@
1
1
  # frozen_string_literal: true
2
2
 
3
+ require_relative '../../../test_helper'
4
+
3
5
  require_relative '../../../helpers/arvm_test_utilities'
4
6
  require_relative '../../../helpers/arvm_test_models'
5
7
  require_relative '../../../helpers/viewmodel_spec_helpers'
6
8
 
7
- require 'minitest/autorun'
8
-
9
9
  require 'view_model/active_record'
10
10
 
11
11
  class ViewModel::ActiveRecord::Migration < ActiveSupport::TestCase
@@ -88,10 +88,18 @@ class ViewModel::ActiveRecord::Migration < ActiveSupport::TestCase
88
88
 
89
89
  it 'migrates' do
90
90
  migrate!
91
-
92
91
  assert_equal(expected_result, subject)
93
92
  end
94
93
 
94
+ describe 'with strict migrations' do
95
+ it 'migrates' do
96
+ ViewModel::Config.stub(:strict_migration_versions, true) do
97
+ migrate!
98
+ end
99
+ assert_equal(expected_result, subject)
100
+ end
101
+ end
102
+
95
103
  describe 'to an unreachable version' do
96
104
  let(:migration_versions) { { viewmodel_class => 2, child_viewmodel_class => 1 } }
97
105
 
@@ -101,6 +109,30 @@ class ViewModel::ActiveRecord::Migration < ActiveSupport::TestCase
101
109
  end
102
110
  end
103
111
  end
112
+
113
+ describe 'leaving a version out of the request' do
114
+ let(:migration_versions) { { viewmodel_class => 2 } }
115
+ let(:parent_only_expected_result) do
116
+ v = expected_result.deep_dup
117
+ v['data']['child'] = current_serialization['data']['child'].deep_dup
118
+ v
119
+ end
120
+
121
+ it 'migrates only the included view' do
122
+ migrate!
123
+ assert_equal(parent_only_expected_result, subject)
124
+ end
125
+
126
+ describe 'with strict migrations' do
127
+ it 'refuses to migrate' do
128
+ ViewModel::Config.stub(:strict_migration_versions, true) do
129
+ assert_raises(ViewModel::Migration::StrictMigrationError) do
130
+ migrate!
131
+ end
132
+ end
133
+ end
134
+ end
135
+ end
104
136
  end
105
137
 
106
138
  describe 'upwards' do
@@ -124,10 +156,18 @@ class ViewModel::ActiveRecord::Migration < ActiveSupport::TestCase
124
156
 
125
157
  it 'migrates' do
126
158
  migrate!
127
-
128
159
  assert_equal(expected_result, subject)
129
160
  end
130
161
 
162
+ describe 'with strict migrations' do
163
+ it 'migrates' do
164
+ ViewModel::Config.stub(:strict_migration_versions, true) do
165
+ migrate!
166
+ end
167
+ assert_equal(expected_result, subject)
168
+ end
169
+ end
170
+
131
171
  describe 'with version unspecified' do
132
172
  let(:subject_data) do
133
173
  v2_serialization_data.except(ViewModel::VERSION_ATTRIBUTE)
@@ -139,6 +179,37 @@ class ViewModel::ActiveRecord::Migration < ActiveSupport::TestCase
139
179
  end
140
180
  end
141
181
 
182
+ describe 'leaving a version out of the request' do
183
+ let(:migration_versions) { { viewmodel_class => 2 } }
184
+
185
+ let(:subject_data) do
186
+ v = v2_serialization_data.deep_dup
187
+ v['child'] = current_serialization['data']['child'].deep_dup
188
+ v
189
+ end
190
+
191
+ let(:parent_only_expected_result) do
192
+ v = expected_result.deep_dup
193
+ v['data']['child'] = current_serialization['data']['child'].deep_dup
194
+ v
195
+ end
196
+
197
+ it 'migrates only the included view' do
198
+ migrate!
199
+ assert_equal(parent_only_expected_result, subject)
200
+ end
201
+
202
+ describe 'with strict migrations' do
203
+ it 'refuses to migrate' do
204
+ ViewModel::Config.stub(:strict_migration_versions, true) do
205
+ assert_raises(ViewModel::Migration::StrictMigrationError) do
206
+ migrate!
207
+ end
208
+ end
209
+ end
210
+ end
211
+ end
212
+
142
213
  describe 'with a version not in the specification' do
143
214
  let(:subject_data) do
144
215
  v2_serialization_data
@@ -1,8 +1,6 @@
1
1
  # frozen_string_literal: true
2
2
 
3
- require 'minitest/autorun'
4
- require 'minitest/unit'
5
- require 'minitest/hooks'
3
+ require_relative '../../../test_helper'
6
4
 
7
5
  require_relative '../../../helpers/arvm_test_utilities'
8
6
  require_relative '../../../helpers/arvm_test_models'
@@ -1,10 +1,10 @@
1
1
  # frozen_string_literal: true
2
2
 
3
+ require_relative '../../../test_helper'
4
+
3
5
  require_relative '../../../helpers/arvm_test_utilities'
4
6
  require_relative '../../../helpers/arvm_test_models'
5
7
 
6
- require 'minitest/autorun'
7
-
8
8
  require 'view_model/active_record'
9
9
 
10
10
  module ViewModel::ActiveRecord::PolyTest
@@ -1,10 +1,10 @@
1
1
  # frozen_string_literal: true
2
2
 
3
+ require_relative '../../../test_helper'
4
+
3
5
  require_relative '../../../helpers/arvm_test_utilities'
4
6
  require_relative '../../../helpers/arvm_test_models'
5
7
 
6
- require 'minitest/autorun'
7
-
8
8
  require 'view_model/active_record'
9
9
 
10
10
  class ViewModel::ActiveRecord::SharedTest < ActiveSupport::TestCase
@@ -1,10 +1,10 @@
1
1
  # frozen_string_literal: true
2
2
 
3
+ require_relative '../../../test_helper'
4
+
3
5
  require_relative '../../../helpers/arvm_test_utilities'
4
6
  require_relative '../../../helpers/arvm_test_models'
5
7
 
6
- require 'minitest/autorun'
7
-
8
8
  require 'view_model/active_record'
9
9
 
10
10
  class ViewModel::ActiveRecord::VersionTest < ActiveSupport::TestCase
@@ -1,11 +1,10 @@
1
1
  # frozen_string_literal: true
2
2
 
3
+ require_relative '../../test_helper'
4
+
3
5
  require_relative '../../helpers/arvm_test_utilities'
4
6
  require_relative '../../helpers/arvm_test_models'
5
7
 
6
- require 'minitest/autorun'
7
- require 'minitest/unit'
8
-
9
8
  require 'view_model/active_record'
10
9
 
11
10
  class ViewModel::ActiveRecordTest < ActiveSupport::TestCase
@@ -1,12 +1,12 @@
1
1
  # frozen_string_literal: true
2
2
 
3
+ require_relative '../../test_helper'
4
+
3
5
  require_relative '../../helpers/arvm_test_utilities'
4
6
  require_relative '../../helpers/arvm_test_models'
5
7
  require_relative '../../helpers/callback_tracer'
6
8
  require_relative '../../helpers/viewmodel_spec_helpers'
7
9
 
8
- require 'minitest/autorun'
9
-
10
10
  require 'view_model/active_record'
11
11
 
12
12
  class ViewModel::CallbacksTest < ActiveSupport::TestCase
@@ -1,8 +1,6 @@
1
1
  # frozen_string_literal: true
2
2
 
3
- require 'minitest/autorun'
4
- require 'minitest/unit'
5
- require 'minitest/hooks'
3
+ require_relative '../../test_helper'
6
4
 
7
5
  require_relative '../../helpers/arvm_test_utilities'
8
6
  require_relative '../../helpers/viewmodel_spec_helpers'
@@ -0,0 +1,37 @@
1
+ # frozen_string_literal: true
2
+
3
+ require_relative '../../../test_helper'
4
+
5
+ require 'pg'
6
+ require 'view_model'
7
+ require 'view_model/deserialization_error'
8
+
9
+ class ViewModel::DeserializationError::DatabaseConstraintTest < ActiveSupport::TestCase
10
+ extend Minitest::Spec::DSL
11
+
12
+ describe 'from_exception' do
13
+ let(:error) { ViewModel::DeserializationError::DatabaseConstraint.from_exception(exception) }
14
+
15
+ describe 'without a Postgres error' do
16
+ let(:exception) do
17
+ ActiveRecord::StatementInvalid.new(
18
+ %(PG::CheckViolation: ERROR: new row for relation "t" violates check constraint "c"\nDETAIL: Failing row contains (1, SECRET).\n))
19
+ end
20
+
21
+ it 'redacts everything from the failing row' do
22
+ expect(error.detail).to eq(
23
+ %(PG::CheckViolation: ERROR: new row for relation "t" violates check constraint "c"\nDETAIL: Failing row contains (redacted).))
24
+ end
25
+ end
26
+
27
+ describe 'without a failing row' do
28
+ let(:exception) do
29
+ ActiveRecord::StatementInvalid.new(%(PG::ForeignKeyViolation: ERROR: insert or update on table "t" violates foreign key constraint "fk"))
30
+ end
31
+
32
+ it 'retains the message' do
33
+ expect(error.detail).to eq(exception.message)
34
+ end
35
+ end
36
+ end
37
+ end
@@ -1,8 +1,6 @@
1
1
  # frozen_string_literal: true
2
2
 
3
- require 'minitest/autorun'
4
- require 'minitest/unit'
5
- require 'rspec/expectations/minitest_integration'
3
+ require_relative '../../../test_helper'
6
4
 
7
5
  require 'view_model'
8
6
  require 'view_model/deserialization_error'
@@ -1,9 +1,6 @@
1
1
  # frozen_string_literal: true
2
2
 
3
- require 'minitest/autorun'
4
- require 'minitest/unit'
5
- require 'minitest/hooks'
6
- require 'rspec/expectations/minitest_integration'
3
+ require_relative '../../test_helper'
7
4
 
8
5
  require_relative '../../helpers/arvm_test_utilities'
9
6
  require_relative '../../helpers/arvm_test_models'
@@ -104,6 +101,40 @@ class ViewModel::ErrorWrappingTest < ActiveSupport::TestCase
104
101
 
105
102
  expect(ex.message).to match(/violates check constraint/)
106
103
  end
104
+
105
+ it 'redacts the failing row' do
106
+ ex = assert_raises(ViewModel::DeserializationError::DatabaseConstraint) do
107
+ subject.wrap_active_record_errors(blame) do
108
+ model_class.create!(name: "SECRET).\nVALUE")
109
+ end
110
+ end
111
+
112
+ expect(ex.detail).to match(/violates check constraint/)
113
+ expect(ex.detail).to include('Failing row contains (redacted).')
114
+ expect(ex.detail).not_to include('SECRET')
115
+ expect(ex.detail).not_to include('VALUE')
116
+ expect(ex.nodes).to eq([blame])
117
+ end
118
+ end
119
+
120
+ describe 'not-null constraint' do
121
+ def model_attributes
122
+ super.merge(
123
+ schema: ->(t) { t.string :required, null: false },
124
+ )
125
+ end
126
+
127
+ it 'redacts the failing row' do
128
+ ex = assert_raises(ViewModel::DeserializationError::DatabaseConstraint) do
129
+ subject.wrap_active_record_errors(blame) do
130
+ model_class.create!(name: 'SECRET')
131
+ end
132
+ end
133
+
134
+ expect(ex.detail).to match(/null value in column "required" .* violates not-null constraint/)
135
+ expect(ex.detail).to include('Failing row contains (redacted).')
136
+ expect(ex.detail).not_to include('SECRET')
137
+ end
107
138
  end
108
139
 
109
140
  describe 'unique constraint' do
@@ -1,7 +1,6 @@
1
1
  # frozen_string_literal: true
2
2
 
3
- require 'minitest/autorun'
4
- require 'minitest/unit'
3
+ require_relative '../../test_helper'
5
4
 
6
5
  require 'view_model'
7
6
  require 'view_model/garbage_collection'
@@ -1,9 +1,8 @@
1
1
  # frozen_string_literal: true
2
2
 
3
- require_relative '../../helpers/test_access_control'
3
+ require_relative '../../test_helper'
4
4
 
5
- require 'minitest/autorun'
6
- require 'minitest/unit'
5
+ require_relative '../../helpers/test_access_control'
7
6
 
8
7
  require 'view_model'
9
8
  require 'view_model/record'
@@ -1,8 +1,6 @@
1
1
  # frozen_string_literal: true
2
2
 
3
- require 'minitest/autorun'
4
- require 'minitest/unit'
5
- require 'minitest/hooks'
3
+ require_relative '../../test_helper'
6
4
 
7
5
  require_relative '../../helpers/arvm_test_utilities'
8
6
  require_relative '../../helpers/arvm_test_models'
@@ -1,8 +1,6 @@
1
1
  # frozen_string_literal: true
2
2
 
3
- require 'minitest/autorun'
4
- require 'minitest/unit'
5
- require 'minitest/hooks'
3
+ require_relative "../../test_helper"
6
4
 
7
5
  require_relative '../../helpers/match_enumerator'
8
6
  require_relative '../../helpers/arvm_test_utilities'
@@ -1,9 +1,6 @@
1
1
  # frozen_string_literal: true
2
2
 
3
- require 'bundler/setup'
4
- Bundler.require
5
-
6
- require 'minitest/autorun'
3
+ require_relative '../test_helper'
7
4
 
8
5
  class DefaultViewModel < ViewModel
9
6
  self.view_name = 'DefaultViewModel'
metadata CHANGED
@@ -1,14 +1,13 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: iknow_view_models
3
3
  version: !ruby/object:Gem::Version
4
- version: 3.14.3
4
+ version: 3.14.5
5
5
  platform: ruby
6
6
  authors:
7
7
  - iKnow Team
8
- autorequire:
9
8
  bindir: bin
10
9
  cert_chain: []
11
- date: 2025-09-22 00:00:00.000000000 Z
10
+ date: 1980-01-02 00:00:00.000000000 Z
12
11
  dependencies:
13
12
  - !ruby/object:Gem::Dependency
14
13
  name: actionpack
@@ -290,6 +289,20 @@ dependencies:
290
289
  - - ">="
291
290
  - !ruby/object:Gem::Version
292
291
  version: '0'
292
+ - !ruby/object:Gem::Dependency
293
+ name: minitest
294
+ requirement: !ruby/object:Gem::Requirement
295
+ requirements:
296
+ - - "~>"
297
+ - !ruby/object:Gem::Version
298
+ version: 6.0.0
299
+ type: :development
300
+ prerelease: false
301
+ version_requirements: !ruby/object:Gem::Requirement
302
+ requirements:
303
+ - - "~>"
304
+ - !ruby/object:Gem::Version
305
+ version: 6.0.0
293
306
  - !ruby/object:Gem::Dependency
294
307
  name: minitest-hooks
295
308
  requirement: !ruby/object:Gem::Requirement
@@ -304,6 +317,34 @@ dependencies:
304
317
  - - ">="
305
318
  - !ruby/object:Gem::Version
306
319
  version: '0'
320
+ - !ruby/object:Gem::Dependency
321
+ name: minitest-mock
322
+ requirement: !ruby/object:Gem::Requirement
323
+ requirements:
324
+ - - ">="
325
+ - !ruby/object:Gem::Version
326
+ version: '0'
327
+ type: :development
328
+ prerelease: false
329
+ version_requirements: !ruby/object:Gem::Requirement
330
+ requirements:
331
+ - - ">="
332
+ - !ruby/object:Gem::Version
333
+ version: '0'
334
+ - !ruby/object:Gem::Dependency
335
+ name: minitest-reporters
336
+ requirement: !ruby/object:Gem::Requirement
337
+ requirements:
338
+ - - ">="
339
+ - !ruby/object:Gem::Version
340
+ version: '0'
341
+ type: :development
342
+ prerelease: false
343
+ version_requirements: !ruby/object:Gem::Requirement
344
+ requirements:
345
+ - - ">="
346
+ - !ruby/object:Gem::Version
347
+ version: '0'
307
348
  - !ruby/object:Gem::Dependency
308
349
  name: pg
309
350
  requirement: !ruby/object:Gem::Requirement
@@ -392,7 +433,6 @@ files:
392
433
  - LICENSE.txt
393
434
  - README.md
394
435
  - Rakefile
395
- - gemfiles/rails_6_1.gemfile
396
436
  - gemfiles/rails_7_0.gemfile
397
437
  - gemfiles/rails_7_1.gemfile
398
438
  - iknow_view_models.gemspec
@@ -437,6 +477,7 @@ files:
437
477
  - lib/view_model/migration.rb
438
478
  - lib/view_model/migration/no_path_error.rb
439
479
  - lib/view_model/migration/one_way_error.rb
480
+ - lib/view_model/migration/strict_migration_error.rb
440
481
  - lib/view_model/migration/unspecified_version_error.rb
441
482
  - lib/view_model/migrator.rb
442
483
  - lib/view_model/record.rb
@@ -465,6 +506,7 @@ files:
465
506
  - test/helpers/query_logging.rb
466
507
  - test/helpers/test_access_control.rb
467
508
  - test/helpers/viewmodel_spec_helpers.rb
509
+ - test/test_helper.rb
468
510
  - test/unit/view_model/access_control_test.rb
469
511
  - test/unit/view_model/active_record/alias_test.rb
470
512
  - test/unit/view_model/active_record/belongs_to_test.rb
@@ -486,6 +528,7 @@ files:
486
528
  - test/unit/view_model/active_record_test.rb
487
529
  - test/unit/view_model/callbacks_test.rb
488
530
  - test/unit/view_model/controller_test.rb
531
+ - test/unit/view_model/deserialization_error/database_constraint_test.rb
489
532
  - test/unit/view_model/deserialization_error/unique_violation_test.rb
490
533
  - test/unit/view_model/error_wrapping_test.rb
491
534
  - test/unit/view_model/garbage_collection_test.rb
@@ -497,7 +540,6 @@ homepage: https://github.com/iknow/cerego_view_models
497
540
  licenses:
498
541
  - MIT
499
542
  metadata: {}
500
- post_install_message:
501
543
  rdoc_options: []
502
544
  require_paths:
503
545
  - lib
@@ -512,8 +554,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
512
554
  - !ruby/object:Gem::Version
513
555
  version: '0'
514
556
  requirements: []
515
- rubygems_version: 3.1.6
516
- signing_key:
557
+ rubygems_version: 3.6.9
517
558
  specification_version: 4
518
559
  summary: ViewModels provide a means of encapsulating a collection of related data
519
560
  and specifying its JSON serialization.
@@ -528,6 +569,7 @@ test_files:
528
569
  - test/helpers/query_logging.rb
529
570
  - test/helpers/test_access_control.rb
530
571
  - test/helpers/viewmodel_spec_helpers.rb
572
+ - test/test_helper.rb
531
573
  - test/unit/view_model/access_control_test.rb
532
574
  - test/unit/view_model/active_record/alias_test.rb
533
575
  - test/unit/view_model/active_record/belongs_to_test.rb
@@ -549,6 +591,7 @@ test_files:
549
591
  - test/unit/view_model/active_record_test.rb
550
592
  - test/unit/view_model/callbacks_test.rb
551
593
  - test/unit/view_model/controller_test.rb
594
+ - test/unit/view_model/deserialization_error/database_constraint_test.rb
552
595
  - test/unit/view_model/deserialization_error/unique_violation_test.rb
553
596
  - test/unit/view_model/error_wrapping_test.rb
554
597
  - test/unit/view_model/garbage_collection_test.rb
@@ -1,10 +0,0 @@
1
- # This file was generated by Appraisal
2
-
3
- source 'https://rubygems.org'
4
-
5
- gem 'minitest-ci'
6
- gem 'activerecord', '~> 6.1.0'
7
- gem 'activesupport', '~> 6.1.0'
8
- gem 'actionpack', '~> 6.1.0'
9
-
10
- gemspec path: '../'