textmagic 0.5.0 → 0.6.0

data/test/test_charset.rb

@@ -2,45 +2,45 @@
 
 require "test_helper"
 
-class CharsetTest < Test::Unit::TestCase
-
-  context "is_gsm method" do
-
-    should "return true if all characters are in GSM 03.38 charset" do
-      TextMagic::API.is_gsm(("a".."z").to_a.join).should == true
-      TextMagic::API.is_gsm(("A".."Z").to_a.join).should == true
-      TextMagic::API.is_gsm(("0".."9").to_a.join).should == true
-      TextMagic::API.is_gsm("@£$¥€").should == true
-      TextMagic::API.is_gsm("\n\r\e\f\\\"").should == true
-      TextMagic::API.is_gsm("èéùìòÇØøÅåÉÆæß").should == true
-      TextMagic::API.is_gsm("ΔΦΓΛΩΠΨΣΘΞ").should == true
-      TextMagic::API.is_gsm("^{}[~]| !#¤%&'()").should == true
-      TextMagic::API.is_gsm("*+,-./_:;<=>?¡¿§").should == true
-      TextMagic::API.is_gsm("ÖÑÜöñüàäÄ").should == true
+describe "Charset" do
+
+  describe "is_gsm method" do
+
+    it "should return true if all characters are in GSM 03.38 charset" do
+      assert_equal true, TextMagic::API.is_gsm(("a".."z").to_a.join)
+      assert_equal true, TextMagic::API.is_gsm(("A".."Z").to_a.join)
+      assert_equal true, TextMagic::API.is_gsm(("0".."9").to_a.join)
+      assert_equal true, TextMagic::API.is_gsm("@£$¥€")
+      assert_equal true, TextMagic::API.is_gsm("\n\r\e\f\\\"")
+      assert_equal true, TextMagic::API.is_gsm("èéùìòÇØøÅåÉÆæß")
+      assert_equal true, TextMagic::API.is_gsm("ΔΦΓΛΩΠΨΣΘΞ")
+      assert_equal true, TextMagic::API.is_gsm("^{}[~]| !#¤%&'()")
+      assert_equal true, TextMagic::API.is_gsm("*+,-./_:;<=>?¡¿§")
+      assert_equal true, TextMagic::API.is_gsm("ÖÑÜöñüàäÄ")
     end
 
-    should "return false if some characters are outside of GSM 03.38 charset" do
-      TextMagic::API.is_gsm("Arabic: مرحبا فيلما").should == false
-      TextMagic::API.is_gsm("Chinese: 您好").should == false
-      TextMagic::API.is_gsm("Cyrilic: Вильма Привет").should == false
-      TextMagic::API.is_gsm("Thai: สวัสดี").should == false
+    it "should return false if some characters are outside of GSM 03.38 charset" do
+      assert_equal false, TextMagic::API.is_gsm("Arabic: مرحبا فيلما")
+      assert_equal false, TextMagic::API.is_gsm("Chinese: 您好")
+      assert_equal false, TextMagic::API.is_gsm("Cyrilic: Вильма Привет")
+      assert_equal false, TextMagic::API.is_gsm("Thai: สวัสดี")
     end
   end
 
-  context "real_length method" do
+  describe "real_length method" do
 
-    should "count escaped characters as two and all others as one for non-unicode text" do
+    it "should count escaped characters as two and all others as one for non-unicode text" do
       escaped = "{}\\~[]|€"
       unescaped = random_string
       text = "#{escaped}#{unescaped}".scan(/./).sort_by { rand }.join
-      TextMagic::API.real_length(text, false).should == unescaped.size + escaped.size * 2
+      assert_equal unescaped.size + escaped.size * 2, TextMagic::API.real_length(text, false)
     end
 
-    should "count all characters as one for unicode text" do
+    it "should count all characters as one for unicode text" do
       escaped = "{}\\~[]|€"
       unescaped = random_string
       text = "#{escaped}#{unescaped}".scan(/./).sort_by { rand }.join
-      TextMagic::API.real_length(text, true).should == unescaped.size + escaped.size
+      assert_equal unescaped.size + escaped.size, TextMagic::API.real_length(text, true)
     end
   end
 end

data/test/test_error.rb

@@ -1,24 +1,24 @@
 require "test_helper"
 
-class ErrorTest < Test::Unit::TestCase
+describe "Error" do
 
-  context "Initialization" do
+  describe "Initialization" do
 
-    setup do
+    before do
       @code = rand(1e3)
       @message = random_string
     end
 
-    should "accept a hash with error_code and error_message" do
+    it "should accept a hash with error_code and error_message" do
       e = TextMagic::API::Error.new("error_code" => @code, "error_message" => @message)
-      e.code.should == @code
-      e.message.should == @message
+      assert_equal @code, e.code
+      assert_equal @message, e.message
     end
 
-    should "accept error_code and error_message" do
+    it "should accept error_code and error_message" do
       e = TextMagic::API::Error.new(@code, @message)
-      e.code.should == @code
-      e.message.should == @message
+      assert_equal @code, e.code
+      assert_equal @message, e.message
     end
   end
 end

data/test/test_executor.rb

@@ -1,71 +1,68 @@
 require "test_helper"
 
-class ExecutorTest < Test::Unit::TestCase
+describe "Executor" do
 
-  context "execute method" do
+  describe "execute method" do
 
-    setup do
+    before do
       FakeWeb.allow_net_connect = false
 
       @username, @password = random_string, random_string
       @command, @options = random_string, random_hash
-      @uri = "http://www.textmagic.com/app/api"
+      @uri = "https://www.textmagic.com/app/api"
     end
 
-    should "not send HTTP request without command" do
-      TextMagic::API::Executor.expects(:post).never
-      lambda {
+    it "should not send HTTP request without command" do
+      assert_raises TextMagic::API::Error do
         TextMagic::API::Executor.execute(nil, @username, @password, @options)
-      }.should raise_error(TextMagic::API::Error)
+      end
     end
 
-    should "not send HTTP request without username" do
+    it "should not send HTTP request without username" do
       TextMagic::API::Executor.expects(:post).never
-      lambda {
-        TextMagic::API::Executor.execute(@command, nil, @password, @options)
-      }.should raise_error(TextMagic::API::Error)
+      assert_raises(TextMagic::API::Error) { TextMagic::API::Executor.execute(@command, nil, @password, @options) }
     end
 
-    should "not send HTTP request without password" do
+    it "should not send HTTP request without password" do
       TextMagic::API::Executor.expects(:post).never
-      lambda {
+      assert_raises TextMagic::API::Error do
         TextMagic::API::Executor.execute(@command, @username, nil, @options)
-      }.should raise_error(TextMagic::API::Error)
+      end
     end
 
-    should "send a POST request to proper uri" do
+    it "should send a POST request to proper uri" do
       response = "{}"
       FakeWeb.register_uri(:post, @uri, :body => response)
       TextMagic::API::Executor.execute(@command, @username, @password, @options)
     end
 
-    should "not send parameters with nil keys" do
+    it "should not send parameters with nil keys" do
       options_with_empty_values = @options.merge(nil => random_string)
       @options.merge!(:username => @username, :password => @password, :cmd => @command)
       TextMagic::API::Executor.expects(:post).with("/api", :body => @options, :format => :json)
       TextMagic::API::Executor.execute(@command, @username, @password, options_with_empty_values)
     end
 
-    should "not send parameters with nil values" do
+    it "should not send parameters with nil values" do
       options_with_empty_values = @options.merge(random_string => nil)
       @options.merge!(:username => @username, :password => @password, :cmd => @command)
       TextMagic::API::Executor.expects(:post).with("/api", :body => @options, :format => :json)
       TextMagic::API::Executor.execute(@command, @username, @password, options_with_empty_values)
     end
 
-    should "raise an error if the response contains error_code" do
+    it "should raise an error if the response contains error_code" do
       response = "{\"error_code\":#{1 + rand(10)}}"
       FakeWeb.register_uri(:post, @uri, :body => response)
-      lambda {
+      assert_raises TextMagic::API::Error do
         TextMagic::API::Executor.execute(@command, @username, @password, @options)
-      }.should raise_error(TextMagic::API::Error)
+      end
     end
 
-    should "return a hash with values from the response" do
+    it "should return a hash with values from the response" do
       hash = { "this" => "is", "just" => "a", "random" => "hash" }
       FakeWeb.register_uri(:post, @uri, :body => '{"this":"is","just":"a","random":"hash"}')
       response = TextMagic::API::Executor.execute(@command, @username, @password, @options)
-      response.should == hash
+      assert_equal hash, response.to_hash
     end
   end
 end

data/test/test_helper.rb

@@ -1,17 +1,5 @@
-require "rubygems"
-require "test/unit"
-require "shoulda"
-require "mocha"
-require "matchy"
-require "fakeweb"
-
-$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), "..", "lib"))
-$LOAD_PATH.unshift(File.dirname(__FILE__))
-
-require "textmagic"
-
-class Test::Unit::TestCase
-end
+require "bundler"
+Bundler.require
 
 def random_string(legth = 5 + rand(10))
   Array.new(legth) { rand(36).to_s(36) }.join
@@ -26,3 +14,11 @@ def random_hash
   3.times { hash[random_string] = random_string }
   hash
 end
+
+class Minitest::Test
+
+  def self.it(name, &block)
+    test_name = "test_#{name.gsub(/\s+/,'_')}".to_sym
+    define_method(test_name, &block)
+  end
+end

data/test/test_response.rb

@@ -1,27 +1,27 @@
 require "test_helper"
 
-class ResponseTest < Test::Unit::TestCase
+describe "Response" do
 
-  context "Response to account command" do
+  describe "Response to account command" do
 
-    setup do
+    before do
       @balance = 0.1 * rand(1e4)
       @hash = { "balance" => @balance.to_s }
       @response = TextMagic::API::Response.account(@hash)
     end
 
-    should "be an OpenStruct instance" do
-      @response.class.should == OpenStruct
+    it "should be an OpenStruct instance" do
+      assert_kind_of OpenStruct, @response
     end
 
-    should "have balance" do
-      @response.balance.should be_close(@balance, 1e-10)
+    it "should have balance" do
+      assert_in_delta @response.balance, @balance, 1e-10
     end
   end
 
-  context "Response to send command with single phone number" do
+  describe "Response to send command with single phone number" do
 
-    setup do
+    before do
       @message_id, @phone = random_string, random_phone
       @text = random_string
       @parts_count = 1 + rand(3)
@@ -29,22 +29,22 @@ class ResponseTest < Test::Unit::TestCase
       @response = TextMagic::API::Response.send(@hash, true)
     end
 
-    should "equal to the message_id" do
-      @response.should == @message_id
+    it "should equal to the message_id" do
+      assert_equal @message_id, @response
     end
 
-    should "have sent_text" do
-      @response.sent_text.should == @text
+    it "should have sent_text" do
+      assert_equal @text, @response.sent_text
     end
 
-    should "have parts_count" do
-      @response.parts_count.should == @parts_count
+    it "should have parts_count" do
+      assert_equal @parts_count, @response.parts_count
     end
   end
 
-  context "Response to send command with multiple phone numbers" do
+  describe "Response to send command with multiple phone numbers" do
 
-    setup do
+    before do
       @message_id1, @phone1 = random_string, random_phone
       @message_id2, @phone2 = random_string, random_phone
       @text = random_string
@@ -53,31 +53,31 @@ class ResponseTest < Test::Unit::TestCase
       @response = TextMagic::API::Response.send(@hash, false)
     end
 
-    should "be a hash" do
-      @response.class.should == Hash
+    it "should be a hash" do
+      assert_kind_of Hash, @response
     end
 
-    should "have phone numbers as keys" do
-      @response.keys.sort.should == [@phone1, @phone2].sort
+    it "should have phone numbers as keys" do
+      assert_equal [@phone1, @phone2].sort, @response.keys.sort
     end
 
-    should "have message ids as values" do
-      @response[@phone1].should == @message_id1
-      @response[@phone2].should == @message_id2
+    it "should have message ids as values" do
+      assert_equal @message_id1, @response[@phone1]
+      assert_equal @message_id2, @response[@phone2]
     end
 
-    should "have sent_text" do
-      @response.sent_text.should == @text
+    it "should have sent_text" do
+      assert_equal @text, @response.sent_text
     end
 
-    should "have parts_count" do
-      @response.parts_count.should == @parts_count
+    it "should have parts_count" do
+      assert_equal @parts_count, @response.parts_count
     end
   end
 
-  context "Response to message_status command with single id" do
+  describe "Response to message_status command with single id" do
 
-    setup do
+    before do
       @text = random_string
       @status = random_string
       @reply_number = random_phone
@@ -97,38 +97,38 @@ class ResponseTest < Test::Unit::TestCase
       @response = TextMagic::API::Response.message_status(@hash, true)
     end
 
-    should "equal to the message status" do
-      @response.should == @status
+    it "should equal to the message status" do
+      assert_equal @status, @response
     end
 
-    should "have text" do
-      @response.text.should == @text
+    it "should have text" do
+      assert_equal @text, @response.text
     end
 
-    should "have created_time" do
-      @response.created_time.should == Time.at(@created_time)
+    it "should have created_time" do
+      assert_equal Time.at(@created_time), @response.created_time
     end
 
-    should "have completed_time" do
-      @response.completed_time.should == Time.at(@completed_time)
+    it "should have completed_time" do
+      assert_equal Time.at(@completed_time), @response.completed_time
     end
 
-    should "have reply_number" do
-      @response.reply_number.should == @reply_number
+    it "should have reply_number" do
+      assert_equal @reply_number, @response.reply_number
     end
 
-    should "have credits_cost" do
-      @response.credits_cost.should be_close(@credits_cost, 1e-10)
+    it "should have credits_cost" do
+      assert_in_delta @response.credits_cost, @credits_cost, 1e-10
     end
 
-    should "have status" do
-      @response.status.should == @status
+    it "should have status" do
+      assert_equal @status, @response.status
     end
   end
 
-  context "Response to message_status command with multiple ids" do
+  describe "Response to message_status command with multiple ids" do
 
-    setup do
+    before do
       @text = random_string
       @status = random_string
       @reply_number = random_phone
@@ -148,46 +148,46 @@ class ResponseTest < Test::Unit::TestCase
       @response = TextMagic::API::Response.message_status(@hash, false)
     end
 
-    should "be a hash" do
-      @response.class.should == Hash
+    it "should be a hash" do
+      assert_kind_of Hash, @response
     end
 
-    should "have message_ids as keys" do
-      @response.keys.should == ["141421"]
+    it "should have message_ids as keys" do
+      assert_equal ["141421"], @response.keys
     end
 
-    should "contain statuses" do
-      @response.values.first.should == @status
+    it "should contain statuses" do
+      assert_equal @status, @response.values.first
     end
 
-    should "have text for all statuses" do
-      @response.values.first.text.should == @text
+    it "should have text for all statuses" do
+      assert_equal @text, @response.values.first.text
     end
 
-    should "have created_time for all statuses" do
-      @response.values.first.created_time.should == Time.at(@created_time)
+    it "should have created_time for all statuses" do
+      assert_equal Time.at(@created_time), @response.values.first.created_time
     end
 
-    should "have completed_time for all statuses" do
-      @response.values.first.completed_time.should == Time.at(@completed_time)
+    it "should have completed_time for all statuses" do
+      assert_equal Time.at(@completed_time), @response.values.first.completed_time
     end
 
-    should "have reply_number for all statuses" do
-      @response.values.first.reply_number.should == @reply_number
+    it "should have reply_number for all statuses" do
+      assert_equal @reply_number, @response.values.first.reply_number
     end
 
-    should "have status for all statuses" do
-      @response.values.first.status.should == @status
+    it "should have status for all statuses" do
+      assert_equal @status, @response.values.first.status
     end
 
-    should "have credits_cost for all statuses" do
-      @response.values.first.credits_cost.should be_close(@credits_cost, 1e-10)
+    it "should have credits_cost for all statuses" do
+      assert_in_delta @response.values.first.credits_cost, @credits_cost, 1e-10
     end
   end
 
-  context "Response to receive command" do
+  describe "Response to receive command" do
 
-    setup do
+    before do
       @timestamp = (Time.now - 30).to_i
       @text, @phone, @message_id = random_string, random_phone, random_string
       @message = {
@@ -201,38 +201,38 @@ class ResponseTest < Test::Unit::TestCase
       @response = TextMagic::API::Response.receive(@hash)
     end
 
-    should "have unread" do
-      @response.unread.should == @unread
+    it "should have unread" do
+      assert_equal @unread, @response.unread
     end
 
-    should "be an array" do
-      @response.class.should == Array
+    it "should be an array" do
+      assert_kind_of Array, @response
     end
 
-    should "contain strings with phones numbers and texts" do
-      @response.first.should == "#{@phone}: #{@text}"
+    it "should contain strings with phones numbers and texts" do
+      assert_equal "#{@phone}: #{@text}", @response.first
     end
 
-    should "have timestamp for all messages" do
-      @response.first.timestamp.should == Time.at(@timestamp)
+    it "should have timestamp for all messages" do
+      assert_equal Time.at(@timestamp), @response.first.timestamp
     end
 
-    should "have from for all messages" do
-      @response.first.from.should == @phone
+    it "should have from for all messages" do
+      assert_equal @phone, @response.first.from
     end
 
-    should "have text for all messages" do
-      @response.first.text.should == @text
+    it "should have text for all messages" do
+      assert_equal @text, @response.first.text
     end
 
-    should "have message_id for all messages" do
-      @response.first.message_id.should == @message_id
+    it "should have message_id for all messages" do
+      assert_equal @message_id, @response.first.message_id
     end
   end
 
-  context "Response to check_number command with single phone" do
+  describe "Response to check_number command with single phone" do
 
-    setup do
+    before do
       @phone = random_phone
       @price = rand
       @country = random_string
@@ -245,22 +245,22 @@ class ResponseTest < Test::Unit::TestCase
       @response = TextMagic::API::Response.check_number(@hash, true)
     end
 
-    should "be an OpenStruct instance" do
-      @response.class.should == OpenStruct
+    it "should be an OpenStruct instance" do
+      assert_kind_of OpenStruct, @response
     end
 
-    should "have price" do
-      @response.price.should be_close(@price, 1e-10)
+    it "should have price" do
+      assert_in_delta @response.price, @price, 1e-10
     end
 
-    should "have country" do
-      @response.country.should == @country
+    it "should have country" do
+      assert_equal @country, @response.country
     end
   end
 
-  context "Response to check_number command with multiple phones" do
+  describe "Response to check_number command with multiple phones" do
 
-    setup do
+    before do
       @phone = random_phone
       @price = rand
       @country = random_string
@@ -273,24 +273,24 @@ class ResponseTest < Test::Unit::TestCase
       @response = TextMagic::API::Response.check_number(@hash, false)
     end
 
-    should "be a hash" do
-      @response.class.should == Hash
+    it "should be a hash" do
+      assert_kind_of Hash, @response
     end
 
-    should "have phones as keys" do
-      @response.keys.should == [@phone]
+    it "should have phones as keys" do
+      assert_equal [@phone], @response.keys
     end
 
-    should "contain OpenStruct instances" do
-      @response.values.first.class.should == OpenStruct
+    it "should contain OpenStruct instances" do
+      assert_kind_of OpenStruct, @response.values.first
     end
 
-    should "have price for all phones" do
-      @response.values.first.price.should be_close(@price, 1e-10)
+    it "should have price for all phones" do
+      assert_in_delta @response.values.first.price, @price, 1e-10
     end
 
-    should "have country for all phones" do
-      @response.values.first.country.should == @country
+    it "should have country for all phones" do
+      assert_equal  @response.values.first.country, @country
     end
   end
 end