fixed issue #309

daddyz · Sep 8, 2024 · 504ed6c · 504ed6c
1 parent 466a328
commit 504ed6c
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 2 deletions.
diff --git a/lib/phonelib/data_importer.rb b/lib/phonelib/data_importer.rb
@@ -209,7 +209,7 @@ def import_country_names
       # adds double country code flag in case country allows
       def add_double_country_flag(country)
         if DOUBLE_COUNTRY_CODES_COUNTRIES.include?(country[:id])
-          country[:double_prefix] = true
+          country[Core::DOUBLE_COUNTRY_PREFIX_FLAG] = true
         end
         country
       end

diff --git a/lib/phonelib/phone_analyzer.rb b/lib/phonelib/phone_analyzer.rb
@@ -70,7 +70,7 @@ def better_result(base_result, result = nil)
     # replacing national prefix to simplified format
     def with_replaced_national_prefix(phone, data)
       return phone unless data[Core::NATIONAL_PREFIX_TRANSFORM_RULE]
-      phone = phone.gsub(/^#{data[Core::COUNTRY_CODE]}/, '') if phone.start_with?(data[Core::COUNTRY_CODE])
+      phone = phone.gsub(/^#{data[Core::COUNTRY_CODE]}/, '') if phone.start_with?(data[Core::COUNTRY_CODE]) && !data[Core::DOUBLE_COUNTRY_PREFIX_FLAG]
       pattern = cr("^(?:#{data[Core::NATIONAL_PREFIX_FOR_PARSING]})")
       match = phone.match pattern
       if match && match.captures.compact.size > 0

diff --git a/spec/phonelib_spec.rb b/spec/phonelib_spec.rb
@@ -1373,6 +1373,15 @@
     end
   end
 
+  context 'issue #309' do
+    it 'should return same result without specifying country' do
+      p1 = Phonelib.parse('+55 55 96722 8964', 'BR')
+      p2 = Phonelib.parse('+55 55 96722 8964')
+      expect(p1.valid?).to be(p2.valid?)
+      expect(p1.international).to eq(p2.international)
+    end
+  end
+
   context 'example numbers' do
     it 'are valid' do
       data_file = File.dirname(__FILE__) + '/../data/phone_data.dat'