limitable 1.0.1 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e90558c6154eec0d84bc96b53b16feb809a6dfab2135a054e5d59a6714c49cfc
-  data.tar.gz: 5a2ac5366290ab0fe20904dd80166ca76a7d7f9aa0d1591d43a5d850312dd652
+  metadata.gz: 40858400b0402bc9997ba697359789cf32255fc366d746a79d9fefb01c725ef1
+  data.tar.gz: d8719386f9528e0f9c508ece436f02259cc620a9692f84466eef205c2d4eab09
 SHA512:
-  metadata.gz: f575314e180d4b218aaea9a062acaaa6aa26ac5193ae9a37d699f9bf0f4ed352bdd3960de99526b7d21a8ce1f5ea2a247e80b60ce565dd899ed50a229d8fe367
-  data.tar.gz: d08094e1249af6b703cd84c255d1e0b8fcfd23c0d7fe7c7f5c3d67fca369860ece3bcad070af83c1856ec639dabbf9a26d08bfa7aae848f62a054707f01f0bca
+  metadata.gz: cf6db368c846bd59f870c569d31a49f7bcb6a2d9e5cb508256b9acdbd9cf8b28582db914d0320af77354f8ea2517bcbbbcbb106861934fcbba96a52d25a89513
+  data.tar.gz: 205f0c6ced808e91f8c3475c0377093f52688e2b7e2c7b26e06e7071969f1c55a6692d1d271470b6f035eed45151910e604e04e23b6c66c28bfa3cd3c66013c4

data/CHANGELOG.md

@@ -1,3 +1,10 @@
+# [1.1.0](https://github.com/benmelz/limitable/compare/v1.0.1...v1.1.0) (2023-07-17)
+
+
+### Features
+
+* support for binary column limits ([#14](https://github.com/benmelz/limitable/issues/14)) ([43224d1](https://github.com/benmelz/limitable/commit/43224d1351052833246b94666b7aca76f8c89aa5)), closes [#3](https://github.com/benmelz/limitable/issues/3)
+
 ## [1.0.1](https://github.com/benmelz/limitable/compare/v1.0.0...v1.0.1) (2023-06-09)
 
 

data/README.md

@@ -34,8 +34,8 @@ gem install limitable
 
 ## Usage
 
-Once included in a model, `Limitable` will scan `integer`, `string` and `text` columns for size limits
-and define byte size validations accordingly. Limits are configurable through `ActiveRecord` migrations.
+Once included in a model, `Limitable` will scan `integer`, `string`, `text` and `binary` columns for size limits,
+defining byte size validations accordingly. Limits are configurable through `ActiveRecord` migrations.
 
 ### Quick Start
 
@@ -72,7 +72,7 @@ limits in your database migrations/schema unless you want to change them from th
 #### `pg`
 
 PostgreSQL has and reports hard limits on its integer columns, however it supports and defaults to unlimited
-string/text columns. If you wish for limits to be validated on those columns, they must be explicitly set in your
+string/text/binary columns. If you wish for limits to be validated on those columns, they must be explicitly set in your
 database migrations/schema.
 
 #### `sqlite3`

data/lib/limitable/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Limitable
-  VERSION = '1.0.1'
+  VERSION = '1.1.0'
 end

data/lib/limitable.rb

@@ -8,13 +8,13 @@ require_relative 'limitable/version'
 # == Limitable
 #
 # Module that declares database limit validations when included in an ActiveRecord model class. Supports limit
-# inferences on integer, string and text columns.
+# inferences on integer, string, text and binary columns.
 #
 module Limitable
   class << self
     def included(klass)
-      safe_column_names(klass)&.each do |column_name|
-        add_limit_validation klass, column_name
+      safe_column_names(klass).each do |column_name|
+        attach_limit_validator_if_needed klass, column_name
       end
     end
 
@@ -23,53 +23,51 @@ module Limitable
     def safe_column_names(klass)
       klass.column_names
     rescue ActiveRecord::ActiveRecordError, ArgumentError
-      nil
+      []
     end
 
-    def add_limit_validation(klass, column_name)
+    def attach_limit_validator_if_needed(klass, column_name)
       column = klass.column_for_attribute column_name
       limit = column.sql_type_metadata.limit
       return if limit.blank?
 
       case column.type
       when :integer
-        add_integer_limit_validation klass, column_name, limit
-      when :string, :text
-        add_string_limit_validation klass, column_name, limit
+        klass.validate(&build_integer_limit_validator(column_name, limit))
+      when :binary, :string, :text
+        klass.validate(&build_string_limit_validator(column_name, limit))
       end
     end
 
-    def add_integer_limit_validation(klass, column_name, limit)
+    def build_integer_limit_validator(column_name, limit)
       min, max = integer_limit_range limit
-      integer_type_normalizer = method :integer_type_normalizer
-      klass.validate do
-        value = integer_type_normalizer.call klass, column_name, self[column_name]
-        next unless value.is_a?(Integer)
+      lambda do
+        value = begin
+          self.class.type_for_attribute(column_name).serialize self[column_name]
+        rescue ActiveModel::RangeError => e
+          e.message.match(/(?<number>\d+) is out of range/)[:number].to_i
+        end
+        next unless value.is_a? Integer
 
         errors.add column_name, I18n.t('errors.messages.greater_than_or_equal_to', count: min) if value < min
         errors.add column_name, I18n.t('errors.messages.less_than_or_equal_to', count: max) if value > max
       end
     end
 
-    def integer_limit_range(limit)
-      max = (1 << ((limit * 8) - 1)) - 1
-      min = -max
-      [min, max]
-    end
-
-    def integer_type_normalizer(klass, column_name, value)
-      klass.type_for_attribute(column_name).serialize value
-    rescue ActiveModel::RangeError => e
-      e.message.match(/(?<number>\d+) is out of range/)[:number].to_i
-    end
-
-    def add_string_limit_validation(klass, column_name, limit)
-      klass.validate do
-        value = klass.type_for_attribute(column_name).serialize self[column_name]
+    def build_string_limit_validator(column_name, limit)
+      lambda do
+        value = self.class.type_for_attribute(column_name).serialize self[column_name]
+        value = value.to_s if value.is_a? ActiveModel::Type::Binary::Data
         next unless value.is_a?(String) && value.bytesize > limit
 
         errors.add column_name, I18n.t('errors.messages.too_long.other', count: limit)
       end
     end
+
+    def integer_limit_range(limit)
+      max = (1 << ((limit * 8) - 1)) - 1
+      min = -max
+      [min, max]
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: limitable
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.1.0
 platform: ruby
 authors:
 - Benjamin Melz
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-06-09 00:00:00.000000000 Z
+date: 2023-07-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -70,7 +70,7 @@ licenses:
 metadata:
   homepage_uri: https://github.com/benmelz/limitable
   source_code_uri: https://github.com/benmelz/limitable
-  changelog_uri: https://github.com/benmelz/limitable/blob/v1.0.1/CHANGELOG.md
+  changelog_uri: https://github.com/benmelz/limitable/blob/v1.1.0/CHANGELOG.md
   rubygems_mfa_required: 'true'
 post_install_message: 
 rdoc_options: []