4info 1.2.1 → 1.2.2

data/4info.gemspec

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

data/README.markdown

@@ -28,13 +28,22 @@ 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
 
+Turning the thing on
+---
+
+Because it can be expensive to send TXTs accidentally it's required that you manually configure FourInfo in your app. Put this line in config/initializers/sms.rb or config/environment.rb or anything that loads when the app starts:
+
+    FourInfo.mode = :live
+
+Skipping this step (or adding any other value) will prevent TXTs from actually being sent.
+
 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
+    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.
@@ -47,6 +56,7 @@ You can manage the user's SMS state like so:
 
     @user = User.create(:sms_phone_number => '5552223333')
     @user.send_sms_confirmation!
+    @user.sms_confirmed? # => false
 
 then ask the user for the confirmation code off their phone and pass it in to sms_confirm_with:
 

data/VERSION

@@ -1 +1 @@
-1.2.1
+1.2.2

data/lib/contactable.rb

@@ -99,7 +99,7 @@ module FourInfo
       response = FourInfo::Request.new.unblock(four_info_sms_phone_number)
       if response.success?
         self.four_info_sms_blocked = 'false'
-        save!
+        save
       else
         false
       end
@@ -113,6 +113,8 @@ module FourInfo
         # save the phone number into the 'confirmed phone number' attribute
         self.four_info_sms_confirmed_phone_number = four_info_sms_phone_number
         save
+      else
+        false
       end
     end
 

data/lib/four_info.rb

@@ -3,12 +3,20 @@ module FourInfo
 
   class << self
     def mode
-      @@mode ||= :live
+      @@mode ||= :test
     end
     def mode=(new_mode)
       @@mode = new_mode
     end
 
+    def log(msg)
+      if defined?(Rails)
+        Rails.logger.info msg
+      else
+        STDOUT.puts msg
+      end
+    end
+
     def numerize(numberish)
       numberish.to_s.scan(/\d+/).join
     end

data/lib/request.rb

@@ -18,9 +18,9 @@ module FourInfo
     attr_accessor :message
 
     def initialize
-      config_file = :test == FourInfo.mode ?
-                      @@test_mode_config_file :
-                      @@likely_config_files.detect {|f| File.exist?(f) }
+      config_file = :live == FourInfo.mode.to_sym ?
+                      @@likely_config_files.detect {|f| File.exist?(f) } :
+                      @@test_mode_config_file
 
       raise "Missing config File! Please add sms.yml to ./config or the 4info directory" unless config_file
 
@@ -58,12 +58,16 @@ module FourInfo
       end
 
       def perform(body)
-        start do |http|
-          http.post(
-            FourInfo::Gateway.path,
-            body,
-            {'Content-Type' => 'text/xml'}
-          ).read_body
+        if :live == FourInfo.mode
+          start do |http|
+            http.post(
+              FourInfo::Gateway.path,
+              body,
+              {'Content-Type' => 'text/xml'}
+            ).read_body
+          end
+        else
+          FourInfo.log "Would have sent to 4info.net: #{body}"
         end
       end
 

data/test/four_info_contactable_test.rb

@@ -102,6 +102,9 @@ class FourInfoContactableTest < ActiveSupport::TestCase
         end
         context "calling sms_confirm_with(right_code)" do
           setup { @user.sms_confirm_with(@user.four_info_sms_confirmation_code) }
+          should "work" do
+            assert @worked
+          end
           should "save the phone number into the confirmed attribute" do
             assert_equal @user.four_info_sms_confirmed_phone_number,
                          @user.four_info_sms_phone_number
@@ -111,7 +114,10 @@ class FourInfoContactableTest < ActiveSupport::TestCase
           end
         end
         context "calling sms_confirm_with(wrong_code)" do
-          setup { @user.sms_confirm_with('wrong_code') }
+          setup { @worked = @user.sms_confirm_with('wrong_code') }
+          should "not work" do
+            assert !@worked
+          end
           should "not save the phone number into the confirmed attribute" do
             assert_not_equal @user.four_info_sms_confirmed_phone_number,
                              @user.four_info_sms_phone_number

data/test/test_helper.rb

@@ -30,11 +30,10 @@ class User < ActiveRecord::Base
 end
 
 # kill all network access
-# module FourInfo
-#   class Request
-#     def start
-#       Response.new(:success => true,
-#                    :confirmation_code => 'FAKE')
-#     end
-#   end
-# end
+module FourInfo
+  class Request
+    def start
+      raise "You forgot to stub out your net requests!"
+    end
+  end
+end

metadata

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