smsc_manager 0.3.2 → 0.3.3

data/lib/smsc_manager/broadcast.rb

@@ -2,16 +2,20 @@
 #require 'monitor'
 require 'thread'
 module SmscManager
-  class UseSend_SmsForListofSize1 < RuntimeError
+  class BadList < RuntimeError
   end
 # this class helps to broadcast sms to list
 class Broadcast
   @@MAX_THROUGHPUT =5  # in messages per second
-  attr_accessor :text, :source, :list,  :num_threads
+  attr_accessor :text, :source, :list,  :num_threads, :attempts, :sent
   def initialize(txt,lst,src='888')
+    @guard    = Mutex.new
     self.text=txt
     self.list=lst
-    raise UseSend_SmsForListofSize1.new("use send_sms for lists of size 1") if lst.size==1
+    self.attempts=0
+    self.sent=0
+   # puts "lst.size is #{lst.size}"
+    raise BadList.new("use send_sms for lists of size 1") if lst.class==String
     self.source=src
     self.calculate_threads
     @list_queue=Queue.new
@@ -39,8 +43,8 @@ class Broadcast
      smsc=SmscManager::SmscConnection.factory
      c=0
      thread_mgr=[]
-     puts "queue size is #{@list_queue.size} " 
-     puts "queue empty is #{@list_queue.empty?}"
+    # puts "queue size is #{@list_queue.size} " 
+    # puts "queue empty is #{@list_queue.empty?}"
     while c < self.num_threads 
        thread_mgr << Thread.new(c+=1)  { |ctmp|
            #puts " #{Time.now}Creating retry thread: #{ctmp}"
@@ -57,7 +61,10 @@ class Broadcast
     protected 
     def send_sms(smsc,sms)
       begin
+     
       res= smsc.send(sms)
+      @guard.synchronize { self.attempts +=1 
+                           self.sent +=1 if res.kind_of? Net::HTTPAccepted }
       rescue  Exception => e
          puts "Exception found #{e.message}"
        ensure

data/lib/smsc_manager/version.rb

@@ -2,7 +2,7 @@ module SmscManager #:nodoc:
   module VERSION #:nodoc:
     MAJOR = 0
     MINOR = 3
-    TINY  = 2
+    TINY  = 3
 
     STRING = [MAJOR, MINOR, TINY].join('.')
   end

data/test/smsc_manager_test.rb

@@ -43,18 +43,22 @@ class SmscManagerTest < Test::Unit::TestCase
   def test_broadcast_two
      list = %w(9991 9992)
      b=SmscManager::Broadcast.new("hello there",list)
+     assert b.attempts ==2, "did not send two sms"
    end
   def test_broadcast_five
-    list = %w(9991 9992 9993 9994 9995 9996)
+    list = %w(9991 9992 9993 9994 9995)
     b=SmscManager::Broadcast.new("hello there",list)
+     assert b.attempts ==5, "did not send 5 sms"
   end
-  def test_broadcast_ten
+  def test_broadcast_12
     list = %w(9991 9992 9993 9994 9995 9996 99910 99920 99930 99940 99950 99960)
     b=SmscManager::Broadcast.new("hello there",list)
+     assert b.attempts ==12, "did not send 12 sms"
   end
   def test_broadcast_six
-     list = %w(9991 9992 9993 9994 9995 9996 9997)
+     list = %w(9991 9992 9993 9994 9995 9996)
      b=SmscManager::Broadcast.new("second hello there",list)
+     assert b.attempts ==6, "did not send 6 sms"
    end
   def test_find_google_mod
     @smsc.hostname='www.google.com'

metadata

@@ -3,7 +3,7 @@ rubygems_version: 0.9.2
 specification_version: 1
 name: smsc_manager
 version: !ruby/object:Gem::Version 
-  version: 0.3.2
+  version: 0.3.3
 date: 2007-03-21 00:00:00 +08:00
 summary: connection to smsc via http using kannel
 require_paths: