smsc_manager 0.4.5 → 0.4.7

data/CHANGELOG.txt

@@ -1,3 +1,5 @@
+Version 0.4.6
+fix blank destination
 Version 0.4.3
 improve om server and message handling characteristics
 

data/Manifest.txt

@@ -6,8 +6,10 @@ setup.rb
 config/smsc.yml
 bin/smsc_config.rb
 bin/smsc_print_config.rb
+bin/send_sms_post.rb
 bin/send_sms.rb
 bin/send_sms_load_test.rb
+bin/sms_print_xml.rb
 bin/send_sms_http.rb
 bin/sms_topic_server.rb
 bin/sms_topic_server_control.rb

data/bin/send_sms_load_test.rb

@@ -15,6 +15,9 @@ def parse_options(params)
    opts.on("-u","--user VAL", String) {|val|  temp_hash[:user ] = val
                                            puts "user is #{val}"
                                            user_flag=false }
+    opts.on("-h","--host VAL", String) {|val|  temp_hash[:host ] = val
+                                                puts "host is #{val}"
+                                                   }                                       
                                            
    opts.on("-c","--count VAL", Integer) {|val|  temp_hash[:count ] = val
                                      puts "count is #{val}"
@@ -46,7 +49,7 @@ 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  

data/bin/send_sms_post.rb

@@ -0,0 +1,72 @@
+#!/usr/bin/env ruby
+require 'optparse'
+def usage
+    puts "Usage: send_sms_post.rb -u user -m msisdn -s source -t text -h host -p port -a topic " 
+   
+   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("-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 }
+     opts.on("-p","--port VAL", String) {|val|  temp_hash[:port ] = val
+                                            puts "port is #{val}"
+                                           }
+                                                                                                                     opts.on("-a","--topic VAL", String) {|val|  temp_hash[:topic ] = 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'
+require 'net/http'
+
+     user=arg_hash[:user]
+     destination=arg_hash[:msisdn]
+     source=arg_hash[:source]
+     text=arg_hash[:text]
+     puts "create stomp message"
+     m=SmscManager::SmsSendTopic.create_stomp_message(text,destination,source)
+     puts "message is #{m.to_xml}"
+      puts "hostname: #{arg_hash[:host]} port #{arg_hash[:port]}"
+ url="#{arg_hash[:topic]}?m.to_xml"
+     ht =Net::HTTP.start(arg_hash[:host],arg_hash[:port])
+       r=ht.post(url)
+       puts "url was: #{url}"
+       puts "result: #{r.to_s}"
+   #  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

@@ -13,7 +13,7 @@ require 'smsc_manager'
   #  begin
   # can add additional options to change host/port etc
       sms_listener=SmscManager::SmsStatisticsListener.new({:topic => '/topic/sms'}).run
-      sms_listener.join
+    #  sms_listener.join
    # rescue Exception => e
       puts "exception found #{e.backtrace}" 
   #  end

data/bin/sms_print_xml.rb

@@ -0,0 +1,10 @@
+#!/usr/bin/env ruby
+require 'rubygems'
+gem 'smsc_manager'
+require 'smsc_manager'
+#require 'lib/smsc_manager/smsc_connection'
+#require 'lib/smsc_manager/sms'
+require 'pp'
+    puts "printing sms xml configuration"
+    puts "#{SmscManager::SmsSendTopic.print_example_xml}"
+    

data/lib/smsc_manager/broadcast_topic.rb

@@ -8,7 +8,7 @@ module SmscManager
 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
+ attr_accessor :text, :source, :list,  :num_threads, :attempts, :sent, :sms_sender
   def common_setup(src)
     @guard    = Mutex.new  
     self.attempts=0
@@ -33,26 +33,30 @@ class BroadcastTopic
   def populate_topic(lst)
     # puts "list is #{lst}"
     arg_hash = {:host => 'localhost'}
-    sms_sender=SmscManager::SmsSendTopic.new(arg_hash)  
+    self.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 "text is #{txt2} dest is #{dst}"
+                 send_it(txt2,dst) if SmscManager::Sms.check_destination(dst)
                
               # puts "  dst is #{dst}" 
                }
     puts "populate topic sent #{self.sent}"
   end
+  def send_it(txt,dst)
+  #  puts "hello from send it"
+    begin
+     sms=SmscManager::Sms.new(txt,dst,self.source)
+     self.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
+   end
   end
 end

data/lib/smsc_manager/sms.rb

@@ -22,9 +22,10 @@ class Sms
     @@msisdn_valid_prefix.each {|t| sentence << t <<" " }
     sentence
   end
-  def starts_with?(prefix)
+  def self.starts_with?(prefix,dest)
             prefix = prefix.to_s
-            self.destination[0, prefix.length] == prefix
+            return false if dest == nil
+            dest[0, prefix.length] == prefix
           end
   def initialize(txt,dest,src='888')
     self.orig_txt=txt
@@ -34,9 +35,12 @@ class Sms
     raise InvalidPrefix.new("invalid prefix: valid prefix area:" + Sms.valid ) if !prefix_test
   end
   def prefix_test
+    Sms.check_destination(self.destination)
+  end
+  def self.check_destination(dst)
     flag = false
     
-    @@msisdn_valid_prefix.each { |w| k= self.starts_with? w 
+    @@msisdn_valid_prefix.each { |w| k= Sms.starts_with? w , dst
                                    flag=true if k }
     flag
   end

data/lib/smsc_manager/sms_send_topic.rb

@@ -10,6 +10,8 @@ class SmsSendTopic
   attr_accessor :conn
   #need to define topic, host properly
   @@TOPIC='/topic/sms'
+  # must be defined as method in sms_listener
+  @@STOMP_SMS_MESSAGE='stomp_SMS'
  def initialize(options={})
    # set up variables using hash
     host =   options[:host]==nil ? 'localhost' : options[:host]
@@ -31,10 +33,28 @@ class SmsSendTopic
   def send_topic(sms)
          #sms=SmscManager::Sms.new(text,destination,source)
         # msgbody=sms.to_xml
-         m=StompMessage::Message.new('stomp_SMS', sms.to_xml)
+         m=StompMessage::Message.new(@@STOMP_SMS_MESSAGE, sms.to_xml)
       #   puts "message body is #{msgbody}"
          self.conn.send @@TOPIC, m.to_xml, {'persistent'=>'false'}
   end #send_sms
+  # simple script to show xml message
+  def self.create_stomp_message(txt,dest,src)
+       sms=SmscManager::Sms.new(txt,dest,src)
+       m=StompMessage::Message.new(@@STOMP_SMS_MESSAGE, sms.to_xml)
+      end
+  def self.print_example_xml
+     text= "hello there #{Time.now}"
+     destination = "639993130030"  #must be valid destination
+     source = '888'
+     sms=SmscManager::Sms.new(text,destination,source)
+     m=SmscManager::SmsSendTopic.create_stomp_message( text,destination,source)
+     result = "------------ SMS XML----------------\n"
+     result << "#{sms.to_xml}\n"
+     result << "------------STOMP XML--------------\n"
+     result << "#{m.to_xml}\n"
+     result << "------------END--------------------"
+     result
+  end
 end # smsc listener
 
 end #module

data/lib/smsc_manager/sms_statistics_listener.rb

@@ -23,17 +23,18 @@ class SmsStatisticsListener < StompMessage::StompStatisticsServer
    # self.source[sms.source] += 1 
   end
   def stomp_REPORT(msg, stomp_msg)
-     super(msg, stomp_msg)
-     puts " --------------------------------- details"
+     result = super(msg, stomp_msg)
+     #puts " --------------------------------- details"
     # self.source.each_pair { |key,val| puts "     key: #{key}  value: #{val}"}
    #  puts " --------------------------------- "
+  
   end
   def stomp_SMS(msg, stomp_msg)
      puts "msg command #{msg.command} msg body #{msg.body}" if @debug
      sms=SmscManager::Sms.load_xml(msg.body)
      create_m_statistics(sms)
      puts "#{self.topic} OM report stomp_SMS" if @debug
-	   stomp_REPORT(msg) if self.msg_count % 100 == 0
+	 #  stomp_REPORT(msg) if self.msg_count % 100 == 0
   end
 end # smsc listener
 

data/lib/smsc_manager/smsc_listener.rb

@@ -17,6 +17,16 @@ class SmscListener < StompMessage::StompServer
     self.smsc=SmscManager::SmscConnection.factory
     puts "finished initializing"
   end
+  def send_reply(headers,msg)
+     msisdn = headers['msisdn']
+     reply_topic=headers['reply-to']
+     puts "headers:  #{headers['msisdn']} reply topic #{headers['reply-to']}"
+         internal_conn =  Stomp::Connection.open '', '', self.host, self.port, false 
+         internal_conn.subscribe reply_topic, { :ack =>"auto" }
+      #   m=StompMessage::Message.new('stomp_REPLY', msg_body)
+         internal_conn.send(reply_topic, msg.to_xml, {'persistent'=>'false',  'msisdn' => "#{msisdn}" }) 
+         internal_conn.unsubscribe reply_topic
+   end
   # name is message command
   def stomp_SMS(msg, stomp_msg)
      sms=SmscManager::Sms.load_xml(msg.body)

data/lib/smsc_manager/version.rb

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

data/test/smsc_manager_test.rb

@@ -65,6 +65,18 @@ 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_blank
+      list = %w(9991 '')
+      b=SmscManager::BroadcastTopic.new('888',list,"hello there")
+      assert b.attempts ==1, "did not send one sms"
+    end
+     def test_broadcast_nil
+        list = %w(9991 nil)
+        list << nil
+        b=SmscManager::BroadcastTopic.new('888',list,"hello there")
+        assert b.attempts ==1, "did not send one sms"
+      end
+     
    def test_broadcast_topic_one
       list = %w(9991 9992)
       b=SmscManager::BroadcastTopic.new('888',list,"hello there")
@@ -94,5 +106,12 @@ class SmscManagerTest < Test::Unit::TestCase
     @smsc.hostname='www.google.com'
     #assert @smsc.save==true, 'could not save google mod'
     assert @smsc.hostname == 'www.google.com', "assign not working" 
+    
   end
+   def test_print_xml
+        b=SmscManager::SmsSendTopic.print_example_xml
+        puts "#{b}"
+        res = b.include? "<sms>"
+        assert res, "xml looks wrong"
+      end
 end

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.9.4
 specification_version: 1
 name: smsc_manager
 version: !ruby/object:Gem::Version 
-  version: 0.4.5
-date: 2007-09-24 00:00:00 +08:00
+  version: 0.4.7
+date: 2007-10-01 00:00:00 +08:00
 summary: connection to smsc via http using kannel
 require_paths: 
 - lib
@@ -37,8 +37,10 @@ files:
 - config/smsc.yml
 - bin/smsc_config.rb
 - bin/smsc_print_config.rb
+- bin/send_sms_post.rb
 - bin/send_sms.rb
 - bin/send_sms_load_test.rb
+- bin/sms_print_xml.rb
 - bin/send_sms_http.rb
 - bin/sms_topic_server.rb
 - bin/sms_topic_server_control.rb
@@ -69,8 +71,10 @@ extra_rdoc_files:
 executables: 
 - smsc_config.rb
 - smsc_print_config.rb
+- send_sms_post.rb
 - send_sms.rb
 - send_sms_load_test.rb
+- sms_print_xml.rb
 - send_sms_http.rb
 - sms_topic_server.rb
 - sms_topic_server_control.rb