itax_code 2.0.0 → 2.0.2

data/lib/itax_code/encoder.rb

@@ -14,8 +14,6 @@ module ItaxCode
   #
   # @return [String] The encoded tax code
   class Encoder
-    MissingDataError = Class.new(StandardError)
-
     # @param [Hash]  data  The user attributes
     # @param [Utils] utils
     #
@@ -25,6 +23,8 @@ module ItaxCode
     # @option data [String, Date] :birthdate  The user birthdate
     # @option data [String]       :birthplace The user birthplace
     def initialize(data = {}, utils = Utils.new)
+      @utils = utils
+
       @surname    = data[:surname]
       @name       = data[:name]
       @gender     = data[:gender]&.upcase
@@ -33,7 +33,6 @@ module ItaxCode
       validate_data_presence!
 
       @birthdate = parse_birthdate!
-      @utils     = utils
     end
 
     # Computes the tax code from its components.
@@ -81,8 +80,8 @@ module ItaxCode
         place_slug = utils.slugged(birthplace)
         place_item = src.find { |i| place_slug == utils.slugged(i[lookup_key]) }
 
-        code = place_item.try(:[], "code")
-        return code if code.present?
+        code = place_item&.[]("code")
+        return code if utils.present?(code)
         raise MissingDataError, "no code found for #{birthplace}" if stop
 
         encode_birthplace(utils.countries, stop: true)
@@ -90,7 +89,7 @@ module ItaxCode
 
       def validate_data_presence!
         instance_variables.each do |ivar|
-          next if instance_variable_get(ivar).present?
+          next if utils.present?(instance_variable_get(ivar))
 
           raise MissingDataError, "missing #{ivar} value"
         end
@@ -99,7 +98,7 @@ module ItaxCode
       def parse_birthdate!
         Date.parse(birthdate)
       rescue StandardError
-        raise ArgumentError, "#{birthdate} is not a valid date"
+        raise InvalidBirthdateError, "#{birthdate} is not a valid date"
       end
   end
 end

data/lib/itax_code/error.rb

@@ -0,0 +1,20 @@
+# frozen_string_literal: true
+
+module ItaxCode
+  Error = Class.new(StandardError)
+
+  class Encoder
+    Error = Class.new(Error)
+
+    InvalidBirthdateError = Class.new(Error)
+    MissingDataError = Class.new(Error)
+  end
+
+  class Parser
+    Error = Class.new(Error)
+
+    InvalidControlInternalNumberError = Class.new(Error)
+    InvalidTaxCodeError = Class.new(Error)
+    NoTaxCodeError = Class.new(Error)
+  end
+end

data/lib/itax_code/parser.rb

@@ -11,11 +11,6 @@ module ItaxCode
   #
   # @return [Hash] The parsed tax code
   class Parser
-    Error                             = Class.new(StandardError)
-    NoTaxCodeError                    = Class.new(Error)
-    InvalidControlInternalNumberError = Class.new(Error)
-    InvalidTaxCodeError               = Class.new(Error)
-
     LENGTH = 16
 
     # @param [String] tax_code
@@ -24,7 +19,7 @@ module ItaxCode
       @tax_code = tax_code&.upcase
       @utils    = utils
 
-      raise NoTaxCodeError if @tax_code.blank?
+      raise NoTaxCodeError if @utils.blank?(@tax_code)
       raise InvalidTaxCodeError if @tax_code.length != LENGTH
       raise InvalidControlInternalNumberError if raw[:cin] != @utils.encode_cin(@tax_code)
     end
@@ -61,7 +56,7 @@ module ItaxCode
       end
 
       def raw_matches
-        @raw_matches ||= tax_code.scan(utils.regex).flatten
+        @raw_matches ||= tax_code.scan(utils.tax_code_sections_regex).flatten
       end
 
       def gender
@@ -73,8 +68,9 @@ module ItaxCode
       # value could be wrong. E.g. a person born on 1920 would have birthdate_year = 20 meaning
       # that both 1920 and 2020 could be valid born years.
       def year
-        val = (Date.today.year.to_s[0..1] + utils.omocodia_decode(raw[:birthdate_year])).to_i
-        val > Date.today.year ? val - 100 : val
+        current_year = Date.today.year
+        val = (current_year.to_s[0..1] + utils.omocodia_decode(raw[:birthdate_year])).to_i
+        val > current_year ? val - 100 : val
       end
 
       def month
@@ -96,7 +92,7 @@ module ItaxCode
         if place.nil?
           birthplace(utils.countries, stop: true) unless stop
         else
-          place.to_h.deep_symbolize_keys
+          place.to_h.transform_keys(&:to_sym)
         end
       end
 

data/lib/itax_code/transliterator.rb

@@ -0,0 +1,211 @@
+# frozen_string_literal: true
+
+module ItaxCode
+  # https://github.com/ruby-i18n/i18n/blob/master/lib/i18n/backend/transliterator.rb
+  class Transliterator
+    DEFAULT_REPLACEMENT_CHAR = "?"
+
+    def transliterate(string, replacement = nil)
+      replacement ||= DEFAULT_REPLACEMENT_CHAR
+      string.gsub(/[^\x00-\x7f]/u) { |char| approximations[char] || replacement }
+    end
+
+    private
+
+      def approximations
+        @approximations ||= {
+          "À" => "A",
+          "Á" => "A",
+          "Â" => "A",
+          "Ã" => "A",
+          "Ä" => "A",
+          "Å" => "A",
+          "Æ" => "AE",
+          "Ç" => "C",
+          "È" => "E",
+          "É" => "E",
+          "Ê" => "E",
+          "Ë" => "E",
+          "Ì" => "I",
+          "Í" => "I",
+          "Î" => "I",
+          "Ï" => "I",
+          "Ð" => "D",
+          "Ñ" => "N",
+          "Ò" => "O",
+          "Ó" => "O",
+          "Ô" => "O",
+          "Õ" => "O",
+          "Ö" => "O",
+          "×" => "x",
+          "Ø" => "O",
+          "Ù" => "U",
+          "Ú" => "U",
+          "Û" => "U",
+          "Ü" => "U",
+          "Ý" => "Y",
+          "Þ" => "Th",
+          "ß" => "ss",
+          "ẞ" => "SS",
+          "à" => "a",
+          "á" => "a",
+          "â" => "a",
+          "ã" => "a",
+          "ä" => "a",
+          "å" => "a",
+          "æ" => "ae",
+          "ç" => "c",
+          "è" => "e",
+          "é" => "e",
+          "ê" => "e",
+          "ë" => "e",
+          "ì" => "i",
+          "í" => "i",
+          "î" => "i",
+          "ï" => "i",
+          "ð" => "d",
+          "ñ" => "n",
+          "ò" => "o",
+          "ó" => "o",
+          "ô" => "o",
+          "õ" => "o",
+          "ö" => "o",
+          "ø" => "o",
+          "ù" => "u",
+          "ú" => "u",
+          "û" => "u",
+          "ü" => "u",
+          "ý" => "y",
+          "þ" => "th",
+          "ÿ" => "y",
+          "Ā" => "A",
+          "ā" => "a",
+          "Ă" => "A",
+          "ă" => "a",
+          "Ą" => "A",
+          "ą" => "a",
+          "Ć" => "C",
+          "ć" => "c",
+          "Ĉ" => "C",
+          "ĉ" => "c",
+          "Ċ" => "C",
+          "ċ" => "c",
+          "Č" => "C",
+          "č" => "c",
+          "Ď" => "D",
+          "ď" => "d",
+          "Đ" => "D",
+          "đ" => "d",
+          "Ē" => "E",
+          "ē" => "e",
+          "Ĕ" => "E",
+          "ĕ" => "e",
+          "Ė" => "E",
+          "ė" => "e",
+          "Ę" => "E",
+          "ę" => "e",
+          "Ě" => "E",
+          "ě" => "e",
+          "Ĝ" => "G",
+          "ĝ" => "g",
+          "Ğ" => "G",
+          "ğ" => "g",
+          "Ġ" => "G",
+          "ġ" => "g",
+          "Ģ" => "G",
+          "ģ" => "g",
+          "Ĥ" => "H",
+          "ĥ" => "h",
+          "Ħ" => "H",
+          "ħ" => "h",
+          "Ĩ" => "I",
+          "ĩ" => "i",
+          "Ī" => "I",
+          "ī" => "i",
+          "Ĭ" => "I",
+          "ĭ" => "i",
+          "Į" => "I",
+          "į" => "i",
+          "İ" => "I",
+          "ı" => "i",
+          "IJ" => "IJ",
+          "ij" => "ij",
+          "Ĵ" => "J",
+          "ĵ" => "j",
+          "Ķ" => "K",
+          "ķ" => "k",
+          "ĸ" => "k",
+          "Ĺ" => "L",
+          "ĺ" => "l",
+          "Ļ" => "L",
+          "ļ" => "l",
+          "Ľ" => "L",
+          "ľ" => "l",
+          "Ŀ" => "L",
+          "ŀ" => "l",
+          "Ł" => "L",
+          "ł" => "l",
+          "Ń" => "N",
+          "ń" => "n",
+          "Ņ" => "N",
+          "ņ" => "n",
+          "Ň" => "N",
+          "ň" => "n",
+          "ʼn" => "'n",
+          "Ŋ" => "NG",
+          "ŋ" => "ng",
+          "Ō" => "O",
+          "ō" => "o",
+          "Ŏ" => "O",
+          "ŏ" => "o",
+          "Ő" => "O",
+          "ő" => "o",
+          "Œ" => "OE",
+          "œ" => "oe",
+          "Ŕ" => "R",
+          "ŕ" => "r",
+          "Ŗ" => "R",
+          "ŗ" => "r",
+          "Ř" => "R",
+          "ř" => "r",
+          "Ś" => "S",
+          "ś" => "s",
+          "Ŝ" => "S",
+          "ŝ" => "s",
+          "Ş" => "S",
+          "ş" => "s",
+          "Š" => "S",
+          "š" => "s",
+          "Ţ" => "T",
+          "ţ" => "t",
+          "Ť" => "T",
+          "ť" => "t",
+          "Ŧ" => "T",
+          "ŧ" => "t",
+          "Ũ" => "U",
+          "ũ" => "u",
+          "Ū" => "U",
+          "ū" => "u",
+          "Ŭ" => "U",
+          "ŭ" => "u",
+          "Ů" => "U",
+          "ů" => "u",
+          "Ű" => "U",
+          "ű" => "u",
+          "Ų" => "U",
+          "ų" => "u",
+          "Ŵ" => "W",
+          "ŵ" => "w",
+          "Ŷ" => "Y",
+          "ŷ" => "y",
+          "Ÿ" => "Y",
+          "Ź" => "Z",
+          "ź" => "z",
+          "Ż" => "Z",
+          "ż" => "z",
+          "Ž" => "Z",
+          "ž" => "z"
+        }
+      end
+  end
+end

data/lib/itax_code/utils.rb

@@ -1,20 +1,37 @@
 # frozen_string_literal: true
 
 require "csv"
+require "itax_code/transliterator"
 
 module ItaxCode
   class Utils
-    def regex
+    def blank?(obj)
+      obj.respond_to?(:empty?) ? !!obj.empty? : !obj
+    end
+
+    def present?(obj)
+      !blank?(obj)
+    end
+
+    def slugged(string)
+      transliterated = transliterate(string.downcase.strip)
+      transliterated.gsub(/[^\w-]+/, "-").gsub(/-{2,}/, "-").gsub(/^-+|-+$/, "")
+    end
+
+    def transliterate(string)
+      return string if string.ascii_only?
+
+      transliterator = Transliterator.new
+      transliterator.transliterate(string.unicode_normalize(:nfc))
+    end
+
+    def tax_code_sections_regex
       /^([A-Z]{3})([A-Z]{3})
         (([A-Z\d]{2})([ABCDEHLMPRST]{1})([A-Z\d]{2}))
         ([A-Z]{1}[A-Z\d]{3})
         ([A-Z]{1})$/x
     end
 
-    def slugged(str, separator = "-")
-      str.gsub(/\s*@\s*/, " at ").gsub(/\s*&\s*/, " and ").parameterize(separator: separator)
-    end
-
     def months
       %w[A B C D E H L M P R S T]
     end

data/lib/itax_code/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module ItaxCode
-  VERSION = "2.0.0"
+  VERSION = "2.0.2"
 end

data/lib/itax_code.rb

@@ -1,15 +1,12 @@
 # frozen_string_literal: true
 
-require "active_support/all"
-
 require "itax_code/version"
 require "itax_code/utils"
 require "itax_code/encoder"
 require "itax_code/parser"
+require "itax_code/error"
 
 module ItaxCode
-  Error = Class.new(StandardError)
-
   class << self
     # Encodes the user tax code.
     #

data/rakelib/cities.rake

@@ -16,7 +16,7 @@ namespace :cities do
     output_string = CSV.generate do |csv|
       csv << %w[code province name created_on deleted_on]
 
-      CSV.foreach(tempfile.path, headers: true) do |row|
+      CSV.foreach(tempfile.path, encoding: "bom|utf-8", headers: true) do |row|
         csv << [
           row["CODCATASTALE"],
           row["SIGLAPROVINCIA"],

metadata

@@ -1,29 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: itax_code
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.0.2
 platform: ruby
 authors:
 - Matteo Rossi
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-10-01 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
-  name: activesupport
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
+date: 2023-11-04 00:00:00.000000000 Z
+dependencies: []
 description: 
 email:
 - mttrss5@gmail.com
@@ -37,7 +23,6 @@ files:
 - ".github/workflows/test.yml"
 - ".gitignore"
 - ".rubocop.yml"
-- ".travis.yml"
 - CHANGELOG.md
 - CODE_OF_CONDUCT.md
 - Gemfile
@@ -51,8 +36,10 @@ files:
 - lib/itax_code/data/cities.csv
 - lib/itax_code/data/countries.csv
 - lib/itax_code/encoder.rb
+- lib/itax_code/error.rb
 - lib/itax_code/omocode.rb
 - lib/itax_code/parser.rb
+- lib/itax_code/transliterator.rb
 - lib/itax_code/utils.rb
 - lib/itax_code/version.rb
 - rakelib/cities.rake

data/.travis.yml

@@ -1,6 +0,0 @@
----
-language: ruby
-cache: bundler
-rvm:
-  - 2.7.0
-before_install: gem install bundler -v 2.1.4