textmagic 0.2.2 → 0.3.0

data/test/test_response.rb

@@ -2,175 +2,223 @@ require 'test_helper'
 
 class ResponseTest < Test::Unit::TestCase
 
-  context 'Account response' do
+  context 'Response to account command' do
 
     setup do
       @balance = 0.1 * rand(1e4)
-      @response = { 'balance' => @balance.to_s }
-      @response.extend TextMagic::API::Response::Account
+      @hash = { 'balance' => @balance.to_s }
+      @response = TextMagic::API::Response.account(@hash)
     end
 
-    should 'allow access to balance' do
+    should 'be an OpenStruct instance' do
+      @response.class.should == OpenStruct
+    end
+
+    should 'have balance' do
       @response.balance.should be_close(@balance, 1e-10)
     end
   end
 
-  context 'Send response' do
+  context 'Response to send command with single phone number' do
 
     setup do
-      @message_id = {
-        '141421' => '999314159265',
-        '173205' => '999271828182'
-      }
+      @message_id, @phone = random_string, random_phone
       @text = random_string
-      @parts_count = rand(10)
-      @response = {
-        'message_id' => @message_id,
-        'sent_text' => @text,
-        'parts_count' => @parts_count
-      }
-      @response.extend TextMagic::API::Response::Send
+      @parts_count = 1 + rand(3)
+      @hash = { 'message_id' => { @message_id => @phone }, 'sent_text' => @text, 'parts_count' => @parts_count }
+      @response = TextMagic::API::Response.send(@hash, true)
+    end
+
+    should 'equal to the message_id' do
+      @response.should == @message_id
+    end
+
+    should 'have sent_text' do
+      @response.sent_text.should == @text
+    end
+
+    should 'have parts_count' do
+      @response.parts_count.should == @parts_count
+    end
+  end
+
+  context 'Response to send command with multiple phone numbers' do
+
+    setup do
+      @message_id1, @phone1 = random_string, random_phone
+      @message_id2, @phone2 = random_string, random_phone
+      @text = random_string
+      @parts_count = 1 + rand(3)
+      @hash = { 'message_id' => { @message_id1 => @phone1, @message_id2 => @phone2 }, 'sent_text' => @text, 'parts_count' => @parts_count }
+      @response = TextMagic::API::Response.send(@hash, false)
+    end
+
+    should 'be a hash' do
+      @response.class.should == Hash
     end
 
-    should 'allow access to message_ids array' do
-      @response.message_ids.should == ['141421', '173205']
+    should 'have phone numbers as keys' do
+      @response.keys.sort.should == [@phone1, @phone2].sort
     end
 
-    should 'allow access to message_id for a given phone number' do
-      @response['999314159265'].should == '141421'
-      @response['999271828182'].should == '173205'
+    should 'have message ids as values' do
+      @response[@phone1].should == @message_id1
+      @response[@phone2].should == @message_id2
     end
 
-    should 'allow access to sent_text' do
+    should 'have sent_text' do
       @response.sent_text.should == @text
     end
 
-    should 'allow access to parts_count' do
+    should 'have parts_count' do
       @response.parts_count.should == @parts_count
     end
   end
 
-  context 'MessageStatus response' do
+  context 'Response to message_status command with single id' do
 
     setup do
       @text = random_string
+      @status = random_string
       @reply_number = random_phone
       @created_time = (Time.now - 30).to_i
       @completed_time = (Time.now - 20).to_i
       @credits_cost = 0.01 * rand(300)
-      @response = {
+      @hash = {
         '141421' => {
           'text' => @text,
-          'status' => 'd',
-          'created_time' => @created_time,
+          'status' => @status,
+          'created_time' => @created_time.to_s,
           'reply_number' => @reply_number,
-          'completed_time' => @completed_time,
+          'completed_time' => @completed_time.to_s,
           'credits_cost' => @credits_cost
-        },
-        '173205' => {
-          'text' => 'test',
-          'status' => 'r',
-          'created_time' => '1242979839',
-          'reply_number' => '447624800500',
-          'completed_time' => nil,
-          'credits_cost' => 0.5
         }
       }
-      @response.extend TextMagic::API::Response::MessageStatus
+      @response = TextMagic::API::Response.message_status(@hash, true)
     end
 
-    should 'allow access to text for all statuses' do
-      @response['141421'].text.should == @text
-      @response['173205'].text.should == 'test'
+    should 'equal to the message status' do
+      @response.should == @status
     end
 
-    should 'allow access to status for a given message_id' do
-      @response['141421'].status.should == 'd'
-      @response['173205'].status.should == 'r'
+    should 'have text' do
+      @response.text.should == @text
     end
 
-    should 'allow access to reply_number for a given message_id' do
-      @response['141421'].reply_number.should == @reply_number
-      @response['173205'].reply_number.should == '447624800500'
+    should 'have created_time' do
+      @response.created_time.should == Time.at(@created_time)
     end
 
-    should 'allow access to created_time for a given message_id' do
-      @response['141421'].created_time.should == Time.at(@created_time)
-      @response['173205'].created_time.should == Time.at(1242979839)
+    should 'have completed_time' do
+      @response.completed_time.should == Time.at(@completed_time)
     end
 
-    should 'allow access to completed_time for a given message_id' do
-      @response['141421'].completed_time.should == Time.at(@completed_time)
-      @response['173205'].completed_time.should == nil
+    should 'have reply_number' do
+      @response.reply_number.should == @reply_number
     end
 
-    should 'allow access to credits_cost for a given message_id' do
-      @response['141421'].credits_cost.should be_close(@credits_cost, 1e-10)
-      @response['173205'].credits_cost.should be_close(0.5, 1e-10)
+    should 'have credits_cost' do
+      @response.credits_cost.should be_close(@credits_cost, 1e-10)
     end
   end
-
-  context 'Receive response' do
+  
+  context 'Response to message_status command with multiple ids' do
 
     setup do
-      @timestamp = (Time.now - 30).to_i
-      @message1 = {
-        'timestamp' => @timestamp,
-        'from' => '999314159265',
-        'text' => 'Hi Fred',
-        'message_id' => '141421'
-      }
-      @message2 = {
-        'timestamp' => 1243244148,
-        'from' => '999271828182',
-        'text' => 'Hello buddy',
-        'message_id' => '173205'
+      @text = random_string
+      @status = random_string
+      @reply_number = random_phone
+      @created_time = (Time.now - 30).to_i
+      @completed_time = (Time.now - 20).to_i
+      @credits_cost = 0.01 * rand(300)
+      @hash = {
+        '141421' => {
+          'text' => @text,
+          'status' => @status,
+          'created_time' => @created_time,
+          'reply_number' => @reply_number,
+          'completed_time' => @completed_time,
+          'credits_cost' => @credits_cost
+        }
       }
-      @messages = [@message1, @message2]
-      @unread = rand(1e4)
-      @response = { 'unread' => @unread, 'messages' => @messages }
-      @response.extend TextMagic::API::Response::Receive
+      @response = TextMagic::API::Response.message_status(@hash, false)
     end
 
-    should 'allow access to unread' do
-      @response.unread.should == @unread
+    should 'be a hash' do
+      @response.class.should == Hash
+    end
+
+    should 'have message_ids as keys' do
+      @response.keys.should == ['141421']
     end
 
-    should 'allow access to messages array' do
-      @response.messages.should == @messages
+    should 'contain statuses' do
+      @response.values.first.should == @status
     end
 
-    should 'allow access to message_ids array' do
-      @response.message_ids.should == ['141421', '173205']
+    should 'have text for all statuses' do
+      @response.values.first.text.should == @text
     end
 
-    should 'allow access to message_id for all messages' do
-      @response.messages.first.message_id.should == '141421'
+    should 'have created_time for all statuses' do
+      @response.values.first.created_time.should == Time.at(@created_time)
     end
 
-    should 'allow access to timestamp for all messages' do
-      @response.messages.first.timestamp.should == Time.at(@timestamp)
+    should 'have completed_time for all statuses' do
+      @response.values.first.completed_time.should == Time.at(@completed_time)
     end
 
-    should 'allow access to from for all messages' do
-      @response.messages.first.from.should == '999314159265'
+    should 'have reply_number for all statuses' do
+      @response.values.first.reply_number.should == @reply_number
     end
 
-    should 'allow access to text for all messages' do
-      @response.messages.first.text.should == 'Hi Fred'
+    should 'have credits_cost for all statuses' do
+      @response.values.first.credits_cost.should be_close(@credits_cost, 1e-10)
     end
   end
 
-  context 'DeleteReply response' do
+  context 'Response to receive command' do
 
     setup do
-      @ids = ['141421', '1780826']
-      @response = { 'deleted' => @ids }
-      @response.extend TextMagic::API::Response::DeleteReply
+      @timestamp = (Time.now - 30).to_i
+      @text, @phone, @message_id = random_string, random_phone, random_string
+      @message = {
+        'timestamp' => @timestamp,
+        'from' => @phone,
+        'text' => @text,
+        'message_id' => @message_id
+      }
+      @unread = rand(1e4)
+      @hash = { 'unread' => @unread, 'messages' => [@message] }
+      @response = TextMagic::API::Response.receive(@hash)
+    end
+
+    should 'have unread' do
+      @response.unread.should == @unread
+    end
+
+    should 'be an array' do
+      @response.class.should == Array
+    end
+
+    should 'contain strings with phones numbers and texts' do
+      @response.first.should == "#{@phone}: #{@text}"
+    end
+
+    should 'have timestamp for all messages' do
+      @response.first.timestamp.should == Time.at(@timestamp)
+    end
+
+    should 'have from for allmessages' do
+      @response.first.from.should == @phone
+    end
+
+    should 'have text for all messages' do
+      @response.first.text.should == @text
     end
 
-    should 'allow access to deleted' do
-      @response.deleted.should == @ids
+    should 'have message_id for all messages' do
+      @response.first.message_id.should == @message_id
     end
   end
 end

data/textmagic.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{textmagic}
-  s.version = "0.2.2"
+  s.version = "0.3.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = ["Vladim\303\255r Bobe\305\241 Tu\305\276insk\303\275"]
-  s.date = %q{2009-05-25}
+  s.authors = ["Vladimir Bobes Tuzinsky"]
+  s.date = %q{2009-05-28}
   s.email = %q{vladimir.tuzinsky@gmail.com}
   s.extra_rdoc_files = [
     "LICENSE",
@@ -35,13 +35,12 @@ Gem::Specification.new do |s|
      "test/test_validation.rb",
      "textmagic.gemspec"
   ]
-  s.has_rdoc = true
   s.homepage = %q{http://github.com/bobes/textmagic}
   s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
   s.rubyforge_project = %q{textmagic}
-  s.rubygems_version = %q{1.3.1}
-  s.summary = %q{Ruby interface to the TextMagic's SMS gateway}
+  s.rubygems_version = %q{1.3.3}
+  s.summary = %q{Ruby interface to the TextMagic's Bulk SMS Gateway}
   s.test_files = [
     "test/test_api.rb",
      "test/test_charset.rb",
@@ -54,11 +53,23 @@ Gem::Specification.new do |s|
 
   if s.respond_to? :specification_version then
     current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
-    s.specification_version = 2
+    s.specification_version = 3
 
     if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
+      s.add_runtime_dependency(%q<httparty>, [">= 0.4.3"])
+      s.add_development_dependency(%q<mocha>, [">= 0.9.5"])
+      s.add_development_dependency(%q<fakeweb>, [">= 1.2.2"])
+      s.add_development_dependency(%q<jeremymcanally-matchy>, [">= 0.1.0"])
     else
+      s.add_dependency(%q<httparty>, [">= 0.4.3"])
+      s.add_dependency(%q<mocha>, [">= 0.9.5"])
+      s.add_dependency(%q<fakeweb>, [">= 1.2.2"])
+      s.add_dependency(%q<jeremymcanally-matchy>, [">= 0.1.0"])
     end
   else
+    s.add_dependency(%q<httparty>, [">= 0.4.3"])
+    s.add_dependency(%q<mocha>, [">= 0.9.5"])
+    s.add_dependency(%q<fakeweb>, [">= 1.2.2"])
+    s.add_dependency(%q<jeremymcanally-matchy>, [">= 0.1.0"])
   end
 end

metadata

@@ -1,18 +1,57 @@
 --- !ruby/object:Gem::Specification 
 name: textmagic
 version: !ruby/object:Gem::Version 
-  version: 0.2.2
+  version: 0.3.0
 platform: ruby
 authors: 
-- "Vladim\xC3\xADr Bobe\xC5\xA1 Tu\xC5\xBEinsk\xC3\xBD"
+- Vladimir Bobes Tuzinsky
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2009-05-25 00:00:00 +02:00
+date: 2009-05-28 00:00:00 +02:00
 default_executable: 
-dependencies: []
-
+dependencies: 
+- !ruby/object:Gem::Dependency 
+  name: httparty
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 0.4.3
+    version: 
+- !ruby/object:Gem::Dependency 
+  name: mocha
+  type: :development
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 0.9.5
+    version: 
+- !ruby/object:Gem::Dependency 
+  name: fakeweb
+  type: :development
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 1.2.2
+    version: 
+- !ruby/object:Gem::Dependency 
+  name: jeremymcanally-matchy
+  type: :development
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 0.1.0
+    version: 
 description: 
 email: vladimir.tuzinsky@gmail.com
 executables: []
@@ -46,6 +85,8 @@ files:
 - textmagic.gemspec
 has_rdoc: true
 homepage: http://github.com/bobes/textmagic
+licenses: []
+
 post_install_message: 
 rdoc_options: 
 - --charset=UTF-8
@@ -66,10 +107,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: textmagic
-rubygems_version: 1.3.1
+rubygems_version: 1.3.3
 signing_key: 
-specification_version: 2
-summary: Ruby interface to the TextMagic's SMS gateway
+specification_version: 3
+summary: Ruby interface to the TextMagic's Bulk SMS Gateway
 test_files: 
 - test/test_api.rb
 - test/test_charset.rb