spanish_vat_validators 0.0.2 → 0.0.3

data/README.md

@@ -31,7 +31,7 @@ Or install it yourself as:
 Just use any of the following validators.
 
     # A person id
-    class Person < ActiveRecord::Base
+    class Spaniard < ActiveRecord::Base
       validates :dni, :valid_nif => true
     end
 
@@ -45,9 +45,14 @@ Just use any of the following validators.
       validates :nie, :valid_nie => true
     end
 
+    # Any person id
+    class Person < ActiveRecord::Base
+      validates :any_id, :valid_spanish_id => true
+    end
+
     # Any kind of id is valid
     class SpanishSubject < ActiveRecord::Base
-      validates :id, :valid_spanish_vat => true
+      validates :nif, :valid_spanish_vat => true
     end
 
 ## Contributing

data/lib/spanish_vat_validators/version.rb

@@ -1,3 +1,3 @@
 module SpanishVatValidators
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

data/lib/spanish_vat_validators.rb

@@ -11,10 +11,10 @@ module ActiveModel::Validations
     # Validates NIF
     def validate_nif(v)
       return false if v.nil? || v.empty?
-      value = v.clone
+      value = v.upcase
       return false unless value.match(/[0-9]{8}[a-z]/i)
       letters = "TRWAGMYFPDXBNJZSQVHLCKE"
-      check = value.slice!(value.length - 1..value.length - 1).upcase
+      check = value.slice!(value.length - 1..value.length - 1)
       calculated_letter = letters[value.to_i % 23].chr
       return check === calculated_letter
     end
@@ -52,14 +52,13 @@ module ActiveModel::Validations
       end
     end
 
-    # Validates NIE, in fact is a fake, a NIE is really a NIF with first number changed to capital 'X' letter, so we change the first X to a 0 and then try to
-    # pass the nif validator
+    # Validates NIE
+    # a NIE is really a NIF with first number changed to capital X, Y or Z letter
     def validate_nie(v)
-      return false if v.nil? || v.empty?
-      value = v.clone
-      return false unless value.match(/[x][0-9]{7,8}[a-z]/i)
-      value[0] = '0'
-      value.slice(0) if value.size > 9
+	  return false if v.nil? || v.empty?
+      value = v.upcase
+      return false unless value.match(/[xyz][0-9]{7}[a-z]/i)
+      value[0] = {"X" => "0", "Y" => "1", "Z" => "2"}[value[0]]
       validate_nif(value)
     end
   end
@@ -72,6 +71,14 @@ module ActiveModel::Validations
     end
   end
 
+  # Validates any Spanish person number
+  class ValidSpanishIdValidator < ActiveModel::EachValidator
+    include SpanishVatValidatorsHelpers
+    def validate_each(record, attribute, value)
+      record.errors[attribute] = message unless validate_nif(value) or validate_nie(value)
+    end
+  end
+
   # Validates NIF number only
   class ValidNifValidator < ActiveModel::EachValidator
     include SpanishVatValidatorsHelpers
@@ -92,7 +99,7 @@ module ActiveModel::Validations
   class ValidNieValidator < ActiveModel::EachValidator
     include SpanishVatValidatorsHelpers
     def validate_each(record, attribute,value)
-      record.errors[attribute] = message('nie') unless validate_cif(value)
+      record.errors[attribute] = message('nie') unless validate_nie(value)
     end
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: spanish_vat_validators
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-25 00:00:00.000000000 Z
+date: 2013-04-17 00:00:00.000000000 Z
 dependencies: []
 description: Provides validators for spanish VAT numbers (NIF, CIF and NIE)
 email:
@@ -53,4 +53,3 @@ specification_version: 3
 summary: Provides Rails3 compatible validators for spanish VAT numbers (NIF, CIF and
   NIE), with support for I18n
 test_files: []
-has_rdoc: