smsc_manager 0.3.1 → 0.3.2

data/Manifest.txt

@@ -4,11 +4,12 @@ CHANGELOG.txt
 Manifest.txt
 setup.rb
 config/smsc.yml
-bin/config_smsc.rb
-bin/print_smsc_config.rb
+bin/smsc_config.rb
+bin/smsc_print_config.rb
 bin/send_sms.rb
 lib/smsc_manager/version.rb
 lib/smsc_manager/sms.rb
+lib/smsc_manager/broadcast.rb
 lib/smsc_manager/smsc_connection.rb
 lib/smsc_manager.rb
 test/test_helper.rb

data/bin/{config_smsc.rb → smsc_config.rb}

@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
  if ARGV.size !=4
-   puts "Usage: config_smsc.rb  hostname username password port"
+   puts "Usage: smsc_config.rb  hostname username password port"
    exit
 end
 

data/bin/{print_smsc_config.rb → smsc_print_config.rb}

@@ -14,6 +14,6 @@ require 'pp'
       puts "exception found"
       puts "#{e.backtrace}"
    ensure
-    puts 'please run config_smsc script as no smsc found' if smsc==nil
+    puts 'please run smsc_config.rb script as no smsc found' if smsc==nil
    end
     

data/lib/smsc_manager/broadcast.rb

@@ -0,0 +1,68 @@
+# Sms stuff for handling sms
+#require 'monitor'
+require 'thread'
+module SmscManager
+  class UseSend_SmsForListofSize1 < 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
+  def initialize(txt,lst,src='888')
+    self.text=txt
+    self.list=lst
+    raise UseSend_SmsForListofSize1.new("use send_sms for lists of size 1") if lst.size==1
+    self.source=src
+    self.calculate_threads
+    @list_queue=Queue.new
+    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 "  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
+    self.num_threads =1 if self.list.size<=@@MAX_THROUGHPUT 
+  end
+  
+  # send using number of threads
+  def send
+     smsc=SmscManager::SmscConnection.factory
+     c=0
+     thread_mgr=[]
+     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}"
+           begin 
+              dest = @list_queue.pop
+              sms=SmscManager::Sms.new(self.text,dest,self.source)
+              puts "Thread #{ctmp}  destination: #{dest}  text: #{self.text}"
+              self.send_sms(smsc,sms)
+             end until @list_queue.empty?
+         }      
+     end
+      thread_mgr.each { |aThread|  aThread.join if aThread.alive? }  #wait till all end
+    end
+    protected 
+    def send_sms(smsc,sms)
+      begin
+      res= smsc.send(sms)
+      rescue  Exception => e
+         puts "Exception found #{e.message}"
+       ensure
+      sleep(1)
+      end
+    end
+  end
+end

data/lib/smsc_manager/version.rb

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

data/test/smsc_manager_test.rb

@@ -8,7 +8,7 @@ class SmscManagerTest < Test::Unit::TestCase
   # Replace this with your real tests.
   def test_sms_send
     smsc_new=@smsc
-    sms=SmscManager::Sms.new('hello scott','09896557890','websource')
+    sms=SmscManager::Sms.new('hello scott','09996557890','websource')
     begin
     r=smsc_new.test(sms)
     rescue Exception
@@ -37,9 +37,25 @@ class SmscManagerTest < Test::Unit::TestCase
     
   end
   def test_sms_text_nil
-      sms=SmscManager::Sms.new(nil,'09896557890','websource')
-      assert sms.text==" ", "text not correct"
+      sms=SmscManager::Sms.new(nil,'09996557890','websource')
+      assert sms.text==" ", "text not correct for nil"
   end
+  def test_broadcast_two
+     list = %w(9991 9992)
+     b=SmscManager::Broadcast.new("hello there",list)
+   end
+  def test_broadcast_five
+    list = %w(9991 9992 9993 9994 9995 9996)
+    b=SmscManager::Broadcast.new("hello there",list)
+  end
+  def test_broadcast_ten
+    list = %w(9991 9992 9993 9994 9995 9996 99910 99920 99930 99940 99950 99960)
+    b=SmscManager::Broadcast.new("hello there",list)
+  end
+  def test_broadcast_six
+     list = %w(9991 9992 9993 9994 9995 9996 9997)
+     b=SmscManager::Broadcast.new("second hello there",list)
+   end
   def test_find_google_mod
     @smsc.hostname='www.google.com'
     #assert @smsc.save==true, 'could not save 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.1
-date: 2007-03-19 00:00:00 +08:00
+  version: 0.3.2
+date: 2007-03-21 00:00:00 +08:00
 summary: connection to smsc via http using kannel
 require_paths: 
 - lib
@@ -35,11 +35,12 @@ files:
 - Manifest.txt
 - setup.rb
 - config/smsc.yml
-- bin/config_smsc.rb
-- bin/print_smsc_config.rb
+- bin/smsc_config.rb
+- bin/smsc_print_config.rb
 - bin/send_sms.rb
 - lib/smsc_manager/version.rb
 - lib/smsc_manager/sms.rb
+- lib/smsc_manager/broadcast.rb
 - lib/smsc_manager/smsc_connection.rb
 - lib/smsc_manager.rb
 - test/test_helper.rb
@@ -52,8 +53,8 @@ rdoc_options: []
 extra_rdoc_files: []
 
 executables: 
-- config_smsc.rb
-- print_smsc_config.rb
+- smsc_config.rb
+- smsc_print_config.rb
 - send_sms.rb
 extensions: []