codice-fiscale 0.0.9 → 1.0.1

data/lib/codice_fiscale/codes/country_codes.csv

@@ -1 +1,216 @@
-CONTIN,SIGLA,DENOMINAZ,CODICE,DATAIST,DATASOP,CODRIF,DATAVARIAZ
+Albania,Albania,Z100
+Andorra,Andorra,Z101
+Austria,Austria,Z102
+Belgio,Belgium,Z103
+Bulgaria,Bulgaria,Z104
+Danimarca,Denmark,Z107
+Finlandia,Finland,Z109
+Francia,France,Z110
+Germania,Germany,Z112
+Regno Unito,United Kingdom,Z114
+Grecia,Greece,Z115
+Irlanda,Ireland,Z116
+Islanda,Iceland,Z117
+Liechtenstein,Liechtenstein,Z119
+Lussemburgo,Luxembourg,Z120
+Malta,Malta,Z121
+Monaco,Monaco,Z123
+Norvegia,Norway,Z125
+Paesi Bassi,Netherlands,Z126
+Polonia,Poland,Z127
+Portogallo,Portugal,Z128
+Romania,Romania,Z129
+San Marino,San Marino,Z130
+Spagna,Spain,Z131
+Svezia,Sweden,Z132
+Svizzera,Switzerland,Z133
+Ucraina,Ukraine,Z138
+Ungheria,Hungary,Z134
+Federazione russa,Russian Federation,Z154
+Stato della Città del Vaticano,Vatican City State,Z106
+Estonia,Estonia,Z144
+Lettonia,Latvia,Z145
+Lituania,Lithuania,Z146
+Croazia,Croatia,Z149
+Slovenia,Slovenia,Z150
+Bosnia-Erzegovina,Bosnia and Herzegovina,Z153
+Ex Repubblica Jugoslava di Macedonia,The former Yugoslav Republic of Macedonia,Z148
+Moldova,Moldova,Z140
+Slovacchia,Slovakia,Z155
+Bielorussia,Belarus,Z139
+Repubblica ceca,Czech Republic,Z156
+Montenegro,Montenegro,Z159
+Serbia,Serbia,Z158
+Kosovo,Kosovo,Z160
+Afghanistan,Afghanistan,Z200
+Arabia Saudita,Saudi Arabia,Z203
+Bahrein,Bahrain,Z204
+Bangladesh,Bangladesh,Z249
+Bhutan,Bhutan,Z205
+Myanmar/Birmania,Myanmar/Burma,Z206
+Brunei Darussalam,Brunei Darussalam,Z207
+Cambogia,Cambodia,Z208
+Sri Lanka,Sri Lanka,Z209
+Cina,China,Z210
+Cipro,Cyprus,Z211
+Corea del Nord,North Korea,Z214
+Corea del Sud,South Korea,Z213
+Emirati Arabi Uniti,United Arab Emirates,Z215
+Filippine,Philippines,Z216
+Palestina,Palestine,Z161
+Giappone,Japan,Z219
+Giordania,Jordan,Z220
+India,India,Z222
+Indonesia,Indonesia,Z223
+Iran,Iran,Z224
+Iraq,Iraq,Z225
+Israele,Israel,Z226
+Kuwait,Kuwait,Z227
+Laos,Laos,Z228
+Libano,Lebanon,Z229
+Timor Leste,Timor Leste,Z242
+Maldive,Maldives,Z232
+Malaysia,Malaysia,Z247
+Mongolia,Mongolia,Z233
+Nepal,Nepal,Z234
+Oman,Oman,Z235
+Pakistan,Pakistan,Z236
+Qatar,Qatar,Z237
+Singapore,Singapore,Z248
+Siria,Syria,Z240
+Thailandia,Thailand,Z241
+Turchia,Turkey,Z243
+Vietnam,Vietnam,Z251
+Yemen,Yemen,Z246
+Kazakhstan,Kazakhstan,Z255
+Uzbekistan,Uzbekistan,Z259
+Armenia,Armenia,Z252
+Azerbaigian,Azerbaijan,Z253
+Georgia,Georgia,Z254
+Kirghizistan,Kyrgyzstan,Z256
+Tagikistan,Tajikistan,Z257
+Taiwan,Taiwan,Z217
+Turkmenistan,Turkmenistan,Z258
+Algeria,Algeria,Z301
+Angola,Angola,Z302
+Costa d'Avorio,Côte d'Ivoire,Z313
+Benin,Benin,Z314
+Botswana,Botswana,Z358
+Burkina Faso,Burkina Faso,Z354
+Burundi,Burundi,Z305
+Camerun,Cameroon,Z306
+Capo Verde,Cape Verde,Z307
+Repubblica Centrafricana,Central African Republic,Z308
+Ciad,Chad,Z309
+Comore,Comoros,Z310
+Congo,Congo,Z311
+Egitto,Egypt,Z336
+Etiopia,Ethiopia,Z315
+Gabon,Gabon,Z316
+Gambia,Gambia,Z317
+Ghana,Ghana,Z318
+Gibuti,Djibouti,Z361
+Guinea,Guinea,Z319
+Guinea-Bissau,Guinea-Bissau,Z320
+Guinea equatoriale,Equatorial Guinea,Z321
+Kenya,Kenya,Z322
+Lesotho,Lesotho,Z359
+Liberia,Liberia,Z325
+Libia,Libya,Z326
+Madagascar,Madagascar,Z327
+Malawi,Malawi,Z328
+Mali,Mali,Z329
+Marocco,Morocco,Z330
+Mauritania,Mauritania,Z331
+Maurizio,Mauritius,Z332
+Mozambico,Mozambique,Z333
+Namibia,Namibia,Z300
+Niger,Niger,Z334
+Nigeria,Nigeria,Z335
+Ruanda,Rwanda,Z338
+Sao Tomé e Principe,Sao Tome and Principe,Z341
+Seychelles,Seychelles,Z342
+Senegal,Senegal,Z343
+Sierra Leone,Sierra Leone,Z344
+Somalia,Somalia,Z345
+Sudafrica,South Africa,Z347
+Sudan,Sudan,Z348
+Eswatini,Eswatini,Z349
+Tanzania,Tanzania,Z357
+Togo,Togo,Z351
+Tunisia,Tunisia,Z352
+Uganda,Uganda,Z353
+Repubblica Democratica del Congo,Democratic Republic of the Congo,Z312
+Zambia,Zambia,Z355
+Zimbabwe,Zimbabwe,Z337
+Eritrea,Eritrea,Z368
+Sud Sudan,South Sudan,Z907
+Antigua e Barbuda,Antigua and Barbuda,Z532
+Bahamas,Bahamas,Z502
+Barbados,Barbados,Z522
+Belize,Belize,Z512
+Canada,Canada,Z401
+Costa Rica,Costa Rica,Z503
+Cuba,Cuba,Z504
+Dominica,Dominica,Z526
+Repubblica Dominicana,Dominican Republic,Z505
+El Salvador,El Salvador,Z506
+Giamaica,Jamaica,Z507
+Grenada,Grenada,Z524
+Guatemala,Guatemala,Z509
+Haiti,Haiti,Z510
+Honduras,Honduras,Z511
+Messico,Mexico,Z514
+Nicaragua,Nicaragua,Z515
+Panama,Panama,Z516
+Santa Lucia,Saint Lucia,Z527
+Saint Vincent e Grenadine,Saint Vincent and the Grenadines,Z528
+Saint Kitts e Nevis,Saint Kitts and Nevis,Z533
+Stati Uniti d'America,United States of America,Z404
+Argentina,Argentina,Z600
+Bolivia,Bolivia,Z601
+Brasile,Brazil,Z602
+Cile,Chile,Z603
+Colombia,Colombia,Z604
+Ecuador,Ecuador,Z605
+Guyana,Guyana,Z606
+Paraguay,Paraguay,Z610
+Perù,Peru,Z611
+Suriname,Suriname,Z608
+Trinidad e Tobago,Trinidad and Tobago,Z612
+Uruguay,Uruguay,Z613
+Venezuela,Venezuela,Z614
+Australia,Australia,Z700
+Figi,Fiji,Z704
+Kiribati,Kiribati,Z731
+Isole Marshall,Marshall Islands,Z711
+Stati Federati di Micronesia,Federated States of Micronesia,Z735
+Nauru,Nauru,Z713
+Nuova Zelanda,New Zealand,Z719
+Palau,Palau,Z734
+Papua Nuova Guinea,Papua New Guinea,Z730
+Isole Salomone,Solomon Islands,Z724
+Samoa,Samoa,Z726
+Tonga,Tonga,Z728
+Tuvalu,Tuvalu,Z732
+Vanuatu,Vanuatu,Z733
+Nuova Caledonia,New Caledonia,Z716
+Sahara occidentale,Western Sahara,Z339
+Bermuda,Bermuda,Z400
+Isole Cook (NZ),Cook Islands (NZ),Z703
+Gibilterra,Gibraltar,Z113
+Isole Cayman,Cayman Islands,Z530
+Anguilla,Anguilla,Z529
+Polinesia francese,French Polynesia,Z723
+Isole Fær Øer,Faroe Islands,Z108
+Aruba,Aruba,Z501
+Groenlandia,Greenland,Z402
+Isole Falkland (Malvine),Falkland Islands (Malvinas),Z609
+Isola di Man,Isle of Man,Z122
+Montserrat,Montserrat,Z531
+Isole Pitcairn,Pitcairn,Z722
+Saint Pierre e Miquelon,Saint Pierre and Miquelon,Z403
+Sant'Elena,Saint Helena,Z340
+Isole Turks e Caicos,Turks and Caicos Islands,Z519
+Isole Vergini britanniche,British Virgin Islands,Z525
+Wallis e Futuna,Wallis and Futuna Islands,Z729

data/lib/codice_fiscale/codes.rb

@@ -24,8 +24,8 @@ module CodiceFiscale
     def city city_name, province_code
       return config.city_code.call(city_name, province_code) if config.city_code
       CSV.foreach config.city_codes_csv_path do |row|
-        if city_name.casecmp(row[3].strip).zero? and province_code.casecmp(row[2].strip).zero?
-          return row[0].strip.upcase
+        if city_name.casecmp(row[0]).zero? and province_code.casecmp(row[1]).zero?
+          return row[2].upcase
         end
       end
       nil
@@ -34,7 +34,7 @@ module CodiceFiscale
     def country country_name
       return config.country_code.call(country_name) if config.country_code
       CSV.foreach config.country_codes_csv_path do |row|
-        return row[3].strip.upcase if country_name.casecmp(row[2].strip).zero?
+        return row[2].upcase if country_name.casecmp(row[0]).zero? or country_name.casecmp(row[1]).zero?
       end
       nil
     end

data/lib/codice_fiscale/version.rb

@@ -1,3 +1,3 @@
 module CodiceFiscale
-  VERSION = "0.0.9"
+  VERSION = "1.0.1"
 end

data/lib/codice_fiscale.rb

@@ -21,4 +21,83 @@ module CodiceFiscale
     raise ArgumentError.new(citizen.errors.full_messages.join(', ')) unless citizen.valid?
     citizen.fiscal_code
   end
+
+  # This method is used by me to update the csv and repack the gem
+  def self.update_csv_files(are_you_sure = false)
+    unless are_you_sure
+      warn("Nothing was done, call me with are_you_sure = true")
+      return
+    end
+
+    require "net/http"
+    require "tmpdir"
+    require "tmpdir"
+    require "fileutils"
+
+    # download the CSV with all the city codes
+    # @see https://www.istat.it/it/archivio/6789 for more info
+    url = "https://www.istat.it/storage/codici-unita-amministrative/Elenco-comuni-italiani.csv"
+    res = Net::HTTP.get_response(URI(url))
+    raise("Failed to GET #{url}") unless res.is_a?(Net::HTTPSuccess)
+    data = res.body
+
+    # Covert to utf-8
+    data.force_encoding("iso-8859-1")
+    data.encode!("utf-8")
+    raise("Failed to convert to utf-8") unless data.valid_encoding?
+
+    # parse it and rebuild a new CSV selecting only the columns I need
+    CSV.open(config.city_codes_csv_path, "wb") do |csv|
+      CSV.parse(data, :col_sep => ";", :row_sep => "\r\n").each_with_index do |r, index|
+        next if index == 0
+
+        c, p, x = *[r[5], r[13], r[18]].map(&:strip)
+
+        raise("Check the number of columns: #{r}") if r.size != 23
+        raise("Invalid city name: #{c}")           if c.include?(',') or c.blank?
+        raise("Invalid province code: #{p}")       if p !~ /^[A-Z]{2}$/
+        raise("Invalid city code: #{x}")           if x !~ /^[A-Z]{1}[0-9]{3}$/
+
+        csv << [c, p, x]
+      end
+    end
+
+    # checkout the CSV with all the country codes
+    # @see https://www.istat.it/it/archivio/6747
+    url = "https://www.istat.it/it/files//2011/01/Elenco-codici-e-denominazioni-unita-territoriali-estere.zip"
+    res = Net::HTTP.get_response(URI(url))
+    raise("Failed to GET #{url}") unless res.is_a?(Net::HTTPSuccess)
+
+    # store the zip in temporary folder and extract it
+    tmpdir = Dir.mktmpdir
+    filename = "Elenco-codici-e-denominazioni-unita-territoriali-estere"
+    system("cd #{tmpdir} && unzip -q -o #{tmpdir}/#{filename}.zip")
+    data = File.open(Dir["#{tmpdir}/**/*.csv"][0], "rb", &:read)
+
+    # Covert the csv to utf-8
+    data.force_encoding("iso-8859-1")
+    data.encode!("utf-8")
+    raise("Failed to convert to utf-8") unless data.valid_encoding?
+
+    # parse it and rebuild a new CSV selecting only the columns I need
+    CSV.open(config.country_codes_csv_path, "wb") do |csv|
+      CSV.parse(data, :col_sep => ";", :row_sep => "\r\n").each_with_index do |r, index|
+        next if index == 0
+        next if r.compact.empty?
+
+        c1, c2, x = *[r[6], r[7], r[9]].map(&:strip)
+
+        next if x.casecmp('n.d.').zero?
+
+        raise("Check the number of columns: #{r}") if r.size != 15
+        raise("Invalid country name: #{c1}")       if c1.include?(',') or c1.blank?
+        raise("Invalid country name: #{c2}")       if c2.include?(',') or c2.blank?
+        raise("Invalid country code: #{x}")        if x !~ /^[A-Z]{1}[0-9]{3}$/
+
+        csv << [c1, c2, x]
+      end
+    end
+  ensure
+    FileUtils.rm_rf(tmpdir) if tmpdir and Dir.exists?(tmpdir)
+  end
 end

data/spec/lib/codice_fiscale/alphabet_spec.rb

@@ -3,23 +3,31 @@ require 'spec_helper'
 describe CodiceFiscale::Alphabet do
   describe '#letters' do
     it 'is 26 long' do
-      subject.letters.size.should == 26
+      expect(subject.letters.size).to eq 26
     end
 
-    it 'return only upcased letters' do
-      subject.letters.each { |letter| letter.upcase.should == letter }
+    it 'consists only of upcased letters' do
+      expect(subject.letters.join).to match /^[A-Z]{1,}$/
     end
   end
 
   describe '#consonants' do
     it 'is 21 long' do
-      subject.consonants.size.should == 21
+      expect(subject.consonants.size).to eq 21
+    end
+
+    it 'consists only of upcased letters' do
+      expect(subject.vowels.join).to match /^[A-Z]{1,}$/
     end
   end
 
-  describe '#vocals' do
-    it 'return only upcased letters' do
-      subject.letters.each { |letter| letter.upcase.should == letter }
+  describe '#vowels' do
+    it 'is 5 long' do
+      expect(subject.vowels.size).to eq 5
+    end
+
+    it 'consists only of upcased letters' do
+      expect(subject.vowels.join).to match /^[A-Z]{1,}$/
     end
   end
-end
+end

data/spec/lib/codice_fiscale/codes_spec.rb

@@ -4,19 +4,23 @@ describe CodiceFiscale::Codes do
   describe '#month_letter' do
     context 'the given number is greater than 0 and less than 12' do
       it 'return a letter' do
-        subject.month_letter(1).should == 'A'
+        1.upto(12).each do |n|
+          expect(subject.month_letter(1)).to match /^[A-Z]{1,}$/
+        end
       end
     end
 
     context 'the given number is greater than 12' do
       it 'return nil' do
-        subject.month_letter(13).should be_nil
+        expect(subject.month_letter(13)).to be_nil
       end
     end
 
     context 'the given number is less than 1' do
       it 'return nil' do
-        subject.month_letter(0).should be_nil
+        -1.upto(0).each do |n|
+          expect(subject.month_letter(n)).to be_nil
+        end
       end
     end
   end

data/spec/lib/codice_fiscale/fiscal_code_spec.rb

@@ -1,23 +1,33 @@
 require 'spec_helper'
 
 describe CodiceFiscale::FiscalCode do
-  let(:citizen_marco_galli) { CodiceFiscale::ItalianCitizen.new :name => 'Marco', :surname => 'Galli', :gender => :male, :birthdate => Date.new(1983, 5, 3), :city_name => 'Oggiono', :province_code => 'LC' }
+  let(:citizen_marco_galli) do
+    CodiceFiscale::ItalianCitizen.new(
+      :name           => 'Marco',
+      :surname        => 'Galli',
+      :gender         => :male,
+      :birthdate      => Date.new(1983, 5, 3),
+      :city_name      => 'Oggiono',
+      :province_code  => 'LC'
+    )
+  end
+
   let(:fiscal_code) { described_class.new citizen_marco_galli }
 
   describe '#surname_part' do
     it 'takes the first 3 consonants' do
-      fiscal_code.surname_part.should == 'GLL'
+      expect(fiscal_code.surname_part).to eq 'GLL'
     end
 
     it 'is 3 chrs long' do
-      fiscal_code.surname_part.size.should == 3
+      expect(fiscal_code.surname_part.size).to eq 3
     end
 
     context 'when surname has only 1 consonant' do
       before { fiscal_code.citizen.surname = 'oof' }
 
       it 'puts the vowels after the consonants' do
-        fiscal_code.surname_part.should == 'FOO'
+        expect(fiscal_code.surname_part).to eq 'FOO'
       end
     end
 
@@ -25,21 +35,21 @@ describe CodiceFiscale::FiscalCode do
       before { fiscal_code.citizen.surname = 'm' }
 
       it 'pads with the "X" character' do
-        fiscal_code.surname_part.should == 'MXX'
+        expect(fiscal_code.surname_part).to eq 'MXX'
       end
     end
   end
 
   describe '#name_part' do
     it 'is 3 chrs long' do
-      fiscal_code.name_part.size.should == 3
+      expect(fiscal_code.name_part.size).to eq 3
     end
 
     context 'when name has 4 or more consonants' do
       before { fiscal_code.citizen.name = 'danielino' }
 
       it 'takes the 1st the 3rd and the 4th' do
-        fiscal_code.name_part.should == 'DLN'
+        expect(fiscal_code.name_part).to eq 'DLN'
       end
     end
 
@@ -47,7 +57,7 @@ describe CodiceFiscale::FiscalCode do
       before { fiscal_code.citizen.name = 'daniele' }
 
       it 'takes the first 3 consonants' do
-        fiscal_code.name_part.should == 'DNL'
+        expect(fiscal_code.name_part).to eq 'DNL'
       end
     end
 
@@ -55,7 +65,7 @@ describe CodiceFiscale::FiscalCode do
       before { fiscal_code.citizen.name = 'bar' }
 
       it 'puts the vowels after the consonants' do
-        fiscal_code.name_part.should == 'BRA'
+        expect(fiscal_code.name_part).to eq 'BRA'
       end
     end
 
@@ -63,7 +73,7 @@ describe CodiceFiscale::FiscalCode do
       before { fiscal_code.citizen.name = 'd' }
 
       it 'pad with the "X" character' do
-        fiscal_code.name_part.should == 'DXX'
+        expect(fiscal_code.name_part).to eq 'DXX'
       end
     end
   end
@@ -71,14 +81,16 @@ describe CodiceFiscale::FiscalCode do
 
   describe '#birthdate_part' do
     it 'start with the last 2 digit of the year' do
-      fiscal_code.birthdate_part.should start_with '83'
+      expect(fiscal_code.birthdate_part).to start_with '83'
     end
 
     describe 'the 3rd character' do
-      before { CodiceFiscale::Codes.stub(:month_letter).and_return('X') }
+      before do
+        allow(CodiceFiscale::Codes).to receive(:month_letter).and_return('X')
+      end
 
       it 'is the month code' do
-        fiscal_code.birthdate_part[2].should == 'X'
+        expect(fiscal_code.birthdate_part[2]).to eq 'X'
       end
     end
 
@@ -86,13 +98,13 @@ describe CodiceFiscale::FiscalCode do
       context 'gender is male' do
         before { fiscal_code.citizen.gender = :male }
 
-        it('is the birth day') { fiscal_code.birthdate_part[3..5].should == '03' }
+        it('is the birth day') { expect(fiscal_code.birthdate_part[3..5]).to eq '03' }
       end
 
       context 'gender is female' do
         before { fiscal_code.citizen.gender = :female }
 
-        it('is the birth day + 40') { fiscal_code.birthdate_part[3..5].should == '43' }
+        it('is the birth day + 40') { expect(fiscal_code.birthdate_part[3..5]).to eq '43' }
       end
     end
   end
@@ -105,15 +117,17 @@ describe CodiceFiscale::FiscalCode do
         before { fiscal_code.config.city_code { 'Winterfell' } }
 
         it 'returns the result of the city-block execution' do
-          fiscal_code.birthplace_part.should == 'Winterfell'
+          expect(fiscal_code.birthplace_part). to eq 'Winterfell'
         end
       end
 
       context 'when codes are fetched using csv' do
-        before { CodiceFiscale::Codes.stub(:city).and_return('hello') }
+        before do
+          allow(CodiceFiscale::Codes).to receive(:city).and_return('hello')
+        end
 
         it 'returns the city code' do
-          fiscal_code.birthplace_part.should == 'hello'
+          expect(fiscal_code.birthplace_part).to eq 'hello'
         end
       end
     end
@@ -125,15 +139,17 @@ describe CodiceFiscale::FiscalCode do
         before { fiscal_code.config.country_code { 'The North' } }
 
         it 'returns the result of the country-block execution' do
-          fiscal_code.birthplace_part.should == 'The North'
+          expect(fiscal_code.birthplace_part).to eq 'The North'
         end
       end
 
       context 'when codes are fetched using csv' do
-        before { CodiceFiscale::Codes.stub(:country).and_return('Middle-Earth') }
+        before do
+          allow(CodiceFiscale::Codes).to receive(:country).and_return('Middle-Earth')
+        end
 
         it 'returns the country code' do
-          fiscal_code.birthplace_part.should == 'Middle-Earth'
+          expect(fiscal_code.birthplace_part).to eq 'Middle-Earth'
         end
       end
     end
@@ -141,7 +157,7 @@ describe CodiceFiscale::FiscalCode do
 
   describe '#control_character' do
     it 'returns the expected letter' do
-      fiscal_code.control_character('RSSMRA87A01A005').should == 'V'
+      expect(fiscal_code.control_character('RSSMRA87A01A005')).to eq 'V'
     end
   end
-end
+end

data/spec/lib/codice_fiscale/italian_citizen_spec.rb

@@ -9,11 +9,11 @@ describe CodiceFiscale::ItalianCitizen do
 
   describe '#initialize' do
     it 'accepts 1 attribute' do
-      lambda { marco }.should_not raise_error
+      expect { marco }.not_to raise_error
     end
 
     it 'do not accepts 0 attribute' do
-      lambda { described_class.new }.should raise_error(ArgumentError)
+      expect { described_class.new }.to raise_error(ArgumentError)
     end
   end
 
@@ -21,8 +21,8 @@ describe CodiceFiscale::ItalianCitizen do
   describe '#validations' do
     describe 'when all attributes are valid' do
       it 'is valid' do
-        marco.should be_valid
-        john.should be_valid
+        expect(marco).to be_valid
+        expect(john).to be_valid
       end
     end
 
@@ -31,7 +31,7 @@ describe CodiceFiscale::ItalianCitizen do
 
       it 'is not valid' do
         citizen_without_name.valid?
-        citizen_without_name.errors[:name].should_not be_empty
+        expect(citizen_without_name.errors[:name]).not_to be_empty
       end
     end
 
@@ -40,7 +40,7 @@ describe CodiceFiscale::ItalianCitizen do
 
       it 'is not valid' do
         citizen_with_strange_gender.valid?
-        citizen_with_strange_gender.errors[:gender].should_not be_empty
+        expect(citizen_with_strange_gender.errors[:gender]).not_to be_empty
       end
     end
 
@@ -49,7 +49,7 @@ describe CodiceFiscale::ItalianCitizen do
 
       it 'is not valid' do
         citizen_with_invalid_province.valid?
-        citizen_with_invalid_province.errors[:province_code].should_not be_empty
+        expect(citizen_with_invalid_province.errors[:province_code]).not_to be_empty
       end
     end
 
@@ -58,7 +58,7 @@ describe CodiceFiscale::ItalianCitizen do
 
       it 'is not valid' do
         citizen_with_invalid_date.valid?
-        citizen_with_invalid_date.errors[:birthdate].should_not be_empty
+        expect(citizen_with_invalid_date.errors[:birthdate]).not_to be_empty
       end
     end
   end

data/spec/lib/codice_fiscale_spec.rb

@@ -1,25 +1,34 @@
+# -*- encoding: utf-8 -*-
 require 'spec_helper'
 
 describe CodiceFiscale do
   describe '#calculate' do
-    let(:mario_attributes) { {:name => 'mario', :surname => 'rossi', :gender => :male, :birthdate => Date.new(1987, 1, 1),
-                              :province_code => 'lc', :city_name => 'Abbadia Lariana'} }
-
     before do
       subject.config.city_code = nil
       subject.config.country_code = nil
     end
 
     it 'returns the expected code' do
-      subject.calculate(mario_attributes).should == 'RSSMRA87A01A005V'
+      # Please note that the following are completely made-up data
+      [
+        [{:name => 'mario', :surname => 'rossi', :gender => :male, :birthdate => Date.new(1987, 1, 1), :province_code => 'lc', :city_name => 'Abbadia Lariana'}, "RSSMRA87A01A005V"],
+        [{:name => "Marco", :surname => "Rossi", :gender => :male, :birthdate => Date.new(1983, 5, 3), :city_name => "Oggiono", :province_code => "LC"}, "RSSMRC83E03G009W"],
+        [{:name => "John", :surname => "Smith", :gender => :male, :birthdate => Date.new(1988, 5, 3), :country_name => "Francia"}, "SMTJHN88E03Z110R"],
+        [{:name => "John", :surname => "Smith", :gender => :male, :birthdate => Date.new(1988, 5, 3), :country_name => "France"}, "SMTJHN88E03Z110R"],
+        [{:name => "John", :surname => "Smith", :gender => :male, :birthdate => Date.new(1988, 5, 3), :country_name => "Sao Tomé e Principe"}, "SMTJHN88E03Z341A"],
+        [{:name => "Marco", :surname => "Rossi", :gender => :male, :birthdate => Date.new(1983, 5, 3), :city_name => "Forlì", :province_code =>"FC"}, "RSSMRC83E03D704X"],
+      ].each do |row|
+        params, expected_code = row[0], row[1]
+        expect(subject.calculate(params)).to eq expected_code
+      end
     end
 
     context 'when params are not valid' do
-      let(:invalid_attributes) { mario_attributes.merge(:name => '') }
+      let(:invalid_attributes) { {:name => ''} }
 
       it 'raises an error' do
-        lambda { subject.calculate(invalid_attributes) }.should raise_error(ArgumentError)
+        expect { subject.calculate(invalid_attributes) }.to raise_error(ArgumentError)
       end
     end
   end
-end
+end

data/spec/spec_helper.rb

@@ -3,5 +3,3 @@ def fixtures_path
 end
 
 require File.expand_path '../../lib/codice_fiscale', __FILE__
-
-