routo 0.0.2 → 0.0.3

data/lib/routo.rb

@@ -42,5 +42,11 @@ module Routo
   def self.send_sms msg, *numbers
     Message.new(msg).send_sms(*numbers)
   end
+
+  # not tested
+  def self.balance
+    balance = open("http://smsc5.routotelecom.com/balance.php?username=#{URI.encode(Routo.username)}=&password=#{URI.encode(Routo.password)}")
+    balance.to_i
+  end
   
 end

data/lib/routo/exception.rb

@@ -2,7 +2,8 @@ module Routo
 
   module Exception
     class Base < ::Exception
-      def initialize msg
+      def initialize message, body
+        msg = "[number=#{message.recipients}] #{msg}"
         super(msg)
       end
     end

data/lib/routo/exception/no_credits_left.rb

@@ -1,8 +1,8 @@
 module Routo
   module Exception
     class NoCreditsLeft < Base
-      def initialize msg
-        super(msg)
+      def initialize message, text
+        super(message, text)
         Pony.mail(:to => Routo.email, :subject => Routo.no_credits_left[:subject], :body => Routo.no_credits_left[:body]) if Routo.email && Routo.no_credits_left.present? && Routo.no_credits_left_sent_at.to_i<(Time.now.to_i-Routo.seconds_between_mails)
         Routo.no_credits_left_sent_at = Time.now
       end

data/lib/routo/message.rb

@@ -3,6 +3,7 @@ module Routo
   class Message
 
     attr_accessor :text
+    attr_accessor :recipients
 
     def initialize text
       @text = text
@@ -11,25 +12,25 @@ module Routo
 
     def send_sms *numbers
       options = numbers.last.is_a?(Hash) ? numbers.last : {}
-      recipients = numbers.map{|n| Number.new(n)}
+      @recipients = numbers.map{|n| Number.new(n)}
       begin
-        parse_response(Net::HTTP.post_form(URI.parse(Routo.http_api_url), params(*recipients, options)))
+        parse_response(Net::HTTP.post_form(URI.parse(Routo.http_api_url), params(options)))
       rescue Routo::Exception::SystemError, Routo::Exception::Failed # trying with backup url if Routo returns an internal error
         begin # here a mail error should not prevent the sms to be send
           Pony.mail(:to => Routo.email, :subject => Routo.using_backup_url[:subject], :body => Routo.using_backup_url[:body]) if Routo.email && Routo.using_backup_url.present? && Routo.using_backup_url_sent_at.to_i<(Time.now.to_i-Routo.seconds_between_mails)
           Routo.using_backup_url_sent_at = Time.now
         ensure
-          parse_response(Net::HTTP.post_form(URI.parse(Routo.http_api_url_backup), params(*recipients, options)))
+          parse_response(Net::HTTP.post_form(URI.parse(Routo.http_api_url_backup), params(options)))
         end
       end
     end
 
     private
 
-    def params *number_objects, options
+    def params options
       {:user => Routo.username,
        :pass => URI.encode(Routo.password),
-       :number => number_objects.map(&:number).join(','),
+       :number => @recipients.map(&:number).join(','),
        :ownnum => Routo.ownnum,
        :message => URI.encode(@text),
        :type => Routo.type,
@@ -47,21 +48,21 @@ module Routo
       Rails.logger.debug "msg: "+rep.message.inspect
       case rep.body
         when /success/i           then return true
-        when /error/i             then raise Routo::Exception::Error.new(rep.body)
-        when /auth_failed/i       then raise Routo::Exception::AuthFailed.new(rep.body)
-        when /wrong_number/i      then raise Routo::Exception::WrongNumber.new(rep.body)
-        when /not_allowed/i       then raise Routo::Exception::NotAllowed.new(rep.body)
-        when /too_many_numbers/i  then raise Routo::Exception::TooManyNumbers.new(rep.body)
-        when /no_message/i        then raise Routo::Exception::NoMessage.new(rep.body)
-        when /too_long/i          then raise Routo::Exception::TooLong.new(rep.body)
-        when /wrong_type/i        then raise Routo::Exception::WrongType.new(rep.body)
-        when /wrong_message/i     then raise Routo::Exception::WrongMessage.new(rep.body)
-        when /wrong_format/i      then raise Routo::Exception::WrongFormat.new(rep.body)
-        when /bad_operator/i      then raise Routo::Exception::BadOperator.new(rep.body)
-        when /failed/i            then raise Routo::Exception::Failed.new(rep.body)
-        when /sys_error/i         then raise Routo::Exception::SystemError.new(rep.body)
-        when /no credits left/i   then raise Routo::Exception::NoCreditsLeft.new(rep.body)
-        else raise Routo::Exception::Base.new(rep.body)
+        when /error/i             then raise Routo::Exception::Error.new(self, rep.body)
+        when /auth_failed/i       then raise Routo::Exception::AuthFailed.new(self, rep.body)
+        when /wrong_number/i      then raise Routo::Exception::WrongNumber.new(self, rep.body)
+        when /not_allowed/i       then raise Routo::Exception::NotAllowed.new(self, rep.body)
+        when /too_many_numbers/i  then raise Routo::Exception::TooManyNumbers.new(self, rep.body)
+        when /no_message/i        then raise Routo::Exception::NoMessage.new(self, rep.body)
+        when /too_long/i          then raise Routo::Exception::TooLong.new(self, rep.body)
+        when /wrong_type/i        then raise Routo::Exception::WrongType.new(self, rep.body)
+        when /wrong_message/i     then raise Routo::Exception::WrongMessage.new(self, rep.body)
+        when /wrong_format/i      then raise Routo::Exception::WrongFormat.new(self, rep.body)
+        when /bad_operator/i      then raise Routo::Exception::BadOperator.new(self, rep.body)
+        when /failed/i            then raise Routo::Exception::Failed.new(self, rep.body)
+        when /sys_error/i         then raise Routo::Exception::SystemError.new(self, rep.body)
+        when /no credits left/i   then raise Routo::Exception::NoCreditsLeft.new(self, rep.body)
+        else raise Routo::Exception::Base.new(self, rep.body)
       end
     end
 

metadata

@@ -2,7 +2,7 @@
 name: routo
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors: 
 - Adrien Rambert
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-22 00:00:00 +01:00
+date: 2011-03-23 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency