avromatic 2.0.0 → 2.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 25174d8c67bde4e8a9d7a53dc357ed72db2e1faa08bbf8945d1f93dd69c46942
-  data.tar.gz: b0b2fce3ddb92a463fade05c2cb29cdadd60037357432c99ece5f892d3b54f45
+  metadata.gz: 281093ac30d6f1f5bf7fa5949466ce74b2223968db553e15e473e09c81fc574d
+  data.tar.gz: 0a89d649b7b86d8a1cc55dba25af9dfdab2f7789f2c4daa996b0dab6ba7fd210
 SHA512:
-  metadata.gz: 6566f793b850761a3d7dc2fa88b403c20ab8402e57d062322843038b473c7daf98b5e2484107063dbc2e9014919fabe1b5ac2e140c8e78f81a552356cbf8c5a2
-  data.tar.gz: 25071f9751683a41bb23fc7932e8570b663c87e903a4ad5d953da863e92c47f0e464355278ec712af41490b7abdc6ac6f11f004472ef3b802e274c8ddf83f503
+  metadata.gz: e13e24a119085b1bf8e6f31d83cda3a8d99092026006601a48d21c29516eefb511d1cccaa3080f346bb91b91397433787638b13ee8e2980286b8c06cf0300d07
+  data.tar.gz: 8151877e50ab9e2ca498ea52f990c3fce6e5a87a31972c09cea6bbe1c5654265f52e2a7c5dd577d934b0fdd1b8adf7eee1123481333714c4dedef42afd5d83e4

data/CHANGELOG.md

@@ -1,6 +1,11 @@
 # avromatic changelog
 
-## v2.0.0 (unreleased)
+## v2.0.1
+- Allow generated model attribute accessors to be overridden. This was a regression in Avromatic 2.0.0.
+- Ensure that timestamp-millis are coerced when the number of microseconds is divisible by 1,000 but the
+  number of nanoseconds is not divisible by 1,000,000.
+
+## v2.0.0
 - Remove [virtus](https://github.com/solnic/virtus) dependency resulting in a 3x performance improvement in model instantation and 1.4x - 2.0x performance improvement in Avro serialization and Avromatic code simplification.
 - Raise `Avromatic::Model::CoercionError` when attribute values can't be coerced to the target type in model constructors and attribute setters. Previously coercion errors weren't detected until Avro serialization or an explicit call to `valid?`.
 - Prevent model instances from being constructed with unknown attributes. Previously unknown attributes were ignored. 

data/README.md

@@ -8,8 +8,8 @@
 `Avromatic` generates Ruby models from [Avro](http://avro.apache.org/) schemas
 and provides utilities to encode and decode them.
 
-**This README reflects unreleased changes in Avromatic 2.0. Please see the 
-[1-0-stable](https://github.com/salsify/avromatic/blob/1-0-stable/README.md) branch for the latest stable release.**
+**This README reflects Avromatic 2.0. Please see the 
+[1-0-stable](https://github.com/salsify/avromatic/blob/1-0-stable/README.md) branch for Avromatic 1.0.**
 
 ## Installation
 

data/lib/avromatic/model/attributes.rb

@@ -21,7 +21,7 @@ module Avromatic
       end
 
       class AttributeDefinition
-        attr_reader :name, :type, :field, :default, :owner
+        attr_reader :name, :setter_name, :type, :field, :default, :owner
         delegate :serialize, to: :type
 
         def initialize(owner:, field:, type:)
@@ -29,6 +29,7 @@ module Avromatic
           @field = field
           @type = type
           @name = field.name.to_sym
+          @setter_name = "#{field.name}=".to_sym
           @default = if field.default == :no_default
                        nil
                      elsif field.default.duplicable?
@@ -77,13 +78,13 @@ module Avromatic
           if data.include?(attribute_name)
             valid_keys << attribute_name
             value = data.fetch(attribute_name)
-            _attributes[attribute_name] = attribute_definition.coerce(value)
+            send(attribute_definition.setter_name, value)
           elsif data.include?(attribute_name.to_s)
             valid_keys << attribute_name
             value = data[attribute_name.to_s]
-            _attributes[attribute_name] = attribute_definition.coerce(value)
+            send(attribute_definition.setter_name, value)
           elsif !attributes.include?(attribute_name)
-            _attributes[attribute_name] = attribute_definition.default
+            send(attribute_definition.setter_name, attribute_definition.default)
           end
         end
 
@@ -111,7 +112,7 @@ module Avromatic
       end
 
       module ClassMethods
-        def add_avro_fields
+        def add_avro_fields(generated_methods_module)
           # models are registered in Avromatic.nested_models at this point to
           # ensure that they are available as fields for recursive models.
           register!
@@ -119,13 +120,13 @@ module Avromatic
           if key_avro_schema
             check_for_field_conflicts!
             begin
-              define_avro_attributes(key_avro_schema,
+              define_avro_attributes(key_avro_schema, generated_methods_module,
                                      allow_optional: config.allow_optional_key_fields)
             rescue OptionalFieldError => ex
               raise "Optional field '#{ex.field.name}' not allowed in key schema."
             end
           end
-          define_avro_attributes(avro_schema)
+          define_avro_attributes(avro_schema, generated_methods_module)
         end
 
         private
@@ -151,7 +152,7 @@ module Avromatic
             value_avro_fields_by_name[name].to_avro
         end
 
-        def define_avro_attributes(schema, allow_optional: true)
+        def define_avro_attributes(schema, generated_methods_module, allow_optional: true)
           if schema.type_sym != :record
             raise "Unsupported schema type '#{schema.type_sym}', only 'record' schemas are supported."
           end
@@ -163,33 +164,25 @@ module Avromatic
             attribute_definition = AttributeDefinition.new(
               owner: self,
               field: field,
-              type: create_type(field)
+              type: Avromatic::Model::Types::TypeFactory.create(schema: field.type, nested_models: nested_models)
             )
             attribute_definitions[symbolized_field_name] = attribute_definition
 
-            define_method(field.name) { _attributes[symbolized_field_name] }
-            define_method("#{field.name}?") { !!_attributes[symbolized_field_name] } if boolean?(field)
+            # Add all generated methods to a module so they can be overridden
+            generated_methods_module.send(:define_method, field.name) { _attributes[symbolized_field_name] }
+            generated_methods_module.send(:define_method, "#{field.name}?") { !!_attributes[symbolized_field_name] } if FieldHelper.boolean?(field)
 
-            define_method("#{field.name}=") do |value|
+            generated_methods_module.send(:define_method, "#{field.name}=") do |value|
               _attributes[symbolized_field_name] = attribute_definitions[symbolized_field_name].coerce(value)
             end
 
             unless config.mutable # rubocop:disable Style/Next
-              private("#{field.name}=")
-              define_method(:clone) { self }
-              define_method(:dup) { self }
+              generated_methods_module.send(:private, "#{field.name}=")
+              generated_methods_module.send(:define_method, :clone) { self }
+              generated_methods_module.send(:define_method, :dup) { self }
             end
           end
         end
-
-        def boolean?(field)
-          field.type.type_sym == :boolean ||
-            (FieldHelper.optional?(field) && field.type.schemas.last.type_sym == :boolean)
-        end
-
-        def create_type(field)
-          Avromatic::Model::Types::TypeFactory.create(schema: field.type, nested_models: nested_models)
-        end
       end
 
     end

data/lib/avromatic/model/builder.rb

@@ -22,7 +22,7 @@ module Avromatic
       attr_reader :mod, :config
 
       # For options see Avromatic::Model.build
-      def self.model(**options)
+      def self.model(**options, &block)
         Class.new do
           include Avromatic::Model::Builder.new(**options).mod
 
@@ -30,6 +30,8 @@ module Avromatic
           def self.name
             super || (@name ||= config.avro_schema.name.classify)
           end
+
+          class_eval(&block) if block
         end
       end
 
@@ -55,18 +57,14 @@ module Avromatic
       private
 
       def define_included_method
-        with_builder do |builder|
-          mod.define_singleton_method(:included) do |model_class|
-            model_class.include(*builder.inclusions)
-            model_class.config = builder.config
-            model_class.add_avro_fields
-          end
+        local_mod = mod
+        local_builder = self
+        mod.define_singleton_method(:included) do |model_class|
+          model_class.include(*local_builder.inclusions)
+          model_class.config = local_builder.config
+          model_class.add_avro_fields(local_mod)
         end
       end
-
-      def with_builder
-        yield(self)
-      end
     end
   end
 end

data/lib/avromatic/model/field_helper.rb

@@ -15,6 +15,11 @@ module Avromatic
       def required?(field)
         !optional?(field)
       end
+
+      def boolean?(field)
+        field.type.type_sym == :boolean ||
+          (FieldHelper.optional?(field) && field.type.schemas.last.type_sym == :boolean)
+      end
     end
   end
 end

data/lib/avromatic/model/types/timestamp_micros_type.rb

@@ -16,7 +16,7 @@ module Avromatic
         private
 
         def truncated?(value)
-          value.nsec % 1000 == 0
+          value.nsec % 1_000 == 0
         end
 
         def coerce_time(input)

data/lib/avromatic/model/types/timestamp_millis_type.rb

@@ -16,7 +16,7 @@ module Avromatic
         private
 
         def truncated?(value)
-          value.usec % 1000 == 0
+          value.nsec % 1_000_000 == 0
         end
 
         def coerce_time(input)

data/lib/avromatic/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Avromatic
-  VERSION = '2.0.0'
+  VERSION = '2.0.1'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: avromatic
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.0.1
 platform: ruby
 authors:
 - Salsify Engineering
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-10-22 00:00:00.000000000 Z
+date: 2018-10-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel