mblox 0.0.1 → 0.0.2

data/README.md

@@ -36,6 +36,9 @@ Configuration
       # If config.log_at == :debug and your logger's log level is :info, logging will be suppressed because it is below the log level of the logger.
       config.logger = Logger.new(STDOUT)
       config.log_at :info
+      
+      # What to do if messages are longer than 160 characters.  Default is :raise_error
+      config.on_message_too_long = :truncate
     end
 
 Once your application is configured, send messages:
@@ -49,7 +52,7 @@ Copy config.yml.example to config.yml and set all the values in that file.  Run:
 
     rspec
 
-You should recieve 2 SMS messages to your phone within several seconds.
+You should recieve 3 SMS messages to your phone within several seconds.
 
 ## Contributing
 

data/lib/mblox/configuration.rb

@@ -11,10 +11,16 @@ module Mblox
 
   class Configuration
     attr_accessor :outbound_url, :profile_id, :sender_id, :password, :partner_name, :tariff, :service_id
-    attr_reader :logger, :log_level
+    attr_reader :logger, :log_level, :on_message_too_long
     def initialize
       @logger = Rails.logger if defined?(::Rails)
       @log_level = :debug
+      @on_message_too_long = :raise_error
+    end
+
+    def on_message_too_long= action
+      raise ArgumentError, "Mblox.config.on_message_too_long must be either :truncate or :raise_error" unless [:truncate, :raise_error].include?(action)
+      @on_message_too_long = action
     end
 
     def log_at level

data/lib/mblox/sms.rb

@@ -11,6 +11,10 @@ module Mblox
       raise SmsError, "Phone number must be ten digits" unless /\A[0-9]{10}\z/.match(phone)
       raise SmsError, "Phone number cannot begin with 0 or 1" if ['0','1'].include?(phone[0].to_s)
       raise SmsError, "Message cannot be blank" if message.empty?
+      if message.size > 160
+        raise SmsError, "Message cannot be longer than 160 characters" if :raise_error == Mblox.config.on_message_too_long
+        message = message[0,160] if :truncate == Mblox.config.on_message_too_long
+      end
       @phone = "1#{phone}"
       @message = message.dup
     end

data/lib/mblox/version.rb

@@ -1,3 +1,3 @@
 module Mblox
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

data/spec/configuration_spec.rb

@@ -0,0 +1,23 @@
+require "spec_helper"
+
+describe "configuration" do
+  describe "on_message_too_long" do
+    it "should default to :raise_error" do
+      Mblox.reset_configuration
+      expect(Mblox.config.on_message_too_long).to eq(:raise_error)
+    end
+
+    it "should allow the value :truncate" do
+      expect { Mblox.config.on_message_too_long = :truncate }.to_not raise_error
+    end
+
+    it "should allow the value :raise_error" do
+      expect { Mblox.config.on_message_too_long = :raise_error }.to_not raise_error
+    end
+
+    it "should not allow other values and should remain in a valid state" do
+      expect { Mblox.config.on_message_too_long = :do_nothing }.to raise_error(ArgumentError, "Mblox.config.on_message_too_long must be either :truncate or :raise_error")
+      expect(Mblox.config.on_message_too_long).to eq(:raise_error)
+    end
+  end
+end

data/spec/log_spec.rb

@@ -1,14 +1,6 @@
 require "spec_helper"
 require "logger"
 
-module Mblox
-  class << self
-    def reset_configuration
-      @config = Configuration.new
-    end
-  end
-end
-
 describe "logger" do
   before(:each) do
     Mblox.reset_configuration
@@ -31,7 +23,7 @@ describe "logger" do
 
   it "should not allow log level news when the logger is created after log level is set" do
     Mblox.config.log_at :news
-    expect { Mblox.config.logger = ::Logger.new("STDOUT")}.to raise_error(ArgumentError, "Mblox log level must be set to :fatal, :error, :warn, :info or :debug")
+    expect { Mblox.config.logger = ::Logger.new(STDOUT)}.to raise_error(ArgumentError, "Mblox log level must be set to :fatal, :error, :warn, :info or :debug")
     expect { Mblox.log "Some news" }.to_not raise_error
   end
 

data/spec/sms_spec.rb

@@ -25,6 +25,22 @@ describe "message" do
     expect { Mblox::Sms.new("2"*10, "") }.to raise_error(Mblox::SmsError, "Message cannot be blank")
   end
 
+  it "can be 160 characters long" do
+    expect { Mblox::Sms.new("2"*10, "A"*160) }.to_not raise_error
+  end
+
+  it "will be truncated when the message is longer than 160 characters if configured to do so" do
+    message = "A"+"ABCDEFGHIJ"*16
+    Mblox.config.on_message_too_long = :truncate
+    expect { @mblox = Mblox::Sms.new("2"*10, message) }.to_not raise_error
+    expect(@mblox.message).to eq(message[0,160])
+  end
+
+  it "cannot be longer than 160 characters if configured to raise error" do
+    Mblox.config.on_message_too_long = :raise_error
+    expect { Mblox::Sms.new("2"*10, "A"*161) }.to raise_error(Mblox::SmsError, "Message cannot be longer than 160 characters")
+  end
+
   it "should be safe from changing" do
     msg = the_message
     mblox = Mblox::Sms.new(TEST_NUMBER,msg)
@@ -42,6 +58,10 @@ describe "SMS messages" do
     expect(Mblox::Sms.new(TEST_NUMBER.to_s,the_message).send).to eq(result_ok)
   end
 
+  it "should allow 160-character messages" do
+    expect(Mblox::Sms.new(TEST_NUMBER,"A"*160).send).to eq(result_ok)
+  end
+
   it "should fail when sent to a landline" do
     expect(Mblox::Sms.new("6176354500",the_message).send).to eq(result_unroutable)
   end

data/spec/spec_helper.rb

@@ -30,3 +30,11 @@ end
 def result_unroutable
   "RequestResult: \"0:OK\" / SubscriberResult: \"10:MsipRejectCode=29 Number unroutable:2e Do not retry:2e\""
 end
+
+module Mblox
+  class << self
+    def reset_configuration
+      @config = Configuration.new
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mblox
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -119,7 +119,6 @@ files:
 - LICENSE.txt
 - README.md
 - Rakefile
-- STDOUT
 - config.yml.example
 - lib/mblox.rb
 - lib/mblox/configuration.rb
@@ -127,6 +126,7 @@ files:
 - lib/mblox/sms_error.rb
 - lib/mblox/version.rb
 - mblox.gemspec
+- spec/configuration_spec.rb
 - spec/log_spec.rb
 - spec/sms_spec.rb
 - spec/spec_helper.rb
@@ -164,16 +164,18 @@ summary: ! '# Mblox  This gem is for subscribers to Mblox to send SMS messages.
   will default to Rails.logger and config.log_at will default to :debug # config.log_at
   means the level at which Mblox will log. # If config.log_at == :debug and your logger''s
   log level is :info, logging will be suppressed because it is below the log level
-  of the logger. config.logger = Logger.new(STDOUT) config.log_at :info end  Once
-  your application is configured, send messages:  phone_number = 2225555555 # The
-  number you''re sending to.  Must be a 10-digit number, including the area code.  Can
-  be a String or Fixnum. Mblox::Sms.new(phone_number, "your message").send  ## Testing  Copy
-  config.yml.example to config.yml and set all the values in that file.  Run:  rspec  You
-  should recieve 2 SMS messages to your phone within several seconds.  ## Contributing  1.
+  of the logger. config.logger = Logger.new(STDOUT) config.log_at :info  # What to
+  do if messages are longer than 160 characters.  Default is :raise_error config.on_message_too_long
+  = :truncate end  Once your application is configured, send messages:  phone_number
+  = 2225555555 # The number you''re sending to.  Must be a 10-digit number, including
+  the area code.  Can be a String or Fixnum. Mblox::Sms.new(phone_number, "your message").send  ##
+  Testing  Copy config.yml.example to config.yml and set all the values in that file.  Run:  rspec  You
+  should recieve 3 SMS messages to your phone within several seconds.  ## Contributing  1.
   Fork it 2. Create your feature branch (`git checkout -b my-new-feature`) 3. Commit
   your changes (`git commit -am ''Add some feature''`) 4. Push to the branch (`git
   push origin my-new-feature`) 5. Create new Pull Request'
 test_files:
+- spec/configuration_spec.rb
 - spec/log_spec.rb
 - spec/sms_spec.rb
 - spec/spec_helper.rb

data/STDOUT

@@ -1 +0,0 @@
-# Logfile created on 2013-05-01 15:05:03 -0400 by logger.rb/31641