rentlinx 0.9.2 → 0.9.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f7ed5ff7c85420c6a64056f16eb8c0be453f5c55
-  data.tar.gz: 78f10e0fcb464325ed9a6054ad006388c2136bee
+  metadata.gz: 0551c6f33a75e1776a0bb4d932c0a4b4e09f5591
+  data.tar.gz: 9354d52fbf2bd6f1cc3757332ca92ca8e10893a2
 SHA512:
-  metadata.gz: cb2c09a3a2888959e63d3a2026f499fa8118c73e5aa34eeeaaf6c35fe7bce5ec9adddfa83f3556ebaffc4438eadabe52767d64a50f894cb12d40188debb54b3e
-  data.tar.gz: a71d96fa5e04166e0f9181a62375631b840369d97557be03f6c819795e30ccd28e3171e5cc81e19f4b11ea5d1e18f3398d5c67feb367aa5f14c1aef8e3fe97f4
+  metadata.gz: becc388be2bcfe16eeff36740e784671a624d940e06badbe9f6a205e92132b249b3f0c74440538c2a40b6e474207bcb6a9751a47071a7a6f862dc41d310af4e0
+  data.tar.gz: fd6a4aee865dd53a85dc43dd34e4c4dcef0359cd1aa34c4a02e8b927fb0e3c3d44150590021ae89aab06fc5b81f954493a1732db846bd6ce9827fc75ecc409c4

data/lib/rentlinx/validators/phone_validator.rb

@@ -1,20 +1,28 @@
-require 'phony'
-
 module Rentlinx
   # Validator for phone numbers
   class PhoneValidator < BaseValidator
-    # Validates and normalizes the phone number with Phony
+    # Validates and normalizes the phone number
     def processed_value
       return '' if value_blank?
       return @value unless valid?
-      Phony.normalize(@value)
+      @value.gsub(/\D/, '')
     end
 
     private
 
     def validate
-      return if value_blank? || Phony.plausible?(@value) || Phony.plausible?('1' + @value)
+      return if value_blank? ||
+                valid_us_number_without_country_code?(processed_value) ||
+                valid_us_number_with_country_code?(processed_value)
       @error = "#{@value} is not a valid phone number"
     end
+
+    def valid_us_number_with_country_code?(number)
+      number.start_with?('1') && valid_us_number_without_country_code?(number[1..-1])
+    end
+
+    def valid_us_number_without_country_code?(number)
+      !number.start_with?('1') && !number.start_with?('0') && number.size == 10
+    end
   end
 end

data/lib/rentlinx/version.rb

@@ -1,5 +1,5 @@
 # This is the main rentlinx module. All Rentlinx objects
 # and methods are namespaced under this module.
 module Rentlinx
-  VERSION = '0.9.2'
+  VERSION = '0.9.3'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rentlinx
 version: !ruby/object:Gem::Version
-  version: 0.9.2
+  version: 0.9.3
 platform: ruby
 authors:
 - AppFolio, Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-07 00:00:00.000000000 Z
+date: 2015-10-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httpclient
@@ -38,20 +38,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.8'
-- !ruby/object:Gem::Dependency
-  name: phony
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.12'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.12'
 - !ruby/object:Gem::Dependency
   name: logging
   requirement: !ruby/object:Gem::Requirement