avromatic 5.0.0 → 5.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: edb3e19672493014a88fa7a2f4f564e10fa6f2e733061f5f719b78adbfb6e364
-  data.tar.gz: 5d982242936f4131d2a1756c4320433b09395f5de55513cfdc137612ac860629
+  metadata.gz: c6b34a3331add1ed2df65bcc8d148144ba3eb90fc78a494317acf34275fd0a73
+  data.tar.gz: affa5c94c62344ae8762988f1a1973a8fa568ed4ac7696d6325c46cd18558fa8
 SHA512:
-  metadata.gz: 56fa6e4a6c8d8c4d50ceec2531711d6221f780a985bf6f287ea14e9873c56b5ffd5447e52ed986075a3b93267df7087dd07670ca7643cfcf9bdddc41fdc8d9ce
-  data.tar.gz: 27c92ddfcb77de6dc362be0b8e0dbe4dd71a667f539660e37dd8f6add7e0ae17aa61a32af0aef1266a24f5ca8549c3745aa3a8cdfad159703ca7acec33f1dd56
+  metadata.gz: 3dbfc5a17d910b148b2cdbf7a6ef3174a27fd942cf035f1d8a1945d5abf6e3fedefa9ea0e613006abce6b6c0c2a8ba1acc84fc483ee001cc3e2b55ab80ffc729
+  data.tar.gz: da68000b0b901b9c0a9849dd6c231723b6ca9dfceede3707f52c60cee855bb69d847ad18a04bfc5db06285173c32f8da6f49c51ea0ba95c2a1dd4edd1975c7a1

data/lib/avromatic/model/raw_serialization.rb

@@ -15,8 +15,10 @@ module Avromatic
 
         UNSPECIFIED = Object.new
 
+        # rubocop:disable Style/AccessModifierDeclarations
         delegate :datum_writer, :datum_reader, to: :class
         private :datum_writer, :datum_reader
+        # rubocop:enable Style/AccessModifierDeclarations
 
         def avro_raw_value(validate: UNSPECIFIED)
           unless validate == UNSPECIFIED

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

@@ -4,6 +4,7 @@ module Avromatic
   module Model
     module Types
       class AbstractType
+
         EMPTY_ARRAY = [].freeze
         private_constant :EMPTY_ARRAY
 
@@ -23,12 +24,12 @@ module Avromatic
           raise "#{__method__} must be overridden by #{self.class.name}"
         end
 
-        def coercible?(_input)
-          raise "#{__method__} must be overridden by #{self.class.name}"
+        def coercible?(input)
+          input.nil? || input_classes.any? { |input_class| input.is_a?(input_class) }
         end
 
-        def coerced?(_value)
-          raise "#{__method__} must be overridden by #{self.class.name}"
+        def coerced?(value)
+          value.nil? || value_classes.any? { |value_class| value.is_a?(value_class) }
         end
 
         # Note we use positional args rather than keyword args to reduce

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

@@ -38,7 +38,7 @@ module Avromatic
         end
 
         def coerced?(value)
-          value.nil? || (value.is_a?(::Array) && value.all? { |element| value_type.coerced?(element) })
+          value.nil? || (value.is_a?(::Array) && value.all? { |element_input| value_type.coerced?(element_input) })
         end
 
         def serialize(value, strict)

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

@@ -0,0 +1,49 @@
+# frozen_string_literal: true
+
+require 'avromatic/model/types/abstract_type'
+
+module Avromatic
+  module Model
+    module Types
+      class BigIntType < AbstractType
+        VALUE_CLASSES = [::Integer].freeze
+
+        MAX_RANGE = 2**63
+
+        def self.in_range?(value)
+          value.is_a?(::Integer) && value.between?(-MAX_RANGE, MAX_RANGE - 1)
+        end
+
+        def value_classes
+          VALUE_CLASSES
+        end
+
+        def name
+          'bigint'
+        end
+
+        def coerce(input)
+          if coercible?(input)
+            input
+          else
+            raise ArgumentError.new("Could not coerce '#{input.inspect}' to #{name}")
+          end
+        end
+
+        def coercible?(input)
+          input.nil? || self.class.in_range?(input)
+        end
+
+        alias_method :coerced?, :coercible?
+
+        def serialize(value, _strict)
+          value
+        end
+
+        def referenced_model_classes
+          EMPTY_ARRAY
+        end
+      end
+    end
+  end
+end

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

@@ -24,12 +24,6 @@ module Avromatic
           end
         end
 
-        def coercible?(input)
-          input.nil? || input.is_a?(::TrueClass) || input.is_a?(::FalseClass)
-        end
-
-        alias_method :coerced?, :coercible?
-
         def serialize(value, _strict)
           value
         end

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

@@ -7,11 +7,16 @@ module Avromatic
     module Types
       class DateType < AbstractType
         VALUE_CLASSES = [::Date].freeze
+        INPUT_CLASSES = [::Date, ::Time].freeze
 
         def value_classes
           VALUE_CLASSES
         end
 
+        def input_classes
+          INPUT_CLASSES
+        end
+
         def name
           'date'
         end
@@ -26,12 +31,6 @@ module Avromatic
           end
         end
 
-        def coercible?(input)
-          input.nil? || input.is_a?(::Date) || input.is_a?(::Time)
-        end
-
-        alias_method :coerced?, :coercible?
-
         def serialize(value, _strict)
           value
         end

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

@@ -42,14 +42,6 @@ module Avromatic
           end
         end
 
-        def coercible?(input)
-          input.nil? || input_classes.any? { |input_class| input.is_a?(input_class) }
-        end
-
-        def coerced?(value)
-          value.nil? || value_classes.any? { |value_class| value.is_a?(value_class) }
-        end
-
         def serialize(value, _strict)
           value
         end

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

@@ -38,8 +38,8 @@ module Avromatic
           end
         end
 
-        def coerced?(input)
-          input.nil? || (input.is_a?(::String) && allowed_values.include?(input))
+        def coerced?(value)
+          value.nil? || value.is_a?(::String) && allowed_values.include?(value)
         end
 
         def coercible?(input)

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

@@ -31,14 +31,6 @@ module Avromatic
           end
         end
 
-        def coercible?(input)
-          input.nil? || input.is_a?(::Float) || input.is_a?(::Integer)
-        end
-
-        def coerced?(input)
-          input.nil? || input.is_a?(::Float)
-        end
-
         def serialize(value, _strict)
           value
         end

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

@@ -8,6 +8,12 @@ module Avromatic
       class IntegerType < AbstractType
         VALUE_CLASSES = [::Integer].freeze
 
+        MAX_RANGE = 2**31
+
+        def self.in_range?(value)
+          value.is_a?(::Integer) && value.between?(-MAX_RANGE, MAX_RANGE - 1)
+        end
+
         def value_classes
           VALUE_CLASSES
         end
@@ -17,7 +23,7 @@ module Avromatic
         end
 
         def coerce(input)
-          if input.nil? || input.is_a?(::Integer)
+          if coercible?(input)
             input
           else
             raise ArgumentError.new("Could not coerce '#{input.inspect}' to #{name}")
@@ -25,7 +31,7 @@ module Avromatic
         end
 
         def coercible?(input)
-          input.nil? || input.is_a?(::Integer)
+          input.nil? || self.class.in_range?(input)
         end
 
         alias_method :coerced?, :coercible?

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

@@ -36,10 +36,6 @@ module Avromatic
           false
         end
 
-        def coerced?(value)
-          value.nil? || value.is_a?(record_class)
-        end
-
         def serialize(value, strict)
           if value.nil?
             value

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

@@ -31,14 +31,6 @@ module Avromatic
           end
         end
 
-        def coercible?(input)
-          input.nil? || input.is_a?(::String) || input.is_a?(::Symbol)
-        end
-
-        def coerced?(value)
-          value.nil? || value.is_a?(::String)
-        end
-
         def serialize(value, _strict)
           value
         end

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

@@ -9,6 +9,7 @@ require 'avromatic/model/types/enum_type'
 require 'avromatic/model/types/fixed_type'
 require 'avromatic/model/types/float_type'
 require 'avromatic/model/types/integer_type'
+require 'avromatic/model/types/big_int_type'
 require 'avromatic/model/types/map_type'
 require 'avromatic/model/types/null_type'
 require 'avromatic/model/types/record_type'
@@ -31,7 +32,7 @@ module Avromatic
           'bytes' => Avromatic::Model::Types::StringType.new,
           'boolean' => Avromatic::Model::Types::BooleanType.new,
           'int' => Avromatic::Model::Types::IntegerType.new,
-          'long' => Avromatic::Model::Types::IntegerType.new,
+          'long' => Avromatic::Model::Types::BigIntType.new,
           'float' => Avromatic::Model::Types::FloatType.new,
           'double' => Avromatic::Model::Types::FloatType.new,
           'null' => Avromatic::Model::Types::NullType.new

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

@@ -76,7 +76,15 @@ module Avromatic
         private
 
         def find_index(value)
-          # TODO: Cache this?
+          if value.is_a?(::Integer)
+            if Avromatic::Model::Types::IntegerType.in_range?(value)
+              return member_types.index { |member_type| member_type.is_a?(Avromatic::Model::Types::IntegerType) }
+            elsif Avromatic::Model::Types::BigIntType.in_range?(value)
+              return member_types.index { |member_type| member_type.is_a?(Avromatic::Model::Types::BigIntType) }
+            end
+          end
+
+          # TODO: Consider caching the index for each value class
           member_types.find_index do |member_type|
             member_type.value_classes.any? { |value_class| value.is_a?(value_class) }
           end

data/lib/avromatic/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: avromatic
 version: !ruby/object:Gem::Version
-  version: 5.0.0
+  version: 5.1.1
 platform: ruby
 authors:
 - Salsify Engineering
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-10-13 00:00:00.000000000 Z
+date: 2024-11-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -19,7 +19,7 @@ dependencies:
         version: '5.2'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '7.2'
+        version: '8'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -29,7 +29,7 @@ dependencies:
         version: '5.2'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '7.2'
+        version: '8'
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
@@ -39,7 +39,7 @@ dependencies:
         version: '5.2'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '7.2'
+        version: '8'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -49,7 +49,7 @@ dependencies:
         version: '5.2'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '7.2'
+        version: '8'
 - !ruby/object:Gem::Dependency
   name: avro
   requirement: !ruby/object:Gem::Requirement
@@ -298,6 +298,7 @@ files:
 - lib/avromatic/model/types/abstract_timestamp_type.rb
 - lib/avromatic/model/types/abstract_type.rb
 - lib/avromatic/model/types/array_type.rb
+- lib/avromatic/model/types/big_int_type.rb
 - lib/avromatic/model/types/boolean_type.rb
 - lib/avromatic/model/types/custom_type.rb
 - lib/avromatic/model/types/date_type.rb