lib/codice_fiscale/codes.rb in codice-fiscale-0.0.9 vs lib/codice_fiscale/codes.rb in codice-fiscale-1.0.0

@@ -22,20 +22,20 @@
     end
 
     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
     end
 
     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
 
     def odd_character character
\ No newline at end of file