phonelib 0.2.8 → 0.2.9

data/lib/phonelib/core.rb

@@ -98,17 +98,19 @@ module Phonelib
 
     # method for parsing phone number.
     # On first run fills @@phone_data with data present in yaml file
-    def parse(phone, passed_country = nil)
+    def parse(original, passed_country = nil)
       load_data
+      sanitized = sanitize_phone original
 
       country = country_or_default_country(passed_country)
-      if phone.nil? || country.nil?
+      if sanitized.empty?
         # has to return instance of Phonelib::Phone even if no phone passed
-        Phonelib::Phone.new(phone, @@phone_data)
+        Phonelib::Phone.new(sanitized, original, @@phone_data)
       else
-        detected = detect_and_parse_by_country(phone, country)
+        detected = detect_or_parse_by_country(sanitized, original, country)
         if passed_country.nil? && @@default_country && detected.invalid?
-          Phonelib::Phone.new(phone, @@phone_data)
+          # try to detect country for number if it's invalid for specified one
+          detect_or_parse_by_country(sanitized, original)
         else
           detected
         end
@@ -160,11 +162,19 @@ module Phonelib
     end
 
     # Get Phone instance for provided phone with country specified
-    def detect_and_parse_by_country(phone, country)
-      detected = @@phone_data.find { |data| data[:id] == country }
-      if detected
-        phone = convert_phone_to_e164(phone, detected)
-        Phonelib::Phone.new(phone, [detected])
+    def detect_or_parse_by_country(phone, original, country = nil)
+      if country.nil?
+        Phonelib::Phone.new(phone, original, @@phone_data)
+      else
+        detected = @@phone_data.find { |data| data[:id] == country }
+        if detected
+          phone = convert_phone_to_e164(phone, detected)
+          if phone[0] == '+'
+            detect_or_parse_by_country(phone[1..-1], original)
+          else
+            Phonelib::Phone.new(phone, original, [detected])
+          end
+        end
       end
     end
 
@@ -176,13 +186,18 @@ module Phonelib
       rx << "(#{data[Core::NATIONAL_PREFIX]})?"
       rx << "(#{data[Core::TYPES][Core::GENERAL][Core::VALID_PATTERN]})"
 
-      match = phone.gsub('+', '').match(/^#{rx.join}$/)
+      match = phone.match(/^#{rx.join}$/)
       if match
-        national_start = 1.upto(3).map {|i| match[i].to_s.length}.inject(:+)
+        national_start = (1..3).map { |i| match[i].to_s.length }.inject(:+)
         "#{data[Core::COUNTRY_CODE]}#{phone[national_start..-1]}"
       else
-        phone
+        phone.sub(/^#{data[Core::INTERNATIONAL_PREFIX]}/, '+')
       end
     end
+
+    # Sanitizes passed phone number. Returns only digits from passed string.
+    def sanitize_phone(phone)
+      phone && phone.gsub(/[^0-9]+/, '') || ''
+    end
   end
 end

data/lib/phonelib/phone.rb

@@ -15,9 +15,9 @@ module Phonelib
     # * +phone+ - Phone number for parsing
     # * +country_data+ - Hash of data for parsing
     #
-    def initialize(phone, country_data)
-      @original = phone
-      @sanitized = sanitize_phone(@original)
+    def initialize(sanitized, original, country_data)
+      @sanitized = sanitized
+      @original = original
       if @sanitized.empty?
         @analyzed_data = {}
       else
@@ -148,12 +148,5 @@ module Phonelib
     def invalid_for_country?(country)
       !valid_for_country?(country)
     end
-
-    private
-
-    # Sanitizes passed phone number. Returns only digits from passed string.
-    def sanitize_phone(phone)
-      phone && phone.gsub(/[^0-9]+/, '') || ''
-    end
   end
 end

data/lib/phonelib/phone_analyzer.rb

@@ -23,7 +23,7 @@ module Phonelib
     # provided phone number
     def get_national_and_data(phone, data, country_match)
       prefix_length = data[Core::COUNTRY_CODE].length
-      prefix_length += country_match[1].length unless country_match[1].nil?
+      prefix_length += [1, 2].map {|i| country_match[i].to_s.length}.inject(:+)
       result = data.select { |k, v| ![:types, :formats].include?(k) }
       result[:national] = phone[prefix_length..-1]
       result[:format] = get_number_format(result[:national], data[Core::FORMATS])
@@ -36,8 +36,9 @@ module Phonelib
       country_code = "#{data[Core::COUNTRY_CODE]}"
       inter_prefix = "(#{data[Core::INTERNATIONAL_PREFIX]})?"
       if phone =~ /^#{inter_prefix}#{country_code}/
+        national_prefix = "(#{data[Core::NATIONAL_PREFIX]})?"
         _possible, valid = get_patterns(data[Core::TYPES], Core::GENERAL)
-        phone.match /^#{inter_prefix}#{country_code}#{valid}$/
+        phone.match /^#{inter_prefix}#{country_code}#{national_prefix}#{valid}$/
       end
     end
 

data/lib/phonelib/version.rb

@@ -1,5 +1,5 @@
 # :nodoc:
 module Phonelib
   # :nodoc:
-  VERSION = '0.2.8'
+  VERSION = '0.2.9'
 end

metadata

@@ -1,74 +1,82 @@
 --- !ruby/object:Gem::Specification
 name: phonelib
 version: !ruby/object:Gem::Version
-  version: 0.2.8
+  version: 0.2.9
+  prerelease: 
 platform: ruby
 authors:
 - Vadim Senderovich
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-22 00:00:00.000000000 Z
+date: 2014-02-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-description: |2
-      Google libphonenumber library was taken as a basis for
-      this gem. Gem uses its data file for validations and number formatting.
+description: ! "    Google libphonenumber library was taken as a basis for\n    this
+  gem. Gem uses its data file for validations and number formatting.\n"
 email:
 - daddyzgm@gmail.com
 executables: []
@@ -77,42 +85,47 @@ extra_rdoc_files: []
 files:
 - data/phone_data.dat
 - data/PhoneNumberMetaData.xml
-- lib/phonelib.rb
-- lib/phonelib/version.rb
-- lib/phonelib/phone_analyzer.rb
-- lib/phonelib/phone.rb
-- lib/phonelib/core.rb
 - lib/validators/phone_validator.rb
 - lib/tasks/phonelib_tasks.rake
+- lib/phonelib/phone.rb
+- lib/phonelib/core.rb
+- lib/phonelib/version.rb
+- lib/phonelib/phone_analyzer.rb
+- lib/phonelib.rb
 - MIT-LICENSE
 - Rakefile
 - README.rdoc
 homepage: https://github.com/daddyz/phonelib
 licenses:
 - MIT
-metadata: {}
-post_install_message: |2
-      IMPORTANT NOTICE!
-      Phone types were changed from camel case to snake case!
-      Example: ":tollFree" changed to ":toll_free".
-      Please update your app in case your are checking types!
+post_install_message: ! "    IMPORTANT NOTICE!\n    Phone types were changed from
+  camel case to snake case!\n    Example: \":tollFree\" changed to \":toll_free\".\n
+  \   Please update your app in case your are checking types!\n"
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
-  - - '>='
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: -3579515089575950219
 required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
-  - - '>='
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: -3579515089575950219
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 1.8.23
 signing_key: 
-specification_version: 4
+specification_version: 3
 summary: Gem validates phone numbers with Google libphonenumber database
 test_files: []

checksums.yaml

@@ -1,7 +0,0 @@
----
-SHA1:
-  metadata.gz: 0ff01b459bd1e85094346f7d122ecd50c4767dc8
-  data.tar.gz: 437a1259ac26e6aa385dd5e1135eac3c11416f3c
-SHA512:
-  metadata.gz: 034361056395d337e3e0762bb039d46db01b930c50859b65f15cfa1f4b4b9384588934f909450abdeabd6220eb5bd1a34972221639e6ffa095608c442d46c81d
-  data.tar.gz: c29cd9f483a4cb2e0418e48faf7e63df5e6811006f93f61a4841bede73c3a0862c0865ef8ac0e03804a7915f4d36ba8d8941f7d0a975fc7214099d816b4e372b