virtus_model 0.2.6 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1bbee737381701a5de5826e177046f6b1ef5af3d
-  data.tar.gz: 26d0b9439bc0e8fcd53bc87c16c6bd1b244d17ef
+  metadata.gz: 4889888392103490330641562a43bbc90466a8c4
+  data.tar.gz: 13c865c370ea09c3e0a4857bd6b82ab511191f1c
 SHA512:
-  metadata.gz: b6ac3acec28f5c6608da6a94ed263fac68774384b8dcf7f282141adb8b72b5ae7bdc4d548fbe40f89259d5d90494f1a9d8192a4a2c979ea8e3c01a9ec2ef2809
-  data.tar.gz: 15db98ac93f9e88d7e3eb69ffb59a79e681f2b1ed845a8ae92140f49e1940b4875bc8034f0ade4f62e05f90a8650cd71aa8cd91ba4455b2e61281f8aba7a11c1
+  metadata.gz: 295d96a01e5a71b31db621c6a5de0a1b4a9ac47848d20eced14d6fdf197f5aabcbeaa4b19314b150410b6f04e519505601eb3ad24f62cc1dc83e31fdc65d504a
+  data.tar.gz: e1fb74537b824ebb7cb722694970a357aa707ca0ed011275c0bb9b7eba49cf1d48070e0a2160da5969f403a66f26719e5e68840bf7697de6ce2c7373100db90e

data/README.md

@@ -0,0 +1,87 @@
+# VirtusModel
+
+A practical and pleasant union of [Virtus](https://rubygems.org/gems/virtus) and [ActiveModel](https://rubygems.org/gems/activemodel).
+
+## Installation
+
+Ruby version 2.2.2 or greater is required.
+
+```shell
+$ gem install virtus_model
+```
+
+## Examples
+
+First, familiarize yourself with the Virtus and ActiveModel libraries.
+
+```ruby
+#
+# Class definitions
+#
+
+class ModelOne < VirtusModel::Base
+  attribute :name, String
+
+  validates :name, presence: true
+end
+
+class ModelTwo < VirtusModel::Base
+  attribute :models, Array[ModelOne]
+
+  validates :models, presence: true
+end
+
+#
+# Class methods
+#
+
+raise unless ModelOne.attributes == [:name]
+
+raise unless ModelOne.attribute?(:name)
+
+raise if ModelOne.attribute?(:other)
+
+raise unless ModelTwo.associations == [:models]
+
+raise unless ModelTwo.association?(:models)
+
+raise if ModelTwo.association?(:other)
+
+#
+# Instance methods
+#
+
+model1 = ModelOne.new(name: 'hello')
+
+raise unless model1.attributes == { name: 'hello' }
+
+raise unless model1.valid?
+
+model1.assign_attributes(name: nil)
+
+raise if model1.valid?
+
+raise unless model1.errors[:name] == ["can't be blank"]
+
+raise unless model1.update(name: 'hello')
+
+model2 = ModelTwo.new(models: [model1.attributes])
+
+raise unless model2.valid?
+
+model2.assign_attributes(models: [])
+
+raise if model2.valid?
+
+raise unless model2.errors[:models] == ["can't be blank"]
+
+raise if model2.update(models: [{ name: nil }])
+
+raise unless model2.errors[:'models[0][name]'] == ["can't be blank"]
+
+raise unless model2.update(models: [model1])
+
+raise unless model2.export == { models: [{ name: 'hello' }] }
+
+raise unless ModelTwo.new(model2.export) == model2
+```

data/lib/virtus_model/base.rb

@@ -6,9 +6,10 @@ module VirtusModel
   class Base
     include ActiveModel::Conversion
     include ActiveModel::Validations
-    include Virtus.model
+    include ActiveModel::Validations::Callbacks
+    include Virtus.model(nullify_blank: true)
 
-    set_callback :validate, :validate_associations
+    before_validation :validate_associations
 
     # Get an array of attribute names.
     def self.attributes
@@ -107,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.6'.freeze
+  VERSION = '0.3.0'.freeze
 end

data/spec/spec_helper.rb

@@ -6,6 +6,7 @@ Bundler.setup
 
 require 'virtus_model'
 require 'shoulda/matchers'
+require 'shoulda/callback/matchers'
 require 'active_support/core_ext/object/try'
 
 Shoulda::Matchers.configure do |config|

data/spec/virtus_model/base_spec.rb

@@ -8,6 +8,7 @@ describe VirtusModel::Base do
   let(:simple_model_attributes) { { name: 'test' } }
 
   describe SimpleModel, type: :model do
+    it { is_expected.to callback(:validate_associations).before(:validation) }
     it { is_expected.to validate_presence_of(:name) }
   end
 
@@ -27,6 +28,7 @@ describe VirtusModel::Base do
   end
 
   describe ComplexModel, type: :model do
+    it { is_expected.to callback(:validate_associations).before(:validation) }
     it { is_expected.to validate_presence_of(:model) }
     it { is_expected.to validate_presence_of(:models) }
   end
@@ -36,10 +38,21 @@ describe VirtusModel::Base do
   end
 
   describe InheritedModel, type: :model do
+    it { is_expected.to callback(:validate_associations).before(:validation) }
     it { is_expected.to validate_presence_of(:model) }
     it { is_expected.to validate_presence_of(:models) }
   end
 
+  class CallbackModel < ComplexModel
+    after_validation :child_callback
+  end
+
+  describe CallbackModel, type: :model do
+    before(:example) { allow(subject).to receive(:child_callback) }
+    it { is_expected.to callback(:validate_associations).before(:validation) }
+    it { is_expected.to callback(:child_callback).after(:validation) }
+  end
+
   describe '.attribute?' do
     context SimpleModel do
       subject { SimpleModel }
@@ -130,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
@@ -146,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.6
+  version: 0.3.0
 platform: ruby
 authors:
 - Derek Schaefer
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2016-05-01 00:00:00.000000000 Z
+date: 2022-01-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: virtus
@@ -28,44 +28,56 @@ dependencies:
   name: activemodel
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '4.2'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '4.2'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '6'
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '4.2'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '4.2'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '6'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '11.1'
+        version: '13.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '11.1'
+        version: '13.0'
 - !ruby/object:Gem::Dependency
   name: rdoc
   requirement: !ruby/object:Gem::Requirement
@@ -86,49 +98,64 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.4'
+        version: '3.10'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.4'
+        version: '3.10'
 - !ruby/object:Gem::Dependency
   name: shoulda-matchers
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.1'
+        version: '4.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '4.0'
+- !ruby/object:Gem::Dependency
+  name: shoulda-callback-matchers
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.1'
+        version: '1.1'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.11'
+        version: '0.17'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.11'
-description: VirtusModel
+        version: '0.17'
+description: A practical and pleasant union of Virtus and ActiveModel.
 email:
 - derek.schaefer@gmail.com
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- README.md
 - lib/virtus_model.rb
 - lib/virtus_model/base.rb
 - lib/virtus_model/version.rb
@@ -138,7 +165,7 @@ homepage: https://github.com/derek-schaefer/virtus_model
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -146,18 +173,18 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.0.0
+      version: 2.2.2
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.5.1
-signing_key: 
+rubyforge_project:
+rubygems_version: 2.5.2.3
+signing_key:
 specification_version: 4
-summary: VirtusModel
+summary: VirtusModel = Virtus + ActiveModel
 test_files:
 - spec/spec_helper.rb
 - spec/virtus_model/base_spec.rb