nifval 0.2.1 → 0.2.2

data/Gemfile.lock

@@ -1,21 +1,27 @@
 PATH
   remote: .
   specs:
-    nifval (0.1.4)
+    nifval (0.2.2)
       activemodel
       i18n
 
 GEM
   remote: http://rubygems.org/
   specs:
-    activemodel (3.0.7)
-      activesupport (= 3.0.7)
-      builder (~> 2.1.2)
-      i18n (~> 0.5.0)
-    activesupport (3.0.7)
-    builder (2.1.2)
+    activemodel (3.2.8)
+      activesupport (= 3.2.8)
+      builder (~> 3.0.0)
+    activesupport (3.2.8)
+      i18n (~> 0.6)
+      multi_json (~> 1.0)
+    builder (3.0.3)
     diff-lcs (1.1.2)
-    i18n (0.5.0)
+    fuubar (1.0.0)
+      rspec (~> 2.0)
+      rspec-instafail (~> 0.2.0)
+      ruby-progressbar (~> 0.0.10)
+    i18n (0.6.1)
+    multi_json (1.3.6)
     rspec (2.5.0)
       rspec-core (~> 2.5.0)
       rspec-expectations (~> 2.5.0)
@@ -23,11 +29,14 @@ GEM
     rspec-core (2.5.1)
     rspec-expectations (2.5.0)
       diff-lcs (~> 1.1.2)
+    rspec-instafail (0.2.4)
     rspec-mocks (2.5.0)
+    ruby-progressbar (0.0.10)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
+  fuubar
   nifval!
   rspec (~> 2.5)

data/lib/nifval.rb

@@ -5,30 +5,86 @@ require "active_model"
 module Nifval
   class NifValidator < ActiveModel::EachValidator
     def validate_each(record, attribute, value)
-      if !is_valid_nif value
+      if value.nil? || !Document.new(value).valid?
         record.errors.add(attribute, I18n.t("nifval.wrong"))
       end
     end
 
     private
 
-    def is_valid_nif nif
-      # NIF not provided
-      return false if nif.nil?
+    class Document
+      attr_accessor :nif
+      def initialize(nif)
+        @nif = nif
 
-      # Add zeros to the left if applyable, and accept lowercase
-      nif = nif.rjust(9,'0')
-      nif = nif.upcase
+        setup
+      end
+
+      def valid?
+        case
+        when invalid_format? then false
+        when standard? then valid_standard?
+        when special? then valid_special?
+        when cif? then valid_cif?
+        when nie? then valid_nie?
+        else false
+        end
+      end
 
-      # Format
-      return false if
+      def setup
+        raise MissingNifException if nif.nil?
+
+        # Add zeros to the left if applyable, and accept lowercase
+        @nif = nif.rjust(9,'0')
+        nif.upcase!
+      end
+      private :setup
+
+      def invalid_format?
         !nif.match(/^[A-Z]{1}\d{7}[A-Z0-9]{1}$/) && !nif.match(/^[0-9]{8}[A-Z]{1}$/)
+      end
+
+      def standard?
+        nif.match(/^[0-9]{8}[A-Z]{1}$/)
+      end
+
+      def special?
+        nif.match(/^[KLM]{1}/)
+      end
+
+      def cif?
+        nif.match(/^[ABCDEFGHJNPQRSUVW]{1}/)
+      end
+
+      def nie?
+        nif.match(/^[XYZ]{1}/)
+      end
 
-      if nif.match(/^[0-9]{8}[A-Z]{1}$/)
-        # Standard NIF
+      def valid_cif?
+        nstr = cif_algorithm_value.to_s
+        (ival(nif[8]) == (64+cif_algorithm_value).chr) || (nif[8] == nstr[nstr.length-1])
+      end
+
+      def valid_nie?
+        niff = nif.gsub("X","0").gsub("Y","1").gsub("Z","2")
+        nif[8] == "TRWAGMYFPDXBNJZSQVHLCKE"[niff[0..7].to_i % 23]
+      end
+
+      def valid_special?
+        nif[8] == (64+cif_algorithm_value).chr
+      end
+
+      def valid_standard?
         nif[8] == "TRWAGMYFPDXBNJZSQVHLCKE"[nif[0..7].to_i % 23]
-      else
-        # CIF algorithm
+      end
+
+      def cif_algorithm_value
+        @cif_algorithm_value ||= calculate_cif_algorithm_value
+      end
+      private :cif_algorithm_value
+
+      def calculate_cif_algorithm_value
+        # CIF algorithm
         sum = ival(nif[2]) + ival(nif[4]) + ival(nif[6])
         [1,3,5,7].each do |i|
           t = (2*(ival(nif[i]))).to_s
@@ -37,32 +93,22 @@ module Nifval
           sum += t1+t2
         end
         sumstr = sum.to_s
-        n = 10 - ival(sumstr[sumstr.length-1])
-
-        if nif.match(/^[KLM]{1}/)
-          # Special NIFs (as CIFs)
-          nif[8] == (64+n).chr
-        elsif nif.match(/^[ABCDEFGHJNPQRSUVW]{1}/)
-          # CIFs
-          nstr = n.to_s
-          (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")
-          nif[8] == "TRWAGMYFPDXBNJZSQVHLCKE"[niff[0..7].to_i % 23]
+
+        (10 - ival(sumstr[sumstr.length-1]))
+      end
+      private :calculate_cif_algorithm_value
+
+      def ival v
+        if Gem::Version.new(RUBY_VERSION.dup) >= Gem::Version.new("1.9")
+          v.to_i
         else
-          false
+          v-48
         end
       end
+      private :ival
     end
 
-    def ival v
-      if Gem::Version.new(RUBY_VERSION.dup) >= Gem::Version.new("1.9")
-        v.to_i
-      else
-        v-48
-      end
-    end
+
   end
 end
 

data/lib/nifval/version.rb

@@ -1,3 +1,3 @@
 module NifVal
-  VERSION = "0.2.1"
+  VERSION = "0.2.2"
 end

data/nifval.gemspec

@@ -20,6 +20,7 @@ Gem::Specification.new do |s|
   s.require_paths = ["lib"]
 
   s.add_development_dependency "rspec", "~> 2.5"
+  s.add_development_dependency "fuubar"
   s.add_dependency "activemodel"
   s.add_dependency "i18n"
 end

data/spec/nifval_spec.rb

@@ -3,7 +3,7 @@ require 'spec_helper'
 class Test
   include ActiveModel::Validations
 
-  validates :testfield, :nif => true
+  validates :testfield, nif: true
 
   attr_accessor :testfield
 

data/test_app/app/views/nifs/index.html.haml

@@ -10,6 +10,7 @@
       %td= nif.value
       %td= link_to 'Show', nif
       %td= link_to 'Edit', edit_nif_path(nif)
-      %td= link_to 'Destroy', nif, :confirm => 'Are you sure?', :method => :delete
+      %td= button_to 'Destroy', nif, :confirm => 'Are you sure?', :method => :delete
 %br/
 = link_to 'New Nif', new_nif_path
+

metadata

@@ -1,76 +1,88 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: nifval
-version: !ruby/object:Gem::Version 
-  hash: 21
+version: !ruby/object:Gem::Version
+  version: 0.2.2
   prerelease: 
-  segments: 
-  - 0
-  - 2
-  - 1
-  version: 0.2.1
 platform: ruby
-authors: 
+authors:
 - Albert Bellonch
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-04-29 00:00:00 +02:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2012-09-24 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '2.5'
+  type: :development
   prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 9
-        segments: 
-        - 2
-        - 5
-        version: "2.5"
+      - !ruby/object:Gem::Version
+        version: '2.5'
+- !ruby/object:Gem::Dependency
+  name: fuubar
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: activemodel
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: activemodel
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: i18n
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: i18n
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id003
-description: Validates a Spanish NIF/CIF/NIE by verifying that the digit control corresponds to the number.
-email: 
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+description: Validates a Spanish NIF/CIF/NIE by verifying that the digit control corresponds
+  to the number.
+email:
 - albert@itnig.net
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - .rspec
 - Gemfile
 - Gemfile.lock
@@ -151,40 +163,30 @@ files:
 - test_app/test/unit/helpers/static_helper_test.rb
 - test_app/test/unit/nif_test.rb
 - test_app/vendor/plugins/.gitkeep
-has_rdoc: true
 homepage: https://github.com/albertbellonch/nifval
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: nifval
-rubygems_version: 1.5.2
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Validates a Spanish NIF/CIF/NIE
-test_files: 
+test_files:
 - spec/nifval_spec.rb
 - spec/spec_helper.rb