Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add presence validation for object in SnapshotItem model #56

Merged
merged 6 commits into from
Aug 29, 2024
Merged

Add presence validation for object in SnapshotItem model #56

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
488fe88
Add presence validation for `object` in SnapshotItem model
dmrAnderson Aug 24, 2024
55813d4
[test] Add presence validation for `object` in SnapshotItem model
dmrAnderson Aug 24, 2024
3da53bc
[clean up] Add presence validation for `object` in SnapshotItem model
dmrAnderson Aug 28, 2024
04f0d34
[StandardError] Add readonly flag to fetch_reified_items method
dmrAnderson Aug 28, 2024
156c874
[super] Add readonly flag to fetch_reified_items method
dmrAnderson Aug 28, 2024
0404eae
[without super] Add presence validation for `object` in SnapshotItem …
dmrAnderson Aug 29, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 6 additions & 7 deletions lib/active_snapshot/models/snapshot_item.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,22 +12,21 @@ class SnapshotItem < ActiveRecord::Base
validates :snapshot_id, presence: true
validates :item_id, presence: true, uniqueness: { scope: [:snapshot_id, :item_type] }
validates :item_type, presence: true
validates :object, presence: true

def object
return @object if @object

if ActiveSnapshot.config.storage_method_json?
@object = JSON.parse(self[:object])
@object = self[:object] ? JSON.parse(self[:object]) : {}
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Instead of doing this empty object fallback on every line Maybe we can do @object ||= {} after the if else storage method statements

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Even better, but the new instance with fresh @object will go to JSON.parse(self[:object]) # => Error

elsif ActiveSnapshot.config.storage_method_yaml?
yaml_method = "unsafe_load"
yaml_method = YAML.respond_to?(:unsafe_load) ? :unsafe_load : :load

if !YAML.respond_to?("unsafe_load")
yaml_method = "load"
end

@object = YAML.send(yaml_method, self[:object])
@object = self[:object] ? YAML.public_send(yaml_method, self[:object]) : {}
elsif ActiveSnapshot.config.storage_method_native_json?
@object = self[:object]
else
raise StandardError, "Unsupported storage_method: `#{ActiveSnapshot.config.storage_method}`"
end
end

Expand Down
8 changes: 4 additions & 4 deletions test/models/snapshot_item_test.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ def test_relationships
instance.snapshot = instance
end

instance.snapshot = ActiveSnapshot::Snapshot.new
instance.snapshot = @snapshot_klass.new

instance.item = instance

Expand All @@ -31,9 +31,9 @@ def test_relationships
def test_validations
instance = @snapshot_item_klass.new

instance.valid?
assert instance.invalid?

[:item_id, :item_type, :snapshot_id].each do |attr|
[:item_id, :item_type, :snapshot_id, :object].each do |attr|
assert_equal ["can't be blank"], instance.errors[attr] ### presence error
end

Expand All @@ -42,7 +42,7 @@ def test_validations

instance = @snapshot_item_klass.new(item: snapshot.item, snapshot: snapshot)

assert_not instance.valid?
assert instance.invalid?

assert_equal ["has already been taken"], instance.errors[:item_id] ### uniq error
end
Expand Down
Loading