cfita 0.0.5 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 79fb90478a1c2e761048d863091a60dff5ea118a48b68527ecc2df1fb849d05f
-  data.tar.gz: cb18f19a6a571135d0a7c60963524c5af2d8f1d144283c64892eb93d957b47f8
+  metadata.gz: ab4e090398ad28be565fc5dc2470eb89f2671d23ecc9e7fc6692140616248d53
+  data.tar.gz: 8ac27e3e98e65c3dbd414cb3e1345ddb91f4ee36f3eebe333b3967fd4b1632b2
 SHA512:
-  metadata.gz: 896d41364afed131d83b36d5de1a606cf5e635c4273486c6d9daf20f2e0f272b3577fcf9d6125827286f5be1c0d7463b5ec019b0aa4d53708865e49bff5eb2bb
-  data.tar.gz: 6fed50fdd92d079305eb28a5578bcc1f6d496fe8ad6805f2195e933c728f8684eeb32f0e98bfc4a7a171f72db403e79319ba3bcedfa6ee9594be285e6e48c52e
+  metadata.gz: b7b62b6ca733a0b89aacbaffcfd12e4249ca02463c5b650d074d55284096aecfdf39af980fb26a9c4cbb3b546c5fbac9e8b969831e71d1bc4574a5c1901f821b
+  data.tar.gz: 524c5a1c6d6d849e939a507706db4ab5ad05177008fddf22538778e4e53a0327acffd3193a00b9f112722612b2bcd24e925b7f8489898f89d1f9cc6b9dadc515

data/cfita.gemspec

@@ -3,8 +3,8 @@
 Gem::Specification.new do |s|
   s.required_ruby_version = '>= 2.4'
   s.name        = 'cfita'
-  s.version     = '0.0.5'
-  s.date        = '2019-06-17'
+  s.version     = '0.0.6'
+  s.date        = '2019-06-18'
   s.summary     = 'Italian fiscal code checker'
   s.description = 'Controllo codici fiscali italiani'
   s.authors     = ['Stefano Savanelli']

data/lib/cfita/codice_fiscale.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 require 'active_support/all'
-require 'cfita/codici_catastali'
+require 'cfita/codici_catastali.rb'
 
 module Cfita
   # Controllo codice fiscale italiano
@@ -16,11 +16,18 @@ module Cfita
       @ccat ||= JSON.parse(open('ccat.json'))
     end
 
-    def initialize(fiscal_code, birth_place: nil, birth_date: nil)
+    def initialize(
+      fiscal_code,
+      birth_place: nil,
+      birth_date: nil,
+      name: nil,
+      surname: nil
+    )
       @fiscal_code = fiscal_code.upcase.strip
       @birth_place = birth_place&.upcase
       @birth_date = birth_date && (birth_date.is_a?(Date) ? birth_date : Date.parse(birth_date))
-      @data = {}
+      @name = name&.parameterize&.upcase
+      @surname = surname&.parameterize&.upcase
       @errors = []
       parse
     end
@@ -29,10 +36,8 @@ module Cfita
       fiscal_code
     end
 
-    def valid?(birth_place: nil)
-      result = errors.empty?
-      result = birth_place?(birth_place) if result && birth_place
-      result
+    def valid?
+      errors.empty?
     end
 
     private
@@ -45,10 +50,48 @@ module Cfita
       check_checksum
       return if errors.any?
 
+      check_name
+      check_surname
       check_birth_date
       check_birth_place
     end
 
+    def check_name
+      return unless @name
+
+      a, b, c, d = consonants(@name)
+      name_code = (
+        (d ? [a, c, d] : [a, b, c]).compact.join +
+        vowels(@name).join +
+        'XXX'
+      )[0..2]
+
+      errors << "Il nome non corrisponde al codice '#{name_code}'" unless name_code == @fiscal_code[3..5]
+    end
+
+    def check_surname
+      return unless @surname
+
+      surname_code = (
+        consonants(@surname).join +
+        vowels(@surname).join +
+        'XXX'
+      )[0..2]
+
+      errors << "Il cognome non corrisponde al codice '#{surname_code}'" unless surname_code == @fiscal_code[0..2]
+    end
+
+    VOWELS = 'AEIOU'.chars.freeze
+    CONSONANTS = (('A'..'Z').to_a - VOWELS).freeze
+
+    def vowels(word)
+      word.chars.select { |char| char.in? VOWELS }
+    end
+
+    def consonants(word)
+      word.chars.select { |char| char.in? CONSONANTS }
+    end
+
     def check_size
       size = @fiscal_code.size
       errors << "Lunghezza errata (#{size})" unless size == 16
@@ -101,7 +144,7 @@ module Cfita
       end
     end
 
-    MESI = 'ABCDEHLMPRST'.freeze
+    MESI = 'ABCDEHLMPRST'
 
     def check_birth_date
       yy = cifre(6..7)
@@ -129,9 +172,9 @@ module Cfita
       end
     end
 
-    def yy2yyyy(yy)
+    def yy2yyyy(year_as_yy)
       Date.today.year -
-        (Date.today.year % 100 + 100 - yy ) % 100
+        (Date.today.year % 100 + 100 - year_as_yy) % 100
     end
 
     def cifre(range)