smsc_manager 0.3.3 → 0.3.4

data/lib/smsc_manager/broadcast.rb

@@ -7,31 +7,44 @@ module SmscManager
 # this class helps to broadcast sms to list
 class Broadcast
   @@MAX_THROUGHPUT =5  # in messages per second
-  attr_accessor :text, :source, :list,  :num_threads, :attempts, :sent
-  def initialize(txt,lst,src='888')
-    @guard    = Mutex.new
-    self.text=txt
-    self.list=lst
+ # old attr_accessor :text, :source, :list,  :num_threads, :attempts, :sent
+ attr_accessor :text, :source, :list,  :num_threads, :attempts, :sent
+  def common_setup(src)
+    @guard    = Mutex.new  
     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
+  end
+  # initialize with list of destionations, texts  eg different text for each destination
+  # initialize with common text and list of destinations
+  def initialize(src, lst, txt=nil)
+    common_setup(src)
+    self.list=lst
+    self.text=txt
+   # puts "lst.size is #{lst.size}"
+    raise BadList.new("use send_sms for lists of size 1") if lst.class==String 
     @list_queue=Queue.new
-    self.populate_queue(lst)
+    self.populate_queue(lst) 
     self.send
   #  raise InvalidPrefix.new("invalid prefix: valid prefix area:" + Sms.valid ) if !prefix_test
   end
+  
   # populate thread safe queue
   def populate_queue(lst)
-  
-    # puts "list is #{lst}"
-    lst.each {|dst| @list_queue << dst
+     puts "list is #{lst}"
+    lst.each {|key, val|   
+                # txt=line[1] ||
+                # if value set then send it else send default text value  
+                 txt2 =  val==nil ? self.text : val
+                 dst =  key
+                 puts "text is #{txt2} dest is #{dst}"
+                 sms=SmscManager::Sms.new(txt2,dst,self.source)
+                @list_queue << sms
               # puts "  dst is #{dst}" 
                }
     puts "populate queue list size #{@list_queue.size}"
   end
+ 
   #calculate number of threads
   def calculate_threads
     self.num_threads = @@MAX_THROUGHPUT  +1  #sleep 1 after every message
@@ -40,6 +53,7 @@ class Broadcast
   
   # send using number of threads
   def send
+     self.calculate_threads
      smsc=SmscManager::SmscConnection.factory
      c=0
      thread_mgr=[]
@@ -49,9 +63,8 @@ class Broadcast
        thread_mgr << Thread.new(c+=1)  { |ctmp|
            #puts " #{Time.now}Creating retry thread: #{ctmp}"
            begin 
-              dest = @list_queue.pop
-              sms=SmscManager::Sms.new(self.text,dest,self.source)
-              puts "Thread #{ctmp}  destination: #{dest}  text: #{self.text}"
+              sms = @list_queue.pop
+              puts "Thread #{ctmp}  destination: #{sms.destination}  text: #{sms.text}"
               self.send_sms(smsc,sms)
              end until @list_queue.empty?
          }      

data/lib/smsc_manager/sms.rb

@@ -2,9 +2,10 @@
 module SmscManager
 class InvalidPrefix < RuntimeError
 end
-# this class defines setting up a sms
+# this class defines creating  a sms
+# and strips out the unnecessary junk
 class Sms
-  @@MAX_SIZE=1500 # 3*160   # max 3 sms
+  @@MAX_SIZE=1500 # 3*160   # max 1500 characters, change if your smsc suports less
   @@msisdn_valid_prefix= %w{ 63999 999 0999 1000 888 +63999 }
   attr_accessor :text, :source, :destination, :orig_txt
   def self.max_length

data/lib/smsc_manager/version.rb

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

data/test/smsc_manager_test.rb

@@ -42,22 +42,27 @@ class SmscManagerTest < Test::Unit::TestCase
   end
   def test_broadcast_two
      list = %w(9991 9992)
-     b=SmscManager::Broadcast.new("hello there",list)
+     b=SmscManager::Broadcast.new('888',list,"hello there")
      assert b.attempts ==2, "did not send two sms"
    end
   def test_broadcast_five
     list = %w(9991 9992 9993 9994 9995)
-    b=SmscManager::Broadcast.new("hello there",list)
+    b=SmscManager::Broadcast.new('888',list,"hello there")
      assert b.attempts ==5, "did not send 5 sms"
   end
   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)
+    b=SmscManager::Broadcast.new('888',list,"hello there")
      assert b.attempts ==12, "did not send 12 sms"
   end
+  def test_broadcast_multi_text
+     list = {'9991' => 'text1', '9992' => 'text2', '9993' => 'text3'}
+     b=SmscManager::Broadcast.new('888',list)
+     assert b.attempts ==3, "did not send 3 sms"
+   end
   def test_broadcast_six
      list = %w(9991 9992 9993 9994 9995 9996)
-     b=SmscManager::Broadcast.new("second hello there",list)
+     b=SmscManager::Broadcast.new('888',list,"second hello there")
      assert b.attempts ==6, "did not send 6 sms"
    end
   def test_find_google_mod

metadata

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