smsc_manager 0.3.6 → 0.4.0

data/CHANGELOG.txt

@@ -1,3 +1,6 @@
+Version 0.4.0
+Major improvement to use active mq topics and stomp to send messages and added load test
+
 Version 0.3.5
 Added small improvements to send_sms.rb usage to use flags
 

data/Manifest.txt

@@ -7,8 +7,17 @@ config/smsc.yml
 bin/smsc_config.rb
 bin/smsc_print_config.rb
 bin/send_sms.rb
+bin/send_sms_load_test.rb
+bin/send_sms_http.rb
+bin/sms_topic_server.rb
+bin/sms_topic_server_control.rb
+bin/sms_om_server_control.rb
+bin/sms_om_server.rb
 lib/smsc_manager/version.rb
 lib/smsc_manager/sms.rb
+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/smsc_connection.rb
 lib/smsc_manager.rb

data/bin/send_sms.rb

@@ -40,24 +40,22 @@ require 'rubygems'
 gem 'smsc_manager'
 require 'smsc_manager'
 
-    puts "Finding smsc to use:"
+    puts "Finding sms topic to use:"
     begin
-      smsc=SmscManager::SmscConnection.factory
+      sms_sender=SmscManager::SmsSendTopic.new    
    rescue Exception => e
-      puts "exception found" 
-   end
-     puts "Found smsc: #{smsc.hostname} port #{smsc.port}"
-     
+      puts "exception found #{e.backtrace}" 
+   end  
      user=arg_hash[:user]
      destination=arg_hash[:msisdn]
      source=arg_hash[:source]
      text=arg_hash[:text]
-     sms=SmscManager::Sms.new(text,destination,source)
+     sms_sender.send_sms(text,destination,source)
      puts "Sending user: #{user} destination: #{destination}  text: #{text}"
-     res= smsc.send(sms)
+   #  res= smsc.send(sms)
    #   puts "Response code: #{res.response} body: #{res.response_body}"  
-     puts "Response code: #{res}"  if res.kind_of? String
-     puts "pretty print response:"
-     pp res
+   #  puts "Response code: #{res}"  if res.kind_of? String
+   #  puts "pretty print response:"
+  #   pp res
     # puts "Response code: #{res.} body: #{res.code}"  if res.kind_of? Net::Http
     

data/bin/send_sms_http.rb

@@ -0,0 +1,64 @@
+#!/usr/bin/env ruby
+require 'optparse'
+def usage
+    puts "Usage: send_sms_http.rb -u user -m msisdn -s source -t text " 
+    puts " to send via http directly to server"
+   puts "or for example send_sms_http.rb --user etc."
+   exit
+end
+def parse_options(params)
+   opts = OptionParser.new
+   puts "argv are #{params}"
+   #params_split = params.split(' ')
+   #puts "paramsp is #{paramsp}"
+   user_flag=msisdn_flag=source_flag=text_flag=true
+   temp_hash = {}
+   opts.on("-u","--user VAL", String) {|val|  temp_hash[:user ] = val
+                                           puts "user is #{val}"
+                                           user_flag=false }
+   opts.on("-m","--msisdn VAL", String) {|val|  temp_hash[:msisdn ] = val
+                                          puts "msiddn is #{val}"
+                                          msisdn_flag=false }
+  opts.on("-s","--source VAL", String) {|val|  temp_hash[:source ] = val
+                                              puts "source is #{val}"
+                                              source_flag=false }
+   opts.on("-t","--text VAL", String) {|val|  temp_hash[:text ] = val
+                                          puts "text is #{val}"
+                                          text_flag=false }
+   #opts.on("-d","--database VAL", String) {|val|  temp_hash[:db ] = val }
+   #opts.on("-p","--password VAL", String) {|val|  temp_hash[:password ] = val }
+   #opts.on("-u","--user VAL", String) {|val|  temp_hash[:user ] = val }
+   #puts " in test commander option parse #{port} #{url}"
+   opts.parse(params)
+   # puts " in HTTP #{hostname} port #{port} url: #{url}"
+   usage if user_flag or msisdn_flag or source_flag or text_flag
+   return temp_hash
+ end
+ arg_hash=parse_options(ARGV)
+require 'pp'
+
+require 'rubygems'
+gem 'smsc_manager'
+require 'smsc_manager'
+
+    puts "Finding smsc to use:"
+    begin
+      smsc=SmscManager::SmscConnection.factory
+   rescue Exception => e
+      puts "exception found" 
+   end
+     puts "Found smsc: #{smsc.hostname} port #{smsc.port}"
+     
+     user=arg_hash[:user]
+     destination=arg_hash[:msisdn]
+     source=arg_hash[:source]
+     text=arg_hash[:text]
+     sms=SmscManager::Sms.new(text,destination,source)
+     puts "Sending user: #{user} destination: #{destination}  text: #{text}"
+     res= smsc.send(sms)
+   #   puts "Response code: #{res.response} body: #{res.response_body}"  
+     puts "Response code: #{res}"  if res.kind_of? String
+     puts "pretty print response:"
+     pp res
+    # puts "Response code: #{res.} body: #{res.code}"  if res.kind_of? Net::Http
+    

data/bin/send_sms_load_test.rb

@@ -0,0 +1,75 @@
+#!/usr/bin/env ruby
+require 'optparse'
+def usage
+    puts "Usage: send_sms_load_test.rb -u user -m msisdn -s source -t text  -c count" 
+   puts "to test how long to send c sms"
+   exit
+end
+def parse_options(params)
+   opts = OptionParser.new
+   puts "argv are #{params}"
+   #params_split = params.split(' ')
+   #puts "paramsp is #{paramsp}"
+   user_flag=msisdn_flag=source_flag=text_flag=count_flag=true
+   temp_hash = {}
+   opts.on("-u","--user VAL", String) {|val|  temp_hash[:user ] = val
+                                           puts "user is #{val}"
+                                           user_flag=false }
+                                           
+   opts.on("-c","--count VAL", Integer) {|val|  temp_hash[:count ] = val
+                                     puts "count is #{val}"
+                                     count_flag=false }
+   opts.on("-m","--msisdn VAL", String) {|val|  temp_hash[:msisdn ] = val
+                                          puts "msiddn is #{val}"
+                                          msisdn_flag=false }
+  opts.on("-s","--source VAL", String) {|val|  temp_hash[:source ] = val
+                                              puts "source is #{val}"
+                                              source_flag=false }
+   opts.on("-t","--text VAL", String) {|val|  temp_hash[:text ] = val
+                                          puts "text is #{val}"
+                                          text_flag=false }
+   #opts.on("-d","--database VAL", String) {|val|  temp_hash[:db ] = val }
+   #opts.on("-p","--password VAL", String) {|val|  temp_hash[:password ] = val }
+   #opts.on("-u","--user VAL", String) {|val|  temp_hash[:user ] = val }
+   #puts " in test commander option parse #{port} #{url}"
+   opts.parse(params)
+   # puts " in HTTP #{hostname} port #{port} url: #{url}"
+   usage if user_flag or msisdn_flag or source_flag or text_flag or count_flag
+   return temp_hash
+ end
+ arg_hash=parse_options(ARGV)
+require 'pp'
+
+require 'rubygems'
+gem 'smsc_manager'
+require 'smsc_manager'
+
+    puts "Finding sms topic to use:"
+    begin
+      sms_sender=SmscManager::SmsSendTopic.new    
+   rescue Exception => e
+      puts "exception found #{e.backtrace}" 
+   end  
+     user=arg_hash[:user]
+     destination=arg_hash[:msisdn]
+     source=arg_hash[:source]
+     text=arg_hash[:text]
+     count=arg_hash[:count]
+     start=Time.now
+     puts "Time now: #{start}"
+     1.upto(count) { |c| 
+       puts "sent #{c} messages" if c % 100 == 0   
+       final_text = "count: #{c}: #{text} "
+       sms_sender.send_sms(final_text,destination,source)
+      }
+      diff = Time.now - start
+      
+    	puts "#{Time.now} Sent #{count} in #{diff} seconds";
+    # puts "Sending user: #{user} destination: #{destination}  text: #{text}"
+   #  res= smsc.send(sms)
+   #   puts "Response code: #{res.response} body: #{res.response_body}"  
+   #  puts "Response code: #{res}"  if res.kind_of? String
+   #  puts "pretty print response:"
+  #   pp res
+    # puts "Response code: #{res.} body: #{res.code}"  if res.kind_of? Net::Http
+    

data/bin/sms_om_server.rb

@@ -0,0 +1,20 @@
+#!/usr/bin/env ruby
+require 'optparse'
+def usage
+    puts "Usage: sms_topic_server.rb to start up listener " 
+   exit
+end
+
+require 'rubygems'
+gem 'smsc_manager'
+require 'smsc_manager'
+
+    puts "Starting Operational Measurement (OM) server:"
+  #  begin
+      sms_listener=SmscManager::SmsStatisticsListener.new.run
+      sms_listener.join
+   # rescue Exception => e
+      puts "exception found #{e.backtrace}" 
+  #  end
+   
+    

data/bin/sms_om_server_control.rb

@@ -0,0 +1,12 @@
+#!/usr/bin/env ruby
+require 'optparse'
+require 'rubygems'
+gem 'smsc_manager'
+require 'smsc_manager'
+gem 'daemons'
+require 'daemons'
+ puts "#{ARGV[0]} Operational Measurement (OM) server:"
+  #  begin
+      Daemons.run('sms_om_server.rb')
+   
+    

data/bin/sms_topic_server.rb

@@ -0,0 +1,20 @@
+#!/usr/bin/env ruby
+require 'optparse'
+def usage
+    puts "Usage: sms_topic_server.rb to start up listener " 
+   exit
+end
+
+require 'rubygems'
+gem 'smsc_manager'
+require 'smsc_manager'
+
+    puts "Starting topic server:"
+  #  begin
+      sms_listener=SmscManager::SmscListener.new.run
+      sms_listener.join
+   # rescue Exception => e
+      puts "exception found #{e.backtrace}" 
+  #  end
+   
+    

data/bin/sms_topic_server_control.rb

@@ -0,0 +1,12 @@
+#!/usr/bin/env ruby
+require 'optparse'
+require 'rubygems'
+gem 'smsc_manager'
+require 'smsc_manager'
+gem 'daemons'
+require 'daemons'
+ puts "#{ARGV[0]} SMS Topic server:"
+  #  begin
+      Daemons.run('sms_topic_server.rb')
+   
+    

data/lib/smsc_manager/broadcast.rb

@@ -40,10 +40,11 @@ class Broadcast
                  puts "text is #{txt2} dest is #{dst}"
                  begin
                  sms=SmscManager::Sms.new(txt2,dst,self.source)
+                 @list_queue << sms
                  rescue  Exception => e
                    puts "bad values dst: #{dst} txt: #{txt2} msg: #{e.message}"
                  end
-                @list_queue << sms
+               
               # puts "  dst is #{dst}" 
                }
     puts "populate queue list size #{@list_queue.size}"
@@ -68,8 +69,10 @@ class Broadcast
            #puts " #{Time.now}Creating retry thread: #{ctmp}"
            begin 
               sms = @list_queue.pop
-              puts "Thread #{ctmp}  destination: #{sms.destination}  text: #{sms.text}"
-              self.send_sms(smsc,sms)
+              if sms!=nil 
+                 puts "Thread #{ctmp}  destination: #{sms.destination}  text: #{sms.text}"
+                 self.send_sms(smsc,sms)
+              end
              end until @list_queue.empty?
          }      
      end
@@ -85,7 +88,7 @@ class Broadcast
       rescue  Exception => e
          puts "Exception found #{e.message}"
        ensure
-      sleep(1)
+        sleep(1)
       end
     end
   end

data/lib/smsc_manager/sms.rb

@@ -1,3 +1,4 @@
+require 'rexml/document'
 # Sms stuff for handling sms
 module SmscManager
 class InvalidPrefix < RuntimeError
@@ -35,8 +36,30 @@ class Sms
                                    flag=true if k }
     flag
   end
+  def to_xml
+    sms_xml = REXML::Element.new "sms"
+    destination_xml = REXML::Element.new "destination"
+    destination_xml.text=self.destination
+    source_xml =REXML::Element.new "source"
+    source_xml.text=self.source
+    text_xml =REXML::Element.new "text"
+    text_xml.text=self.text
+    sms_xml.add_element destination_xml
+    sms_xml.add_element source_xml
+    sms_xml.add_element text_xml
+    sms_xml.to_s
+   # doc= REXML::Document.new sms_xml.to_s
+   # doc.to_s
+  end
+  def self.load_xml(xml_string)
+    doc=REXML::Document.new(xml_string)
+    dest=REXML::XPath.first(doc, "//destination").text
+    src=REXML::XPath.first(doc, "//source").text
+    text=REXML::XPath.first(doc, "//text").text
+    sms=SmscManager::Sms.new(text,dest,src)
+  end
   def limit_text(val)
-    #limit to 300 characters
+    #limit to @@MAX_SIZE characters
       ret=""
       size=[val.size,@@MAX_SIZE].min-1
     0.upto(size) do |i|
@@ -51,6 +74,7 @@ class Sms
         #    result=result.gsub(/\n/," ")   # replace all new lines  return result
          #   result=result.gsub(/\r/," ")   # replace all new lines  return result
            result=result.gsub(/_/,"-")   # replace all new lines  return result
+           result=result.gsub(/-/," ")   # replace all - with space...angelo bug return result
         #    result=result4.gsub(/\//,"")   # replace all new lines  return result
             limit_text(result)
     end

data/lib/smsc_manager/sms_send_topic.rb

@@ -0,0 +1,24 @@
+require 'yaml'
+require 'rubygems'
+gem 'stomp'
+require 'stomp'
+# This sends the sms to a activemq topic
+module SmscManager
+class SmsSendTopic
+  attr_accessor :conn
+  #need to define topic, host properly
+  @@TOPIC='/topic/sms'
+ 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)
+         msgbody=sms.to_xml
+      #   puts "message body is #{msgbody}"
+         self.conn.send @@TOPIC, msgbody, {'persistent'=>'false'}
+  end #send_sms
+end # smsc listener
+
+end #module

data/lib/smsc_manager/sms_statistics_listener.rb

@@ -0,0 +1,51 @@
+require 'yaml'
+require 'rubygems'
+gem 'stomp'
+require 'stomp'
+
+module SmscManager
+class SmsStatisticsListener
+   @@MAX_THROUGHPUT =5  # in messages per second
+  attr_accessor :conn,  :count, :source
+  #need to define topic, host properly
+   @@TOPIC='/topic/sms'
+ def initialize
+    self.conn = Stomp::Connection.open '', '', 'localhost', 61613, false 
+    self.count = 0
+    self.conn.subscribe @@TOPIC, { :ack =>"auto" }
+    self.source ={}
+    puts "finished initializing"
+  end
+  def statistics(sms)
+    self.count+=1
+    self.source[sms.source] = 0 if !self.source.key?(sms.source)
+    self.source[sms.source] += 1 
+  end
+  def report
+    puts "SMS OM Report:  #{Time.now}"
+    puts "message count is: #{count}"
+    self.source.each_pair {|i,val|
+          puts "      source #{i} count #{val}"
+          }
+  end
+  def run
+     Thread.new {
+       while true      #loop forever
+      #   puts "before receive"
+	       msg = self.conn.receive
+	    #   puts "after receive"
+	       begin
+	       sms=SmscManager::Sms.load_xml(msg.body)
+	       statistics(sms)
+	       report if self.count % 100 == 0 
+	      # puts "sms text is: #{sms.text} dest is: #{sms.destination} result is: #{res}"
+         rescue Exception => e
+         puts "exception found #{e.backtrace}" 
+        end
+       end  # while
+      }
+    # t.join  # wait for t to die..
+  end #run
+end # smsc listener
+
+end #module

data/lib/smsc_manager/smsc_listener.rb

@@ -0,0 +1,40 @@
+require 'yaml'
+require 'rubygems'
+gem 'stomp'
+require 'stomp'
+
+module SmscManager
+class SmscListener
+   @@MAX_THROUGHPUT =5  # in messages per second
+   SLEEP_TIME=1/@@MAX_THROUGHPUT    #sleep x seconds to slow down system
+  attr_accessor :conn, :smsc, :count
+  #need to define topic, host properly
+   @@TOPIC='/topic/sms'
+ def initialize
+    self.conn = Stomp::Connection.open '', '', 'localhost', 61613, false 
+    self.count = 0
+    self.conn.subscribe @@TOPIC, { :ack =>"auto" }
+    self.smsc=SmscManager::SmscConnection.factory
+    puts "finished initializing"
+  end
+  def run
+     Thread.new {
+       while true      #loop forever
+       #  puts "before receive"
+	       msg = self.conn.receive
+	#       puts "after receive"
+	       begin
+	       sms=SmscManager::Sms.load_xml(msg.body)
+	       res= self.smsc.send(sms)
+	       sleep(SLEEP_TIME)  #only 5 messages per second max
+	      # puts "sms text is: #{sms.text} dest is: #{sms.destination} result is: #{res}"
+         rescue Exception => e
+         puts "exception found #{e.backtrace}" 
+        end
+       end  # while
+      }
+    # t.join  # wait for t to die..
+  end #run
+end # smsc listener
+
+end #module

data/lib/smsc_manager/version.rb

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

data/test/smsc_manager_test.rb

@@ -6,6 +6,15 @@ class SmscManagerTest < Test::Unit::TestCase
     @smsc=SmscManager::SmscConnection.factory   
   end
   # Replace this with your real tests.
+  def test_sms_to_xml
+     sms=SmscManager::Sms.new('hello scott','09996557890','websource')
+     c=sms.to_xml
+     puts "sms to xml is #{c}"
+     assert_match "destination",  c
+     sms2=SmscManager::Sms.load_xml(c)
+     assert sms.destination == sms2.destination, 'to from xml did not work'
+      assert sms.text == sms2.text, 'to from xml did not work'
+   end
   def test_sms_send
     smsc_new=@smsc
     sms=SmscManager::Sms.new('hello scott','09996557890','websource')

metadata

@@ -1,10 +1,10 @@
 --- !ruby/object:Gem::Specification 
-rubygems_version: 0.9.2
+rubygems_version: 0.9.4
 specification_version: 1
 name: smsc_manager
 version: !ruby/object:Gem::Version 
-  version: 0.3.6
-date: 2007-04-24 00:00:00 +08:00
+  version: 0.4.0
+date: 2007-09-18 00:00:00 +08:00
 summary: connection to smsc via http using kannel
 require_paths: 
 - lib
@@ -38,8 +38,17 @@ files:
 - bin/smsc_config.rb
 - bin/smsc_print_config.rb
 - bin/send_sms.rb
+- bin/send_sms_load_test.rb
+- bin/send_sms_http.rb
+- bin/sms_topic_server.rb
+- bin/sms_topic_server_control.rb
+- bin/sms_om_server_control.rb
+- bin/sms_om_server.rb
 - lib/smsc_manager/version.rb
 - lib/smsc_manager/sms.rb
+- 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/smsc_connection.rb
 - lib/smsc_manager.rb
@@ -48,14 +57,23 @@ files:
 - examples/receive_sms_controller.rb
 test_files: 
 - test/smsc_manager_test.rb
-rdoc_options: []
-
-extra_rdoc_files: []
-
+rdoc_options: 
+- --main
+- README.txt
+extra_rdoc_files: 
+- README.txt
+- CHANGELOG.txt
+- Manifest.txt
 executables: 
 - smsc_config.rb
 - smsc_print_config.rb
 - send_sms.rb
+- send_sms_load_test.rb
+- send_sms_http.rb
+- sms_topic_server.rb
+- sms_topic_server_control.rb
+- sms_om_server_control.rb
+- sms_om_server.rb
 extensions: []
 
 requirements: []