phony 2.10.1 → 2.10.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9943aad9809e0b815de5e6ffa2d73fba1cf093b7
-  data.tar.gz: 0b6b005750e5ec98bde255f8be798bbd17fe309a
+  metadata.gz: cb033161f929557a2dbf12d42456b2142d6137bb
+  data.tar.gz: 552cb66297f8145a4cf2a448a3babdd6e52ea156
 SHA512:
-  metadata.gz: 1fda36df66cb5aee397d7233bc77c93806568006c1d480acbd4ff9c69269b1e8ba8836cdd1c6093637c6cd184addf6de997c639435cf6c401a8bf48b95dd8d14
-  data.tar.gz: 3556dd2e0b8062e3064d02a1ccba3139c6e44d93fdfcb91b5b7123f7371936174658047420b8b1045655105f279ffe525c8f38f9eacfaaa21c48ba6cf14e532f
+  metadata.gz: c6e75ce246cc9b4f697682f54354467d62db2523e2b0465f27ffe32fd61380d7129ee923f4ca24790e777b6ca3f3819c47894c38a1e05bbf0c89521fb73ada50
+  data.tar.gz: fd809a13783a6fdb671945d458ba2c20cbd74d2244be497823cb26fc73e5fefd1f6f693aa92ceef276fedb99548c3f2d23ed078da210e6072f327a906da9cdfa

data/lib/phony/countries/cambodia.rb

@@ -66,6 +66,7 @@ six_digit_mobile_prefixes = [
 seven_digit_mobile_prefixes = [
   '31', # Beeline
   '38', # CooTel
+  '71', # Metfone
   '76', # Mobitel
   '88', # Metfone
   '96', # Smart

data/lib/phony/countries/italy.rb

@@ -114,6 +114,16 @@ Phony.define do
                 one_of(*service)     >> split(3,3) |
                 one_of(*mobile)      >> split(3,4,-1..1) |
                 one_of(*ndcs_2digit) >> split(4,4) |
-                one_of(*ndcs_3digit) >> split(6..7) |
-                one_of(*ndcs_4digit) >> split(3,3)
+                one_of(*ndcs_3digit) >> matched_split(
+                  /^1\d{6}$/ => [7],
+                  /^1\d{7}$/ => [8],
+                  /^[^1]\d{5}$/ => [6],
+                  /^[^1]\d{6}$/ => [7]
+                ) |
+                one_of(*ndcs_4digit) >> matched_split(
+                /^1\d{5}$/ => [6],
+                /^1\d{6}$/ => [7],
+                /^[^1]\d{4}$/ => [5],
+                /^[^1]\d{5}$/ => [3,3]
+                )
 end

data/lib/phony/dsl.rb

@@ -66,7 +66,12 @@ module Phony
       none >> split(10)
     end
     
+    # This country uses a trunk code.
     #
+    # Examples:
+    #  * Hungary uses 06.
+    #  * North America uses 1.
+    #  * Most countries which use a trunk code use 0.
     #
     def trunk code, options = {}
       TrunkCode.new code, options
@@ -84,9 +89,9 @@ module Phony
     #  * options: Set :zero to false to not add a zero on format :national.
     #
     # Example:
-    #   country '33', fixed(1) >> split(2,2,2,2) # France, uses a fixed NDC of size 1.
+    #   # France, uses a fixed NDC of size 1.
+    #   country '33', fixed(1) >> split(2,2,2,2)
     #
-
     def fixed length, options = {}
       options[:zero] = true if options[:zero].nil?
       NationalSplitters::Fixed.instance_for length, options
@@ -112,7 +117,9 @@ module Phony
     #   * Can contain :max_length => number to denote a maximum NDC length.
     #
     # Example:
-    #   country '51', one_of('103', '105') >> split(3,3) # If it's either 103 or 105, then split ...
+    #   country '51',
+    #     # If it's either 103 or 105, then split ...
+    #     one_of('103', '105') >> split(3,3)
     #
     def one_of *ndcs
       options = Hash === ndcs.last ? ndcs.pop : {}
@@ -149,6 +156,8 @@ module Phony
 
     # Splits the number into groups of given sizes.
     #
+    # Also takes ranges.
+    #
     # Example:
     #   match(/^(0\d{2})\d+$/) >> split(2,2,2,2) # If it matches, split in 4 groups of size 2.
     #
@@ -160,20 +169,19 @@ module Phony
     # Matches on the rest of the number and splits according
     # to the given value for the regexp key.
     #
+    # Also takes ranges.
+    #
     # Options:
     #   * fallback A fallback amount of group sizes in case it doesn't match.
     #
     # Example:
+    #   # Norway
     #   country '47',
     #     none >> matched_split(/^[1].*$/   => [3],
     #                           /^[489].*$/ => [3,2,3],
     #                           :fallback   => [2,2,2,2])
     #
     def matched_split options = {}
-      # # TODO: Refactor: it's a workaround. It creates high coupling with Phony::LocalSplitters::Regex.
-      # options.each do |_, format|
-      #   format << format.pop + 10
-      # end
       Phony::LocalSplitters::Regex.instance_for options
     end
     

data/spec/functional/plausibility_spec.rb

@@ -267,6 +267,8 @@ describe 'plausibility' do
         Phony.plausible?("+85588234567").should be_false     # Metfone (too short)
         Phony.plausible?("+855972345678").should be_true     # Metfone (7 digit id)
         Phony.plausible?("+85597234567").should be_false     # Metfone (too short)
+        Phony.plausible?("+855714822684").should be_true     # Metfone (7 digit id)
+        Phony.plausible?("+85571482268").should be_false     # Metfone (too short)
 
         Phony.plausible?("+85513234567").should be_true      # qb (6 digit id)
         Phony.plausible?("+855132345678").should be_false    # qb (too long)
@@ -410,6 +412,9 @@ describe 'plausibility' do
 
         Phony.plausible?('+39 0471 123 456').should be_true
 
+        # Issue #221
+        Phony.plausible?('+39 081 1925 2698').should be_true
+
         # Mobile
         Phony.plausible?('+39 335 123').should be_false
         Phony.plausible?('+39 335 123 45').should be_false

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: phony
 version: !ruby/object:Gem::Version
-  version: 2.10.1
+  version: 2.10.2
 platform: ruby
 authors:
 - Florian Hanke
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-13 00:00:00.000000000 Z
+date: 2015-01-23 00:00:00.000000000 Z
 dependencies: []
 description: 'Fast international phone number (E164 standard) normalizing, splitting
   and formatting. Lots of formatting options: International (+.., 00..), national