avromatic 0.31.0 → 0.32.0.rc0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c4f5da9c86e42f15db6a7792ba18ce8360beacdd08201dfa82c2a4917661e119
-  data.tar.gz: 30728c18e220c5e3514d825b8353241a075738a9d0b7bf093cb196c8b938597a
+  metadata.gz: 0017af435f0fc21a76680f24432fc7068f27a9a048b24e748784153c179efccd
+  data.tar.gz: 29095ba588695b75be4faabbd7c0e51e42f0738fb8d5224f33802f451f072f8a
 SHA512:
-  metadata.gz: 59ff7e8a760ab10a9a72f0af55f91aa66ee72c8a00824e760857f8f6fb5322ba3f06e34f7ea7ec7b1e12f075a0b4a25eb9d43018b2458c3789b5d20f6344314a
-  data.tar.gz: 339f7c10dc3605909f4cf097d773e2fde6b3581b5ee7c028e5a6b0d6f615d0c3b6cfd8dda57db02399251578447317aa35a3154a3a4dda6bf5867d6d0800439e
+  metadata.gz: 375f90d488350a0a74b07a20ccb6c42cd8f613a2390d7d889702e37ce4a830f1972244cc69d1de6b29b77d29a387e4af55ebeb6a993648bd5daa63dde3a92048
+  data.tar.gz: 4de0b09cb599d89362fbda7f26f0cc3d3cc01ea5ffd0b2faa71b4d4c4f17476fac31d5beb120a21513c6ebc2f087d82aa639c0289fcd18cd45fcc1194d0208be

data/CHANGELOG.md

@@ -1,7 +1,12 @@
 # avromatic changelog
 
+## v0.32.0 (unreleased)
+- Improve partial assignment using a hash for records outside of unions.
+- Prevent invalid types from being assigned to primitives in unions.
+- Add validation that primitive attributes have the expected type.
+
 ## v0.31.0
-= Add support for Rails 5.2.
+- Add support for Rails 5.2.
 
 ## v0.30.0
 - Add `Avromatic::Model::MessageDecoder#model` method to return the Avromatic

data/lib/avromatic/model/allowed_type_validator.rb

@@ -0,0 +1,7 @@
+class AllowedTypeValidator < ActiveModel::EachValidator
+  def validate_each(record, name, value)
+    if options[:in].find { |klass| value.is_a?(klass) }.nil?
+      record.errors[name] << "does not have the expected type #{options[:in]}"
+    end
+  end
+end

data/lib/avromatic/model/attribute/record.rb

@@ -12,10 +12,9 @@ module Avromatic
         primitive Avromatic::Model::Attributes
 
         def coerce(value)
-          return value if value.nil? || value_coerced?(value)
+          return value if value.nil? || value.is_a?(primitive)
 
-          coerced = primitive.new(value)
-          coerced if coerced.valid?
+          primitive.new(value)
         end
 
         def value_coerced?(value)

data/lib/avromatic/model/attribute/union.rb

@@ -47,7 +47,12 @@ module Avromatic
 
         def safe_coerce(member_attribute, input)
           coerced = member_attribute.coerce(input)
-          coerced unless coerced.is_a?(Avromatic::Model::Attributes) && coerced.invalid?
+
+          if coerced.is_a?(Avromatic::Model::Attributes)
+            coerced if coerced.valid?
+          elsif member_attribute.coerced?(coerced)
+            coerced
+          end
         rescue
           nil
         end

data/lib/avromatic/model/attributes.rb

@@ -1,5 +1,7 @@
 require 'active_support/core_ext/object/duplicable'
+require 'active_support/time'
 require 'ice_nine/core_ext/object'
+require 'avromatic/model/allowed_type_validator'
 
 module Avromatic
   module Model
@@ -83,12 +85,12 @@ module Avromatic
                       field_class,
                       avro_field_options(field, field_class))
 
-            add_validation(field)
+            add_validation(field, field_class)
             add_serializer(field, field_class)
           end
         end
 
-        def add_validation(field)
+        def add_validation(field, field_class)
           case field.type.type_sym
           when :enum
             validates(field.name,
@@ -97,11 +99,25 @@ module Avromatic
             validates(field.name, length: { is: field.type.size })
           when :record, :array, :map, :union
             validate_complex(field.name)
+          else
+            add_type_validation(field.name, field_class)
           end
 
           add_required_validation(field)
         end
 
+        def add_type_validation(name, field_class)
+          allowed_types = if field_class == Axiom::Types::Boolean
+                            [TrueClass, FalseClass]
+                          elsif field_class < Avromatic::Model::Attribute::AbstractTimestamp
+                            [Time]
+                          else
+                            [field_class]
+                          end
+
+          validates(name, allowed_type: allowed_types, allow_blank: true)
+        end
+
         def add_required_validation(field)
           if required?(field) && field.default == :no_default
             case field.type.type_sym

data/lib/avromatic/version.rb

@@ -1,3 +1,3 @@
 module Avromatic
-  VERSION = '0.31.0'.freeze
+  VERSION = '0.32.0.rc0'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: avromatic
 version: !ruby/object:Gem::Version
-  version: 0.31.0
+  version: 0.32.0.rc0
 platform: ruby
 authors:
 - Salsify Engineering
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-06-20 00:00:00.000000000 Z
+date: 2018-06-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: avro
@@ -283,6 +283,7 @@ files:
 - lib/avromatic/io/datum_writer.rb
 - lib/avromatic/messaging.rb
 - lib/avromatic/model.rb
+- lib/avromatic/model/allowed_type_validator.rb
 - lib/avromatic/model/allowed_writer_methods_memoization.rb
 - lib/avromatic/model/attribute/abstract_timestamp.rb
 - lib/avromatic/model/attribute/record.rb
@@ -327,9 +328,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.7.6