phonelib 0.6.8 → 0.6.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 52dfab24f832cd68c1737ac9eb6add1bebca27bb
-  data.tar.gz: 1fdd018fcbfd3edbfb5266a98f0828fd0397ef3b
+  metadata.gz: 057bf64ada014da3a08f3355708b52ff368ecbba
+  data.tar.gz: 58f4e1fd554667c03f827fc73b45fdcb91c38cfe
 SHA512:
-  metadata.gz: ebeadc2bb517ed0590f130cbaf00182283f43a8adb52d7d4439b4004ba9718593de2dc795991d39a2f1afa8ddb1add278d280adcb4b5f2ced14efb6e8ad35418
-  data.tar.gz: 31a6365ed3d5acbb62f496c10c54745f81f39cb6836f67c344117552039c0253e02d61b4d81c1aefe22b052b026f5f5f3e6331f81ac829387f880ae3bbb4b910
+  metadata.gz: e7dc5128f57dd6d743d32ea86ae5de72cf3ac539d19a3bafa7fc8d33153520d7382d786286e417be9b4fb31f0cf69b9e5baa4c353de51d68754397862db28bb5
+  data.tar.gz: 4abda9ec008548813bd838137a4f9139345f57f2e794f296f218db0d48263c14874446aac396f1d264e5f864a35294a22aa6b2b6d8b619d5652f0237eb167caa

data/README.md

@@ -1,5 +1,6 @@
 ## Phonelib
 
+[![Built in integration with JetBrains RubyMine](https://github.com/daddyz/phonelib/blob/master/icon_RubyMine.png?raw=true)](https://www.jetbrains.com/ruby/)
 [![Gem Version](https://badge.fury.io/rb/phonelib.svg)](http://badge.fury.io/rb/phonelib)
 [![Build Status](https://travis-ci.org/daddyz/phonelib.png?branch=master)](http://travis-ci.org/daddyz/phonelib)
 [![](https://codeclimate.com/github/daddyz/phonelib/badges/coverage.svg)](https://codeclimate.com/github/daddyz/phonelib/coverage)
@@ -67,6 +68,12 @@ To set symbols that are used for separating extension from phone number for pars
 Phonelib.extension_separate_symbols = '#;'
 ```
 
+In case you need to overwrite some Google's libphonenumber library data, you need to assign file path to this setter. File should be Marshal.dump'ed with existing structure like in ```Phonelib.phone_data```. Gem is simply doing ```merge``` between hashes.
+
+``` ruby
+Phonelib.override_phone_data = '/path/to/override_phone_data.dat'
+```
+
 In case phone number that was passed for parsing has "+" sign in the beginning, library will try to detect a country regarding the provided one.
 
 ### ActiveRecord Integration
@@ -84,7 +91,7 @@ Please note that passing blank value also fails.
 Additional options:
 
 ``` ruby
-validates :attribute, phone: { possible: true, allow_blank: true, types: [:voip, :mobile] }
+validates :attribute, phone: { possible: true, allow_blank: true, types: [:voip, :mobile], country_specifier: -> phone { phone.country.try(:upcase) } }
 ```
 
 <tt>possible: true</tt> - enables validation to check whether the passed number is a possible phone number (not strict check).
@@ -95,6 +102,8 @@ Refer to [Google libphonenumber](http://code.google.com/p/libphonenumber/) for m
 <tt>types: :mobile</tt> or <tt>types: [:voip, :mobile]</tt> - allows to validate against specific phone types patterns,
 if mixed with <tt>possible</tt> will check if number is possible for specified type
 
+<tt>country_specifier: -> phone { phone.country.try(:upcase) }</tt> - allows to specify country for validation dynamically for each validation. 
+
 ### Basic usage
 
 To check if phone number is valid simply run:

data/lib/phonelib/core.rb

@@ -107,6 +107,16 @@ module Phonelib
       @@strict_check = strict
     end
 
+    @@override_phone_data = nil
+    # setter for data file to use
+    def override_phone_data=(file_path)
+      @@override_phone_data = file_path
+    end
+
+    def override_phone_data
+      @@override_phone_data
+    end
+
     # gem constants definition
 
     # @private Main data file
@@ -324,7 +334,12 @@ module Phonelib
     # @private Load data file into memory
     def load_data
       data_file = "#{File.dirname(__FILE__)}/../../#{FILE_MAIN_DATA}"
-      Marshal.load(File.binread(data_file))
+      default_data = Marshal.load(File.binread(data_file))
+      if override_phone_data
+        override_data_file = Marshal.load(File.binread(override_phone_data))
+        default_data.merge!(override_data_file)
+      end
+      default_data
     end
 
     # @private Load extended data file into memory

data/lib/phonelib/data_importer_helper.rb

@@ -55,10 +55,10 @@ module Phonelib
     def parse_raw_file(file)
       data = {}
       File.readlines(file).each do |line|
-        line = str_clean line
+        line = str_clean line, false
         next if line.empty? || line[0] == '#'
         prefix, line_data = line.split('|')
-        data[prefix] = line_data && line_data.split('&')
+        data[prefix] = line_data && line_data.strip.split('&')
       end
       data
     end

data/lib/phonelib/phone_formatter.rb

@@ -124,7 +124,7 @@ module Phonelib
 
     # @private Get needable data for formatting phone as national number
     def formatting_data
-      return @formatting_data if @formatting_data
+      return @formatting_data if defined?(@formatting_data)
 
       format = @data[country][:format]
       prefix = @data[country][Core::NATIONAL_PREFIX]

data/lib/phonelib/version.rb

@@ -1,4 +1,4 @@
 module Phonelib
   # @private
-  VERSION = '0.6.8'
+  VERSION = '0.6.9'
 end

data/lib/validators/phone_validator.rb

@@ -43,8 +43,9 @@ class PhoneValidator < ActiveModel::EachValidator
   # Validation method
   def validate_each(record, attribute, value)
     return if options[:allow_blank] && value.blank?
+    country = options[:country_specifier].call(record) if options[:country_specifier]
 
-    phone = parse(value)
+    phone = parse(value, country)
     valid = if simple_validation?
               method = options[:possible] ? :possible? : :valid?
               phone.send(method)

metadata

@@ -1,29 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: phonelib
 version: !ruby/object:Gem::Version
-  version: 0.6.8
+  version: 0.6.9
 platform: ruby
 authors:
 - Vadim Senderovich
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-11-28 00:00:00.000000000 Z
+date: 2017-01-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '11.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '11.0'
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
@@ -108,6 +108,20 @@ dependencies:
     - - '='
       - !ruby/object:Gem::Version
         version: '1.2'
+- !ruby/object:Gem::Dependency
+  name: json
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 1.8.6
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 1.8.6
 description: |2
       Google libphonenumber library was taken as a basis for
       this gem. Gem uses its data file for validations and number formatting.