avromatic 0.9.0.rc6 → 0.9.0.rc7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ba5443f9bd3883ce2b78d8a27782069b8b6f9387
-  data.tar.gz: 010950770be1bea00cc8aa4143e8124667d00379
+  metadata.gz: 4b3788ff5afb0346f35c6835573445dcd27a1f73
+  data.tar.gz: 8a85631271bb0e8203d5b0bf848525e59360c435
 SHA512:
-  metadata.gz: 353f84a00f41772c41d4b9889f3610750b66364151d051ab315429f3f5b77a353376f70cd2101c896e043b486a4df22f20e7467158ef29eb5c47d72d9109444b
-  data.tar.gz: f86f38a32fad99f98f8c697119cc0b4c4b2a8f4e76264b6e8755d8a148b2ee3a3076d19b51c16ca5fefaeb07ff450c3e1b1376dbd3836719648bd353699689dd
+  metadata.gz: 67b0159ac2b5c54e4e462b00e022e6a7482dd9b84f412184fec923bd6aadd772b7711320296836653f033ad22de298f894ad066819bff1ed6ce0216bb4335c7d
+  data.tar.gz: 81051a75c091280a29d4f70cfa3d7e28a5bfed9743effee953d4f2c11510f7fcce615a02cb4d5c10a1e96e80d3c4a085f613e34a4f40cae9f2be98157649ecea

data/CHANGELOG.md

@@ -7,8 +7,9 @@
 - Add support for recursive models.
 - Allow required array and map fields to be empty. Only nil values for required
   array and map fields are now considered invalid.
-- Validate nested models. This does not apply to nested models embedded
-  within other complex types (array, map, and union).
+- Validate nested models. This includes models embedded within other complex
+  types (array, map, and union).
+- Truncate values for timestamps to the precision supported by the logical type.
 
 ## v0.8.0
 - Add support for logical types. Currently this requires using the

data/avromatic.gemspec

@@ -30,7 +30,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'rspec', '~> 3.0'
   spec.add_development_dependency 'simplecov'
   spec.add_development_dependency 'webmock'
-  spec.add_development_dependency 'avro-builder', '>= 0.11.0'
+  spec.add_development_dependency 'avro-builder', '>= 0.12.0'
   # For FakeSchemaRegistryServer
   spec.add_development_dependency 'sinatra'
   spec.add_development_dependency 'salsify_rubocop', '~> 0.42.0'

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

@@ -0,0 +1,26 @@
+module Avromatic
+  module Model
+    module Attribute
+
+      # This subclass of Virtus::Attribute is used to truncate timestamp values
+      # to the supported precision.
+      class AbstractTimestamp < Virtus::Attribute
+        def coerce(value)
+          return value if value.nil? || value_coerced?(value)
+
+          value.is_a?(Time) ? coerce_time(value) : value
+        end
+
+        def value_coerced?(_value)
+          raise 'subclass must implement `value_coerced?`'
+        end
+
+        private
+
+        def coerce_time(_value)
+          raise 'subclass must implement `coerce_time`'
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,23 @@
+require 'avromatic/model/attribute/abstract_timestamp'
+
+module Avromatic
+  module Model
+    module Attribute
+
+      # This subclass is used to truncate timestamp values to microseconds.
+      class TimestampMicros < AbstractTimestamp
+
+        def value_coerced?(value)
+          value.is_a?(Time) && value.nsec % 1000 == 0
+        end
+
+        private
+
+        def coerce_time(value)
+          Time.at(value.to_i, value.usec)
+        end
+
+      end
+    end
+  end
+end

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

@@ -0,0 +1,23 @@
+require 'avromatic/model/attribute/abstract_timestamp'
+
+module Avromatic
+  module Model
+    module Attribute
+
+      # This subclass is used to truncate timestamp values to milliseconds.
+      class TimestampMillis <AbstractTimestamp
+
+        def value_coerced?(value)
+          value.is_a?(Time) && value.usec % 1000 == 0
+        end
+
+        private
+
+        def coerce_time(value)
+          Time.at(value.to_i, value.usec / 1000 * 1000)
+        end
+
+      end
+    end
+  end
+end

data/lib/avromatic/model/attributes.rb

@@ -77,24 +77,13 @@ module Avromatic
                       inclusion: { in: Set.new(field.type.symbols.map(&:freeze)).freeze })
           when :fixed
             validates(field.name, length: { is: field.type.size })
-          when :record
-            validate_record(field.name)
+          when :record, :array, :map, :union
+            validate_complex(field.name)
           end
 
           add_required_validation(field)
         end
 
-        def validate_record(field_name)
-          validate do |instance|
-            record = instance.send(field_name)
-            if record && record.invalid?
-              record.errors.each do |key, message|
-                errors.add(field_name.to_sym, "invalid: #{key} #{message}")
-              end
-            end
-          end
-        end
-
         def add_required_validation(field)
           if required?(field) && field.default == :no_default
             case field.type.type_sym

data/lib/avromatic/model/builder.rb

@@ -5,6 +5,7 @@ require 'avromatic/model/configuration'
 require 'avromatic/model/value_object'
 require 'avromatic/model/configurable'
 require 'avromatic/model/nested_models'
+require 'avromatic/model/validation'
 require 'avromatic/model/attribute/union'
 require 'avromatic/model/attributes'
 require 'avromatic/model/attribute/record'
@@ -44,6 +45,7 @@ module Avromatic
           Virtus.value_object,
           Avromatic::Model::Configurable,
           Avromatic::Model::NestedModels,
+          Avromatic::Model::Validation,
           Avromatic::Model::Attributes,
           Avromatic::Model::ValueObject,
           Avromatic::Model::RawSerialization,

data/lib/avromatic/model/logical_types.rb

@@ -1,11 +1,14 @@
+require 'avromatic/model/attribute/timestamp_micros'
+require 'avromatic/model/attribute/timestamp_millis'
+
 module Avromatic
   module Model
     module LogicalTypes
 
       LOGICAL_TYPE_MAP = {
         'date' => Date,
-        'timestamp-micros' => Time,
-        'timestamp-millis' => Time
+        'timestamp-micros' => Avromatic::Model::Attribute::TimestampMicros,
+        'timestamp-millis' => Avromatic::Model::Attribute::TimestampMillis
       }.freeze
 
       def self.value_class(logical_type)

data/lib/avromatic/model/validation.rb

@@ -0,0 +1,54 @@
+module Avromatic
+  module Model
+    module Validation
+      extend ActiveSupport::Concern
+
+      module ClassMethods
+
+        # Returns an array of messages
+        def validate_nested_value(value)
+          case value
+          when Avromatic::Model::Attributes
+            validate_record_value(value)
+          when Array
+            value.flat_map.with_index do |element, index|
+              validate_nested_value(element).map do |message|
+                "[#{index}]#{message}"
+              end
+            end
+          when Hash
+            value.flat_map do |key, map_value|
+              # keys for the Avro map type are always strings and do not require
+              # validation
+              validate_nested_value(map_value).map do |message|
+                "['#{key}']#{message}"
+              end
+            end
+          else
+            []
+          end
+        end
+
+        private
+
+        def validate_complex(field_name)
+          validate do |instance|
+            value = instance.send(field_name)
+            messages = self.class.validate_nested_value(value)
+            messages.each { |message| instance.errors.add(field_name.to_sym, message) }
+          end
+        end
+
+        def validate_record_value(record)
+          if record && record.invalid?
+            record.errors.map do |key, message|
+              ".#{key} #{message}".gsub(' .', '.')
+            end
+          else
+            []
+          end
+        end
+      end
+    end
+  end
+end

data/lib/avromatic/version.rb

@@ -1,3 +1,3 @@
 module Avromatic
-  VERSION = '0.9.0.rc6'.freeze
+  VERSION = '0.9.0.rc7'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: avromatic
 version: !ruby/object:Gem::Version
-  version: 0.9.0.rc6
+  version: 0.9.0.rc7
 platform: ruby
 authors:
 - Salsify Engineering
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-09-26 00:00:00.000000000 Z
+date: 2016-09-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: avro
@@ -156,14 +156,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.11.0
+        version: 0.12.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.11.0
+        version: 0.12.0
 - !ruby/object:Gem::Dependency
   name: sinatra
   requirement: !ruby/object:Gem::Requirement
@@ -246,7 +246,10 @@ files:
 - gemfiles/rails4_2.gemfile
 - lib/avromatic.rb
 - lib/avromatic/model.rb
+- lib/avromatic/model/attribute/abstract_timestamp.rb
 - lib/avromatic/model/attribute/record.rb
+- lib/avromatic/model/attribute/timestamp_micros.rb
+- lib/avromatic/model/attribute/timestamp_millis.rb
 - lib/avromatic/model/attribute/union.rb
 - lib/avromatic/model/attribute_type/union.rb
 - lib/avromatic/model/attributes.rb
@@ -262,6 +265,7 @@ files:
 - lib/avromatic/model/passthrough_serializer.rb
 - lib/avromatic/model/raw_serialization.rb
 - lib/avromatic/model/type_registry.rb
+- lib/avromatic/model/validation.rb
 - lib/avromatic/model/value_object.rb
 - lib/avromatic/model_registry.rb
 - lib/avromatic/railtie.rb