virtus_model 0.2.8 → 0.2.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e85be758bb952a2fbc508008efbe0d244f5af3e2
-  data.tar.gz: cdad84c5350c981a368abc3f1b308e2e061ceeb9
+  metadata.gz: b0cb3157871c8866d19ac88f068076329ee5d9c5
+  data.tar.gz: 68f6a26a49f767e902e335b30ef43a4cf5ef01e8
 SHA512:
-  metadata.gz: 74bef150dbd2ab9809b3a666d0ff835050956d797f22374ce07045eb412ead50eeb981cadadea23bad4a58728035932adcc7a74141bce794a8a5ffac0072183b
-  data.tar.gz: f00a3746229a7971a1fad82b64c030097d06f66f5e031dfa72c8448645c11b2e967a3877a850f2570e803c0854349f868c89da15ce3f2c4f560a73c2a5525968
+  metadata.gz: d74acfb486d3792660e01ee32423c95c7c10837c775d35e41183325c47b64a637ed712502771cad02c56ba7e6d9c48ec12c49a1d2705071d7d139ef32654cd39
+  data.tar.gz: 3ec66545f02ad0aba4a926d6748880a8a3e2ae9221ea0d5c466369574c58e332f89768578ce72ef25c932cd9838a5e67c75c3f3077999d7a0a6c1f25b3938be3

data/lib/virtus_model/base.rb

@@ -108,7 +108,7 @@ module VirtusModel
       self.class.attributes.reduce({}) do |result, name|
         if model.respond_to?(name)
           result[name] = model.public_send(name)
-        elsif model.respond_to?(:[])
+        elsif model.respond_to?(:[]) && model.respond_to?(:key?) && model.key?(name)
           result[name] = model[name]
         end
         result

data/lib/virtus_model/version.rb

@@ -1,3 +1,3 @@
 module VirtusModel
-  VERSION = '0.2.8'.freeze
+  VERSION = '0.2.9'.freeze
 end

data/spec/virtus_model/base_spec.rb

@@ -143,8 +143,14 @@ describe VirtusModel::Base do
 
       context 'hash' do
         let(:attributes) { { name: 'test', other: 'test' } }
+
         it { expect(subject.attributes).to include(name: 'test') }
         it { expect(subject.attributes).not_to include(other: 'test') }
+
+        it 'does not overwrite omitted fields' do
+          expect(subject.assign_attributes({})).to be_a(SimpleModel)
+          expect(subject.attributes[:name]).to eq('test')
+        end
       end
 
       context 'object' do
@@ -159,9 +165,16 @@ describe VirtusModel::Base do
       context 'hash' do
         let(:attributes) { { model: model, models: [model], other: 'test' } }
         let(:model) { { name: 'test', other: 'test' } }
+
         it { expect(subject.attributes[:model]).to eq(SimpleModel.new(model)) }
         it { expect(subject.attributes[:models]).to eq([SimpleModel.new(model)]) }
         it { expect(subject.attributes).not_to include(other: 'test') }
+
+        it 'does not overwrite omitted fields' do
+          expect(subject.assign_attributes(model: nil)).to be_a(ComplexModel)
+          expect(subject.attributes[:model]).to be(nil)
+          expect(subject.attributes[:models]).to eq([SimpleModel.new(model)])
+        end
       end
 
       context 'object' do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: virtus_model
 version: !ruby/object:Gem::Version
-  version: 0.2.8
+  version: 0.2.9
 platform: ruby
 authors:
 - Derek Schaefer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-12-07 00:00:00.000000000 Z
+date: 2017-11-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: virtus
@@ -169,7 +169,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.6.13
 signing_key: 
 specification_version: 4
 summary: VirtusModel = Virtus + ActiveModel