validation_kit 1.0.1 → 1.0.2

data/lib/validation_kit/email_validator/email_validator.rb

@@ -9,8 +9,9 @@ module ValidationKit
 
     def validate_each(record, attribute, value)
       unless EMAIL_ADDRESS_RE.match(value)
-        message = I18n.t("activerecord.errors.models.#{name.underscore}.attributes.#{attr_name}.invalid",
-                         :default => [:"activerecord.errors.models.#{name.underscore}.invalid",
+        model_name = record.class.to_s
+        message = I18n.t("activerecord.errors.models.#{model_name.underscore}.attributes.#{attribute}.invalid",
+                         :default => [:"activerecord.errors.models.#{model_name.underscore}.invalid",
                                       options[:message],
                                       :'activerecord.errors.messages.invalid'])
         record.errors[attribute] << message

data/lib/validation_kit/mixed_case_validator/mixed_case_validator.rb

@@ -16,19 +16,21 @@ module ValidationKit
 
       return if error.nil?
 
-      item_name = I18n.t("activerecord.models.attributes.#{name.underscore}.#{attribute}",
+      model_name = record.class.to_s
+
+      item_name = I18n.t("activerecord.models.attributes.#{model_name.underscore}.#{attribute}",
                          :default => nil) or options[:attribute_name] or attribute
 
       if error == ALL_CAPS
-       message = I18n.t("activerecord.errors.models.attributes.#{name.underscore}.#{attr_name}.all_caps",
+       message = I18n.t("activerecord.errors.models.attributes.#{model_name.underscore}.#{attribute}.all_caps",
                    :item => item_name,
-                   :default => [:"activerecord.errors.models.#{name.underscore}.all_caps",
+                   :default => [:"activerecord.errors.models.#{model_name.underscore}.all_caps",
                                 options[:all_caps],
                                 :'activerecord.errors.messages.all_caps'])
       elsif error == ALL_LOWERCASE
-        message = I18n.t("activerecord.errors.models.attributes.#{name.underscore}.#{attr_name}.all_lowercase",
+        message = I18n.t("activerecord.errors.models.attributes.#{model_name.underscore}.#{attributes}.all_lowercase",
                     :item => item_name,
-                    :default => [:"activerecord.errors.models.#{name.underscore}.all_lowercase",
+                    :default => [:"activerecord.errors.models.#{model_name.underscore}.all_lowercase",
                                  options[:all_lowercase],
                                  :'activerecord.errors.messages.all_lowercase'])
       end

data/lib/validation_kit/phone_validator/phone_validator.rb

@@ -30,8 +30,10 @@ module ValidationKit
       new_value = value.to_s.gsub(/[^0-9]/, '')
       new_value ||= ''
 
-      message = I18n.t("activerecord.errors.models.#{name.underscore}.attributes.#{attr_name}.invalid",
-                       :default => [:"activerecord.errors.models.#{name.underscore}.invalid",
+      model_name = record.class.to_s
+
+      message = I18n.t("activerecord.errors.models.#{model_name.underscore}.attributes.#{attribute}.invalid",
+                       :default => [:"activerecord.errors.models.#{model_name.underscore}.invalid",
                        options[:message], :'activerecord.errors.messages.invalid'])
 
       unless (options[:allow_blank] && new_value.blank?) || new_value =~ current_regex
@@ -42,7 +44,7 @@ module ValidationKit
           if formatted_phone.nil?
             record.errors[attribute] << message
           else
-            record.send(attr_name.to_s + '=', formatted_phone)
+            record.send(attribute.to_s + '=', formatted_phone)
           end
         end # options
       end # unless

data/lib/validation_kit/postal_code_validator/postal_code_validator.rb

@@ -44,14 +44,16 @@ module ValidationKit
 
       new_value = value.nil? ? "" : value.upcase.gsub(disallowed_characters, '')
 
+      model_name = record.class.to_s
+
       unless (options[:allow_blank] && new_value.blank?) || new_value =~ current_regex
-        message = I18n.t("activerecord.errors.models.#{name.underscore}.attributes.#{attribute}.invalid",
-                         :default => [:"activerecord.errors.models.#{name.underscore}.invalid",
+        message = I18n.t("activerecord.errors.models.#{model_name.underscore}.attributes.#{attribute}.invalid",
+                         :default => [:"activerecord.errors.models.#{model_name.underscore}.invalid",
                                       options[:message],
                                       :'activerecord.errors.messages.invalid'])
         record.errors[attribute] << message
       else
-        record.send(attr_name.to_s + '=',
+        record.send(attribute.to_s + '=',
           format_as_postal_code(new_value, country, disallowed_characters)
         ) if options[:set]
       end

data/lib/validation_kit/version.rb

@@ -1,3 +1,3 @@
 module ValidationKit
-  VERSION = "1.0.1"
+  VERSION = "1.0.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: validation_kit
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-12 00:00:00.000000000 Z
+date: 2012-03-13 00:00:00.000000000 Z
 dependencies: []
 description: A collection of various validators for Rails forms
 email: