validation_kit 1.0.0 → 1.0.1

data/lib/validation_kit/{validates_mixed_case_of/validates_mixed_case_of.rb → mixed_case_validator/mixed_case_validator.rb}

@@ -4,8 +4,8 @@ module ValidationKit
     ALL_LOWERCASE = -1
 
     def validate_each(record, attribute, value)
-      next if value.nil?
-      next if value.gsub(/\W/, "").size < 3 # skip very short words
+      return if value.nil?
+      return if value.gsub(/\W/, "").size < 3 # skip very short words
       error = nil
 
       if (value.upcase == value)
@@ -14,7 +14,7 @@ module ValidationKit
         error = ALL_LOWERCASE
       end
 
-      next if error.nil?
+      return if error.nil?
 
       item_name = I18n.t("activerecord.models.attributes.#{name.underscore}.#{attribute}",
                          :default => nil) or options[:attribute_name] or attribute

data/lib/validation_kit/{validates_as_phone/validates_as_phone.rb → phone_validator/phone_validator.rb}

@@ -23,9 +23,9 @@ module ValidationKit
         country = false
       end
 
-      next unless country
+      return unless country
       current_regex = regex_for_country(country)
-      next unless current_regex
+      return unless current_regex
 
       new_value = value.to_s.gsub(/[^0-9]/, '')
       new_value ||= ''

data/lib/validation_kit/postal_code_validator/postal_code_validator.rb

@@ -0,0 +1,87 @@
+module ValidationKit
+  class PostalCodeValidator < ActiveModel::EachValidator
+    def postal_code_regex_for_country(country_code)
+      if country_code.blank?
+        nil
+      elsif ["AU", "NZ"].include?(country_code)
+        /\d{4}/
+      elsif ["US"].include?(country_code)
+        /\d{5}(-\d{4})?/
+      elsif ["CA"].include?(country_code)
+        /[ABCEGHJKLMNPRSTVXY]\d[ABCEGHJKLMNPRSTWVXYZ]\d[ABCEGHJKLMNPRSTWVXYZ]\d/
+      else
+        nil
+      end
+    end
+
+    def disallowed_characters_for_country(country_code)
+      if country_code.blank?
+        nil
+      elsif ["US", "AU", "NZ"].include?(country_code)
+        /[^0-9]/
+      elsif ["CA", "UK"].include?(country_code)
+        /[^0-9A-Z]/
+      else
+        nil
+      end
+    end
+
+    def validate_each(record, attribute, value)
+      if options[:country].is_a?(String)
+        country = options[:country]
+      elsif options[:country].is_a?(Symbol) and record.respond_to?(options[:country])
+        country = record.send(options[:country])
+      elsif record.respond_to?(:country)
+        country = record.send(:country)
+      else
+        country = false
+      end
+
+      return unless country
+      current_regex = postal_code_regex_for_country(country)
+      return unless current_regex
+      disallowed_characters = disallowed_characters_for_country(country)
+
+      new_value = value.nil? ? "" : value.upcase.gsub(disallowed_characters, '')
+
+      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",
+                                      options[:message],
+                                      :'activerecord.errors.messages.invalid'])
+        record.errors[attribute] << message
+      else
+        record.send(attr_name.to_s + '=',
+          format_as_postal_code(new_value, country, disallowed_characters)
+        ) if options[:set]
+      end
+    end
+
+    def format_as_postal_code(arg, country_code, disallowed_characters)
+      return nil if (arg.blank? or country_code.blank? or !postal_code_regex_for_country(country_code))
+
+      postal_code = arg.gsub(disallowed_characters, '')
+
+      if ["US"].include?(country_code)
+        digit_count = postal_code.length
+        if digit_count == 5
+          return postal_code
+        elsif digit_count == 9
+          return "%s-%s" % [postal_code[0..4], postal_code[5..8]]
+        else
+          return nil
+        end
+
+      elsif ["AU", "NZ"].include?(country_code)
+        postal_code
+
+      elsif ["CA"].include?(country_code)
+        fsa = postal_code[0..2]
+        lda = postal_code[3..5]
+
+        postal_code = "%s %s" % [fsa, lda]
+        postal_code.upcase
+      end
+    end
+  end
+end

data/lib/validation_kit/version.rb

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

data/lib/validation_kit.rb

@@ -1,8 +1,10 @@
 require "validation_kit/version"
 
-validators = Dir[File.join(File.expand_path(File.join('..', __FILE__)), '**', '*.rb')]
+lib_path = File.dirname(__FILE__)
+validators = Dir[File.join(lib_path, '**', '*_validator.rb')]
 validators.each do |v|
   require v
+  validator_class = File.basename(v, '.rb').camelize
+  validator = "ValidationKit::#{validator_class}".constantize
+  ActiveModel::Validations.const_set(validator_class, validator)
 end
-
-module ValidationKit; end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: validation_kit
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-08 00:00:00.000000000 Z
+date: 2012-03-12 00:00:00.000000000 Z
 dependencies: []
 description: A collection of various validators for Rails forms
 email:
@@ -24,16 +24,16 @@ files:
 - Gemfile
 - Rakefile
 - lib/validation_kit.rb
-- lib/validation_kit/validates_as_email/README
-- lib/validation_kit/validates_as_email/validates_as_email.rb
-- lib/validation_kit/validates_as_phone/README
-- lib/validation_kit/validates_as_phone/validates_as_phone.rb
-- lib/validation_kit/validates_as_postal_code/README
-- lib/validation_kit/validates_as_postal_code/validates_as_postal_code.rb
-- lib/validation_kit/validates_mixed_case_of/README
-- lib/validation_kit/validates_mixed_case_of/config/locales/en.yml
-- lib/validation_kit/validates_mixed_case_of/config/locales/fr.yml
-- lib/validation_kit/validates_mixed_case_of/validates_mixed_case_of.rb
+- lib/validation_kit/email_validator/README
+- lib/validation_kit/email_validator/email_validator.rb
+- lib/validation_kit/mixed_case_validator/README
+- lib/validation_kit/mixed_case_validator/config/locales/en.yml
+- lib/validation_kit/mixed_case_validator/config/locales/fr.yml
+- lib/validation_kit/mixed_case_validator/mixed_case_validator.rb
+- lib/validation_kit/phone_validator/README
+- lib/validation_kit/phone_validator/phone_validator.rb
+- lib/validation_kit/postal_code_validator/README
+- lib/validation_kit/postal_code_validator/postal_code_validator.rb
 - lib/validation_kit/version.rb
 - validation_kit.gemspec
 homepage: https://github.com/turbovote/validation_kit

data/lib/validation_kit/validates_as_postal_code/validates_as_postal_code.rb

@@ -1,89 +0,0 @@
-module ValidationKit
-  class PostalCodeValidator < ActiveModel::EachValidator
-
-      def postal_code_regex_for_country(country_code)
-        if country_code.blank?
-          nil
-        elsif ["AU", "NZ"].include?(country_code)
-          /\d{4}/
-        elsif ["US"].include?(country_code)
-          /\d{5}(-\d{4})?/
-        elsif ["CA"].include?(country_code)
-          /[ABCEGHJKLMNPRSTVXY]\d[ABCEGHJKLMNPRSTWVXYZ]\d[ABCEGHJKLMNPRSTWVXYZ]\d/
-        else
-          nil
-        end
-      end
-
-      def disallowed_characters_for_country(country_code)
-        if country_code.blank?
-          nil
-        elsif ["US", "AU", "NZ"].include?(country_code)
-          /[^0-9]/
-        elsif ["CA", "UK"].include?(country_code)
-          /[^0-9A-Z]/
-        else
-          nil
-        end
-      end
-
-      def validate_each(record, attribute, value)
-        if options[:country].is_a?(String)
-          country = options[:country]
-        elsif options[:country].is_a?(Symbol) and record.respond_to?(options[:country])
-          country = record.send(options[:country])
-        elsif record.respond_to?(:country)
-          country = record.send(:country)
-        else
-          country = false
-        end
-
-        next unless country
-        current_regex = postal_code_regex_for_country(country)
-        next unless current_regex
-        disallowed_characters = disallowed_characters_for_country(country)
-
-        new_value = value.nil? ? "" : value.upcase.gsub(disallowed_characters, '')
-
-        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",
-                                        options[:message],
-                                        :'activerecord.errors.messages.invalid'])
-          record.errors[attribute] << message
-        else
-          record.send(attr_name.to_s + '=',
-            format_as_postal_code(new_value, country, disallowed_characters)
-          ) if options[:set]
-        end
-      end
-
-      def format_as_postal_code(arg, country_code, disallowed_characters)
-        return nil if (arg.blank? or country_code.blank? or !postal_code_regex_for_country(country_code))
-
-        postal_code = arg.gsub(disallowed_characters, '')
-
-        if ["US"].include?(country_code)
-          digit_count = postal_code.length
-          if digit_count == 5
-            return postal_code
-          elsif digit_count == 9
-            return "%s-%s" % [postal_code[0..4], postal_code[5..8]]
-          else
-            return nil
-          end
-
-        elsif ["AU", "NZ"].include?(country_code)
-          postal_code
-
-        elsif ["CA"].include?(country_code)
-          fsa = postal_code[0..2]
-          lda = postal_code[3..5]
-
-          postal_code = "%s %s" % [fsa, lda]
-          postal_code.upcase
-        end
-      end
-    end
-  end
-end