table_sync 6.8.0 → 6.9.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d5a835e891243ac8adecc1e4fd83c9689ec4f2082eb17667beaf103a863d78ec
-  data.tar.gz: 590bdc2445a3624f5c650518abc53b33fc6d478cbf0994a91a221184d2feeb51
+  metadata.gz: '09c6fd6d3ac06db07e1ac54edd3b5dbbcfb96b15191450f1fc71750087ecb660'
+  data.tar.gz: 4270f9f7a0037128664b9ee48b57ddf349304e46654a39a1cec08f59036d10da
 SHA512:
-  metadata.gz: 844982d049022ca0e885392d65cd1ebeaf58d994a0f8de239ed4acb4d48a7faad83e85516c0abc840a80ed0c6ccb049430ed49af699e8b313894c66d8ab383f9
-  data.tar.gz: 464b8edcdcc22869e4797a4a3236bae8287915815a05eb51243afc00a0fdd99964cb6a45ff53cdcee927f930647031cae28c2089b60407e2dd497b38dd788cdd
+  metadata.gz: 95b363fd2d16fae609205940176ff31069864ee044ce691fbf6fbde5e5e5153c53e8bc1fa5089e42a32b310014f4970ab8efa35bb972b68f4734e75d5978a009
+  data.tar.gz: d1ef68707a2ec0cee63edd72a55511c8107fe5b056458cd808444a46d1fbfd8d1f03dbcb394901d269389029b0f9438034f7a36c4058eb95c3756c7a9ba1d17d

data/CHANGELOG.md

@@ -1,6 +1,18 @@
 # Changelog
 All notable changes to this project will be documented in this file.
 
+## [6.9.2] - 2025-10-03
+### Fixed
+- Fix of all types taking type cast into account
+
+## [6.9.1] - 2025-10-02
+### Fixed
+- DateTime can be String now
+
+## [6.9.0] - 2025-10-02
+### Added
+- Add check of data scalar types in order to provide readable error text
+
 ## [6.8.0] - 2025-08-25
 ### Changed
 - Updated `rabbit_messaging` gem version to `1.7.0`

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    table_sync (6.8.0)
+    table_sync (6.9.2)
       memery
       rabbit_messaging (>= 1.7.0)
       rails

data/lib/table_sync/receiving/handler.rb

@@ -131,12 +131,20 @@ class TableSync::Receiving::Handler < Rabbit::EventHandler
     end
   end
 
+  def validate_data_types(model, data)
+    errors = model.validate_types(data)
+    return if errors.nil?
+
+    raise TableSync::DataError.new(data, errors.keys, errors.to_json)
+  end
+
   def perform(config, params)
     model = config.model
 
     model.transaction do
       results = if event == :update
                   config.before_update(**params)
+                  validate_data_types(model, params[:data])
                   model.upsert(**params)
                 else
                   config.before_destroy(**params)

data/lib/table_sync/receiving/model/active_record.rb

@@ -25,6 +25,7 @@ module TableSync::Receiving::Model
         self.table_name = table_name
         self.inheritance_column = nil
       end
+      @types_validator = TableSync::Utils::Schema::Builder::ActiveRecord.build(@raw_model)
 
       model_naming = ::TableSync::NamingResolver::ActiveRecord.new(table_name:)
 
@@ -105,6 +106,10 @@ module TableSync::Receiving::Model
       result
     end
 
+    def validate_types(data)
+      types_validator.validate(data)
+    end
+
     def transaction(&)
       ::ActiveRecord::Base.transaction(&)
     end
@@ -115,7 +120,7 @@ module TableSync::Receiving::Model
 
     private
 
-    attr_reader :raw_model
+    attr_reader :raw_model, :types_validator
 
     def db
       raw_model.connection

data/lib/table_sync/receiving/model/sequel.rb

@@ -6,6 +6,7 @@ module TableSync::Receiving::Model
 
     def initialize(table_name)
       @raw_model = Class.new(::Sequel::Model(table_name)).tap(&:unrestrict_primary_key)
+      @types_validator = TableSync::Utils::Schema::Builder::Sequel.build(@raw_model)
 
       model_naming = ::TableSync::NamingResolver::Sequel.new(
         table_name:,
@@ -52,6 +53,10 @@ module TableSync::Receiving::Model
       result
     end
 
+    def validate_types(data)
+      types_validator.validate(data)
+    end
+
     def transaction(&)
       db.transaction(&)
     end
@@ -62,7 +67,7 @@ module TableSync::Receiving::Model
 
     private
 
-    attr_reader :raw_model
+    attr_reader :raw_model, :types_validator
 
     def dataset
       raw_model.dataset

data/lib/table_sync/utils/schema/builder/active_record.rb

@@ -0,0 +1,43 @@
+# frozen_string_literal: true
+
+class TableSync::Utils::Schema
+  module Builder
+    class ActiveRecord
+      class << self
+        Type = TableSync::Utils::Schema::Validator::Type
+
+        def build(model)
+          TableSync::Utils::Schema.new(schema(model))
+        end
+
+        private
+
+        def schema(model)
+          model.attribute_types.to_h do |key, value|
+            next [nil, nil] unless (type = type(value))
+            [key.to_sym, TableSync::Utils::Schema::Validator.new(type)]
+          end.tap(&:compact!)
+        end
+
+        def type(value)
+          case value
+          when ActiveModel::Type::String,
+               ActiveModel::Type::ImmutableString
+            Type::STRING
+          when ActiveModel::Type::DateTime,
+               ActiveModel::Type::Date,
+               ActiveModel::Type::Time
+            Type::DATETIME
+          when ActiveModel::Type::Integer,
+               ActiveModel::Type::Decimal,
+               ActiveModel::Type::Float,
+               ActiveModel::Type::BigInteger
+            Type::DECIMAL
+          when ActiveModel::Type::Boolean
+            Type::BOOLEAN
+          end
+        end
+      end
+    end
+  end
+end

data/lib/table_sync/utils/schema/builder/sequel.rb

@@ -0,0 +1,37 @@
+# frozen_string_literal: true
+
+class TableSync::Utils::Schema
+  module Builder
+    class Sequel
+      class << self
+        Type = TableSync::Utils::Schema::Validator::Type
+
+        def build(model)
+          TableSync::Utils::Schema.new(schema(model))
+        end
+
+        private
+
+        def schema(model)
+          model.db_schema.transform_values do |value|
+            next unless (type = type(value))
+            TableSync::Utils::Schema::Validator.new(type)
+          end.tap(&:compact!)
+        end
+
+        def type(value)
+          case value[:type]
+          when :string
+            Type::STRING
+          when :datetime, :date, :time
+            Type::DATETIME
+          when :integer, :decimal, :float
+            Type::DECIMAL
+          when :boolean
+            Type::BOOLEAN
+          end
+        end
+      end
+    end
+  end
+end

data/lib/table_sync/utils/schema/builder.rb

@@ -0,0 +1,5 @@
+# frozen_string_literal: true
+
+require_relative "validator"
+require_relative "builder/sequel"
+require_relative "builder/active_record"

data/lib/table_sync/utils/schema/validator/type.rb

@@ -0,0 +1,61 @@
+# frozen_string_literal: true
+
+class TableSync::Utils::Schema
+  class Validator
+    class Type
+      class Decimal < Type
+        def valid?(value)
+          !Float(value, exception: false).nil?
+        end
+      end
+
+      class DateTime < Type
+        def valid?(value)
+          Date._parse(value.to_s).any?
+        end
+      end
+
+      class Boolean < Type
+        def valid?(value)
+          %w[true false t f 0 1 on off].include?(value.to_s.downcase)
+        end
+      end
+
+      class Text < Type
+        def valid?(value)
+          return true if value.is_a?(::String)
+          return true if value.is_a?(::Symbol)
+          return true if Type::DECIMAL.valid?(value)
+          return true if Type::BOOLEAN.valid?(value)
+          return true if Type::DATETIME.valid?(value)
+          false
+        end
+      end
+
+      attr_reader :display_name
+
+      def initialize(display_name)
+        @display_name = display_name
+      end
+
+      # @!method valid?
+
+      # rubocop:disable Layout/ClassStructure
+      DECIMAL = Decimal.new("Decimal")
+      DATETIME = DateTime.new("DateTime")
+      BOOLEAN = Boolean.new("Boolean")
+      STRING = Text.new("String")
+      # rubocop:enable Layout/ClassStructure
+
+      def validate(value)
+        return if value.nil?
+        return if valid?(value)
+        "expected #{display_name}, got: #{value.class}"
+      end
+
+      def inspect
+        display_name.inspect
+      end
+    end
+  end
+end

data/lib/table_sync/utils/schema/validator.rb

@@ -0,0 +1,21 @@
+# frozen_string_literal: true
+
+require_relative "validator/type"
+
+class TableSync::Utils::Schema
+  class Validator
+    attr_reader :type
+
+    def initialize(type)
+      @type = type
+    end
+
+    def validate(value)
+      type.validate(value)
+    end
+
+    def inspect
+      type.inspect
+    end
+  end
+end

data/lib/table_sync/utils/schema.rb

@@ -0,0 +1,28 @@
+# frozen_string_literal: true
+
+# Next code checks that hash values have required data types
+
+require_relative "schema/builder"
+
+class TableSync::Utils::Schema
+  attr_reader :schema
+
+  def initialize(schema)
+    @schema = schema
+  end
+
+  def validate(data)
+    errors = nil
+    data.each do |row|
+      schema.each do |key, value|
+        if (error = value.validate(row[key]))
+          errors ||= {}
+          errors[key] = error
+        end
+      end
+
+      return errors.freeze unless errors.nil?
+    end
+    errors
+  end
+end

data/lib/table_sync/utils.rb

@@ -6,5 +6,6 @@ module TableSync
     require_relative "utils/proc_keywords_resolver"
     require_relative "utils/interface_checker"
     require_relative "utils/required_validator"
+    require_relative "utils/schema"
   end
 end

data/lib/table_sync/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module TableSync
-  VERSION = "6.8.0"
+  VERSION = "6.9.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: table_sync
 version: !ruby/object:Gem::Version
-  version: 6.8.0
+  version: 6.9.2
 platform: ruby
 authors:
 - Umbrellio
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-09-10 00:00:00.000000000 Z
+date: 2025-10-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: memery
@@ -128,6 +128,12 @@ files:
 - lib/table_sync/utils/proc_array.rb
 - lib/table_sync/utils/proc_keywords_resolver.rb
 - lib/table_sync/utils/required_validator.rb
+- lib/table_sync/utils/schema.rb
+- lib/table_sync/utils/schema/builder.rb
+- lib/table_sync/utils/schema/builder/active_record.rb
+- lib/table_sync/utils/schema/builder/sequel.rb
+- lib/table_sync/utils/schema/validator.rb
+- lib/table_sync/utils/schema/validator/type.rb
 - lib/table_sync/version.rb
 - log/.keep
 - table_sync.gemspec
@@ -150,7 +156,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.3
+rubygems_version: 3.3.27
 signing_key:
 specification_version: 4
 summary: DB Table synchronization between microservices based on Model's event system