curp_generator 1.1.0 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0d11b87f0397f7dcd5831ef07ea67eb6f29889fc95a893716b1dba19a19dd615
-  data.tar.gz: 2f890f4ce2669444a87c3eb8e75e06bd13eb6980969a2eb2dd6771be067ee403
+  metadata.gz: 62ae367b8e132528cf37923aef01e10d851f75c90abd13822d578f7d9f9a32df
+  data.tar.gz: ea0d939d2e17d09b120c521aaa9146c83ee3cf8f526a10c9ceebb22ff052ecb5
 SHA512:
-  metadata.gz: aa637fec84655aad27564a7b4aea659fcfabc055fe70f3b49731e800cac7263ed18d752e9210d3c0299d5c990e676ef6fe8ba87afd3a626b5dc90477590d8459
-  data.tar.gz: 0ff4930ccb17cd5f2a545f7381db129babb42510fa84379d001e375d4eed0d005b2265a53195bf83fcce0400f1b2dc7964df5b105a72c53e5bd6b6d372b5562d
+  metadata.gz: 4ffd3e8de1ab7ef8e8f57d0f1a00892e26a4c34ca7987114f67ec8ea65e0d9b8ebeccbdd003e9405a1fd8057eebb8f6f7068a02ae867025b94291baad9b3a612
+  data.tar.gz: 90c3566aeb640e972cb49d163d7c4e9a5670a54539ff0ce5b1ce602539c7ea9a8040fd350f65c78328f2e3194d25edff0f95e355063f8c6cb5ad3ce71e743872

data/lib/base.rb

@@ -22,7 +22,7 @@ class CurpGenerator::Base
   def parse_attribute(attribute)
     return if blank_string?(attribute)
 
-    str = remove_special_chars(normalize(attribute))
+    str = remove_special_chars(attribute)
     remove_composed_names(str)
   end
 
@@ -31,7 +31,8 @@ class CurpGenerator::Base
   end
 
   def remove_special_chars(string)
-    string&.gsub(/[.'\d-]/, "")
+    normalized = normalize(string)
+    normalized&.gsub(/[.'\d-]/, "")
   end
 
   def normalize(string)

data/lib/birth_date.rb

@@ -14,20 +14,27 @@ class CurpGenerator::BirthDate < CurpGenerator::Base
   end
 
   def generate
-    invalid_params? ? error_message! : parsed_date
+    validate_params
+    parsed_date
   end
 
   def homoclave_digit
+    validate_params
     @birth_date.year < 2000 ? '0' : 'A'
   end
 
   private
 
-  def invalid_params?
-    blank_string?(@birth_date) || !@birth_date.respond_to?(:strftime)
+  def validate_params
+    missing_birth_date_error! if blank_string?(@birth_date)
+    invalid_format_error! unless @birth_date.respond_to?(:strftime)
   end
 
-  def error_message!
+  def missing_birth_date_error!
+    raise InvalidCurpArgumentError, 'Missing birth date'
+  end
+
+  def invalid_format_error!
     raise InvalidCurpArgumentError, 'Invalid date format'
   end
 

data/lib/digit_verifier.rb

@@ -12,19 +12,25 @@ class CurpGenerator::DigitVerifier < CurpGenerator::Base
   end
 
   def generate
-    invalid_params? ? error_message! : verifying_digit
+    validate_params
+    verifying_digit
   end
 
   private
 
-  def invalid_params?
-    blank_string?(@partial_curp) || @partial_curp.size != 17
+  def validate_params
+    missing_partial_curp_error! if blank_string?(@partial_curp)
+    invalid_size_error! if @partial_curp.size != 17
   end
 
-  def error_message!
+  def missing_partial_curp_error!
     raise InvalidCurpArgumentError, 'Missing partial curp'
   end
 
+  def invalid_size_error!
+    raise InvalidCurpArgumentError, 'Invalid partial curp size'
+  end
+
   def verifying_digit
     length_sum = 0.0
 

data/lib/gender.rb

@@ -24,20 +24,26 @@ class CurpGenerator::Gender < CurpGenerator::Base
   end
 
   def generate
-    invalid_params? ? error_message! : parsed_gender
+    validate_params
+    parsed_gender
   end
 
   private
 
-  def invalid_params?
-    blank_string?(@gender) || invalid_gender?
+  def validate_params
+    missing_gender_error! if blank_string?(@gender)
+    invalid_gender_error! if invalid_gender?
   end
 
   def invalid_gender?
     !VALID_MALE_GENDERS.include?(@gender) && !VALID_FEMALE_GENDERS.include?(@gender)
   end
 
-  def error_message!
+  def missing_gender_error!
+    raise InvalidCurpArgumentError, 'Missing gender'
+  end
+
+  def invalid_gender_error!
     raise InvalidCurpArgumentError, "Available gender options are #{VALID_MALE_GENDERS + VALID_FEMALE_GENDERS}"
   end
 

data/lib/name.rb

@@ -20,7 +20,7 @@ class CurpGenerator::Name < CurpGenerator::Base
   end
 
   def generate
-    error_message! if invalid_params?
+    validate_params
   end
 
   def prefix_name
@@ -35,12 +35,17 @@ class CurpGenerator::Name < CurpGenerator::Base
 
   private
 
-  def invalid_params?
-    blank_string?(@first_name) || blank_string?(@first_last_name)
+  def validate_params
+    missing_first_name_error! if blank_string?(@first_name)
+    missing_first_last_name_error! if blank_string?(@first_last_name)
   end
 
-  def error_message!
-    raise InvalidCurpArgumentError, 'Invalid name arguments'
+  def missing_first_name_error!
+    raise InvalidCurpArgumentError, 'Missing first name'
+  end
+
+  def missing_first_last_name_error!
+    raise InvalidCurpArgumentError, 'Missing first last name'
   end
 
   def prefix_consonants

data/lib/state.rb

@@ -4,7 +4,7 @@ class CurpGenerator::State < CurpGenerator::Base
   include CurpGenerator::Catalogs
 
   def initialize(birth_state)
-    @birth_state = parse_attribute(birth_state&.upcase)
+    @birth_state = remove_special_chars(birth_state&.upcase)
   end
 
   def self.generate(birth_state)
@@ -12,7 +12,7 @@ class CurpGenerator::State < CurpGenerator::Base
   end
 
   def generate
-    invalid_params? ? error_message! : parsed_state
+    invalid_params? ? missing_birth_state_error! : parsed_state
   end
 
   private
@@ -21,7 +21,7 @@ class CurpGenerator::State < CurpGenerator::Base
     blank_string?(@birth_state)
   end
 
-  def error_message!
+  def missing_birth_state_error!
     raise InvalidCurpArgumentError, 'Missing birth state argument'
   end
 

data/lib/version.rb

@@ -1,3 +1,3 @@
 module CurpGenerator
-  VERSION = '1.1.0'.freeze
+  VERSION = '1.1.1'.freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: curp_generator
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.1
 platform: ruby
 authors:
 - Juan Carlos Estebes