codice_fiscale 0.1 → 0.2

data/lib/codice_fiscale.rb

@@ -3,7 +3,7 @@
 #
 # This file is part of codice_fiscale.
 #
-# codice_fiscale is free software: you can redistribute it and/or modify 
+# codice_fiscale is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License as published
 # by the Free Software Foundation, either version 3 of the License, or
 # (at your option) any later version.
@@ -17,8 +17,8 @@
 # along with codice_fiscale. If not, see <http://www.gnu.org/licenses/>.
 #++
 
-class CodiceFiscale < String
-  VERSION = '0.1'
+class CodiceFiscale
+  VERSION = '0.2'
 
   MONTH = [nil, ?A, ?B, ?C, ?D, ?E, ?H, ?L, ?M, ?P, ?R, ?S, ?T]
 
@@ -82,14 +82,10 @@ class CodiceFiscale < String
 
   def name=(n)
     @name = n.upcase if n.is_a?(String) and n =~ /^[A-Z]+$/i
-
-    generate_code!
   end
 
   def surname=(s)
     @surname = s.upcase if s.is_a?(String) and s =~ /^[A-Z]+$/i
-
-    generate_code!
   end
 
   def bday=(day)
@@ -105,8 +101,6 @@ class CodiceFiscale < String
         @bday
       else @bday
     end
-
-    generate_code!
   end
 
   def bplace=(place)
@@ -119,21 +113,17 @@ class CodiceFiscale < String
         prov: $2
       }
     end
-
-    generate_code!
   end
 
   def gender=(gen)
-    if gen == :M or gen == :m or gen =~ /^m(ale)?$/i
+    if gen.to_s =~ /^m(ale)?$/i
       @gender = :M
-    elsif gen == :F or gen == :f or gen =~ /^f(emale)?$/i
+    elsif gen.to_s =~ /^f(emale)?$/i
       @gender = :F
     end
-
-    generate_code!
   end
 
-  def initialize(options = {})
+  def initialize(options={})
     self.name = options[:name]
     self.surname = options[:surname]
     self.bday = options[:bday]
@@ -141,59 +131,60 @@ class CodiceFiscale < String
     self.gender = options[:gender]
   end
 
-  def generate_code!
+  def to_s(separator=nil)
     return unless self.data?
-    code = ""
+    separator ||= ''
 
     # TRIPLET FOR SURNAME
-    code << (self.surname.scan(/[^AEIOU]/).join + self.surname.scan(/[AEIOU]/).join)[0, 3].ljust(3, 'X')
+    surname = (self.surname.scan(/[^AEIOU]/).join + self.surname.scan(/[AEIOU]/).join)[0, 3].ljust(3, 'X')
 
     # TRIPLET FOR NAME
-    cons = self.name.scan(/[^AEIOU]/).join
-    cons << cons[1] && cons[1] = '' if cons.size > 3
-    code << (cons + self.name.scan(/[AEIOU]/).join)[0, 3].ljust(3, 'X')
+    name = (self.name.scan(/[^AEIOU]/).join.tap {|cons|
+      cons << cons[1] && cons[1] = '' if cons.size > 3
+    } + self.name.scan(/[AEIOU]/).join)[0, 3].ljust(3, 'X')
 
     # QUINTET FOR BDAY AND GENDER
-    code << self.bday[:year].to_s.rjust(2, '0')
-    code << CodiceFiscale::MONTH[self.bday[:mon]]
-    code << (self.bday[:day] + (self.gender == :F ? 40 : 0)).to_s.rjust(2, '0')
+    q = self.bday[:year].to_s.rjust(2, '0') +
+        CodiceFiscale::MONTH[self.bday[:mon]] +
+        (self.bday[:day] + (self.gender == :F ? 40 : 0)).to_s.rjust(2, '0')
 
     # QUARTET FOR BPLACE
-    code << self.belfiore_code(self.bplace[:city], self.bplace[:prov])
-    
+    b_place = self.belfiore_code(self.bplace[:city], self.bplace[:prov])
+
     # CONTROL CODE
-    sum = 0
-    code.split(//).each_with_index {|ch, i|
-      sum += ALFANUM_TO_CODE[i.odd? ? :even : :odd][ch]
-    }
-    code << ((sum % 26) + 65).chr
+    code = ([surname, name, q, b_place].join.each_char.each_with_index.inject(0) {|sum, (ch, i)|
+      sum + ALFANUM_TO_CODE[i.odd? ? :even : :odd][ch]
+    } % 26 + 65).chr
 
-    self.replace(code)
+    [surname, name, q, b_place, code].join(separator)
   end
 
-  def belfiore_code(city, province = nil)
-    code = nil
+  def self.belfiore_code(city, province=nil)
     File.open(File.join(DBDIR, (province and province == 'EE' ? 'ee.db' : "#{city[0].downcase}.db"))) {|f|
       f.each_line {|line|
         co, c, p = line.strip.split(';')
-        code = co.dup and break if c == city and (province and province != 'EE' ? p == province : true)
+        break co if c == city and (province and province != 'EE' ? p == province : true)
       }
     }
+  end
 
-    code
+  def belfiore_code(city, province=nil)
+    self.class.belfiore_code(city, province)
   end
 
-  def alternative(level = 1)
-    code = self.dup
-    code.scan(/[0-9]/).reverse[0, level].each {|n|
-      i = code.rindex(n)
-      code[i] = ALTERNATIVE[code[i]]
+  def alternative(level=1, separator=nil)
+    self.to_s(separator).tap {|code|
+      code.scan(/[0-9]/).reverse[0, level].each {|n, i = code.rindex(n)|
+        code[i] = ALTERNATIVE[code[i]]
+      }
     }
-
-    code
   end
 
-  def alternative!(level = 1)
-    self.replace(self.alternative(level))
+  def ==(code)
+    code = code.to_s.scan(/[A-Z0-9]/i).join
+    return true if self.to_s == code
+    (1..7).any? {|x|
+      self.alternative(x) == code
+    }
   end
 end

data/lib/db/ee.db

@@ -50,7 +50,7 @@ Z115;GRECIA
 Z402;GROENLANDIA
 Z706;GUAM
 Z509;GUATEMALA
-Z607;GUAYANA FRANCESE
+Z607;GUIANA FRANCESE
 Z319;GUINEA
 Z321;GUINEA EQUATORIALE
 Z221;HONG KONG

metadata

@@ -1,36 +1,30 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: codice_fiscale
-version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-  - 0
-  - 1
-  version: "0.1"
+version: !ruby/object:Gem::Version
+  version: '0.2'
+  prerelease: 
 platform: ruby
-authors: 
+authors:
 - shura
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-01-15 00:00:00 +01:00
-default_executable: 
+date: 2011-11-15 00:00:00.000000000 Z
 dependencies: []
-
 description: Codice fiscale library
 email: shura1991@gmail.com
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
+- lib/db/y.db
+- lib/db/k.db
 - lib/db/n.db
 - lib/db/s.db
 - lib/db/e.db
 - lib/db/b.db
 - lib/db/r.db
+- lib/db/x.db
 - lib/db/l.db
 - lib/db/g.db
 - lib/db/a.db
@@ -41,6 +35,7 @@ files:
 - lib/db/f.db
 - lib/db/j.db
 - lib/db/t.db
+- lib/db/w.db
 - lib/db/c.db
 - lib/db/i.db
 - lib/db/v.db
@@ -50,37 +45,28 @@ files:
 - lib/db/u.db
 - lib/db/o.db
 - lib/codice_fiscale.rb
-has_rdoc: true
 homepage: http://github.com/shurizzle/ruby-codice_fiscale
 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 
-      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 
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.8.11
 signing_key: 
 specification_version: 3
-summary: Tiny library to make easy working with codice fiscale
+summary: Tiny library to make easy working with italian "codice fiscale"
 test_files: []
-