4info 1.2.0 → 1.2.1

data/4info.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{4info}
-  s.version = "1.2.0"
+  s.version = "1.2.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Jack Danger Canty"]

data/README.markdown

@@ -28,6 +28,17 @@ You can also specify which attributes you'd like to use instead of the defaults
       # Defaults to the name on the left (minus the '_column' at the end)
     end
 
+Phone number formatting
+---
+
+Whatever is stored in the sms_phone_number_column will be subject to normalized formatting:
+
+  user = User.create :sms_phone_number => '(206) 555-1234'
+  user.sms_phone_number # => 2065551234
+
+If you want to preserve the format of the number exactly as the user entered it you'll want
+to save it in a different attribute.
+
 
 Confirming Phone Number And Sending Messages
 ====

data/VERSION

@@ -1 +1 @@
-1.2.0
+1.2.1

data/lib/contactable.rb

@@ -39,6 +39,18 @@ module FourInfo
           end
         "
       end
+
+      # normalize the phone number before it's saved in the database
+      # (only for model classes using callbacks a la ActiveRecord,
+      #  other folks will have to do this by hand)
+      if model.respond_to?(:before_save)
+        model.before_save :normalize_sms_phone_number
+        model.class_eval do
+          def normalize_sms_phone_number
+            self.four_info_sms_phone_number = FourInfo.numerize(four_info_sms_phone_number)
+          end
+        end
+      end
     end
 
     # Sends one or more TXT messages to the contactable record's

data/test/four_info_contactable_test.rb

@@ -54,11 +54,14 @@ class FourInfoContactableTest < ActiveSupport::TestCase
   context "contactable instance" do
     setup {
       User.delete_all
-      @user = User.create! :sms_phone_number => '555-555-5555'
+      @user = User.create! User.sms_phone_number_column => '(555) 123-4567'
     }
 
+    should "normalize phone number" do
+      assert_equal '5551234567', @user.four_info_sms_phone_number
+    end
     context "when phone number is blank" do
-      setup { @user.sms_phone_number = nil}
+      setup { @user.four_info_sms_phone_number = nil}
       context "confirming phone number" do
         setup { @user.send_sms_confirmation! }
         should_not_change "any attributes" do
@@ -78,7 +81,7 @@ class FourInfoContactableTest < ActiveSupport::TestCase
     end
 
     context "when phone number exists" do
-      setup { @user.sms_phone_number = "206-555-5555"}
+      setup { @user.four_info_sms_phone_number = "206-555-5555"}
       context "confirming phone number" do
         setup {
           FourInfo::Request.any_instance.stubs(:perform).returns(ValidationSuccess)

data/test/four_info_controller_test.rb

@@ -24,13 +24,15 @@ class FourInfoControllerTest < ActionController::TestCase
   context "with a user" do
     setup {
       User.delete_all
-      @user = User.create! :sms_phone_number => '3334445555'
+      @user = User.create! :sms_phone_number => '(206) 335-1596'
+      # and we should be able to find @user by this formatted version
+      @formatted_phone_number = "2063351596"
     }
     context "receiving BLOCK" do
       setup {
         post :index,
         # this is what an xml request will parse to:
-        "request"=>{"block"=>{"recipient"=>{"property"=>{"name"=>"CARRIER", "value"=>"3"}, "id"=>"+1#{@user.sms_phone_number}", "type"=>"5"}}, "type" => "BLOCK"}
+        "request"=>{"block"=>{"recipient"=>{"property"=>{"name"=>"CARRIER", "value"=>"3"}, "id"=>"+1#{@formatted_phone_number}", "type"=>"5"}}, "type" => "BLOCK"}
       }
       should_respond_with :success
       should "block user" do
@@ -43,7 +45,7 @@ class FourInfoControllerTest < ActionController::TestCase
     context "receiving MESSAGE" do
       setup {
         # this is what an xml request will parse to:
-        @receive_params = {"request"=>{"message"=>{"id" => "ABCDEFG", "recipient"=>{"type"=> "6", "id"=>"12345"}, "sender" => {"type" => "5", "id" => "+1#{@user.sms_phone_number}", "property" => {"name" => "CARRIER", "value" => "5"}}, "text" => "This is a text message."}, "type" => "MESSAGE"}}
+        @receive_params = {"request"=>{"message"=>{"id" => "ABCDEFG", "recipient"=>{"type"=> "6", "id"=>"12345"}, "sender" => {"type" => "5", "id" => "+1#{@formatted_phone_number}", "property" => {"name" => "CARRIER", "value" => "5"}}, "text" => "This is a text message."}, "type" => "MESSAGE"}}
       }
       context "when the user is not set up to receive" do
         setup {

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: 4info
 version: !ruby/object:Gem::Version 
-  version: 1.2.0
+  version: 1.2.1
 platform: ruby
 authors: 
 - Jack Danger Canty