smshelper 0.2.10 → 0.3.0

data/README.rdoc

@@ -11,16 +11,22 @@ A small utility library to do SMS-MT
 * www.esendex.com
 * www.mediaburst.co.uk
 * www.nexmo.com
+* www.vianett.com
+* www.traitel.com.au
+* www.my-cool-sms.com
+* www.aql.com
 == Features
 
-* unicode support
+* NEW HLR lookup support via my-cool-sms
+* unicode support - all operators
 * send message
 * check balance
-* check sent message status
+* check sent message status - select operators only
 == Installation
 
 gem install smshelper
 == Usage
+
   require 'smshelper'
   config = Smshelper::Config.new(
                                  :webtext => {:uname => '', :passwd => ''},
@@ -47,8 +53,9 @@ gem install smshelper
 == TODO:
 
 * create tests
-* refactor
-* add support for www.totext.net, www.my-cool-sms.com, sms.vianett.com, www.world-text.com, www.mpulse.eu, www.clicksms.co.uk, www.tellustalk.com, www.aql.com, www.tm4b.com, www.txtnation.com, www.smsextrapro.com, www.truesenses.com, www.traitel.com.au
+* refactor / rewrite class factories as modules
+* handle sms of any size - operator specific settings
+* add support for www.totext.net, www.world-text.com, www.mpulse.eu, www.clicksms.co.uk, www.tellustalk.com, www.tm4b.com, www.txtnation.com, www.smsextrapro.com, www.truesenses.com, www.routomessaging.net
 == Contributing to smshelper
 
 * Check out the latest master to make sure the feature hasn't been implemented or the bug hasn't been fixed yet.

data/VERSION

@@ -1 +1 @@
-0.2.10
+0.3.0

data/lib/smshelper/api/aql.rb

@@ -10,7 +10,33 @@ module Smshelper
       end
 
       def send_message(message)
-        (post 'sms_gw.php')
+        uuid = (Digest::CRC32.hexdigest @uuid.generate).unpack('U*').collect {|x| sprintf '%02X', x}.join
+
+        message.utf_8 ? (q = {:allow_unicode => '1'}) : (q = {})
+        options = {
+          :destination => message.recipient,
+          :originator => message.sender,
+          :message => message.text}
+        options = options.merge(@extra_options) unless @extra_options.nil?
+        # raise ArgumentError, ":dlr_url is required to track messages" unless options.include?(:dlr_url)
+        (options[:dlr_url] = options[:dlr_url] + "?status=%code&destination=%dest&message_id=#{uuid}") if options.include?(:dlr_url)
+        resp = (post 'sms_gw.php', :extra_query => options.merge(q))
+        process_response_code(resp.to_s) ? (@sent_message_ids << uuid; uuid) : (raise ErrorDuringSend, resp)
+      end
+
+      def get_balance
+        {'Credits' => (post 'postmsg.php', :extra_query => {:cmd => :credit}).split('=').last}
+      end
+
+      def get_status
+        raise NotImplementedError, "Aql does not implement status check"
+      end
+
+      def process_response_code(code)
+        (code =~ /SMS successfuly queued/) ? true : false
+      end
+
+      def massage_dlr_url(url)
       end
     end
   end

data/lib/smshelper/api/mycoolsms.rb

@@ -1,7 +1,7 @@
 module Smshelper
   module Api
     class Mycoolsms < Base
-      base_uri 'https://www.my-cool-sms.com/api-socket.php '
+      base_uri 'https://www.my-cool-sms.com/'
 
       def initialize(*args)
         config = args.shift
@@ -10,15 +10,26 @@ module Smshelper
       end
 
       def send_message(message)
-        (post)
+        options = {
+        :number => message.recipient,
+        :message => message.text,
+        :senderid => message.sender,
+        :function => 'sendSms'}
+        options = options.merge(@extra_options) unless @extra_options.nil?
+        resp = JSON.parse(post 'api-socket.php', :extra_query => options)
+        process_response_code(resp) ? (@sent_message_ids << resp['smsid']; resp['smsid']) : (raise ErrorDuringSend, resp)
       end
 
       def get_balance
-        (post '', :extra_query => {:function => :getbalance})
+        {'EUR' => JSON.parse(post 'api-socket.php', :extra_query => {:function => 'getBalance'})['balance']}
       end
 
       def hlr_lookup(number)
+        JSON.parse(post 'api-socket.php', :extra_query => {:function => 'doHlrLookup', :number => number})
+      end
 
+      def process_response_code(code)
+        code['success']
       end
     end
   end

data/lib/smshelper/api/response_codes.rb

@@ -172,6 +172,8 @@ module Smshelper
         '15' => 'Invalid sender address',
         '16' => 'Invalid TTL'}
 
+      AQL = {}
+
       def webtext(code)
         WEBTEXT[code]
       end

data/lib/smshelper/api/traitel.rb

@@ -3,7 +3,6 @@ module Smshelper
     class Traitel < Base
       base_uri 'http://api.traitel.com'
       # headers 'Accept' => 'text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8',  'Accept-Language' => 'en-us,en;q=0.5', 'Accept-Encoding' => 'gzip, deflate', 'DNT' => '1', 'Connection' => 'keep-alive'
-
       def initialize(*args)
         config = args.shift
         add_query_options! :user => config.traitel[:uname], :pass => config.traitel[:passwd] # "\"#{config.traitel[:passwd]}\""
@@ -25,7 +24,7 @@ module Smshelper
           :concatenate => true
         }
         options = options.merge(@extra_options) unless @extra_options.nil?
-        resp = (get 'smsgateway.pl', :extra_query => options.merge(q)) #; resp.split(',')[2]
+        resp = (get 'smsgateway.pl', :extra_query => options.merge(q))
         process_response_code(resp) ?  (@sent_message_ids << resp.split(',')[2]; resp.split(',')[2]) : (raise ErrorDuringSend "Could not deliver")
       end
 

data/lib/smshelper/api/vianett.rb

@@ -16,7 +16,7 @@ module Smshelper
           :destinationaddr => message.recipient,
           :message => message.text,
           :sourceaddr => message.sender,
-          :refno => '1',
+          # :refno => '1',
           :msgid => uuid}
         options = options.merge(@extra_options) unless @extra_options.nil?
         resp = (post 'MT.ashx', :extra_query => options)

data/lib/smshelper/api.rb

@@ -1,19 +1,26 @@
-require 'smshelper/api/base'
-require 'smshelper/api/response_codes'
 # require 'smshelper/api/smswarehouse'
 # require 'smshelper/api/routomessaging'
-require 'smshelper/api/webtext'
-require 'smshelper/api/bulksms'
-require 'smshelper/api/clickatell'
-require 'smshelper/api/textmagic'
-require 'smshelper/api/smstrade'
-require 'smshelper/api/esendex'
-require 'smshelper/api/mediaburst'
-require 'smshelper/api/nexmo'
-require 'smshelper/api/traitel'
 
-# require 'smshelper/api/totext'
-require 'smshelper/api/vianett'
-require 'smshelper/api/aql'
-require 'smshelper/api/txtnation'
-require 'smshelper/api/mycoolsms'
+module Smshelper
+  module Api
+    path = (File.dirname File.expand_path(__FILE__))
+
+    autoload :Base, "#{path}/api/base"
+    autoload :ResponseCodes, "#{path}/api/response_codes"
+    autoload :Webtext, "#{path}/api/webtext"
+    autoload :Bulksms, "#{path}/api/bulksms"
+    autoload :Clickatell, "#{path}/api/clickatell"
+    autoload :Textmagic, "#{path}/api/textmagic"
+    autoload :Smstrade, "#{path}/api/smstrade"
+    autoload :Esendex, "#{path}/api/esendex"
+    autoload :Mediaburst, "#{path}/api/mediaburst"
+    autoload :Nexmo, "#{path}/api/nexmo"
+    autoload :Traitel, "#{path}/api/traitel"
+
+    autoload :Aql, "#{path}/api/aql"
+    autoload :Vianett, "#{path}/api/vianett"
+    autoload :Txtnation, "#{path}/api/txtnation"
+    autoload :Totext, "#{path}/api/totext"
+    autoload :Mycoolsms, "#{path}/api/mycoolsms"
+  end
+end

data/lib/smshelper.rb

@@ -2,18 +2,20 @@ require 'uuid'
 require 'digest/crc32'
 require 'savon'
 require 'textmagic'
-require 'mediaburst'
+require 'json'
 require 'api_smith'
 
-require 'smshelper/api'
-require 'smshelper/languagetools'
-require 'smshelper/message'
-require 'smshelper/config'
-
 module Smshelper
   class NotImplementedError < ArgumentError
   end
 
   class ErrorDuringSend < ArgumentError
   end
+
+  path = (File.dirname File.expand_path(__FILE__))
+
+  autoload :Api, "#{path}/smshelper/api"
+  autoload :Languagetools, "#{path}/smshelper/languagetools"
+  autoload :Message, "#{path}/smshelper/message"
+  autoload :Config, "#{path}/smshelper/config"
 end

data/smshelper.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "smshelper"
-  s.version = "0.2.10"
+  s.version = "0.3.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Voip Scout"]
-  s.date = "2012-05-06"
+  s.date = "2012-05-19"
   s.description = "works with esendex, textmagic, smstrade, bulksms, routomessaging, smswarehouse, mediaburst, clickatell, webtext"
   s.email = "voipscout@gmail.com"
   s.extra_rdoc_files = [

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: smshelper
 version: !ruby/object:Gem::Version
-  version: 0.2.10
+  version: 0.3.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-06 00:00:00.000000000 Z
+date: 2012-05-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: api_smith
@@ -260,7 +260,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -51675857748285695
+      hash: -2282137222022673328
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: