fakie 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bddcb20076c5823e1b26bc9bb9ef5ca10df05889
-  data.tar.gz: 660b1e6cafbf3be204bb4854924706cc4a1ce61e
+  metadata.gz: 2281c84fa85ec11967eb067737b61863ac3843bc
+  data.tar.gz: 5f8d21f3033dcba1701a77ae65edc0af25cb987d
 SHA512:
-  metadata.gz: b1a720adf32ab75f7a1808c56a9c6c4da4345864d9f6d03d7d2cea7d7518f21df05ea11ffd1d6d96d09abd1a5dce177a9c20010c0a539029f4e37032c075b10b
-  data.tar.gz: c035c6cf7a5021c0496d23f8487ae8d654f687a2de81551ce8bb32e2d64a5646f91f9ab0fd0de00e41045854148f2f915b7c4c5373ecdcf616aead3c6e63c47c
+  metadata.gz: 2f0b3f168a97407a9b2aec652ab7f88084c145225b52adff88d01295501d278f8b49245f610e97abc2b4d10c2ec66398f8d76d2645f18df8b466872fab000db5
+  data.tar.gz: e252c165bfc50b32b8d8e18cb8a3013003c9481e88147bb1c5a03889bbd2e4749894cf2f1bb4553c6daf915df500b54531a9214c43f4c22a8b90c4545d85d81c

data/lib/fakie/java_script.rb

@@ -4,7 +4,7 @@ module Fakie
 
     # ExecJS Context
     # @return [ExecJS::ExternalRuntime::Context] context for executing JavaScript against libphonenumber and Fakie
-    def js_context
+    def context
       @@_js_context ||= begin
         require 'execjs'
         js_dir = File.join(File.expand_path(File.dirname(__FILE__)), 'js')
@@ -17,14 +17,14 @@ module Fakie
     # Call a function against the context
     # @param function [String] function name
     # @param args [* String] list of arguments to send to the function
-    def js_call(function, *args)
-      js_context.call(function, *args)
+    def call(function, *args)
+      context.call(function, *args)
     end
 
     # Call a function against the context
     # @param function [String] JavaScript code to evaluate
-    def js_eval(script)
-      js_context.eval(script)
+    def eval(script)
+      context.eval(script)
     end
   end
 end

data/lib/fakie/js/fakie.js

@@ -69,35 +69,17 @@ var Fakie = {
 
     result['e164'] = phoneUtil.format(number, i18n.phonenumbers.PhoneNumberFormat.E164);
 
-    return result;
-  },
-
-  countryForE164Number: function(phone) {
-    try {
-    var phone = Fakie.cleanPhone(phone);
-    var phoneUtil = i18n.phonenumbers.PhoneNumberUtil.getInstance();
-    var number = phoneUtil.parseAndKeepRawInput(phone);
-      return phoneUtil.getRegionCodeForNumber(number);
-    } catch (e) {
-      return "";
+    var nationalSignificantNumber = phoneUtil.getNationalSignificantNumber(number);
+    var areaCodeLength = phoneUtil.getLengthOfGeographicalAreaCode(number);
+    if (areaCodeLength > 0) {
+      result['area_code'] = nationalSignificantNumber.substring(0, areaCodeLength);
     }
-  },
 
-  formatE164: function(country, phone) {
-    try {
-    var phone = Fakie.cleanPhone(phone);
-    var phoneUtil = i18n.phonenumbers.PhoneNumberUtil.getInstance();
-    var number = phoneUtil.parseAndKeepRawInput(phone, country);
-    var PNF = i18n.phonenumbers.PhoneNumberFormat;
-      return phoneUtil.format(number, PNF.E164);
-    } catch (e) {
-      return phone;
-    }
+    return result;
   },
 
   formatInternational: function(country, phone) {
     try {
-    var phone = Fakie.cleanPhone(phone);
       var formatter = new i18n.phonenumbers.AsYouTypeFormatter(country);
       var output = new goog.string.StringBuffer();
       for (var i = 0; i < phone.length; ++i) {
@@ -112,7 +94,6 @@ var Fakie = {
 
   formatLocal: function(country, phone) {
     try {
-      var phone = Fakie.cleanPhone(phone);
       var phoneUtil = i18n.phonenumbers.PhoneNumberUtil.getInstance();
       var number = phoneUtil.parseAndKeepRawInput(phone, country);
       if (phoneUtil.isValidNumberForRegion(number, country)) {
@@ -124,15 +105,5 @@ var Fakie = {
     } catch (e) {
       return Fakie.formatInternational(country, phone);
     }
-  },
-
-  cleanPhone: function(phone) {
-    phone = phone.replace(/[^\d\+]/g,'');
-    if (phone.substr(0, 1) == "+") {
-      phone = "+" + phone.replace(/[^\d]/g,'');
-    } else {
-      phone = phone.replace(/[^\d]/g,'');
-    }
-    return phone;
   }
 };

data/lib/fakie/phone_number.rb

@@ -1,23 +1,20 @@
 module Fakie
   class PhoneNumber
-    include JavaScript
-
     class << self
-      include JavaScript
-
       # Parse a phone number
       # @param phone_number [String] phone number to parse
       # @option options default_country [String] ISO 3166-1 two-letter country code
       # @return [PhoneNumber] phone number object
       def parse(phone_number, options = {})
         region_code = options[:default_country]
-        self.new(js_call('Fakie.parse', phone_number, region_code))
+        self.new(JavaScript.call('Fakie.parse', phone_number, region_code))
       end
     end
 
     attr_reader :e164
     attr_reader :country_code
     attr_reader :national_number
+    attr_reader :area_code
     attr_reader :raw_input
     attr_reader :country_code_source
     attr_reader :preferred_domestic_carrier_code
@@ -29,6 +26,7 @@ module Fakie
       @e164 = hash['e164']
       @country_code = hash['country_code']
       @national_number = hash['national_number']
+      @area_code = hash['area_code']
       @raw_input = hash['raw_input'].to_s
       @country_code_source = hash['country_code_source']
       @preferred_domestic_carrier_code = hash['preferred_domestic_carrier_code']
@@ -48,12 +46,12 @@ module Fakie
 
     def international_format(region = self.region_code)
       raise InvalidPhoneNumber unless self.is_valid?
-      @international_format ||= js_call('Fakie.formatInternational', region, self.e164)
+      @international_format ||= JavaScript.call('Fakie.formatInternational', region, self.e164)
     end
 
     def local_format(region = self.region_code)
       raise InvalidPhoneNumber unless self.is_valid?
-      @local_format ||= js_call('Fakie.formatLocal', region, self.e164)
+      @local_format ||= JavaScript.call('Fakie.formatLocal', region, self.e164)
     end
 
     def country_name

data/lib/fakie/version.rb

@@ -1,3 +1,3 @@
 module Fakie
-  VERSION = '0.1.2'
+  VERSION = '0.1.3'
 end

data/test/fakie/java_script_test.rb

@@ -0,0 +1,9 @@
+require 'test_helper'
+
+module Fakie
+  class JavaScriptTest < TestCase
+    def test_eval
+      assert_equal '415', JavaScript.eval('Fakie.parse("+14155550123")["area_code"]')
+    end
+  end
+end

data/test/fakie/phone_number_test.rb

@@ -6,9 +6,11 @@ module Fakie
       phone_number = Fakie.parse('+1 415 555 0123')
       assert_equal 1, phone_number.country_code
       assert_equal 4155550123, phone_number.national_number
+      assert_equal '415', phone_number.area_code
       assert_equal '+1 415 555 0123', phone_number.raw_input
       assert_equal '+14155550123', phone_number.e164
       assert_equal 'US', phone_number.region_code
+      assert_equal 'United States', phone_number.country_name
       assert phone_number.is_possible?
       assert phone_number.is_valid?
     end

data/test/fakie_test.rb

@@ -5,5 +5,9 @@ module Fakie
     def test_parse
       assert_kind_of PhoneNumber, Fakie.parse('+14155550123')
     end
+
+    def test_invalid_country
+      refute Fakie.country_name_for_region_code('ZZ')
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fakie
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Sam Soffes
@@ -47,6 +47,7 @@ files:
 - lib/fakie/phone_number.rb
 - lib/fakie/version.rb
 - tasks/import.rake
+- test/fakie/java_script_test.rb
 - test/fakie/phone_number_test.rb
 - test/fakie_test.rb
 - test/js.html
@@ -76,6 +77,7 @@ signing_key:
 specification_version: 4
 summary: libphonenumber wrapper with ExecJS
 test_files:
+- test/fakie/java_script_test.rb
 - test/fakie/phone_number_test.rb
 - test/fakie_test.rb
 - test/js.html