fixed issue #152, incorrect formatting of MX

Author: daddyz

lib/phonelib/phone_formatter.rb

@@ -149,7 +149,12 @@ def formatting_data
       rule.gsub!(/(\$NP|\$FG)/, '$NP' => prefix, '$FG' => '$1')
 
       # add space to format groups, change first group to rule,
-      format_string = format[:format].gsub(/(\d)\$/, '\\1 $').gsub('$1', rule)
+      format_string = format[:format].gsub(/(\d)\$/, '\\1 $')
+      if format_string.include? '$1'
+	format_string.gsub! '$1', rule
+      else
+	format_string = rule.gsub('$1', '') + format_string
+      end
 
       @formatting_data =
           [@national_number.match(/#{format[Core::PATTERN]}/), format_string]

spec/phonelib_spec.rb

@@ -454,7 +454,7 @@
       number = Phonelib.parse('+5215545258448', 'mx')
       expect(number.valid?).to be true
       expect(number.international).to eq('+52 1 55 4525 8448')
-      expect(number.national).to eq('55 4525 8448')
+      expect(number.national).to eq('044 55 4525 8448')
 
       intl = number.international
 
@@ -1150,6 +1150,13 @@
     end
   end
 
+  context 'issue #152' do
+    it 'should return correct format for MX' do
+      p = Phonelib.parse('0459991234567', 'MX')
+      expect(p.national).to eq('044 999 123 4567')
+    end
+  end
+
   context 'example numbers' do
     it 'are valid' do
       data_file = File.dirname(__FILE__) + '/../data/phone_data.dat'