kontact 0.4.0 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3238d535c1065f7c98282b6ddbd121b261f8aa915cb4f92ecccf644e7ad9637d
-  data.tar.gz: bc3d99070aa60d3fd9c9afb839f726bdc4e5a2b576c7b9d2a1f27d8392e108b0
+  metadata.gz: 16404ff6239dd1e82e910bd4005283bbeae32ebe1d0bb8f208732f9fd521ae64
+  data.tar.gz: 0d33957070f27bc246722299d37275ad198f18628b48fbf13832755b8a2c771d
 SHA512:
-  metadata.gz: 78a769a6c43855a3e0595a104f3b7f9e3d9d5435054141b2a89b6100cc2c74dfdd763732d7f8160d402e4b9c182e64e9c205684b5f3b60c67ae42b0b70f00a3c
-  data.tar.gz: 904cd9d5a24afdaed88ebb53b09796cb915818a0e4426d8579ee6520a7a3326123b3d9c82783895aceee58a56a05f46c5f4541386016df9c3402f86c17668598
+  metadata.gz: 5a858b95baaaa1521eb34cc5cc6346ba666b3a8f63d4c41c8483dbe090537ba349f5df2ee9e2b42359d4bc6f5a4d3c6e2116ecbdcda9e34207da819a724c91aa
+  data.tar.gz: c30309d06aa9c307e19093363ed7350d4c7593b8b43a1c775a9f6fc8e5c0aa6f392c50af407564934e60e758cdc8889baf174bbb234fa8c86ed4fa1bf180cf1a

data/lib/kontact/brazil.rb

@@ -17,35 +17,40 @@ module Kontact
       91 92 93 94 95 96 97 98 99
     ].freeze
 
-    def self.generate(type = :mobile)
+    PATTERN = [
+      /\A\+55 \((\d{2})\) 9\d{4}-\d{4}\z/,
+      /\A\((\d{2})\) 9\d{4}-\d{4}\z/,
+      /\A\+55 \((\d{2})\) [2-5]\d{3}-\d{4}\z/,
+      /\A\((\d{2})\) [2-5]\d{3}-\d{4}\z/,
+      /\A\+55(\d{2})9\d{8}\z/,
+      /\A\+55(\d{2})[2-5]\d{7}\z/
+    ].freeze
+
+    def self.generate(type: :mobile, formatted: false)
       ddd = DDD.sample
       number = case type
                when :mobile
-                 "9#{rand(1000..9999)}-#{rand(1000..9999)}"
+                 "9#{rand(1000..9999)}#{formatted ? "-" : ""}#{rand(1000..9999)}"
                when :landline
-                 "#{rand(2000..5999)}-#{rand(1000..9999)}"
+                 "#{rand(2000..5999)}#{formatted ? "-" : ""}#{rand(1000..9999)}"
                else
                  raise ArgumentError, "Invalid type: #{type}"
                end
-      "+55 #{ddd} #{number}"
+      formatted ? "+55 (#{ddd}) #{number}" : "+55#{ddd}#{number}"
     end
 
     def self.valid?(number)
-      return false unless number.match?(/\A\+?55[ ()\d-]+\z/)
-      return false if number.include?("--") || number.include?("++") || number.include?("-+")
-      return false unless number.match?(/\A[\d\s\-+()]+\z/)
-      return false if number.count("+") > 1
-      return false if number.count("-") > 1
-      return false if number.count("(") > 1
-      return false if number.count(")") > 1
-      return false if number.match?(/[^\d\s\-+()]/)
-
-      digits = number.gsub(/\D/, "")
+      raise ArgumentError, "Number can not empty or blank" unless number
 
-      return false unless digits.start_with?("55")
+      number = number.strip
 
-      digits = digits[2..]
+      PATTERN.any? do |regex|
+        match = number.match(regex)
+        match && DDD.include?(match[1])
+      end
 
+      digits = number.gsub(/\D/, "")
+      digits = digits[2..] if digits.start_with?("55")
       return false unless [10, 11].include?(digits.length)
 
       ddd = digits[0..1]

data/lib/kontact/usa.rb

@@ -45,12 +45,17 @@ module Kontact
       941 947 948 949 951 952 954 956 957
       959 970 971 972 973 975 976 978 979
       980 984 985 986 989
+    ].freeze
+
+    PATTERN = [
+      /\A\+1 \((\d{3})\) (\d{3})-(\d{4})\z/, # formatado
+      /\A\+1(\d{3})(\d{3})(\d{4})\z/ # compacto
     ]
 
-    def self.generate(_type = :mobile)
+    def self.generate(formatted: false)
       area = AREAS.sample
       line_number = rand(1000..9999)
-      "+1 #{area} #{valid_prefix}-#{line_number}"
+      formatted ? "+1 (#{area}) #{valid_prefix}-#{line_number}" : "+1#{area}#{valid_prefix}#{line_number}"
     end
 
     def self.valid_prefix
@@ -61,16 +66,16 @@ module Kontact
     end
 
     def self.valid?(number)
-      match = number.match(/\A\+1 (\d{3}) (\d{3})-(\d{4})\z/)
-      return false unless match
+      raise ArgumentError, "Number can not be empty or blank" if number.nil? || number.strip.empty?
 
-      area = match[1]
-      prefix = match[2].to_i
-      return false unless AREAS.include?(area)
-      return false if [911, 411, 555].include?(prefix)
-      return false unless prefix.to_s[0].match?(/[2-9]/)
+      PATTERN.any? do |regex|
+        match = number.match(regex)
+        next false unless match
 
-      true
+        area = match[1]
+        prefix = match[2].to_i
+        AREAS.include?(area) && ![911, 411, 555].include?(prefix) && prefix.to_s[0].match?(/[2-9]/)
+      end
     end
   end
 end

data/lib/kontact/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Kontact
-  VERSION = "0.4.0"
+  VERSION = "0.5.0"
 end

data/lib/kontact.rb

@@ -3,18 +3,20 @@ require_relative "kontact/brazil"
 require_relative "kontact/usa"
 
 module Kontact
-  def self.generate(country = detect_country, type = :mobile)
+  def self.generate(country: :brazil, type: :mobile, formatted: false)
+    validate_country(country)
     case country.to_sym
     when :brazil
-      Brazil.generate(type)
+      Brazil.generate(type: type, formatted: formatted)
     when :usa
-      USA.generate(type)
+      USA.generate(formatted: formatted)
     else
       raise ArgumentError, "Unsupported country: #{country}"
     end
   end
 
-  def self.valid?(number, country = detect_country)
+  def self.valid?(number, country: :brazil)
+    validate_country(country)
     raise ArgumentError, "Number can not empty or blank" unless number
 
     case country.to_sym
@@ -40,4 +42,15 @@ module Kontact
       :brazil # as a main fallback
     end
   end
+
+  def self.validate_country(country)
+    case country.to_sym
+    when :brazil
+      :brazil
+    when :usa
+      :usa
+    else
+      raise ArgumentError, "Unsupported country: #{country}"
+    end
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: kontact
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.5.0
 platform: ruby
 authors:
 - Thiago Chirana