Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
8 changes: 7 additions & 1 deletion lib/shallow_attributes/instance_methods.rb
Original file line number Diff line number Diff line change
Expand Up @@ -139,7 +139,13 @@ def reset_attribute(attribute)
#
# @since 0.1.0
def coerce(value, _options = {})
self.attributes = value
self.attributes =
if value.class.included_modules.include?(ShallowAttributes)
value.to_h
else
value
end

self
end

Expand Down
2 changes: 1 addition & 1 deletion shallow_attributes.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ Gem::Specification.new do |spec|
spec.executables = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
spec.require_paths = ["lib"]

spec.add_development_dependency "bundler", "~> 1.11"
spec.add_development_dependency "bundler", "> 1.11"
spec.add_development_dependency "rake", "~> 10.0"
spec.add_development_dependency "minitest", "~> 5.0"
spec.add_development_dependency "dry-types", "~> 0.11"
Expand Down
62 changes: 45 additions & 17 deletions test/custom_types_test.rb
Original file line number Diff line number Diff line change
Expand Up @@ -58,23 +58,22 @@ class Person
end

describe 'when one of attribute is array' do
let(:person) do
Person.new(
addresses: [
{
street: 'Street 1/2',
city: {
name: 'NYC'
}
},
{
street: 'Street 3/2',
city: {
name: 'Moscow'
}
}
]
)
let(:person) { Person.new addresses: [address_1, address_2] }
let(:address_1) do
{
street: 'Street 1/2',
city: {
name: 'NYC'
}
}
end
let(:address_2) do
{
street: 'Street 3/2',
city: {
name: 'Moscow'
}
}
end

it 'allows embedded values' do
Expand Down Expand Up @@ -105,6 +104,35 @@ class Person
person.addresses[0].must_be_instance_of Address
end

describe 'array of ShallowAttributes objects' do
let(:address_1) do
Address.new(
street: 'Street 1/2',
city: {
name: 'NYC'
}
)
end
let(:address_2) do
Address.new(
street: 'Street 3/2',
city: {
name: 'Moscow'
}
)
end

it 'allows embedded ShallowAttributes objects' do
person.addresses.count.must_equal 2

person.addresses[0].street.must_equal 'Street 1/2'
person.addresses[0].city.name.must_equal 'NYC'

person.addresses[1].street.must_equal 'Street 3/2'
person.addresses[1].city.name.must_equal 'Moscow'
end
end

describe '#attributes' do
it 'returns attributes hash' do
hash = person.attributes
Expand Down