smsc_manager 0.4.7 → 0.4.8

data/bin/send_sms_load_test.rb

@@ -66,7 +66,7 @@ require 'smsc_manager'
        sms_sender.send_sms(final_text,destination,source)
       }
       diff = Time.now - start
-      
+      sms_sender.close_topic
     	puts "#{Time.now} Sent #{count} in #{diff} seconds";
     # puts "Sending user: #{user} destination: #{destination}  text: #{text}"
    #  res= smsc.send(sms)

data/lib/smsc_manager/broadcast_topic.rb

@@ -45,18 +45,20 @@ class BroadcastTopic
               # puts "  dst is #{dst}" 
                }
     puts "populate topic sent #{self.sent}"
+    self.sms_sender.close_topic
   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.sms_sender.send_topic_sms(sms)
      self.attempts+=1
      self.sent+=1
      rescue  Exception => e
        self.sent-=1
-       puts "bad values dst: #{dst} txt: #{txt2} msg: #{e.message}"
+       puts "bad values dst: #{dst} txt: #{txt} msg: #{e.message}"
      end
+     self.sms_sender.close_topic
    end
   end
 end

data/lib/smsc_manager/sms_send_topic.rb

@@ -6,7 +6,7 @@ gem 'stomp_message'
 require 'stomp_message'
 # This sends the sms to a activemq topic
 module SmscManager
-class SmsSendTopic
+class SmsSendTopic < StompMessage::StompSendTopic
   attr_accessor :conn
   #need to define topic, host properly
   @@TOPIC='/topic/sms'
@@ -14,11 +14,9 @@ class SmsSendTopic
   @@STOMP_SMS_MESSAGE='stomp_SMS'
  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" }
+    options[:topic] =   options[:topic]==nil ? @@TOPIC : options[:topic]
+    puts "#{self.class}: host is: #{host} port is #{port} topic is #{options[:topic]}"
+    super(options)
     puts "finished initializing"
   end
  # def initialize()
@@ -28,14 +26,15 @@ class SmsSendTopic
  #   end
   def send_sms(text,destination,source)
          sms=SmscManager::Sms.new(text,destination,source)
-         self.send_topic(sms)
+         self.send_topic_sms(sms)
   end #send_sms
-  def send_topic(sms)
+  def send_topic_sms(sms)
          #sms=SmscManager::Sms.new(text,destination,source)
         # msgbody=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'}
+         headers = {:msisdn =>"#{sms.destination}"}
+         send_topic(m, headers)     
   end #send_sms
   # simple script to show xml message
   def self.create_stomp_message(txt,dest,src)

data/lib/smsc_manager/version.rb

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

data/test/smsc_manager_test.rb

@@ -37,11 +37,11 @@ class SmscManagerTest < Test::Unit::TestCase
     sms=SmscManager::Sms.new('hello scott','09996557890','websource')
     begin
     smsc=SmscManager::SmsSendTopic.new()
-    r=smsc.send_topic(sms)
+    r=smsc.send_topic_sms(sms)
     end
     puts "test send topic"
      smsc=SmscManager::SmsSendTopic.new({:host => '127.0.0.1'})
-      r=smsc.send_topic(sms)
+      r=smsc.send_topic_sms(sms)
       puts "test send topic after host"
   end
   def test_smsc_db    

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.9.4
 specification_version: 1
 name: smsc_manager
 version: !ruby/object:Gem::Version 
-  version: 0.4.7
-date: 2007-10-01 00:00:00 +08:00
+  version: 0.4.8
+date: 2007-10-03 00:00:00 +08:00
 summary: connection to smsc via http using kannel
 require_paths: 
 - lib