phonelib 0.6.35 → 0.6.36

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 770eab6b0e50f91ca3f6ee754d39913dda65dccd
-  data.tar.gz: 5f7cbc9b9a7c10fcb76210a70bc8af9772636761
+  metadata.gz: ebb5c4a03e76dff6c8aafae4aca658e6703542bf
+  data.tar.gz: 62e417bddb31c30731c9db39419840c7337558aa
 SHA512:
-  metadata.gz: 6f2f4cf02a6733c9c156fc8d6a6c009bf89016962f181acfb6dd2c1b97249eb2b8ea5e8d9d52ddd7684264741c44e46dd80f80d2ef55a00fec046b3c140057ec
-  data.tar.gz: a60fbde65be9395dfedb166776d2902b29352a9a0965d1bcab0ef1a5de0c5e73410a228ebd60cbb91c831e7feaef54a90afafde3c36d3bf7de5f9f4e9447c537
+  metadata.gz: 61fb6b7dee5132bf7c63cb5a604cd2fb2ab9782ba20bc6df8b4a0367cb497da9b596f475dc00031f93ee4580d2a98ae13ea5feb43bdc6a273f87b3a77941c969
+  data.tar.gz: 978d3dcb0236573a1b2425949e0a5716abe196d0052d59e30dd71fae5b794094dda948de9a243dfc91c2f900867ad73164504e101243eead4c9d6c98df10a983

data/lib/phonelib/phone_formatter.rb

@@ -149,7 +149,12 @@ module Phonelib
       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]

data/lib/phonelib/version.rb

@@ -1,4 +1,4 @@
 module Phonelib
   # @private
-  VERSION = '0.6.35'
+  VERSION = '0.6.36'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: phonelib
 version: !ruby/object:Gem::Version
-  version: 0.6.35
+  version: 0.6.36
 platform: ruby
 authors:
 - Vadim Senderovich
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-06-10 00:00:00.000000000 Z
+date: 2019-06-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake