sequent 0.1.7 → 0.1.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6cfc6364eb9b237df9e8869ef5d602e7e2509954
-  data.tar.gz: 4a280a35f92badb08aa8dbe2919d6aa329c6a23b
+  metadata.gz: ecf3a14a1b1acf03a8269e158bad28a533c54095
+  data.tar.gz: af4beb48c4dc6323e2baaf5f0047a41fed3fff6e
 SHA512:
-  metadata.gz: 6b56f436d037c8a9ba3718c512d413a2fe7e03822618c1a48c386cf45167490ee987223d596c432ce8bdfb367a76f044317ffb5081e5c4ec6056af065e4e1a09
-  data.tar.gz: 9bd699e91835b989e6f417bd9976826576742ef98e5c84e815ae9f68f6a9447993f28ed622426599b9fb242a5321e46f18ae4f1066d1454f1eb2e1463f01a9f7
+  metadata.gz: 8d4478a2872b35922943920af4d572933f6cef35ae7c8b872326237687cfd9b4b2dc0ef44c7731ef3ae5dfc245fd5533b512b7e0be11d0bf1ee235e799afc89d
+  data.tar.gz: 20bc101b0fa43c2e04635e390d7529a2b2c1d86c33d45283410c3066a0a645f24dd1eeff1ca937c663ddb39b277d49ca37a3f83e6ce173f74d267571344c6589

data/lib/sequent/core/helpers/association_validator.rb

@@ -6,28 +6,36 @@ module Sequent
       # Validator for associations. Typically used in Sequent::Core::Command,
       # Sequent::Core::Event and Sequent::Core::ValueObjects.
       #
+      # When you define attrs that are also value object or array(..) then this class is
+      # automatically used.
+      #
       # Example:
       #
-      #   class RegisterForTrainingCommand < UpdateCommand
+      #   class RegisterForTrainingCommand < Sequent::Core::Command
       #     attrs trainee: Person
+      #   end
       #
-      #     validates_presence_of :trainee
-      #     validates_with Sequent::Core::Helpers::AssociationValidator, associations: [:trainee]
+      # This will register :trainee with the AssociationValidator and is equivilant to
+      #
+      #   validates_with Sequent::Core::AssociationValidator, associations: [:trainee]
       #
-      #   end
       class AssociationValidator < ActiveModel::Validator
 
+        def initialize(options = {})
+          super
+          raise "Must provide ':associations' to validate" unless options[:associations].present?
+        end
+
         def validate(record)
           associations = options[:associations]
           associations = [associations] unless associations.instance_of?(Array)
           associations.each do |association|
-            next unless association # since ruby 2.0...?
             value = record.instance_variable_get("@#{association.to_s}")
             if value && incorrect_type?(value, record, association)
               record.errors[association] = "is not of type #{record.class.types[association]}"
             elsif value && value.kind_of?(Array)
               item_type = record.class.type_for(association).item_type
-              record.errors[association] = "is invalid" if all_valid?(value, item_type)
+              record.errors[association] = "is invalid" unless validate_all(value, item_type).all?
             else
               record.errors[association] = "is invalid" if value && value.invalid?
             end
@@ -40,14 +48,14 @@ module Sequent
           !value.kind_of?(Array) && record.class.respond_to?(:types) && !value.kind_of?(record.class.types[association])
         end
 
-        def all_valid?(value, item_type)
-          value.any? do |v|
-            if v.nil?
-              true
-            elsif v.respond_to? :valid?
-              not v.valid?
+        def validate_all(values, item_type)
+          values.map do |value|
+            if value.nil?
+              false
+            elsif value.respond_to?(:valid?)
+              value.valid?
             else
-              not Sequent::Core::Helpers::ValueValidators.for(item_type).valid_value?(v)
+              Sequent::Core::Helpers::ValueValidators.for(item_type).valid_value?(value)
             end
           end
         end

data/lib/sequent/core/helpers/attribute_support.rb

@@ -132,6 +132,14 @@ EOS
             value = self.instance_variable_get("@#{field[0]}")
             if value.respond_to? :validation_errors
               value.validation_errors.each { |k, v| result["#{field[0].to_s}_#{k.to_s}".to_sym] = v }
+            elsif field[1].class == ArrayWithType and value.present?
+              value
+              .select { |val| val.respond_to?(:validation_errors) }
+              .each_with_index do |val, index|
+                val.validation_errors.each do |k, v|
+                  result["#{field[0].to_s}_#{index}_#{k.to_s}".to_sym] = v
+                end
+              end
             end
           end
           prefix ? HashWithIndifferentAccess[result.map { |k, v| ["#{prefix}_#{k}", v] }] : result

data/lib/version.rb

@@ -1,3 +1,3 @@
 module Sequent
-  VERSION = '0.1.7'
+  VERSION = '0.1.8'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sequent
 version: !ruby/object:Gem::Version
-  version: 0.1.7
+  version: 0.1.8
 platform: ruby
 authors:
 - Lars Vonk
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-03 00:00:00.000000000 Z
+date: 2015-08-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord