activerecord-databasevalidations 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 608512afb0bd466e2129b4ff11b4c6a03d6a69f5
-  data.tar.gz: 5ec035ae1221a5519ce1acad4ac5855e402e909a
+  metadata.gz: c00506fa5c0018170d2c1b919b76f0a334cd1216
+  data.tar.gz: 6d8631cb529bbbeb52e53211f83dc27b9be94084
 SHA512:
-  metadata.gz: 82727638c4003d042fd9466879f40ada27259903efb1c9e939a8398508f8f7e5e29038d667314f929e2af5bd547be68554ad94fe74f0b342ee84e00895b24071
-  data.tar.gz: c98d2eea1a40164736f2f6830971b72f4d7b3710f7c0597d2890e53e9628c6746b679a964b2db9b51b0ea7acbe5324f83a7807746bf981f88a102859967c351f
+  metadata.gz: 8fddcc3dcfee81c8dd7c9d2c812de2567307e30176ffc52b503218b30a0779d8a5668bce442990335f9d60e1817b28eb2ddfba8a164adb7828019cc1afbcf919
+  data.tar.gz: 4a41f0963cc799e802518fc21a97b1583bc7978136e4ec28c49f6a7d5b1be642e6f4ea3e86cbfcdb9a6873bf04168b95111dfba4ce724ec1e5bf34c7fd6d5021

data/README.md

@@ -1,4 +1,4 @@
-# ActiveRecord::DatabaseValidations
+# ActiveRecord::DatabaseValidations [![Build Status](https://travis-ci.org/wvanbergen/activerecord-databasevalidations.svg?branch=master)](https://travis-ci.org/wvanbergen/activerecord-databasevalidations)
 
 Add validations to your ActiveRecord models based on your database constraints.
 

data/lib/active_record/database_validations/version.rb

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

data/lib/active_record/validations/string_truncator.rb

@@ -5,35 +5,32 @@ module ActiveRecord
 
       module ClassMethods
         def truncate_string(field)
-          column = self.columns_hash[field.to_s]
-          case column.type
-          when :string
-            lambda do
-              return unless self.changes.key?(field.to_s)
-              return if self[field].nil?
+          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?
 
-              limit = StringTruncator.mysql_textual_column_limit(column)
+            column = self.class.columns_hash[field.to_s]
+            limit = StringTruncator.mysql_textual_column_limit(column)
+
+            case column.type
+            when :string
               value = self[field].to_s
               if limit && value.length > limit
                 self[field] = value.slice(0, limit)
               end
-              return true # to make sure the callback chain doesn't halt
-            end
 
-          when :text
-            lambda do
-              return unless self.changes.key?(field.to_s)
-              return if self[field].nil?
-
-              limit = StringTruncator.mysql_textual_column_limit(column)
+            when :text
               value = self[field].to_s
               value.encode!('utf-8') if value.encoding != Encoding::UTF_8
               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
             end
+
+            return # to make sure the callback chain doesn't halt
           end
+          return method_name
         end
       end
 

metadata

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