active_type 1.10.0 → 2.1.1
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.
- checksums.yaml +4 -4
- data/.github/workflows/test.yml +23 -15
- data/.ruby-version +1 -1
- data/CHANGELOG.md +17 -0
- data/Gemfile.4.2.mysql2.lock +1 -1
- data/Gemfile.4.2.pg.lock +1 -1
- data/Gemfile.4.2.sqlite3.lock +1 -1
- data/Gemfile.5.2.mysql2.lock +1 -1
- data/Gemfile.5.2.pg.lock +2 -2
- data/Gemfile.5.2.sqlite3.lock +1 -1
- data/Gemfile.6.0.sqlite3.lock +1 -1
- data/Gemfile.6.1.pg.lock +2 -1
- data/Gemfile.6.1.sqlite3.lock +2 -1
- data/Gemfile.7.0.pg +9 -0
- data/Gemfile.7.0.pg.lock +58 -0
- data/Gemfile.7.0.sqlite3 +9 -0
- data/Gemfile.7.0.sqlite3.lock +58 -0
- data/README.md +5 -3
- data/active_type.gemspec +3 -2
- data/lib/active_type/mutation_after_cast_error.rb +6 -0
- data/lib/active_type/not_castable_error.rb +6 -0
- data/lib/active_type/record_extension/inheritance.rb +1 -1
- data/lib/active_type/util/unmutable_attributes.rb +32 -0
- data/lib/active_type/util.rb +32 -5
- data/lib/active_type/version.rb +1 -1
- data/lib/active_type/virtual_attributes.rb +1 -1
- metadata +15 -7
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA256:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: b0a5d8d33884c5002323fee2411daea972323f973b14f885ea5b3c6336569f8f
|
|
4
|
+
data.tar.gz: 4b29935992035498d74b4c4d80c1041e17adc890234f81357828fe71e723288d
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: a853c942d84f065a4f1be9fad10801f635f5d759bbb969bc655d2160d0e9757f579147f0197f52af0335eb412e1cea164a78eff56ce6747f9ca36a2340fdb36f
|
|
7
|
+
data.tar.gz: b91df99ae7b73ee3702d05b9d70bcde4a45623054293cc3ccbcedd3d6c83c22a5ac2261ca140730fd5afd3299c96ad71b275102a0ac5612260e0d5771cc11f8d
|
data/.github/workflows/test.yml
CHANGED
|
@@ -2,9 +2,9 @@ name: Tests
|
|
|
2
2
|
|
|
3
3
|
on:
|
|
4
4
|
push:
|
|
5
|
-
branches: [
|
|
5
|
+
branches: [master]
|
|
6
6
|
pull_request:
|
|
7
|
-
branches: [
|
|
7
|
+
branches: [master]
|
|
8
8
|
|
|
9
9
|
jobs:
|
|
10
10
|
test_sqlite:
|
|
@@ -28,16 +28,22 @@ jobs:
|
|
|
28
28
|
gemfile: Gemfile.6.0.sqlite3
|
|
29
29
|
- ruby: "2.6.3"
|
|
30
30
|
gemfile: Gemfile.6.1.sqlite3
|
|
31
|
-
- ruby: "2.
|
|
31
|
+
- ruby: "2.6.3"
|
|
32
|
+
gemfile: Gemfile.7.0.sqlite3
|
|
33
|
+
- ruby: "2.7.4"
|
|
32
34
|
gemfile: Gemfile.5.2.sqlite3
|
|
33
|
-
- ruby: "2.7.
|
|
35
|
+
- ruby: "2.7.4"
|
|
34
36
|
gemfile: Gemfile.6.0.sqlite3
|
|
35
|
-
- ruby: "2.7.
|
|
37
|
+
- ruby: "2.7.4"
|
|
36
38
|
gemfile: Gemfile.6.1.sqlite3
|
|
39
|
+
- ruby: "2.7.4"
|
|
40
|
+
gemfile: Gemfile.7.0.sqlite3
|
|
37
41
|
- ruby: "3.0.1"
|
|
38
42
|
gemfile: Gemfile.6.0.sqlite3
|
|
39
43
|
- ruby: "3.0.1"
|
|
40
44
|
gemfile: Gemfile.6.1.sqlite3
|
|
45
|
+
- ruby: "3.0.1"
|
|
46
|
+
gemfile: Gemfile.7.0.sqlite3
|
|
41
47
|
|
|
42
48
|
env:
|
|
43
49
|
BUNDLE_GEMFILE: ${{ matrix.gemfile }}
|
|
@@ -50,12 +56,11 @@ jobs:
|
|
|
50
56
|
ruby-version: ${{ matrix.ruby }}
|
|
51
57
|
- name: Bundle
|
|
52
58
|
run: |
|
|
53
|
-
gem install bundler:2.
|
|
59
|
+
gem install bundler:2.2.27
|
|
54
60
|
bundle install --no-deployment
|
|
55
61
|
- name: Run tests
|
|
56
62
|
run: bundle exec rake spec
|
|
57
63
|
|
|
58
|
-
|
|
59
64
|
test_mysql:
|
|
60
65
|
runs-on: ubuntu-20.04
|
|
61
66
|
|
|
@@ -65,7 +70,7 @@ jobs:
|
|
|
65
70
|
env:
|
|
66
71
|
MYSQL_ROOT_PASSWORD: password
|
|
67
72
|
ports:
|
|
68
|
-
|
|
73
|
+
- 3306:3306
|
|
69
74
|
options: >-
|
|
70
75
|
--health-cmd="mysqladmin ping"
|
|
71
76
|
--health-interval=10s
|
|
@@ -80,7 +85,7 @@ jobs:
|
|
|
80
85
|
gemfile: Gemfile.4.2.mysql2
|
|
81
86
|
- ruby: "2.6.3"
|
|
82
87
|
gemfile: Gemfile.5.2.mysql2
|
|
83
|
-
- ruby: "2.7.
|
|
88
|
+
- ruby: "2.7.4"
|
|
84
89
|
gemfile: Gemfile.5.2.mysql2
|
|
85
90
|
|
|
86
91
|
env:
|
|
@@ -95,10 +100,10 @@ jobs:
|
|
|
95
100
|
- name: Install database client
|
|
96
101
|
run: |
|
|
97
102
|
sudo apt-get update
|
|
98
|
-
sudo apt-get install -y
|
|
103
|
+
sudo apt-get install -y mariadb-client libmariadbclient-dev
|
|
99
104
|
- name: Bundle
|
|
100
105
|
run: |
|
|
101
|
-
gem install bundler:2.
|
|
106
|
+
gem install bundler:2.2.27
|
|
102
107
|
bundle install --no-deployment
|
|
103
108
|
- name: Setup databases
|
|
104
109
|
run: |
|
|
@@ -106,7 +111,6 @@ jobs:
|
|
|
106
111
|
- name: Run tests
|
|
107
112
|
run: bundle exec rake spec
|
|
108
113
|
|
|
109
|
-
|
|
110
114
|
test_pg:
|
|
111
115
|
runs-on: ubuntu-20.04
|
|
112
116
|
|
|
@@ -137,12 +141,16 @@ jobs:
|
|
|
137
141
|
gemfile: Gemfile.5.2.pg
|
|
138
142
|
- ruby: "2.6.3"
|
|
139
143
|
gemfile: Gemfile.6.1.pg
|
|
140
|
-
- ruby: "2.7.
|
|
144
|
+
- ruby: "2.7.4"
|
|
141
145
|
gemfile: Gemfile.5.2.pg
|
|
142
|
-
- ruby: "2.7.
|
|
146
|
+
- ruby: "2.7.4"
|
|
143
147
|
gemfile: Gemfile.6.1.pg
|
|
148
|
+
- ruby: "2.7.4"
|
|
149
|
+
gemfile: Gemfile.7.0.pg
|
|
144
150
|
- ruby: "3.0.1"
|
|
145
151
|
gemfile: Gemfile.6.1.pg
|
|
152
|
+
- ruby: "3.0.1"
|
|
153
|
+
gemfile: Gemfile.7.0.pg
|
|
146
154
|
|
|
147
155
|
env:
|
|
148
156
|
BUNDLE_GEMFILE: ${{ matrix.gemfile }}
|
|
@@ -158,7 +166,7 @@ jobs:
|
|
|
158
166
|
sudo apt-get install -y postgresql-client
|
|
159
167
|
- name: Bundle
|
|
160
168
|
run: |
|
|
161
|
-
gem install bundler:2.
|
|
169
|
+
gem install bundler:2.2.27
|
|
162
170
|
bundle install --no-deployment
|
|
163
171
|
- name: Setup databases
|
|
164
172
|
run: |
|
data/.ruby-version
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
2.
|
|
1
|
+
2.7.4
|
data/CHANGELOG.md
CHANGED
|
@@ -4,6 +4,23 @@ All notable changes to this project will be documented in this file.
|
|
|
4
4
|
|
|
5
5
|
## Unreleased changes
|
|
6
6
|
|
|
7
|
+
## 2.1.1 (2021-12-22)
|
|
8
|
+
|
|
9
|
+
* Fixed: Ruby compiler warning and suboptimal attribut name validation. Thanks to @remofrizsche.
|
|
10
|
+
|
|
11
|
+
## 2.1.0 (2021-12-22)
|
|
12
|
+
|
|
13
|
+
* Fixed: ActiveType now works for Rails 7.
|
|
14
|
+
|
|
15
|
+
## 2.0.0 (2021-11-24)
|
|
16
|
+
|
|
17
|
+
* Added: Casting is prevented when the base record has changes in its already loaded associations, because those would be lost. Option `force: true` can be used to override this and still do the cast (this is not recommended).
|
|
18
|
+
* Added: After casting, the base record will not be usable any more. The base record and the newly created casted record share state which is unexpected. Option `force: true` can be used to override this, so the base record is still usable (this is not recommended).
|
|
19
|
+
|
|
20
|
+
## 1.10.1 (2021-10-19)
|
|
21
|
+
|
|
22
|
+
* Removed: When casting an unsaved record, the new record will no longer have the same associations as the base record. This was introduced with version 1.8.0 and lead to issues (#147 and #148). Therefore the change was rolled back.
|
|
23
|
+
|
|
7
24
|
## 1.10.0 (2021-08-11)
|
|
8
25
|
|
|
9
26
|
* Removed: Tests for Ruby 2.4 and ActiveRecord 3.2.
|
data/Gemfile.4.2.mysql2.lock
CHANGED
data/Gemfile.4.2.pg.lock
CHANGED
data/Gemfile.4.2.sqlite3.lock
CHANGED
data/Gemfile.5.2.mysql2.lock
CHANGED
data/Gemfile.5.2.pg.lock
CHANGED
data/Gemfile.5.2.sqlite3.lock
CHANGED
data/Gemfile.6.0.sqlite3.lock
CHANGED
data/Gemfile.6.1.pg.lock
CHANGED
data/Gemfile.6.1.sqlite3.lock
CHANGED
data/Gemfile.7.0.pg
ADDED
data/Gemfile.7.0.pg.lock
ADDED
|
@@ -0,0 +1,58 @@
|
|
|
1
|
+
PATH
|
|
2
|
+
remote: .
|
|
3
|
+
specs:
|
|
4
|
+
active_type (2.1.1)
|
|
5
|
+
activerecord (>= 3.2)
|
|
6
|
+
|
|
7
|
+
GEM
|
|
8
|
+
remote: https://rubygems.org/
|
|
9
|
+
specs:
|
|
10
|
+
activemodel (6.1.4.4)
|
|
11
|
+
activesupport (= 6.1.4.4)
|
|
12
|
+
activerecord (6.1.4.4)
|
|
13
|
+
activemodel (= 6.1.4.4)
|
|
14
|
+
activesupport (= 6.1.4.4)
|
|
15
|
+
activesupport (6.1.4.4)
|
|
16
|
+
concurrent-ruby (~> 1.0, >= 1.0.2)
|
|
17
|
+
i18n (>= 1.6, < 2)
|
|
18
|
+
minitest (>= 5.1)
|
|
19
|
+
tzinfo (~> 2.0)
|
|
20
|
+
zeitwerk (~> 2.3)
|
|
21
|
+
concurrent-ruby (1.1.9)
|
|
22
|
+
diff-lcs (1.4.4)
|
|
23
|
+
gemika (0.6.1)
|
|
24
|
+
i18n (1.8.11)
|
|
25
|
+
concurrent-ruby (~> 1.0)
|
|
26
|
+
minitest (5.15.0)
|
|
27
|
+
pg (1.2.3)
|
|
28
|
+
rake (13.0.6)
|
|
29
|
+
rspec (3.10.0)
|
|
30
|
+
rspec-core (~> 3.10.0)
|
|
31
|
+
rspec-expectations (~> 3.10.0)
|
|
32
|
+
rspec-mocks (~> 3.10.0)
|
|
33
|
+
rspec-core (3.10.1)
|
|
34
|
+
rspec-support (~> 3.10.0)
|
|
35
|
+
rspec-expectations (3.10.1)
|
|
36
|
+
diff-lcs (>= 1.2.0, < 2.0)
|
|
37
|
+
rspec-support (~> 3.10.0)
|
|
38
|
+
rspec-mocks (3.10.2)
|
|
39
|
+
diff-lcs (>= 1.2.0, < 2.0)
|
|
40
|
+
rspec-support (~> 3.10.0)
|
|
41
|
+
rspec-support (3.10.3)
|
|
42
|
+
tzinfo (2.0.4)
|
|
43
|
+
concurrent-ruby (~> 1.0)
|
|
44
|
+
zeitwerk (2.5.1)
|
|
45
|
+
|
|
46
|
+
PLATFORMS
|
|
47
|
+
ruby
|
|
48
|
+
|
|
49
|
+
DEPENDENCIES
|
|
50
|
+
active_type!
|
|
51
|
+
activerecord (~> 6.1.0)
|
|
52
|
+
gemika
|
|
53
|
+
pg
|
|
54
|
+
rake
|
|
55
|
+
rspec (~> 3.4)
|
|
56
|
+
|
|
57
|
+
BUNDLED WITH
|
|
58
|
+
2.1.4
|
data/Gemfile.7.0.sqlite3
ADDED
|
@@ -0,0 +1,58 @@
|
|
|
1
|
+
PATH
|
|
2
|
+
remote: .
|
|
3
|
+
specs:
|
|
4
|
+
active_type (2.1.1)
|
|
5
|
+
activerecord (>= 3.2)
|
|
6
|
+
|
|
7
|
+
GEM
|
|
8
|
+
remote: https://rubygems.org/
|
|
9
|
+
specs:
|
|
10
|
+
activemodel (6.1.4.4)
|
|
11
|
+
activesupport (= 6.1.4.4)
|
|
12
|
+
activerecord (6.1.4.4)
|
|
13
|
+
activemodel (= 6.1.4.4)
|
|
14
|
+
activesupport (= 6.1.4.4)
|
|
15
|
+
activesupport (6.1.4.4)
|
|
16
|
+
concurrent-ruby (~> 1.0, >= 1.0.2)
|
|
17
|
+
i18n (>= 1.6, < 2)
|
|
18
|
+
minitest (>= 5.1)
|
|
19
|
+
tzinfo (~> 2.0)
|
|
20
|
+
zeitwerk (~> 2.3)
|
|
21
|
+
concurrent-ruby (1.1.9)
|
|
22
|
+
diff-lcs (1.4.4)
|
|
23
|
+
gemika (0.6.1)
|
|
24
|
+
i18n (1.8.11)
|
|
25
|
+
concurrent-ruby (~> 1.0)
|
|
26
|
+
minitest (5.15.0)
|
|
27
|
+
rake (13.0.6)
|
|
28
|
+
rspec (3.10.0)
|
|
29
|
+
rspec-core (~> 3.10.0)
|
|
30
|
+
rspec-expectations (~> 3.10.0)
|
|
31
|
+
rspec-mocks (~> 3.10.0)
|
|
32
|
+
rspec-core (3.10.1)
|
|
33
|
+
rspec-support (~> 3.10.0)
|
|
34
|
+
rspec-expectations (3.10.1)
|
|
35
|
+
diff-lcs (>= 1.2.0, < 2.0)
|
|
36
|
+
rspec-support (~> 3.10.0)
|
|
37
|
+
rspec-mocks (3.10.2)
|
|
38
|
+
diff-lcs (>= 1.2.0, < 2.0)
|
|
39
|
+
rspec-support (~> 3.10.0)
|
|
40
|
+
rspec-support (3.10.3)
|
|
41
|
+
sqlite3 (1.4.2)
|
|
42
|
+
tzinfo (2.0.4)
|
|
43
|
+
concurrent-ruby (~> 1.0)
|
|
44
|
+
zeitwerk (2.5.1)
|
|
45
|
+
|
|
46
|
+
PLATFORMS
|
|
47
|
+
ruby
|
|
48
|
+
|
|
49
|
+
DEPENDENCIES
|
|
50
|
+
active_type!
|
|
51
|
+
activerecord (~> 6.1.0)
|
|
52
|
+
gemika
|
|
53
|
+
rake
|
|
54
|
+
rspec (~> 3.4)
|
|
55
|
+
sqlite3
|
|
56
|
+
|
|
57
|
+
BUNDLED WITH
|
|
58
|
+
2.1.4
|
data/README.md
CHANGED
|
@@ -53,7 +53,7 @@ end
|
|
|
53
53
|
|
|
54
54
|
### A note on Rails 5+
|
|
55
55
|
|
|
56
|
-
Rails 5 comes with its own implementation of `.attribute`. This implementation is functionally very
|
|
56
|
+
Rails 5+ comes with its own implementation of `.attribute`. This implementation is functionally very
|
|
57
57
|
similar, but not identical to ActiveType's.
|
|
58
58
|
|
|
59
59
|
We have decided to continue to use our own implementation. This means that if you use ActiveType, `ActiveRecord::Base.attribute` will be overriden.
|
|
@@ -364,8 +364,10 @@ sign_up.is_a?(SignUp) # => true
|
|
|
364
364
|
This is basically like [`ActiveRecord#becomes`](http://apidock.com/rails/v4.2.1/ActiveRecord/Persistence/becomes), but with less bugs and more consistent behavior.
|
|
365
365
|
|
|
366
366
|
**Note that `cast` is destructive.** The originally casted record (`user`) and the returned record (`sign_up`)
|
|
367
|
-
share internal state (such as attributes). To avoid unexpected behavior,
|
|
368
|
-
|
|
367
|
+
share internal state (such as attributes). To avoid unexpected behavior, the original record will raise an error when trying to change or persist it. Also, casting of a record that has changes in its loaded associations is prevented, because those changes would be lost.
|
|
368
|
+
If you know what you are doing and absolutely want that, you may use the option `force: true` to allow this potentially problematic behaviour, e.g. `sign_up = ActiveType.cast(user, SignUp, force: true)`
|
|
369
|
+
|
|
370
|
+
|
|
369
371
|
|
|
370
372
|
You can also cast an entire relation (scope) to a relation of an `ActiveType::Record`:
|
|
371
373
|
|
data/active_type.gemspec
CHANGED
|
@@ -10,16 +10,17 @@ Gem::Specification.new do |s|
|
|
|
10
10
|
s.summary = 'Make any Ruby object quack like ActiveRecord'
|
|
11
11
|
s.description = s.summary
|
|
12
12
|
s.license = 'MIT'
|
|
13
|
+
s.metadata = { 'rubygems_mfa_required' => 'true' }
|
|
13
14
|
|
|
14
15
|
s.files = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
|
|
15
16
|
s.executables = s.files.grep(%r{^bin/}) { |f| File.basename(f) }
|
|
16
17
|
s.test_files = s.files.grep(%r{^(test|spec|features)/})
|
|
17
18
|
s.require_paths = ["lib"]
|
|
18
19
|
|
|
19
|
-
s.add_development_dependency "bundler", "
|
|
20
|
+
s.add_development_dependency "bundler", ">= 1.5"
|
|
20
21
|
s.add_development_dependency "rake"
|
|
21
22
|
|
|
22
23
|
s.add_runtime_dependency('activerecord', '>= 3.2')
|
|
23
24
|
|
|
24
|
-
s.required_ruby_version = '>=
|
|
25
|
+
s.required_ruby_version = '>= 2.5.0'
|
|
25
26
|
end
|
|
@@ -120,7 +120,7 @@ module ActiveType
|
|
|
120
120
|
type_name = base_class.type_for_attribute(inheritance_column).cast(type_name)
|
|
121
121
|
subclass = begin
|
|
122
122
|
if store_full_sti_class
|
|
123
|
-
|
|
123
|
+
type_name.constantize
|
|
124
124
|
else
|
|
125
125
|
compute_type(type_name)
|
|
126
126
|
end
|
|
@@ -0,0 +1,32 @@
|
|
|
1
|
+
require 'active_type/mutation_after_cast_error'
|
|
2
|
+
|
|
3
|
+
module ActiveType
|
|
4
|
+
module Util
|
|
5
|
+
|
|
6
|
+
# This object is used as a substitute for a record's @attributes.
|
|
7
|
+
# Reading from the original @attributes is still allowed, to enable
|
|
8
|
+
# `#inspect` and similar functions.
|
|
9
|
+
# But the @attributes can no longer be mutated and will raise instead.
|
|
10
|
+
class UnmutableAttributes
|
|
11
|
+
|
|
12
|
+
attr_reader :original_attributes
|
|
13
|
+
|
|
14
|
+
def initialize(attributes)
|
|
15
|
+
@original_attributes = attributes
|
|
16
|
+
end
|
|
17
|
+
|
|
18
|
+
def fetch_value(key)
|
|
19
|
+
original_attributes.fetch_value(key)
|
|
20
|
+
end
|
|
21
|
+
|
|
22
|
+
def key?(key)
|
|
23
|
+
original_attributes.key?(key)
|
|
24
|
+
end
|
|
25
|
+
|
|
26
|
+
def method_missing(*args)
|
|
27
|
+
raise MutationAfterCastError, 'Changing a record that has been used to create an ActiveType::Record could have unexpected side effects!'
|
|
28
|
+
end
|
|
29
|
+
|
|
30
|
+
end
|
|
31
|
+
end
|
|
32
|
+
end
|
data/lib/active_type/util.rb
CHANGED
|
@@ -1,11 +1,14 @@
|
|
|
1
|
+
require 'active_type/not_castable_error'
|
|
2
|
+
require 'active_type/util/unmutable_attributes'
|
|
3
|
+
|
|
1
4
|
module ActiveType
|
|
2
5
|
module Util
|
|
3
6
|
|
|
4
|
-
def cast(object, klass)
|
|
7
|
+
def cast(object, klass, force: false)
|
|
5
8
|
if object.is_a?(ActiveRecord::Relation)
|
|
6
9
|
cast_relation(object, klass)
|
|
7
10
|
elsif object.is_a?(ActiveRecord::Base)
|
|
8
|
-
cast_record(object, klass)
|
|
11
|
+
cast_record(object, klass, force: force)
|
|
9
12
|
else
|
|
10
13
|
raise ArgumentError, "Don't know how to cast #{object.inspect}"
|
|
11
14
|
end
|
|
@@ -17,7 +20,11 @@ module ActiveType
|
|
|
17
20
|
|
|
18
21
|
private
|
|
19
22
|
|
|
20
|
-
def cast_record(record, klass)
|
|
23
|
+
def cast_record(record, klass, force: false)
|
|
24
|
+
if associations_touched?(record) && !force
|
|
25
|
+
raise NotCastableError, 'Record has changes in its loaded associations!'
|
|
26
|
+
end
|
|
27
|
+
|
|
21
28
|
# record.becomes(klass).dup
|
|
22
29
|
klass.new do |casted|
|
|
23
30
|
using_single_table_inheritance = using_single_table_inheritance?(klass, casted)
|
|
@@ -37,8 +44,6 @@ module ActiveType
|
|
|
37
44
|
# Rails 5.2+
|
|
38
45
|
casted.instance_variable_set(:@mutations_from_database, record.instance_variable_get(:@mutations_from_database))
|
|
39
46
|
|
|
40
|
-
casted.instance_variable_set(:@association_cache, record.instance_variable_get(:@association_cache))
|
|
41
|
-
|
|
42
47
|
# Rails 3.2, 4.2
|
|
43
48
|
errors = record.errors
|
|
44
49
|
if errors.kind_of? ActiveModel::Errors
|
|
@@ -50,6 +55,11 @@ module ActiveType
|
|
|
50
55
|
casted.instance_variable_set(:@errors, errors)
|
|
51
56
|
|
|
52
57
|
casted[klass.inheritance_column] = klass.sti_name if using_single_table_inheritance
|
|
58
|
+
|
|
59
|
+
if !force
|
|
60
|
+
make_record_unusable(record)
|
|
61
|
+
end
|
|
62
|
+
casted
|
|
53
63
|
end
|
|
54
64
|
end
|
|
55
65
|
|
|
@@ -63,6 +73,23 @@ module ActiveType
|
|
|
63
73
|
scoped(klass).merge(scoped(relation))
|
|
64
74
|
end
|
|
65
75
|
|
|
76
|
+
def associations_touched?(record)
|
|
77
|
+
return false unless record.instance_variable_get(:@association_cache)
|
|
78
|
+
|
|
79
|
+
!!record.instance_variable_get(:@association_cache)[:associated_records]&.target&.any? do |target|
|
|
80
|
+
target.changed?
|
|
81
|
+
end
|
|
82
|
+
end
|
|
83
|
+
|
|
84
|
+
def make_record_unusable(record)
|
|
85
|
+
# Changing and saving the base record may lead to unexpected behaviour,
|
|
86
|
+
# since the casted record may have different changes in its autosave
|
|
87
|
+
# associations and will be saved to the same record in the database as
|
|
88
|
+
# the casted record. Therefore we prevent that.
|
|
89
|
+
original_attributes = record.instance_variable_get(:@attributes)
|
|
90
|
+
record.instance_variable_set(:@attributes, UnmutableAttributes.new(original_attributes) )
|
|
91
|
+
end
|
|
92
|
+
|
|
66
93
|
extend self
|
|
67
94
|
|
|
68
95
|
end
|
data/lib/active_type/version.rb
CHANGED
|
@@ -112,7 +112,7 @@ module ActiveType
|
|
|
112
112
|
end
|
|
113
113
|
|
|
114
114
|
def validate_attribute_name!(name)
|
|
115
|
-
unless name.to_s =~ /\A[A-z0-9_]*\z/
|
|
115
|
+
unless name.to_s =~ /\A[A-Za-z0-9_]*\z/
|
|
116
116
|
raise InvalidAttributeNameError.new("'#{name}' is not a valid name for a virtual attribute")
|
|
117
117
|
end
|
|
118
118
|
end
|
metadata
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
|
2
2
|
name: active_type
|
|
3
3
|
version: !ruby/object:Gem::Version
|
|
4
|
-
version: 1.
|
|
4
|
+
version: 2.1.1
|
|
5
5
|
platform: ruby
|
|
6
6
|
authors:
|
|
7
7
|
- Tobias Kraze
|
|
@@ -9,20 +9,20 @@ authors:
|
|
|
9
9
|
autorequire:
|
|
10
10
|
bindir: bin
|
|
11
11
|
cert_chain: []
|
|
12
|
-
date:
|
|
12
|
+
date: 2022-02-15 00:00:00.000000000 Z
|
|
13
13
|
dependencies:
|
|
14
14
|
- !ruby/object:Gem::Dependency
|
|
15
15
|
name: bundler
|
|
16
16
|
requirement: !ruby/object:Gem::Requirement
|
|
17
17
|
requirements:
|
|
18
|
-
- - "
|
|
18
|
+
- - ">="
|
|
19
19
|
- !ruby/object:Gem::Version
|
|
20
20
|
version: '1.5'
|
|
21
21
|
type: :development
|
|
22
22
|
prerelease: false
|
|
23
23
|
version_requirements: !ruby/object:Gem::Requirement
|
|
24
24
|
requirements:
|
|
25
|
-
- - "
|
|
25
|
+
- - ">="
|
|
26
26
|
- !ruby/object:Gem::Version
|
|
27
27
|
version: '1.5'
|
|
28
28
|
- !ruby/object:Gem::Dependency
|
|
@@ -83,6 +83,10 @@ files:
|
|
|
83
83
|
- Gemfile.6.1.pg.lock
|
|
84
84
|
- Gemfile.6.1.sqlite3
|
|
85
85
|
- Gemfile.6.1.sqlite3.lock
|
|
86
|
+
- Gemfile.7.0.pg
|
|
87
|
+
- Gemfile.7.0.pg.lock
|
|
88
|
+
- Gemfile.7.0.sqlite3
|
|
89
|
+
- Gemfile.7.0.sqlite3.lock
|
|
86
90
|
- Gemfile.lock
|
|
87
91
|
- LICENSE
|
|
88
92
|
- README.md
|
|
@@ -90,24 +94,28 @@ files:
|
|
|
90
94
|
- active_type.gemspec
|
|
91
95
|
- lib/active_type.rb
|
|
92
96
|
- lib/active_type/change_association.rb
|
|
97
|
+
- lib/active_type/mutation_after_cast_error.rb
|
|
93
98
|
- lib/active_type/nested_attributes.rb
|
|
94
99
|
- lib/active_type/nested_attributes/association.rb
|
|
95
100
|
- lib/active_type/nested_attributes/builder.rb
|
|
96
101
|
- lib/active_type/nested_attributes/nests_many_association.rb
|
|
97
102
|
- lib/active_type/nested_attributes/nests_one_association.rb
|
|
98
103
|
- lib/active_type/no_table.rb
|
|
104
|
+
- lib/active_type/not_castable_error.rb
|
|
99
105
|
- lib/active_type/object.rb
|
|
100
106
|
- lib/active_type/record.rb
|
|
101
107
|
- lib/active_type/record_extension.rb
|
|
102
108
|
- lib/active_type/record_extension/inheritance.rb
|
|
103
109
|
- lib/active_type/type_caster.rb
|
|
104
110
|
- lib/active_type/util.rb
|
|
111
|
+
- lib/active_type/util/unmutable_attributes.rb
|
|
105
112
|
- lib/active_type/version.rb
|
|
106
113
|
- lib/active_type/virtual_attributes.rb
|
|
107
114
|
homepage: https://github.com/makandra/active_type
|
|
108
115
|
licenses:
|
|
109
116
|
- MIT
|
|
110
|
-
metadata:
|
|
117
|
+
metadata:
|
|
118
|
+
rubygems_mfa_required: 'true'
|
|
111
119
|
post_install_message:
|
|
112
120
|
rdoc_options: []
|
|
113
121
|
require_paths:
|
|
@@ -116,14 +124,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
|
|
|
116
124
|
requirements:
|
|
117
125
|
- - ">="
|
|
118
126
|
- !ruby/object:Gem::Version
|
|
119
|
-
version:
|
|
127
|
+
version: 2.5.0
|
|
120
128
|
required_rubygems_version: !ruby/object:Gem::Requirement
|
|
121
129
|
requirements:
|
|
122
130
|
- - ">="
|
|
123
131
|
- !ruby/object:Gem::Version
|
|
124
132
|
version: '0'
|
|
125
133
|
requirements: []
|
|
126
|
-
rubygems_version: 3.2.
|
|
134
|
+
rubygems_version: 3.2.6
|
|
127
135
|
signing_key:
|
|
128
136
|
specification_version: 4
|
|
129
137
|
summary: Make any Ruby object quack like ActiveRecord
|