smsc_manager 0.2.5 → 0.2.6

data/bin/send_sms.rb

@@ -3,6 +3,7 @@ if ARGV.size !=4
    puts "Usage: send_sms.rb  user destination source text"
    exit
 end
+require 'pp'
 
 require 'rubygems'
 gem 'smsc_manager'
@@ -14,7 +15,7 @@ require 'smsc_manager'
    rescue Exception => e
       puts "exception found" 
    end
-     puts "Found smsc: #{smsc.hostname}"
+     puts "Found smsc: #{smsc.hostname} port #{smsc.port}"
      
      user=ARGV[0]
      destination=ARGV[1]
@@ -22,7 +23,10 @@ require 'smsc_manager'
      text=ARGV[3]
      sms=SmscManager::Sms.new(text,destination,source)
      puts "Sending user: #{user} destination: #{destination}  text: #{text}"
-     res= smsc.test(sms)
-   #   puts "Response code: #{res.response} body: #{res.response_body}" 
-   puts "Response code: #{res.response}"
+     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/lib/smsc_manager/smsc_connection.rb

@@ -10,7 +10,7 @@ class SmscConnection
   
  # def intialize(pass, user, port=13013, host='localhost')
  # end
-  def send_block(smsc,text,destination,source)
+  def send_block(text,destination,source)
       @flag=false
       s = Time.now    #max forty second timeout
       @res='before'
@@ -34,13 +34,13 @@ class SmscConnection
     def dump
       #change this in database or here
       test_path=SmscManager::SmscConnection.path_to_config
-      puts "Path to config file is: #{test_path}"
+   #   puts "Path to config file is: #{test_path}"
       config = File.open(test_path,'w') { |f| YAML.dump(self,f) }
     end
    def self.load_smsc
      #change this in database or here
      test_path=self.path_to_config
-     puts "Path to config file is: #{test_path}"
+    # puts "Path to config file is: #{test_path}"
      config = File.open(test_path) { |f| YAML.load(f) }
     #puts "config is: #{config} config.class is: #{config.class}"
     if config.class==SmscManager::SmscConnection
@@ -55,34 +55,12 @@ class SmscConnection
    end
      smsc
    end
-   def sms_send_log(user, sms)
-      sms_transaction_log = SmsLog.new
- #    sms_transaction_log.user=user
-       begin
-      sms_transaction_log.sms_content=sms.text
-      sms_transaction_log.destination=sms.destination
-      sms_transaction_log.source=sms.source
-      sms_transaction_log.username=user
-     
-       r= sms_send(sms)
-       
-       if r.kind_of? Net::HTTPResponse    
-          sms_transaction_log.response=r.code      
-          sms_transaction_log.response_body=r.body
-        else
-           sms_transaction_log.response=9000
-           sms_transaction_log.response_body=r.to_s
-        end
-    
-     rescue  Exception => e
-       sms_transaction_log.response=9999
-       sms_transaction_log.response_body=e
-     end
-      sms_transaction_log.save!
-      sms_transaction_log
-   end
+   
+   def send(sms)
+      sms_send(sms)
+    end
    def test(sms)
-     sms_send(sms)
+      send(sms)
    end
    def self.factory
      SmscManager::SmscConnection.load_smsc
@@ -96,16 +74,16 @@ class SmscConnection
      
       txt_encoded=ERB::Util.url_encode(sms.text)
     #  txt_encoded=limit_text(txt_encoded)
-      smsc=SmscManager::SmscConnection.factory     
-      internal_send(smsc,txt_encoded,sms.destination,sms.source)
+     # smsc=SmscManager::SmscConnection.factory     
+      internal_send(txt_encoded,sms.destination,sms.source)
     end
     private
-    def internal_send(smsc,text,destination,source)
+    def internal_send(text,destination,source)
       
-      return send_block(smsc,text,destination,source) {  
-          ht =Net::HTTP.start(smsc.hostname,smsc.port)
-          puts "hostname: #{smsc.hostname} port #{smsc.port}"
-          url="/cgi-bin/sendsms?username=#{smsc.username}&password=#{smsc.password}&from=#{source}&to=#{destination}&text=#{text}"
+      return send_block(text,destination,source) {  
+          ht =Net::HTTP.start(self.hostname,self.port)
+          puts "hostname: #{self.hostname} port #{self.port} destination #{destination}"
+          url="/cgi-bin/sendsms?username=#{self.username}&password=#{self.password}&from=#{source}&to=#{destination}&text=#{text}"
           r=ht.get(url)
           puts "url was: #{url}"
           @res = r.code

data/lib/smsc_manager/version.rb

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

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.9.2
 specification_version: 1
 name: smsc_manager
 version: !ruby/object:Gem::Version 
-  version: 0.2.5
-date: 2007-02-12 00:00:00 +08:00
+  version: 0.2.6
+date: 2007-02-13 00:00:00 +08:00
 summary: connection to smsc via http using kannel
 require_paths: 
 - lib