smsc_manager 0.4.0 → 0.4.2

data/CHANGELOG.txt

@@ -1,3 +1,6 @@
+Version 0.4.2
+
+Activemq support for broacast... other stuff. stomp control file to start/stop projects
 Version 0.4.0
 Major improvement to use active mq topics and stomp to send messages and added load test
 

data/Manifest.txt

@@ -19,8 +19,10 @@ lib/smsc_manager/smsc_listener.rb
 lib/smsc_manager/sms_statistics_listener.rb
 lib/smsc_manager/sms_send_topic.rb
 lib/smsc_manager/broadcast.rb
+lib/smsc_manager/broadcast_topic.rb
 lib/smsc_manager/smsc_connection.rb
 lib/smsc_manager.rb
 test/test_helper.rb
 test/smsc_manager_test.rb
 examples/receive_sms_controller.rb
+examples/stomp

data/bin/send_sms.rb

@@ -2,7 +2,7 @@
 require 'optparse'
 def usage
     puts "Usage: send_sms.rb -u user -m msisdn -s source -t text " 
-   puts "or for example send_sms.rb --user etc."
+   puts "or for example send_sms.rb --user etc. -h hostname optional"
    exit
 end
 def parse_options(params)
@@ -12,6 +12,9 @@ def parse_options(params)
    #puts "paramsp is #{paramsp}"
    user_flag=msisdn_flag=source_flag=text_flag=true
    temp_hash = {}
+    opts.on("-h","--host VAL", String) {|val|  temp_hash[:host ] = val
+                                            puts "host is #{val}"
+                                            }
    opts.on("-u","--user VAL", String) {|val|  temp_hash[:user ] = val
                                            puts "user is #{val}"
                                            user_flag=false }
@@ -42,10 +45,11 @@ require 'smsc_manager'
 
     puts "Finding sms topic to use:"
     begin
-      sms_sender=SmscManager::SmsSendTopic.new    
+      sms_sender=SmscManager::SmsSendTopic.new(arg_hash)   
    rescue Exception => e
       puts "exception found #{e.backtrace}" 
    end  
+    
      user=arg_hash[:user]
      destination=arg_hash[:msisdn]
      source=arg_hash[:source]

data/bin/sms_om_server_control.rb

@@ -7,6 +7,11 @@ gem 'daemons'
 require 'daemons'
  puts "#{ARGV[0]} Operational Measurement (OM) server:"
   #  begin
-      Daemons.run('sms_om_server.rb')
-   
+  options = {
+  #  :ontop => true,
+  #  :multiple => true,
+    :monitor => true
+    
+  }
+     Daemons.run(File.join(File.dirname(__FILE__), 'sms_om_server.rb'), options)
     

data/bin/sms_topic_server.rb

@@ -11,8 +11,8 @@ require 'smsc_manager'
 
     puts "Starting topic server:"
   #  begin
-      sms_listener=SmscManager::SmscListener.new.run
-      sms_listener.join
+      SmscManager::SmscListener.new.run
+   #   sms_listener.join
    # rescue Exception => e
       puts "exception found #{e.backtrace}" 
   #  end

data/bin/sms_topic_server_control.rb

@@ -7,6 +7,14 @@ gem 'daemons'
 require 'daemons'
  puts "#{ARGV[0]} SMS Topic server:"
   #  begin
-      Daemons.run('sms_topic_server.rb')
+  options = {
+  #  :ontop => true,
+  #  :multiple => true,
+    :monitor => true
+    
+  }
+     Daemons.run(File.join(File.dirname(__FILE__), 'sms_topic_server.rb'), options)
+        
+
    
     

data/bin/smsc_config.rb

@@ -13,7 +13,6 @@ require 'pp'
     puts "configuring smsc settings"
     begin
       smsc=SmscManager::SmscConnection.factory
-     
    rescue Exception => e
       puts "exception found"
    ensure

data/examples/stomp

@@ -0,0 +1,37 @@
+#!/bin/bash
+#
+# Copyright (c)  Scott Sproule
+#
+# stomp startup        Startup script for  stomp applications
+#
+# chkconfig: - 85 15
+# description: Stomp manages stomp protocol clients. must start after activemq  
+#              
+
+RETVAL=0
+
+
+
+case "$1" in
+    start)
+      sms_topic_server_control.rb start
+      sms_om_server_control.rb start
+      RETVAL=$?
+  ;;
+    stop)
+      sms_topic_server_control.rb stop
+      sms_om_server_control.rb stop
+      RETVAL=$?
+  ;;
+    restart)
+      sms_topic_server_control.rb restart
+      sms_om_server_control.rb restart
+      RETVAL=$?
+	 ;;
+	    *)
+	      echo "Usage: stomp {start|stop|restart}"
+	      exit 1
+	  ;;
+	esac      
+
+	exit $RETVAL

data/lib/smsc_manager/broadcast_topic.rb

@@ -0,0 +1,58 @@
+# Sms stuff for handling sms
+#require 'monitor'
+require 'thread'
+module SmscManager
+  class BadList < RuntimeError
+  end
+# this class helps to broadcast sms to list
+class BroadcastTopic
+  @@MAX_THROUGHPUT =5  # in messages per second
+ # 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
+    self.source=src
+  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_topic(lst) 
+    
+  #  raise InvalidPrefix.new("invalid prefix: valid prefix area:" + Sms.valid ) if !prefix_test
+  end
+  
+  # populate thread safe queue
+  def populate_topic(lst)
+    # puts "list is #{lst}"
+    arg_hash = {:host => 'localhost'}
+    sms_sender=SmscManager::SmsSendTopic.new(arg_hash)  
+    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}"
+                 begin
+                 sms=SmscManager::Sms.new(txt2,dst,self.source)
+                 sms_sender.send_topic(sms)
+                 self.attempts+=1
+                 self.sent+=1
+                 rescue  Exception => e
+                   self.sent-=1
+                   puts "bad values dst: #{dst} txt: #{txt2} msg: #{e.message}"
+                 end
+               
+              # puts "  dst is #{dst}" 
+               }
+    puts "populate topic sent #{self.sent}"
+  end
+  end
+end

data/lib/smsc_manager/sms_send_topic.rb

@@ -8,13 +8,26 @@ class SmsSendTopic
   attr_accessor :conn
   #need to define topic, host properly
   @@TOPIC='/topic/sms'
- def initialize
-    self.conn = Stomp::Connection.open '', '', 'localhost', 61613, false 
+ def initialize(options={})
+   # set up variables using hash
+    host =   options[:host]==nil ? 'localhost' : options[:host]
+    port =   options[:port]==nil ? '61613' : options[:port]
+    puts "host is: #{host} port is #{port}"
+    self.conn = Stomp::Connection.open '', '', host, port, false 
   #  self.conn.subscribe @@TOPIC, { :ack =>"auto" }
     puts "finished initializing"
   end
+ # def initialize()
+  #    self.conn = Stomp::Connection.open '', '', 'localhost', 61613, false 
+    #  self.conn.subscribe @@TOPIC, { :ack =>"auto" }
+ #     puts "finished initializing"
+ #   end
   def send_sms(text,destination,source)
          sms=SmscManager::Sms.new(text,destination,source)
+         self.send_topic(sms)
+  end #send_sms
+  def send_topic(sms)
+         #sms=SmscManager::Sms.new(text,destination,source)
          msgbody=sms.to_xml
       #   puts "message body is #{msgbody}"
          self.conn.send @@TOPIC, msgbody, {'persistent'=>'false'}

data/lib/smsc_manager/sms_statistics_listener.rb

@@ -29,7 +29,7 @@ class SmsStatisticsListener
           }
   end
   def run
-     Thread.new {
+    # Thread.new {
        while true      #loop forever
       #   puts "before receive"
 	       msg = self.conn.receive
@@ -43,7 +43,7 @@ class SmsStatisticsListener
          puts "exception found #{e.backtrace}" 
         end
        end  # while
-      }
+    #  }
     # t.join  # wait for t to die..
   end #run
 end # smsc listener

data/lib/smsc_manager/smsc_listener.rb

@@ -18,7 +18,7 @@ class SmscListener
     puts "finished initializing"
   end
   def run
-     Thread.new {
+   
        while true      #loop forever
        #  puts "before receive"
 	       msg = self.conn.receive
@@ -32,7 +32,7 @@ class SmscListener
          puts "exception found #{e.backtrace}" 
         end
        end  # while
-      }
+      
     # t.join  # wait for t to die..
   end #run
 end # smsc listener

data/lib/smsc_manager/version.rb

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

data/test/smsc_manager_test.rb

@@ -33,6 +33,17 @@ class SmscManagerTest < Test::Unit::TestCase
     end
     
   end
+  def test_sms_send_topic
+    sms=SmscManager::Sms.new('hello scott','09996557890','websource')
+    begin
+    smsc=SmscManager::SmsSendTopic.new()
+    r=smsc.send_topic(sms)
+    end
+    puts "test send topic"
+     smsc=SmscManager::SmsSendTopic.new({:host => '127.0.0.1'})
+      r=smsc.send_topic(sms)
+      puts "test send topic after host"
+  end
   def test_smsc_db    
     assert @smsc!=nil, 'smsc nil big problems'
     oldport=@smsc.port
@@ -54,6 +65,11 @@ class SmscManagerTest < Test::Unit::TestCase
      b=SmscManager::Broadcast.new('888',list,"hello there")
      assert b.attempts ==2, "did not send two sms"
    end
+   def test_broadcast_topic_one
+      list = %w(9991 9992)
+      b=SmscManager::BroadcastTopic.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('888',list,"hello there")

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.9.4
 specification_version: 1
 name: smsc_manager
 version: !ruby/object:Gem::Version 
-  version: 0.4.0
-date: 2007-09-18 00:00:00 +08:00
+  version: 0.4.2
+date: 2007-09-19 00:00:00 +08:00
 summary: connection to smsc via http using kannel
 require_paths: 
 - lib
@@ -50,11 +50,13 @@ files:
 - lib/smsc_manager/sms_statistics_listener.rb
 - lib/smsc_manager/sms_send_topic.rb
 - lib/smsc_manager/broadcast.rb
+- lib/smsc_manager/broadcast_topic.rb
 - lib/smsc_manager/smsc_connection.rb
 - lib/smsc_manager.rb
 - test/test_helper.rb
 - test/smsc_manager_test.rb
 - examples/receive_sms_controller.rb
+- examples/stomp
 test_files: 
 - test/smsc_manager_test.rb
 rdoc_options: