4info 1.0.5 → 1.1.0

data/4info.gemspec

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

data/README.markdown

@@ -23,7 +23,7 @@ You can also specify which attributes you'd like to use instead of the defaults
       sms_blocked_column                 :is_sms_blocked
       sms_confirmation_code_column       :the_sms_confirmation_code
       sms_confirmation_attempted_column  :when_was_the_sms_confirmation_attempted
-      sms_confirmed_column               :is_the_mobile_number_confirmed
+      sms_confirmed_phone_number_column  :the_mobile_number_thats_been_confirmed
 
       # Defaults to the name on the left (minus the word '_column')
     end
@@ -34,7 +34,7 @@ You can manage the user's SMS state like so:
     @user.confirm_sms!
     # then ask the user for the confirmation code and
     # compare it to @user.sms_confirmation_code
-    @user.update_attributes(:sms_confirmed => true)
+    @user.update_attributes(:sms_confirmed_phone_number => @user.sms_phone_number)
     @user.send_sms!("Hi! This is a text message.")
     # Then maybe the user will reply with 'BLOCK' by accident
     @user.unblock_sms!

data/VERSION

@@ -1 +1 @@
-1.0.5
+1.1.0

data/lib/contactable.rb

@@ -5,7 +5,7 @@ module FourInfo
                     :sms_blocked,
                     :sms_confirmation_code,
                     :sms_confirmation_attempted,
-                    :sms_confirmed ]
+                    :sms_confirmed_phone_number ]
 
     def self.included(model)
       gem 'haml'
@@ -27,8 +27,8 @@ module FourInfo
         # provide a helper method to access the right value
         # no matter which column it's stored in
         #
-        # e.g.: @user.four_info_sms_confirmed
-        #       => @user.send(User.sms_confirmed_column)
+        # e.g.: @user.four_info_sms_confirmation_code
+        #       == @user.send(User.sms_confirmation_code_column)
         model.class_eval "
           def four_info_#{attribute}(value = nil)
             value ?
@@ -41,12 +41,19 @@ module FourInfo
       end
     end
 
+    def current_phone_number_confirmed_for_sms?
+      return false if four_info_sms_confirmed_phone_number.blank?
+      four_info_sms_confirmed_phone_number == four_info_sms_phone_number
+    end
+
     def send_sms!(msg, allow_multiple = false)
       if msg.to_s.size > 160 && !allow_multiple
         raise ArgumentError, "SMS Message is too long. Either specify that you want multiple messages or shorten the string."
       end
-      return false if msg.to_s.strip.blank? || four_info_sms_blocked? || !four_info_sms_confirmed?
+      return false if msg.to_s.strip.blank? || four_info_sms_blocked?
+      return false unless current_phone_number_confirmed_for_sms?
 
+      # split into pieces that fit as individual messages.
       msg.to_s.scan(/.{1,160}/m).map do |text|
         FourInfo::Request.new.deliver_message(text, four_info_sms_phone_number).success?
       end
@@ -54,13 +61,13 @@ module FourInfo
 
     def confirm_sms!
       return false if four_info_sms_blocked?
-      return true  if four_info_sms_confirmed?
+      return true  if current_phone_number_confirmed_for_sms?
       return false if four_info_sms_phone_number.blank?
 
       response = FourInfo::Request.new.confirm(four_info_sms_phone_number)
       if response.success?
-        self.four_info_sms_confirmation_code = response.confirmation_code
-        self.four_info_sms_confirmation_attempted = Time.now
+        self.four_info_sms_confirmation_code response.confirmation_code
+        self.four_info_sms_confirmation_attempted Time.now
         save
       else
         # "Confirmation Failed: #{response['message'].inspect}"

data/lib/response.rb

@@ -16,7 +16,7 @@ module FourInfo
     end
 
     def confirmation_code
-      self['confCode'].inner_text
+      self[:confcode].inner_text
     end
   end
 end

data/test/four_info_contactable_test.rb

@@ -86,13 +86,16 @@ class FourInfoContactableTest < ActiveSupport::TestCase
         }
         should "work" do assert @worked end
         should "save confirmation number in proper attribute" do
-          assert @user.four_info_sms_confirmation_code
+          assert_equal '123abc', @user.four_info_sms_confirmation_code
+        end
+        should "set confirmation attempted time" do
+          assert @user.four_info_sms_confirmation_attempted > 3.minutes.ago
         end
         should_change "stored code" do
           @user.four_info_sms_confirmation_code
         end
-        should "not change sms_confirmed? to true" do
-          assert !@user.four_info_sms_confirmed?
+        should "not have number confirmed yet" do
+          assert !@user.current_phone_number_confirmed_for_sms?
         end
       end
       context "confirming phone number when the confirmation fails for some reason" do
@@ -136,7 +139,7 @@ class FourInfoContactableTest < ActiveSupport::TestCase
     context "when the number is confirmed" do
       setup {
         FourInfo::Request.any_instance.stubs(:perform).returns(SendMsgSuccess)
-        @user.update_attributes!(User.sms_confirmed_column => true)
+        @user.stubs(:current_phone_number_confirmed_for_sms?).returns(true)
       }
       context "sending a message" do
         setup { @result = @user.send_sms!('message') }

data/test/test_helper.rb

@@ -16,7 +16,7 @@ ActiveRecord::Base.establish_connection(config[ENV['DB'] || 'sqlite3'])
 ActiveRecord::Schema.define(:version => 1) do
   create_table :users do |t|
     t.column :sms_phone_number,           :string
-    t.column :sms_confirmed,              :boolean
+    t.column :sms_confirmed_phone_number, :string
     t.column :sms_blocked,                :boolean
     t.column :sms_confirmation_attempted, :datetime
     t.column :sms_confirmation_code,      :string

metadata

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