smsc_manager 0.5.1 → 0.5.6

data/Manifest.txt

@@ -4,6 +4,7 @@ CHANGELOG.txt
 Manifest.txt
 setup.rb
 config/smsc.yml
+config/database.yml
 bin/smsc_config.rb
 bin/smsc_print_config.rb
 bin/send_sms_post.rb
@@ -19,6 +20,7 @@ bin/sms_om_server.rb
 lib/smsc_manager/version.rb
 lib/smsc_manager/sms.rb
 lib/smsc_manager/smsc_listener.rb
+lib/smsc_manager/smsc_stomp_connection.rb
 lib/smsc_manager/sms_statistics_listener.rb
 lib/smsc_manager/sms_send_topic.rb
 lib/smsc_manager/broadcast.rb
@@ -26,6 +28,7 @@ lib/smsc_manager/broadcast_topic.rb
 lib/smsc_manager/smsc_connection.rb
 lib/smsc_manager.rb
 test/test_helper.rb
+app/models/sms_log.rb
 test/smsc_manager_test.rb
 examples/receive_sms_controller.rb
-examples/stomp
+examples/stomp

data/README.txt

@@ -4,7 +4,7 @@ README for smsc_manager
 
 
 For more info:   www.ficonab.com
-				 scott.sproule@gmail.com
+				 scott.sproule@ficonab.com
 
 To print smsc settings:
 bin/print_smsc_config.rb 

data/app/models/sms_log.rb

@@ -0,0 +1,70 @@
+
+class SmsLog < ActiveRecord::Base
+  def self.log(user, sms)
+      sms_transaction_log = SmsLog.new
+ #    sms_transaction_log.user=user
+      sms_transaction_log.setup(sms)
+      sms_transaction_log.username=user
+      sms_transaction_log.save!   
+    end
+    def self.log_result(res, user, sms,flag)
+        sms_transaction_log = SmsLog.new
+   #    sms_transaction_log.user=user
+        sms_transaction_log.setup(sms)
+        sms_transaction_log.username=user
+        case flag
+         when true
+              if res.kind_of? Net::HTTPResponse    
+                  sms_transaction_log.response=res.code      
+                  sms_transaction_log.response_body=res.body
+              else
+                    sms_transaction_log.response=202
+                    sms_transaction_log.response_body=res 
+              end
+          else
+               sms_transaction_log.response=9000
+               sms_transaction_log.response_body=res.to_s
+         end
+          sms_transaction_log.save!   
+      end
+    def setup(sms)
+      self.sms_content=sms.text
+      self.destination=sms.destination
+      self.source= sms.source
+    end
+  
+  #this needs to be fixed....
+  def self.send_sms_and_log(user, sms)
+
+ #    sms_transaction_log.user=user
+       successflag=false
+       begin
+       sms_sender= SmscManager::SmsSendTopic.new
+       r= sms_sender.send_topic_sms(sms)
+       sms_sender.disconnect_stomp
+       successflag=true
+     rescue  Exception => e
+       r = "send failed with #{e.message}"
+     end
+      SmscManager::SmsLog.log_result(r,user,sms,successflag)
+   end
+   
+   
+   # THIS NEEDs TO bE FixED,,, change to text rather string in database as well.
+   def self.send_mms_and_log(user, mms)
+       
+   #    sms_transaction_log.user=user
+          successflag=false
+        begin
+      
+         mms_sender= MmscManager::MmsSendTopic.new
+         r= mms_sender.send_topic_mms(mms)
+         mms_sender.disconnect_stomp
+         successflag=true
+
+       rescue  Exception => e
+          r = "send failed with #{e.message}"
+       end
+        SmscManager::SmsLog.log_result(r,user,mms,successflag)
+     end
+end

data/bin/internal_sms_load_test.rb

@@ -64,13 +64,13 @@ def send_group(arg_hash,sms_sender)
      sms_sender.send_topic_sms_receipt(s) { |m| receipt_count-=1
                                               #  puts "receipt: #{receipt_count}" 
                                                 }
-      sleep(1) if c % 100 == 0   
+      #sleep(1) if c % 100 == 0   
       Thread.pass
     }
   
    # sms_sender.close_topic
         begin
-       Timeout::timeout(count*0.5) {
+       Timeout::timeout(count*0.75) {
             while true  
                puts "sent #{count} waiting for #{receipt_count} receipts"
                exit(0) if receipt_count==0   
@@ -81,7 +81,7 @@ def send_group(arg_hash,sms_sender)
          rescue Exception => e
           puts "exception #{e.message} class: #{e.class}"
           puts  "#{e.backtrace}"
-          raise e 
+         # raise e 
         
          end
          receipt_count
@@ -89,6 +89,7 @@ end
     puts "Finding sms topic to use:"
     begin
       sms_sender=SmscManager::SmsSendTopic.new(arg_hash)    
+      sms_sender.setup_auto_close
       # sms_sender.setup_auto_close   #only call this once  # servers onlycall cloase
    rescue Exception => e
       puts "exception found #{e.backtrace}" 
@@ -101,8 +102,14 @@ end
      no_receipt_count=0
      1.upto(repeat) { |r|
        no_receipt_count+=send_group(arg_hash,sms_sender)
-       sleep(1)
-       
+     #  sleep(1)
+       diff = Time.now - start
+       puts "#{Time.now} Sent #{count*r} in #{diff} seconds with #{no_receipt_count} problems"
+      
+       completion = r.to_f/repeat*100
+        puts "Percent complete: #{completion}"
+        no_prob = count*r - no_receipt_count
+        puts " Average message per second is: #{no_prob/diff}"
        }
              
         diff = Time.now - start

data/bin/send_sms.rb

@@ -1,51 +1,34 @@
 #!/usr/bin/env ruby
-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. -h hostname optional"
-   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("-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)
+# == Synopsis
+#   send sms via sdp
+# == Usage
+#   send_sms.rb -u user -m msisdn -s source -t text 
+# == Useful commands
+# send_sms.rb -u scot -m 639993130030 -s 888 -t 'hello there' 
+# == Author
+#   Scott Sproule  --- Ficonab.com (scott.sproule@ficonab.com)
+# == Copyright
+#    Copyright (c) 2007 Ficonab Pte. Ltd.
+#     See license for license details
+  
+   require 'optparse'
+   require 'rubygems'
+   gem 'stomp_message'
+   require 'stomp_message'
+   require 'rdoc/usage'
+
+    arg_hash=StompMessage::Options.parse_options(ARGV)
+    RDoc::usage if   arg_hash[:msisdn]==nil || arg_hash[:text] == nil || arg_hash[:source] == nil || arg_hash[:help]==true
+
 require 'pp'
 
-require 'rubygems'
 gem 'smsc_manager'
 require 'smsc_manager'
 
     puts "Finding sms topic to use:"
     begin
-      sms_sender=SmscManager::SmsSendTopic.new(arg_hash)   
+      sms_sender=SmscManager::SmsSendTopic.new(arg_hash)  
+      sms_sender.setup_auto_close 
    rescue Exception => e
       puts "exception found #{e.backtrace}" 
    end  

data/bin/send_sms_http.rb

@@ -1,40 +1,24 @@
 #!/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)
+# == Synopsis
+#   send sms via http
+# == Usage
+#   send_sms_http.rb -u user -m msisdn -s source -t text 
+# == Useful commands
+# send_sms_http.rb -u scot -m 639993130030 -s 888 -t 'hello there' 
+# == Author
+#   Scott Sproule  --- Ficonab.com (scott.sproule@ficonab.com)
+# == Copyright
+#    Copyright (c) 2007 Ficonab Pte. Ltd.
+#     See license for license details
+  
+   require 'optparse'
+   require 'rubygems'
+   gem 'stomp_message'
+   require 'stomp_message'
+   require 'rdoc/usage'
+
+    arg_hash=StompMessage::Options.parse_options(ARGV)
+    RDoc::usage if   arg_hash[:msisdn]==nil || arg_hash[:text] == nil || arg_hash[:source] == nil || arg_hash[:help]==true
 require 'pp'
 
 require 'rubygems'

data/bin/send_sms_load_test.rb

@@ -50,6 +50,7 @@ require 'smsc_manager'
     puts "Finding sms topic to use:"
     begin
       sms_sender=SmscManager::SmsSendTopic.new(arg_hash)    
+      sms_sender.setup_auto_close
    rescue Exception => e
       puts "exception found #{e.backtrace}" 
    end  

data/bin/send_sms_post.rb

@@ -1,51 +1,27 @@
 #!/usr/bin/env ruby
+#!/usr/bin/env ruby
+# == Synopsis
+#   send sms via http post to sdp topic  --- example for content providers
+# == Usage
+#   send_sms_post.rb -u user -m msisdn -s source -t text -h host -p port -T topic -U url
+# == Sample commands
+# send_sms_post.rb  -u scot -s 888 -m 639993130030 -t testing -h localhost -p 8161 -T sms
+# == Author
+#   Scott Sproule  --- Ficonab.com (scott.sproule@ficonab.com)
+# == Copyright
+#    Copyright (c) 2007 Ficonab Pte. Ltd.
+#     See license for license details
+
 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 'rubygems'
+gem 'stomp_message'
+require 'stomp_message'
+require 'rdoc/usage'
+
+        arg_hash=StompMessage::Options.parse_options(ARGV)
+        RDoc::usage if   arg_hash[:msisdn]==nil || arg_hash[:text] == nil || arg_hash[:source] == nil || arg_hash[:help]==true
 require 'pp'
 
-require 'rubygems'
 gem 'smsc_manager'
 require 'smsc_manager'
 require 'net/http'
@@ -58,15 +34,9 @@ require 'net/http'
      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
+     url="#{arg_hash[:topic]}?m.to_xml"
+     arg_hash[:url]="/demo/message/" << arg_hash[:topic] if arg_hash[:url]==nil
+       msg_sender=StompMessage::StompSendTopic.new(arg_hash) 
+       msg_sender.post_stomp(m, {})
+ 
     

data/bin/sms_om_server.rb

@@ -1,4 +1,16 @@
 #!/usr/bin/env ruby
+# == Synopsis
+#   start up the sms om listener.  OM = Operational Measurements. This is the statistics/repoting tool listening to sdp message
+# == Usage
+#   sms_om_server.rb 
+# change the number of threads, and other key variables below to control system performance
+# == Useful commands
+# sms_om_server.rb 
+# == Author
+#   Scott Sproule  --- Ficonab.com (scott.sproule@ficonab.com)
+# == Copyright
+#    Copyright (c) 2007 Ficonab Pte. Ltd.
+#     See license for license details
 require 'optparse'
 def usage
     puts "Usage: sms_topic_server.rb to start up listener " 
@@ -12,7 +24,7 @@ require 'smsc_manager'
     puts "Starting Operational Measurement (OM) server:"
   #  begin
   # can add additional options to change host/port etc
-      sms_listener=SmscManager::SmsStatisticsListener.new({:topic => '/topic/sms', :thread_count => '5'}).run
+      sms_listener=SmscManager::SmsStatisticsListener.new({:topic => '/topic/sms', :thread_count => '3'}).run
     #  sms_listener.join
    # rescue Exception => e
       puts "exception found #{e.backtrace}" 

data/bin/sms_topic_server.rb

@@ -1,17 +1,34 @@
 #!/usr/bin/env ruby
+# == Synopsis
+#   start up the sms topic listener.  This is the key component for listening to sdp message
+# == Usage
+#   sms_topic_server.rb path_to_sms_model_files rails_environment
+# change the number of threads, and other key variables below to control system performance
+# == Useful commands
+# sms_topic_server.rb ./ development    --- if in development environment
+# sms_topic_server.rb      --- if in production environment and config ok.
+# == Author
+#   Scott Sproule  --- Ficonab.com (scott.sproule@ficonab.com)
+# == Copyright
+#    Copyright (c) 2007 Ficonab Pte. Ltd.
+#     See license for license details
 require 'optparse'
 def usage
     puts "Usage: sms_topic_server.rb to start up listener " 
+    puts "Usage: sms_topic_server.rb path_to_subscriptions_rails_app environment " 
+      puts "eg: sms_topic_server.rb ./ development " 
    exit
 end
 
 require 'rubygems'
 gem 'smsc_manager'
 require 'smsc_manager'
-
-    puts "Starting topic server:"
+   env_setting = ARGV[1] || "production"
+   path_setting = ARGV[0] || "/opt/local/rails_apps/smsapp/current/"
+   puts "Starting SMSC Topic Server topic server:  path:  #{path_setting} environment: #{env_setting}"
+    #puts "Starting topic server:"
   #  begin
-      SmscManager::SmscListener.new({:topic => '/topic/sms', :thread_count => '14'}).run
+      SmscManager::SmscListener.new({:topic => '/topic/sms', :thread_count => '10', :env => env_setting, :root_path => path_setting }).run
    #   sms_listener.join
    # rescue Exception => e
       puts "exception found #{e.backtrace}" 

data/bin/sms_topic_server_control.rb

@@ -1,4 +1,17 @@
 #!/usr/bin/env ruby
+#!/usr/bin/env ruby
+# == Synopsis
+#   daemonize the sms topic listener.  For use in production environment
+# == Usage
+#   sms_topic_server_control.rb start
+#  sms_topic_server_control.rb stop
+# == Useful commands
+# supports other daemons commands
+# == Author
+#   Scott Sproule  --- Ficonab.com (scott.sproule@ficonab.com)
+# == Copyright
+#    Copyright (c) 2007 Ficonab Pte. Ltd.
+#     See license for license details
 require 'optparse'
 require 'rubygems'
 gem 'smsc_manager'

data/config/database.yml

@@ -0,0 +1,35 @@
+# MySQL (default setup).  Versions 4.1 and 5.0 are recommended.
+#
+# Install the MySQL driver:
+#   gem install mysql
+# On MacOS X:
+#   gem install mysql -- --include=/usr/local/lib
+# On Windows:
+#   There is no gem for Windows.  Install mysql.so from RubyForApache.
+#   http://rubyforge.org/projects/rubyforapache
+#
+# And be sure to use new-style password hashing:
+#   http://dev.mysql.com/doc/refman/5.0/en/old-client.html
+development:
+  adapter: mysql
+  database: smsapp_development
+  username: root
+  password: Abby789
+  host: localhost
+
+# Warning: The database defined as 'test' will be erased and
+# re-generated from your development database when you run 'rake'.
+# Do not set this db to the same as development or production.
+test:
+  adapter: mysql
+  database: smsapp_test
+  username: root
+  password: Abby789
+  host: localhost
+
+production:
+  adapter: mysql
+  database: smsapp_production
+  username: root
+  password: Abby789
+  host: localhost

data/lib/smsc_manager/broadcast_topic.rb

@@ -44,8 +44,11 @@ class BroadcastTopic
                
               # puts "  dst is #{dst}" 
                }
-    puts "populate topic sent #{self.sent}"
-    sleep(1)
+   
+     sleep(2)  # should we wait till we get receipts for all?
+     puts "populate topic sent #{self.sent}"
+    sleep(self.attempts*0.5+1) if self.sent!=self.attempts
+     puts "populate topic sent after sleep #{self.sent}"
     self.sms_sender.disconnect_stomp
   end
   def send_it(txt,dst)

data/lib/smsc_manager/sms.rb

@@ -11,7 +11,7 @@ end
 class 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
+  attr_accessor :text, :source, :destination #, :orig_txt
   def self.max_length
     @@MAX_SIZE
   end
@@ -22,13 +22,16 @@ class Sms
     @@msisdn_valid_prefix.each {|t| sentence << t <<" " }
     sentence
   end
+  def get_message_content
+    self.text
+  end
   def self.starts_with?(prefix,dest)
             prefix = prefix.to_s
             return false if dest == nil
             dest[0, prefix.length] == prefix
           end
   def initialize(txt,dest,src='888')
-    self.orig_txt=txt
+  #  self.orig_txt=txt
     self.destination=dest
     self.source=src
     self.text=strip_text(txt)
@@ -51,21 +54,7 @@ class Sms
    # doc= REXML::Document.new sms_xml.to_s
    # doc.to_s
   end
-  def to_xml_old
-    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
@@ -77,9 +66,10 @@ class Sms
     #limit to @@MAX_SIZE characters
       ret=""
       size=[val.size,@@MAX_SIZE].min-1
-    0.upto(size) do |i|
-      ret << val[i]
-    end
+ #   0.upto(size) do |i|
+   #   ret << val[i]
+ #   end
+      ret=val[0..size]
     ret
   end
     def strip_text(txt) 
@@ -88,9 +78,10 @@ class Sms
             result=txt.gsub(/@/,"(at)")   # replace all at signs  return result
         #    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=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
 end

data/lib/smsc_manager/smsc_connection.rb

@@ -24,7 +24,7 @@ class SmscConnection
        s= Time.now - s
        end
       #  puts "#{Time.now}  result #{hostname}  flag: #{flag} res: #{res} time #{s}"
-       puts "-res #{@res} -time #{s}"
+       puts "-res #{@res} -time #{s} dest: #{destination} src: #{source}"
        return @res
    end
     def self.path_to_config
@@ -71,8 +71,8 @@ class SmscConnection
   
    # URL Encoded specific to Kannel that is why not part of model
     def sms_send(sms)
-     
-      txt_encoded=ERB::Util.url_encode(sms.text)
+      text= ERB::Util.html_escape(sms.text)
+      txt_encoded=ERB::Util.url_encode(text)
     #  txt_encoded=limit_text(txt_encoded)
      # smsc=SmscManager::SmscConnection.factory     
       internal_send(txt_encoded,sms.destination,sms.source)

data/lib/smsc_manager/smsc_listener.rb

@@ -6,33 +6,34 @@ require 'stomp'
 gem 'stomp_message'
 require 'stomp_message'
 module SmscManager
-class SmscListener < StompMessage::StompServer
+class SmscListener < StompMessage::StompZActiveRecordServer
    @@MAX_THROUGHPUT =5  # in messages per second
    SLEEP_TIME=1/@@MAX_THROUGHPUT    #sleep x seconds to slow down system
   attr_accessor :smsc
   #need to define topic, host properly
   # @@TOPIC='/topic/sms'
   def initialize(options={})
+    self.model_list = []
+    self.model_list << "sms_log.rb"
     super(options)
-    self.smsc=SmscManager::SmscConnection.factory
+    #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 archive_sms(res,sms)
+   # do I need to do exception handling in here
+   flag= res.kind_of? Net::HTTPResponse
+   SmsLog.log_result(res, 'stomp_message', sms,flag )
+ end
+ def setup_thread_specific_items(mythread_number)
+    super(mythread_number)
+    puts " ----creating smsc for #{Thread.current[:name]}"
+    Thread.current[:smsc]= SmscManager::SmscConnection.factory
+  end
   def stomp_SMS(msg, stomp_msg)
      sms=SmscManager::Sms.load_xml(msg.body)
-      puts "sending sms #{msg.body}" if @debug
-     res= self.smsc.send(sms)
-     
+      puts "#{Thread.current[:name]}sending sms #{msg.body}" if @debug
+     res= Thread.current[:smsc].send(sms)
+     archive_sms(res,sms)
    #  sleep(SLEEP_TIME)  #only 5 messages per second max
   end
   

data/lib/smsc_manager/smsc_stomp_connection.rb

@@ -0,0 +1,41 @@
+require 'yaml'
+require 'erb'
+require 'timeout'
+require 'net/http'
+module SmscManager
+class SmscStompConnection 
+ # use block for timers etc
+ @@timeout_max = 10 #10 second timeout to contact sms server
+ attr_accessor :hostname, :port, :username, :password, :url, :topic
+  def intialize(args)
+    self.url="/TopicSMS/TopicSMS"
+    self.topic = 'sms'
+    self.hostname = 'x.x.x.x'
+    self.port='8161'
+  end
+ 
+   def send(sms)
+      sms_send(sms)
+    end
+   def test(sms)
+      send(sms)
+   end
+  # asssumes http post --- can be modified for other messaging of course
+    def sms_send(sms)
+       puts "create stomp message"
+       m=SmscManager::SmsSendTopic.create_stomp_message(sms.text,sms.destination,sms.source)
+       puts "message is #{m.to_xml}"
+       # original puts "hostname: #{arg_hash[:host]} port #{arg_hash[:port]}"
+       arg_hash={}
+       arg_hash[:host]=self.hostname
+       argh_hash[:port]=self.port
+          puts "hostname: #{self.hostname} port #{arg_hash[:port]}"
+       url="#{arg_hash[:topic]}?m.to_xml"
+       arg_hash[:url]=self.url
+       arg_hash[:topic]=self.topic
+         msg_sender=StompMessage::StompSendTopic.new(arg_hash) 
+         msg_sender.post_stomp(m, {})
+    end
+ 
+ end
+end

data/lib/smsc_manager/version.rb

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

data/test/smsc_manager_test.rb

@@ -60,6 +60,11 @@ class SmscManagerTest < Test::Unit::TestCase
       sms=SmscManager::Sms.new(nil,'09996557890','websource')
       assert sms.text==" ", "text not correct for nil"
   end
+  def test_sms_text_ampersand
+       sms=SmscManager::Sms.new('test & test','639996557890','websource')
+       sms2=SmscManager::Sms.load_xml(sms.to_xml)
+       assert sms.to_xml==sms2.to_xml, "xml bad with ampersand"
+   end
   def test_broadcast_two
      list = %w(9991 9992)
      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.5.1
-date: 2007-10-08 00:00:00 +08:00
+  version: 0.5.6
+date: 2007-11-02 00:00:00 +08:00
 summary: connection to smsc via http using kannel
 require_paths: 
 - lib
@@ -35,6 +35,7 @@ files:
 - Manifest.txt
 - setup.rb
 - config/smsc.yml
+- config/database.yml
 - bin/smsc_config.rb
 - bin/smsc_print_config.rb
 - bin/send_sms_post.rb
@@ -50,6 +51,7 @@ files:
 - lib/smsc_manager/version.rb
 - lib/smsc_manager/sms.rb
 - lib/smsc_manager/smsc_listener.rb
+- lib/smsc_manager/smsc_stomp_connection.rb
 - lib/smsc_manager/sms_statistics_listener.rb
 - lib/smsc_manager/sms_send_topic.rb
 - lib/smsc_manager/broadcast.rb
@@ -57,6 +59,7 @@ files:
 - lib/smsc_manager/smsc_connection.rb
 - lib/smsc_manager.rb
 - test/test_helper.rb
+- app/models/sms_log.rb
 - test/smsc_manager_test.rb
 - examples/receive_sms_controller.rb
 - examples/stomp