virtus_model 0.2.7 → 0.2.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6f1a953646349c44fa54aa05ee837957d5dbea1b
-  data.tar.gz: 3ef20b44398a1d6e7f570ed9d1e47b252c40d699
+  metadata.gz: e85be758bb952a2fbc508008efbe0d244f5af3e2
+  data.tar.gz: cdad84c5350c981a368abc3f1b308e2e061ceeb9
 SHA512:
-  metadata.gz: fe46421d757999c247e41a7e3e7f9c4eb3ed149a67cd7c0e4b2cd464dc64814a34e67ce32497560b88b2fa5ca1ddb78534efae806d4e20c55e0bb5f9c18d861a
-  data.tar.gz: f180ba36edbc18769315a6a9652d4ff890a11b86348fb4af011f92c943fe7ecc3817a579a04546f263015396eaf873f609f5142c30b18106a4322ea6fc65f2a8
+  metadata.gz: 74bef150dbd2ab9809b3a666d0ff835050956d797f22374ce07045eb412ead50eeb981cadadea23bad4a58728035932adcc7a74141bce794a8a5ffac0072183b
+  data.tar.gz: f00a3746229a7971a1fad82b64c030097d06f66f5e031dfa72c8448645c11b2e967a3877a850f2570e803c0854349f868c89da15ce3f2c4f560a73c2a5525968

data/lib/virtus_model/base.rb

@@ -6,9 +6,10 @@ module VirtusModel
   class Base
     include ActiveModel::Conversion
     include ActiveModel::Validations
+    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

data/lib/virtus_model/version.rb

@@ -1,3 +1,3 @@
 module VirtusModel
-  VERSION = '0.2.7'.freeze
+  VERSION = '0.2.8'.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 }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: virtus_model
 version: !ruby/object:Gem::Version
-  version: 0.2.7
+  version: 0.2.8
 platform: ruby
 authors:
 - Derek Schaefer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-20 00:00:00.000000000 Z
+date: 2016-12-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: virtus
@@ -108,6 +108,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.1'
+- !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: '1.1'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement