backframe 0.0.32 → 0.0.33

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d59f6e11a5b5a46861cbf5deaf1ee801528bedf3
-  data.tar.gz: b3c6cb6c7ab5f6d0277969b778d2fe5cfc64a1a1
+  metadata.gz: ddd42ad68a92951af7d447fe203cf35caefba49e
+  data.tar.gz: d6d17949e7f8cd763de6b45c95213d5eb5162c02
 SHA512:
-  metadata.gz: 7cda2267bcd265dd17bbbd52addbff1dbcfde18ea24809c05f086ec6a8415838862ce7f5cf8b0bff100bd91092d5a5b1233e59d3d84778f5c075559b4b7db646
-  data.tar.gz: f21d1df236414604a00e8255788abc6fd451f4f14fe89f925f0204e9bd072cc29bdb68139703aab1d495a17c0bf16cb16d51ba6c95437197878ba3b40178da35
+  metadata.gz: dde2bb19707f03d683fd87514d75cf0db6642ab86c3ba045ed0ee82e29f2e14facba701a28216001c315e523376e773994b9d4ea418193bbe26239b7abf59bd5
+  data.tar.gz: 060048ae6277590bf40793edbafea2af25565bc2804851d1397ffd97a46a7f4c3c7d2b92b35c80ad3632913a83d333453c14c9319bf964e896d1d3394b6cb8b2

data/lib/backframe/activerecord/acts_as_phone.rb

@@ -17,7 +17,7 @@ module Backframe
 
         class_eval <<-EOV
 
-          after_initialize :uncast_phone_#{entity}, :if => Proc.new { |c| c.#{entity}.present? }
+          after_initialize :uncast_phone_#{entity}, :if => Proc.new { |c| !c.new_record? && c.#{entity}.present? }
           before_save :cast_phone_#{entity}, :if => Proc.new { |c| c.#{entity}.present? }
           after_save :uncast_phone_#{entity}, :if => Proc.new { |c| c.#{entity}.present? }
 
@@ -30,18 +30,23 @@ module Backframe
           end
 
           def cast_phone_#{entity}
-            self.#{entity} = Phony.normalize(self.#{entity})
-            self.#{entity} = '1'+self.#{entity} if (self.#{entity}.length == 10)
+            self.#{entity} = #{entity}_to_international(self.#{entity})
           end
 
           def validates_phone_#{entity}
-            testvalue = Phony.normalize(self.#{entity})
-            testvalue = '1'+testvalue if (testvalue.length == 10)
+            testvalue = #{entity}_to_international(self.#{entity})
             if !Phony.plausible?(testvalue)
               self.errors.add(:#{entity}, 'invalid #{entity} number')
             end
           end
 
+          def #{entity}_to_international(value)
+            regex = Regexp.new('[\\s\\\.\\\-\\\(\\\)]')
+            newvalue = value.gsub(regex, '')
+            newvalue = (newvalue.length == 10) ? '1'+value : value
+            Phony.normalize(newvalue)
+          end
+
         EOV
 
       end

data/lib/backframe/version.rb

@@ -1,5 +1,5 @@
 # encoding: utf-8
 
 module Backframe
-  VERSION = '0.0.32'
+  VERSION = '0.0.33'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: backframe
 version: !ruby/object:Gem::Version
-  version: 0.0.32
+  version: 0.0.33
 platform: ruby
 authors:
 - Greg Kops
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-19 00:00:00.000000000 Z
+date: 2016-05-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: write_xlsx