nifval 0.1.1 → 0.1.2

data/lib/nifval/version.rb

@@ -1,3 +1,3 @@
 module NifVal
-  VERSION = "0.1.1"
+  VERSION = "0.1.2"
 end

data/lib/nifval.rb

@@ -1,12 +1,12 @@
+# encoding: utf-8
 # Adapted from http://compartecodigo.com/javascript/validar-nif-cif-nie-segun-ley-vigente-31.html
-
 require "active_model"
 
 module NifVal
   class NifValidator < ActiveModel::EachValidator
     def validate_each(record, attribute, value)
       if !is_valid_nif value
-        record.errors[attribute] << "NIF/CIF/NIE no válido"
+        record.errors.add(attribute, "NIF/NIE Inválido")
       end
     end
 
@@ -25,15 +25,15 @@ module NifVal
         nif[8] == "TRWAGMYFPDXBNJZSQVHLCKE"[nif[0..7].to_i % 23]
       else
         # CIF algorithm
-        sum = nif[2]-48 + nif[4]-48 + nif[6]-48
+        sum = ival(nif[2]) + ival(nif[4]) + ival(nif[6])
         [1,3,5,7].each do |i|
-          t = (2*(nif[i]-48)).to_s
-          t1 = t[0]-48
-          t2 = t[1].nil? ? 0 : t[1]-48
+          t = (2*(ival(nif[i]))).to_s
+          t1 = ival(t[0])
+          t2 = t[1].nil? ? 0 : ival(t[1])
           sum += t1+t2
         end
         sumstr = sum.to_s
-        n = 10 - (sumstr[sumstr.length-1]-48)
+        n = 10 - ival(sumstr[sumstr.length-1])
 
         if nif.match(/^[KLM]{1}/)
           # Special NIFs (as CIFs)
@@ -41,7 +41,7 @@ module NifVal
         elsif nif.match(/^[ABCDEFGHJNPQRSUVW]{1}/)
           # CIFs
           nstr = n.to_s
-          (nif[8] == (64+n).chr) || (nif[8] == nstr[nstr.length-1])
+          (ival(nif[8]) == (64+n).chr) || (nif[8] == nstr[nstr.length-1])
         elsif nif.match(/^[XYZ]{1}/)
           # NIE
           niff = nif.gsub("X","0").gsub("Y","1").gsub("Z","2")
@@ -51,6 +51,10 @@ module NifVal
         end
       end
     end
+
+    def ival v
+      RUBY_VERSION<="1.8.7" ? (v - 48) : v.to_i
+    end
   end
 end
 

data/spec/nifval_spec.rb

@@ -28,7 +28,7 @@ describe NifVal do
   # Invalid NIFs
   context "when we check invalid NIFs" do
     it "should return ERROR" do
-      nif_validity "A2345678C", false
+      nif_validity "12345678T", false
     end
   end
 
@@ -42,7 +42,7 @@ describe NifVal do
   # Invalid CIFs
   context "when we check invalid CIFs" do
     it "should return ERROR" do
-      nif_validity "12345678T", false
+      nif_validity "A2345678C", false
     end
   end
 

metadata

@@ -1,13 +1,8 @@
 --- !ruby/object:Gem::Specification 
 name: nifval
 version: !ruby/object:Gem::Version 
-  hash: 25
   prerelease: 
-  segments: 
-  - 0
-  - 1
-  - 1
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors: 
 - Albert Bellonch
@@ -15,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-07 00:00:00 +02:00
+date: 2011-04-14 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -26,10 +21,6 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 9
-        segments: 
-        - 2
-        - 5
         version: "2.5"
   type: :development
   version_requirements: *id001
@@ -41,9 +32,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
         version: "0"
   type: :runtime
   version_requirements: *id002
@@ -81,23 +69,17 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
       version: "0"
 requirements: []
 
 rubyforge_project: nifval
-rubygems_version: 1.5.2
+rubygems_version: 1.6.1
 signing_key: 
 specification_version: 3
 summary: Validates a Spanish NIF/CIF/NIE