activerecord-databasevalidations 0.2.3 → 0.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 337cf9c69d98f33651b5a008c20f0d24648151ad
-  data.tar.gz: 3d604b4f812af63b98c0cc0de1820a0b61147eae
+  metadata.gz: 34dc53f04bf08ea073fef57188664b90956b8321
+  data.tar.gz: 1572b1ea15781c21c1ae70c46c3a5ff92732139a
 SHA512:
-  metadata.gz: 6700a0056bb6dd20e32b6c584b21509b1f2531bec7c7c26eb03d4eaff7f118ad2485b62657c97ac1409d80c0ad080a0389b0dc60344a17ff5e9614612d619d35
-  data.tar.gz: 09cc0d7b8c4dffd6f32700e2575e66d74c012f9215db3da75bfda9587f297c8578e5c3c9a38260bcf29123cc6b90726abe5c11c52213fc36a0432db5980ec37e
+  metadata.gz: 0eb07eaee9796217e129a10e1cd955fa48bfd97faa3eb4566331ae46a72c018376bec8b40a3756a42f9e2371d6c2c8e4806921aec74602e0e0992915a5b9b0dc
+  data.tar.gz: 00911b2ddf02fcb8acf37c42b9faa3e4fba6aa60f79d4086427f9ef2ed636f96e4d6039cf1ee71d2344a2225d086620934f7948f7315d3774f0237179e719bc9

data/lib/active_record/database_validations/version.rb

@@ -1,5 +1,5 @@
 module ActiveRecord
   module DatabaseValidations
-    VERSION = "0.2.3"
+    VERSION = "0.2.4"
   end
 end

data/lib/active_record/validations/string_truncator.rb

@@ -3,24 +3,35 @@ module ActiveRecord
     module StringTruncator
       extend ActiveSupport::Concern
 
+      def truncate_value_to_field_limit(field, value)
+        return if value.nil?
+
+        column = self.class.columns_hash[field.to_s]
+        maximum, type, encoding = ActiveRecord::DatabaseValidations::MySQL.column_size_limit(column)
+        value = ActiveRecord::DatabaseValidations::MySQL.value_for_column(value, encoding)
+
+        case type
+        when :characters
+          value = value.slice(0, maximum) if maximum && value.length > maximum
+        when :bytes
+          value = value.mb_chars.limit(maximum).to_s if maximum && value.bytesize > maximum
+        end
+
+        value
+      end
+
       module ClassMethods
+        def truncate_to_field_limit(field)
+          define_method(:"#{field}=") do |value|
+            super(truncate_value_to_field_limit(field, value))
+          end
+        end
+
         def truncate_string(field)
           method_name = :"truncate_#{field}_at_database_limit"
           define_method(method_name) do
             return unless self.changes.key?(field.to_s)
-            return if self[field].nil?
-
-            column = self.class.columns_hash[field.to_s]
-            maximum, type, encoding = ActiveRecord::DatabaseValidations::MySQL.column_size_limit(column)
-            value = ActiveRecord::DatabaseValidations::MySQL.value_for_column(self[field], encoding)
-
-            case type
-            when :characters
-              self[field] = value.slice(0, maximum) if maximum && value.length > maximum
-            when :bytes
-              self[field] = value.mb_chars.limit(maximum).to_s if maximum && value.bytesize > maximum
-            end
-
+            self[field] = truncate_value_to_field_limit(field, self[field])
             return # to make sure the callback chain doesn't halt
           end
           return method_name

data/test/string_truncator_test.rb

@@ -6,6 +6,8 @@ ActiveRecord::Migration.suppress_messages do
     t.string   :string,   limit: 255
     t.text     :tinytext, limit: 255
     t.text     :text
+
+    t.string :another_string, limit: 255
   end
 end
 
@@ -16,7 +18,9 @@ class MagicalCreature < ActiveRecord::Base
   before_validation truncate_string(:tinytext)
   before_validation truncate_string(:text)
 
-  validates :string, :tinytext, database_constraints: :size
+  validates :string, :tinytext, :text, :another_string, database_constraints: :size
+
+  truncate_to_field_limit :another_string
 end
 
 class StringTruncatorTest < Minitest::Test
@@ -63,4 +67,9 @@ class StringTruncatorTest < Minitest::Test
     assert u5.valid?
     assert_equal 'a' * 65535, u5.text
   end
+
+  def test_truncate_to_field_limit
+    u6 = MagicalCreature.new(another_string: 'a' * 256)
+    assert_equal 'a' * 255, u6.another_string
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activerecord-databasevalidations
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.2.4
 platform: ruby
 authors:
 - Willem van Bergen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-01 00:00:00.000000000 Z
+date: 2014-12-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord