smshelper 0.3.1 → 0.4.0

data/README.rdoc

@@ -1,5 +1,5 @@
 = smshelper
-A small utility library to do SMS-MT
+A utility library to do SMS-MT
 
 == Currently supported providers:
 

data/VERSION

@@ -1 +1 @@
-0.3.1
+0.4.0

data/lib/smshelper/api/aql.rb

@@ -32,6 +32,16 @@ module Smshelper
         raise NotImplementedError, "Aql does not implement status check"
       end
 
+      def get_callback_response(args = {})
+          DeliveryReport.new(
+                             :message_id => args['message_id'],
+                             :timestamp => Time.now,
+                             :delivered => ((args['status'] == '1') ? true : false),
+                             :original_params => args
+                             )
+      end
+
+      private
       def process_response_code(code)
         (code =~ /SMS successfuly queued/) ? true : false
       end

data/lib/smshelper/api/base.rb

@@ -11,6 +11,37 @@ module Smshelper
         @response_code = ResponseCodes.new
         @extra_options = args.shift
         @uuid = UUID.new
+        class_factory 'DeliveryReport', 'InboundMessage', 'UnknownReply'
+      end
+
+      protected
+      def class_factory(*names)
+        names.each do |name|
+          klass = self.class.const_set(name, Class.new)
+          klass.class_eval do
+            attr_reader :uuid, :service
+
+            define_method(:initialize) do |args = {}|
+              args.each do |k,v|
+                unless k.to_s =~ (/splat/ || /captures/)
+                  self.class.send(:define_method, k.to_sym) {v}
+                  instance_variable_set("@"+k.to_s, v)
+                end
+              end
+              instance_variable_set("@uuid", UUID.generate)
+              instance_variable_set("@service", self.class.name.split('::')[2])
+            end
+
+            # define_method("marshal_dump".to_sym) do
+            #   self.to_yaml
+            # end
+
+            # define_method("marshal_load".to_sym) do |yaml|
+            #   YAML.load(yaml)
+            # end
+
+          end
+        end
       end
     end
   end

data/lib/smshelper/api/bulksms.rb

@@ -41,6 +41,16 @@ module Smshelper
         {message_id => @sent_message_statuses[message_id]}
       end
 
+      def get_callback_response(args = {})
+          DeliveryReport.new(
+                             :message_id => args['batch_id'],
+                             :timestamp => Time.now,
+                             :delivered => ((args['status'] == '11') ? true : false),
+                             :status => @response_code.bulksms(args['status']),
+                             :original_params => args
+                             )
+      end
+
       private
       def process_response_code(code)
         (code == '0') ? true : false

data/lib/smshelper/api/esendex.rb

@@ -1,6 +1,7 @@
 module Smshelper
   module Api
-    class Esendex < Base
+    class Esendex < Api::Base
+
       INBOX_SERVICE_WSDL = 'https://www.esendex.com/secure/messenger/soap/InboxService.asmx?wsdl'
       SEND_SERVICE_WSDL = 'https://www.esendex.com/secure/messenger/soap/SendService.asmx?wsdl'
       ACCOUNT_SERVICE_WSDL = 'https://www.esendex.com/secure/messenger/soap/AccountService.asmx?wsdl'
@@ -60,6 +61,29 @@ module Smshelper
         end
       end
 
+      # This expects a sinatra style params.merge(:request_body => request.body.read.to_s)
+      def get_callback_response(args = {})
+        if args['notificationType'] == 'MessageReceived'
+          InboundMessage.new(
+                             :message_id => args['id'],
+                             :sender => args['originator'],
+                             :recipient => args['recipient'],
+                             :text => args['body'],
+                             :timestamp => Time.now,
+                             :original_params => args
+                             )
+        elsif args['notificationType'] == 'MessageEvent'
+          DeliveryReport.new(
+                             :message_id => args['id'],
+                             :timestamp => Time.now,
+                             :delivered => ((args['eventType'] == 'Delivered') ? true : false),
+                             :original_params => args
+                             )
+        else
+          UnknownReply.new(args)
+        end
+      end
+
       private
       def connect(service)
         case service

data/lib/smshelper/api/mediaburst.rb

@@ -31,6 +31,16 @@ module Smshelper
         raise NotImplementedError, "Sms status checks unsupported by #{self.class.name}"
       end
 
+      def get_callback_response(args = {})
+        DeliveryReport.new(
+                           :message_id => args['msg_id'],
+                           :timestamp => Time.now,
+                           :delivered => ((args['status'] =~ /DELIVRD/) ? true : false),
+                           :original_params => args
+                           )
+      end
+
+
       private
       def process_response_code(code)
         (code =~ /Error/) ? false : true

data/lib/smshelper/api/mycoolsms.rb

@@ -11,10 +11,10 @@ module Smshelper
 
       def send_message(message)
         options = {
-        :number => message.recipient,
-        :message => message.text,
-        :senderid => message.sender,
-        :function => 'sendSms'}
+          :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)
@@ -28,6 +28,17 @@ module Smshelper
         JSON.parse(post 'api-socket.php', :extra_query => {:function => 'doHlrLookup', :number => number})
       end
 
+      def get_callback_response(args = {})
+        data = JSON.parse args[:request_body]
+        DeliveryReport.new(
+                           :message_id => data['smsid'],
+                           :timestamp => Time.now,
+                           :delivered => ((data['status'] == 'SMS_STATUS_DELIVERED') ? true : false),
+                           :original_params => args
+                           )
+      end
+
+      private
       def process_response_code(code)
         code['success']
       end

data/lib/smshelper/api/nexmo.rb

@@ -32,6 +32,28 @@ module Smshelper
       def get_status(message_id)
       end
 
+      def get_callback_response(args = {})
+        if args['type']
+          InboundMessage.new(
+                             :message_id => args['messageId'],
+                             :sender => args['msisdn'],
+                             :recipient => args['to'],
+                             :text => args['text'],
+                             :timestamp => Time.parse(args['message-timestamp']),
+                             :original_params => args
+                             )
+        elsif args['network-code']
+          DeliveryReport.new(
+                             :message_id => args['messageId'],
+                             :timestamp => Time.parse(args['message-timestamp']),
+                             :delivered => ((args['status'] == 'delivered') ? true : false),
+                             :original_params => args
+                             )
+        else
+          UnknownReply.new(args)
+        end
+      end
+
       private
       def process_response_code(code)
         (code == '0') ? true : false

data/lib/smshelper/api/smstrade.rb

@@ -36,6 +36,15 @@ module Smshelper
         raise NotImplementedError, "Sms status checks unsupported by #{self.class.name}"
       end
 
+      def get_callback_response(args = {})
+        DeliveryReport.new(
+                           :message_id => args['message_id'],
+                           :timestamp => Time.now,
+                           :delivered => ((args['status'] == 'DELIVERED') ? true : false),
+                           :original_params => args
+                           )
+      end
+
       private
       def process_response_code(code)
         (code == '100') ? true : false

data/lib/smshelper/api/textmagic.rb

@@ -25,6 +25,15 @@ module Smshelper
         @sent_message_statuses[message_id] << {"Part 01" => @api.message_status(message_id)}
         {message_id => @sent_message_statuses[message_id]}
       end
+
+      def get_callback_response(args = {})
+        DeliveryReport.new(
+                           :message_id => args['message_id'],
+                           :timestamp => Time.now,
+                           :delivered => ((args['status'] =~ /d/) ? true : false),
+                           :original_params => args
+                           )
+      end
     end
   end
 end

data/lib/smshelper/api.rb

@@ -1,9 +1,9 @@
-# require 'smshelper/api/smswarehouse'
-# require 'smshelper/api/routomessaging'
+require 'hashie'
 
 module Smshelper
   module Api
     path = (File.dirname File.expand_path(__FILE__))
+    VERSION = '0.0.1'#File.read('blahblah')
 
     autoload :Base, "#{path}/api/base"
     autoload :ResponseCodes, "#{path}/api/response_codes"

data/lib/smshelper/languagetools.rb

@@ -1 +1,7 @@
-require 'smshelper/languagetools/languagetools'
+module Smshelper
+  module Languagetools
+    path = (File.dirname File.expand_path(__FILE__))
+
+    autoload :Charset, "#{path}/languagetools/languagetools"
+  end
+end

data/lib/smshelper.rb

@@ -3,6 +3,7 @@ require 'digest/crc32'
 require 'savon'
 require 'textmagic'
 require 'json'
+require 'time'
 require 'api_smith'
 
 module Smshelper

data/smshelper.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "smshelper"
-  s.version = "0.3.1"
+  s.version = "0.4.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Voip Scout"]
-  s.date = "2012-05-19"
+  s.date = "2012-05-26"
   s.description = "works www.bulksms.com, www.webtext.com, www.clickatell.com, www.textmagic.com, www.smstrade.eu, 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"
   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.3.1
+  version: 0.4.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-19 00:00:00.000000000 Z
+date: 2012-05-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: api_smith
@@ -261,7 +261,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3617912919464630746
+      hash: 1710997261661198984
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: