activerecord-databasevalidations 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e4aea1bc84aef567070fd2cb3febe2bdb6895daf
-  data.tar.gz: 2e8257b79b80d5b84d791b3ec7dfcffe3d115ea4
+  metadata.gz: 608512afb0bd466e2129b4ff11b4c6a03d6a69f5
+  data.tar.gz: 5ec035ae1221a5519ce1acad4ac5855e402e909a
 SHA512:
-  metadata.gz: f7359255dd4cd2ad194d62aca4c6b7c19ffb26c999cb77a8d453b4fc28f7617f4bb4b30e520180a7a3cbf190fccccd08d31ca0d3e776d2d153ef6b4dcb9d41ff
-  data.tar.gz: 320f2a3744403023282bb9399fcc720a6592913142283dd8b3c3ec9e82146de6e7974e78b9678c4cc2e1ac924eb250f9acbe8adb70d9dcb56257b0d492bf96b8
+  metadata.gz: 82727638c4003d042fd9466879f40ada27259903efb1c9e939a8398508f8f7e5e29038d667314f929e2af5bd547be68554ad94fe74f0b342ee84e00895b24071
+  data.tar.gz: c98d2eea1a40164736f2f6830971b72f4d7b3710f7c0597d2890e53e9628c6746b679a964b2db9b51b0ea7acbe5324f83a7807746bf981f88a102859967c351f

data/lib/active_record/database_validations/version.rb

@@ -1,5 +1,5 @@
 module ActiveRecord
   module DatabaseValidations
-    VERSION = "0.2.0"
+    VERSION = "0.2.1"
   end
 end

data/lib/active_record/validations/string_truncator.rb

@@ -14,7 +14,7 @@ module ActiveRecord
 
               limit = StringTruncator.mysql_textual_column_limit(column)
               value = self[field].to_s
-              if value.length > limit
+              if limit && value.length > limit
                 self[field] = value.slice(0, limit)
               end
               return true # to make sure the callback chain doesn't halt
@@ -28,7 +28,7 @@ module ActiveRecord
               limit = StringTruncator.mysql_textual_column_limit(column)
               value = self[field].to_s
               value.encode!('utf-8') if value.encoding != Encoding::UTF_8
-              if value.bytesize > limit
+              if limit && value.bytesize > limit
                 self[field] = value.mb_chars.limit(limit).to_s
               end
               return true # to make sure the callback chain doesn't halt
@@ -41,7 +41,10 @@ module ActiveRecord
         @mysql_textual_column_limits ||= {}
         @mysql_textual_column_limits[column] ||= begin
           raise ArgumentError, "Only UTF-8 textual columns are supported." unless column.text? && column.collation =~ /\Autf8_/
-          column.limit
+
+          column_type = column.sql_type.sub(/\(.*\z/, '').gsub(/\s/, '_').to_sym
+          type_limit  = ActiveRecord::Validations::DatabaseConstraintsValidator::TYPE_LIMITS.fetch(column_type, {})
+          column.limit || type_limit[:default_maximum]
         end
       end
     end

data/test/string_truncator_test.rb

@@ -5,6 +5,7 @@ ActiveRecord::Migration.suppress_messages do
   ActiveRecord::Migration.create_table("magical_creatures", force: true, options: "CHARACTER SET utf8mb3") do |t|
     t.string   :string,   limit: 255
     t.text     :tinytext, limit: 255
+    t.text     :text
   end
 end
 
@@ -13,6 +14,7 @@ class MagicalCreature < ActiveRecord::Base
 
   before_validation truncate_string(:string)
   before_validation truncate_string(:tinytext)
+  before_validation truncate_string(:text)
 
   validates :string, :tinytext, database_constraints: :size
 end
@@ -55,4 +57,10 @@ class StringTruncatorTest < Minitest::Test
     assert_equal 'ü' * 127, u4.tinytext
     assert_equal Encoding::UTF_8, u4.tinytext.encoding
   end
+
+  def test_knows_limits_of_standard_types
+    u5 = MagicalCreature.new(text: 'a' * 65536)
+    assert u5.valid?
+    assert_equal 'a' * 65535, u5.text
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: activerecord-databasevalidations
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Willem van Bergen