anjlab-ruby-smpp 0.6.3 → 0.6.4

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 422a4789de23b5d5d553e358c14f9fc51084a563
+  data.tar.gz: 11ee81c9199fe2538ca0ef75ad07373800961cf7
+SHA512:
+  metadata.gz: 0c8a7f4e2b3349b639095a7cefbb1638a3a83a78e6232e9be37f21e536e6353b9441cdaf9f08915ab6de462d72f15a895ad834ec4f45371f771c714d63a83885
+  data.tar.gz: 46b026a70ed509c048634f8bd69026f415866b6eb71190ca213b8e181c4d3651bd40f0158f1763e86f8b524d28586b2ff8d10dea956abc1b27a76359a6a9cbee

data/.gitignore

@@ -0,0 +1,28 @@
+## MAC OS
+.DS_Store
+
+## TEXTMATE
+*.tmproj
+tmtags
+*.gem
+
+## EMACS
+*~
+\#*
+.\#*
+
+## VIM
+*.swp
+
+## PROJECT::GENERAL
+coverage
+rdoc
+pkg
+tags
+.bundle
+vendor/ruby
+.rvmrc
+
+## PROJECT::SPECIFIC
+*.log
+nbproject

data/.travis.yml

@@ -0,0 +1,6 @@
+language: ruby
+rvm:
+ - 1.8.7
+ - 1.9.3
+ - 2.0.0
+ 

data/Gemfile

@@ -1,8 +1,4 @@
-source 'http://rubygems.org'
+source 'https://rubygems.org'
 
-gem "eventmachine", ">= 0.10.0"
-
-group :development do
-  gem "jeweler"
-  gem "rake"
-end
+# Specify your gem's dependencies in ruby-smpp.gemspec
+gemspec

data/Gemfile.lock

@@ -1,18 +1,21 @@
+PATH
+  remote: .
+  specs:
+    ruby-smpp (0.6.0)
+      eventmachine (>= 0.10.0)
+
 GEM
-  remote: http://rubygems.org/
+  remote: https://rubygems.org/
   specs:
     eventmachine (0.12.10)
-    git (1.2.5)
-    jeweler (1.6.4)
-      bundler (~> 1.0)
-      git (>= 1.2.5)
-      rake
     rake (0.9.2)
+    test-unit (2.5.4)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  eventmachine (>= 0.10.0)
-  jeweler
+  bundler (~> 1.3)
   rake
+  ruby-smpp!
+  test-unit

data/README.rdoc

@@ -1,5 +1,7 @@
 = Ruby-SMPP
 
+{<img src="https://travis-ci.org/raykrueger/ruby-smpp.png" />}[https://travis-ci.org/raykrueger/ruby-smpp]
+
 == DESCRIPTION:
 
 Ruby-SMPP is a Ruby implementation of the SMPP v3.4 protocol. It is suitable for writing gateway daemons that communicate with SMSCs for sending and receiving SMS messages.
@@ -24,7 +26,7 @@ The SMPP 3.4 protocol spec can be downloaded here: http://smsforum.net/SMPP_v3_4
 
 === Testing/Sample Code
 
-Logica provides an SMPP simulator that you can download from http://opensmpp.logica.com. You can 
+Logica provides an SMPP simulator that you can download from http://opensmpp.logica.com. You can
 also sign up for a demo SMPP account at one of the many bulk-SMS providers out there.
 
 For a quick test, download smscsim.jar and smpp.jar from the Logica site, and start the simulator by typing:
@@ -35,7 +37,7 @@ Then type 1 (start simulation), and enter 6000 for port number. The simulator th
 
   ruby sample_gateway.rb
 
-You will be able to send MT messages from the sample gateway terminal window by typing the message body. In the simulator terminal window you should see SMPP PDUs being sent from the sample gateway. 
+You will be able to send MT messages from the sample gateway terminal window by typing the message body. In the simulator terminal window you should see SMPP PDUs being sent from the sample gateway.
 
 You can also send MO messages from the simulator to the sample gateway by typing 7 (log to screen off) and then 4 (send message). MO messages received by the sample gateway will be logged to ./sms_gateway.log.
 
@@ -47,18 +49,18 @@ You can also send MO messages from the simulator to the sample gateway by typing
 
 == BASIC USAGE:
 
-Start the transceiver. Receive delegate callbacks whenever incoming messages or delivery reports arrive. Send messages with Transceiver#send_mt. 
+Start the transceiver. Receive delegate callbacks whenever incoming messages or delivery reports arrive. Send messages with Transceiver#send_mt.
 
   # connect to SMSC
-  tx = EventMachine::run do             
+  tx = EventMachine::run do
     $tx = EventMachine::connect(
-    host, 
-    port, 
-    Smpp::Transceiver, 
-    config,             # a property hash 
+    host,
+    port,
+    Smpp::Transceiver,
+    config,             # a property hash
     delegate            # delegate class that will receive callbacks on MOs and DRs and other events
   end
-  
+
   # send a message
   tx.send_mt(id, from, to, body)
 

data/Rakefile

@@ -1,24 +1,4 @@
-require File.expand_path('../config/environment', __FILE__)
-require 'rake'
-
-begin
-  require 'jeweler'
-  Jeweler::Tasks.new do |gem|
-    # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
-    gem.name = "anjlab-ruby-smpp"
-    gem.summary = %Q{Ruby implementation of the SMPP protocol, based on EventMachine.}
-    gem.description = gem.summary + " SMPP is a protocol that allows ordinary people outside the mobile network to exchange SMS messages directly with mobile operators."
-    gem.email = "raykrueger@gmail.com"
-    gem.homepage = "http://github.com/raykrueger/ruby-smpp"
-    gem.authors = ["Ray Krueger", "August Z. Flatby"]
-    gem.rubyforge_project = gem.name
-
-    gem.extra_rdoc_files = ["README.rdoc", "CHANGELOG", "CONTRIBUTORS.txt"]
-  end
-  Jeweler::GemcutterTasks.new
-rescue LoadError
-  puts "Jeweler (or a dependency) not available. Install it with: gem install jeweler"
-end
+require "bundler/gem_tasks"
 
 require 'rake/testtask'
 Rake::TestTask.new(:test) do |test|
@@ -27,27 +7,4 @@ Rake::TestTask.new(:test) do |test|
   test.verbose = true
 end
 
-begin
-  require 'rcov/rcovtask'
-  Rcov::RcovTask.new do |test|
-    test.libs << 'test'
-    test.pattern = 'test/**/*_test.rb'
-    test.verbose = true
-  end
-rescue LoadError
-  task :rcov do
-    abort "RCov is not available. In order to run rcov, you must: sudo gem install spicycode-rcov"
-  end
-end
-
 task :default => :test
-
-require 'rake/rdoctask'
-Rake::RDocTask.new do |rdoc|
-  version = File.exist?('VERSION') ? File.read('VERSION') : ""
-
-  rdoc.rdoc_dir = 'rdoc'
-  rdoc.title = "ruby-smpp #{version}"
-  rdoc.rdoc_files.include('README*', "CHANGELOG", "CONTRIBUTORS.txt", "LICENSE")
-  rdoc.rdoc_files.include('lib/**/*.rb')
-end

data/anjlab-ruby-smpp.gemspec

@@ -1,98 +1,26 @@
-# Generated by jeweler
-# DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
-# -*- encoding: utf-8 -*-
+# coding: utf-8
+lib = File.expand_path('../lib', __FILE__)
+$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
+require 'smpp/version'
 
-Gem::Specification.new do |s|
-  s.name = "anjlab-ruby-smpp"
-  s.version = "0.6.3"
+Gem::Specification.new do |spec|
+  spec.name          = "anjlab-ruby-smpp"
+  spec.version       = Smpp::VERSION
+  spec.authors       = ["Ray Krueger", "August Z. Flatby"]
+  spec.email         = ["raykrueger@gmail.com"]
+  spec.description   = %q{Ruby implementation of the SMPP protocol, based on EventMachine. SMPP is a protocol that allows ordinary people outside the mobile network to exchange SMS messages directly with mobile operators.}
+  spec.summary       = %q{Ruby implementation of the SMPP protocol, based on EventMachine.}
+  spec.homepage      = "http://github.com/raykrueger/ruby-smpp"
+  spec.license       = "MIT"
 
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = ["Ray Krueger", "August Z. Flatby"]
-  s.date = "2012-06-27"
-  s.description = "Ruby implementation of the SMPP protocol, based on EventMachine. SMPP is a protocol that allows ordinary people outside the mobile network to exchange SMS messages directly with mobile operators."
-  s.email = "raykrueger@gmail.com"
-  s.extra_rdoc_files = [
-    "CHANGELOG",
-    "CONTRIBUTORS.txt",
-    "README.rdoc"
-  ]
-  s.files = [
-    "CHANGELOG",
-    "CONTRIBUTORS.txt",
-    "Gemfile",
-    "Gemfile.lock",
-    "LICENSE",
-    "README.rdoc",
-    "Rakefile",
-    "VERSION",
-    "anjlab-ruby-smpp.gemspec",
-    "config/environment.rb",
-    "examples/PDU1.example",
-    "examples/PDU2.example",
-    "examples/sample_gateway.rb",
-    "examples/sample_smsc.rb",
-    "lib/smpp.rb",
-    "lib/smpp/base.rb",
-    "lib/smpp/encoding/utf8_encoder.rb",
-    "lib/smpp/optional_parameter.rb",
-    "lib/smpp/pdu/base.rb",
-    "lib/smpp/pdu/bind_base.rb",
-    "lib/smpp/pdu/bind_receiver.rb",
-    "lib/smpp/pdu/bind_receiver_response.rb",
-    "lib/smpp/pdu/bind_resp_base.rb",
-    "lib/smpp/pdu/bind_transceiver.rb",
-    "lib/smpp/pdu/bind_transceiver_response.rb",
-    "lib/smpp/pdu/bind_transmitter.rb",
-    "lib/smpp/pdu/bind_transmitter_response.rb",
-    "lib/smpp/pdu/deliver_sm.rb",
-    "lib/smpp/pdu/deliver_sm_response.rb",
-    "lib/smpp/pdu/enquire_link.rb",
-    "lib/smpp/pdu/enquire_link_response.rb",
-    "lib/smpp/pdu/generic_nack.rb",
-    "lib/smpp/pdu/submit_multi.rb",
-    "lib/smpp/pdu/submit_multi_response.rb",
-    "lib/smpp/pdu/submit_sm.rb",
-    "lib/smpp/pdu/submit_sm_response.rb",
-    "lib/smpp/pdu/unbind.rb",
-    "lib/smpp/pdu/unbind_response.rb",
-    "lib/smpp/receiver.rb",
-    "lib/smpp/server.rb",
-    "lib/smpp/transceiver.rb",
-    "lib/sms.rb",
-    "test/delegate.rb",
-    "test/encoding_test.rb",
-    "test/optional_parameter_test.rb",
-    "test/pdu_parsing_test.rb",
-    "test/receiver_test.rb",
-    "test/responsive_delegate.rb",
-    "test/server.rb",
-    "test/smpp_test.rb",
-    "test/submit_sm_test.rb",
-    "test/transceiver_test.rb"
-  ]
-  s.homepage = "http://github.com/raykrueger/ruby-smpp"
-  s.require_paths = ["lib"]
-  s.rubyforge_project = "anjlab-ruby-smpp"
-  s.rubygems_version = "1.8.17"
-  s.summary = "Ruby implementation of the SMPP protocol, based on EventMachine."
+  spec.files         = `git ls-files`.split($/)
+  spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
+  spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
+  spec.require_paths = ["lib"]
 
-  if s.respond_to? :specification_version then
-    s.specification_version = 3
+  spec.add_dependency "eventmachine", ">= 0.10.0"
 
-    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<eventmachine>, [">= 0.10.0"])
-      s.add_development_dependency(%q<jeweler>, [">= 0"])
-      s.add_development_dependency(%q<rake>, [">= 0"])
-    else
-      s.add_dependency(%q<eventmachine>, [">= 0.10.0"])
-      s.add_dependency(%q<jeweler>, [">= 0"])
-      s.add_dependency(%q<rake>, [">= 0"])
-    end
-  else
-    s.add_dependency(%q<eventmachine>, [">= 0.10.0"])
-    s.add_dependency(%q<jeweler>, [">= 0"])
-    s.add_dependency(%q<rake>, [">= 0"])
-  end
+  spec.add_development_dependency "bundler", "~> 1.3"
+  spec.add_development_dependency "rake"
+  spec.add_development_dependency "test-unit"
 end
-

data/examples/sample_gateway.rb

@@ -20,15 +20,15 @@ module KeyboardHandler
   def receive_line(data)
     sender, receiver, *body_parts = data.split
     unless sender && receiver && body_parts.size > 0
-      puts "Syntax: <sender> <receiver> <message body>"      
+      puts "Syntax: <sender> <receiver> <message body>"
     else
       body = body_parts.join(' ')
-      puts "Sending MT from #{sender} to #{receiver}: #{body}"  
+      puts "Sending MT from #{sender} to #{receiver}: #{body}"
       SampleGateway.send_mt(sender, receiver, body)
     end
     prompt
   end
-  
+
   def prompt
     print "MT: "
     $stdout.flush
@@ -36,16 +36,16 @@ module KeyboardHandler
 end
 
 class SampleGateway
-  
-  # MT id counter. 
+
+  # MT id counter.
   @@mt_id = 0
-  
+
   # expose SMPP transceiver's send_mt method
   def self.send_mt(*args)
     @@mt_id += 1
     @@tx.send_mt(@@mt_id, *args)
   end
-    
+
   def logger
     Smpp::Base.logger
   end
@@ -53,22 +53,22 @@ class SampleGateway
   def start(config)
     # The transceiver sends MT messages to the SMSC. It needs a storage with Hash-like
     # semantics to map SMSC message IDs to your own message IDs.
-    pdr_storage = {} 
+    pdr_storage = {}
 
     # Run EventMachine in loop so we can reconnect when the SMSC drops our connection.
     puts "Connecting to SMSC..."
     loop do
-      EventMachine::run do             
+      EventMachine::run do
         @@tx = EventMachine::connect(
-          config[:host], 
-          config[:port], 
-          Smpp::Transceiver, 
-          config, 
+          config[:host],
+          config[:port],
+          Smpp::Transceiver,
+          config,
           self    # delegate that will receive callbacks on MOs and DRs and other events
-        )     
+        )
         print "MT: "
         $stdout.flush
-        
+
         # Start consuming MT messages (in this case, from the console)
         # Normally, you'd hook this up to a message queue such as Starling
         # or ActiveMQ via STOMP.
@@ -78,8 +78,8 @@ class SampleGateway
       sleep 5
     end
   end
-  
-  # ruby-smpp delegate methods 
+
+  # ruby-smpp delegate methods
 
   def mo_received(transceiver, pdu)
     logger.info "Delegate: mo_received: from #{pdu.source_addr} to #{pdu.destination_addr}: #{pdu.short_message}"
@@ -101,19 +101,19 @@ class SampleGateway
     logger.info "Delegate: transceiver bound"
   end
 
-  def unbound(transceiver)  
+  def unbound(transceiver)
     logger.info "Delegate: transceiver unbound"
     EventMachine::stop_event_loop
   end
-  
+
 end
 
 # Start the Gateway
-begin   
-  puts "Starting SMS Gateway. Please check the log at #{LOGFILE}"  
+begin
+  puts "Starting SMS Gateway. Please check the log at #{LOGFILE}"
 
   # SMPP properties. These parameters work well with the Logica SMPP simulator.
-  # Consult the SMPP spec or your mobile operator for the correct settings of 
+  # Consult the SMPP spec or your mobile operator for the correct settings of
   # the other properties.
   config = {
     :host => '127.0.0.1',
@@ -129,9 +129,9 @@ begin
     :source_address_range => '',
     :destination_address_range => '',
     :enquire_link_delay_secs => 10
-  }  
+  }
   gw = SampleGateway.new
-  gw.start(config)  
+  gw.start(config)
 rescue Exception => ex
   puts "Exception in SMS Gateway: #{ex} at #{ex.backtrace.join("\n")}"
 end

data/lib/smpp.rb

@@ -1,5 +1,5 @@
 # SMPP v3.4 subset implementation.
-# SMPP is a short message peer-to-peer protocol typically used to communicate 
+# SMPP is a short message peer-to-peer protocol typically used to communicate
 # with SMS Centers (SMSCs) over TCP/IP.
 #
 # August Z. Flatby
@@ -10,6 +10,7 @@ require 'logger'
 $:.unshift(File.dirname(__FILE__))
 require 'smpp/base.rb'
 require 'smpp/transceiver.rb'
+require 'smpp/transmitter.rb'
 require 'smpp/receiver.rb'
 require 'smpp/optional_parameter'
 require 'smpp/pdu/base.rb'

data/lib/smpp/base.rb

@@ -5,13 +5,13 @@ require 'eventmachine'
 
 module Smpp
   class InvalidStateException < Exception; end
-    
+
   class Base < EventMachine::Connection
     include Smpp
-    
+
     # :bound or :unbound
     attr_accessor :state
-    
+
     def initialize(config, delegate)
       @state = :unbound
       @config = config
@@ -19,7 +19,7 @@ module Smpp
       @delegate = delegate
 
       # Array of un-acked MT message IDs indexed by sequence number.
-      # As soon as we receive SubmitSmResponse we will use this to find the 
+      # As soon as we receive SubmitSmResponse we will use this to find the
       # associated message ID, and then create a pending delivery report.
       @ack_ids = {}
 
@@ -31,11 +31,11 @@ module Smpp
     def unbound?
       @state == :unbound
     end
-    
+
     def bound?
       @state == :bound
     end
-    
+
     def Base.logger
       @@logger
     end
@@ -47,8 +47,8 @@ module Smpp
     def logger
       @@logger
     end
-    
-    
+
+
     # invoked by EventMachine when connected
     def post_init
       # send Bind PDU if we are a binder (eg
@@ -68,9 +68,10 @@ module Smpp
     # method named: periodic_call_method
     def start_enquire_link_timer(delay_secs)
       logger.info "Starting enquire link timer (with #{delay_secs}s interval)"
-      EventMachine::PeriodicTimer.new(delay_secs) do 
+      timer = EventMachine::PeriodicTimer.new(delay_secs) do
         if error?
           logger.warn "Link timer: Connection is in error state. Disconnecting."
+          timer.cancel
           close_connection
         elsif unbound?
           logger.warn "Link is unbound, waiting until next #{delay_secs} interval before querying again"
@@ -81,7 +82,7 @@ module Smpp
           rval = defined?(periodic_call_method) ? periodic_call_method : true
 
           # only send an OK if this worked
-          write_pdu Pdu::EnquireLink.new if rval 
+          write_pdu Pdu::EnquireLink.new if rval
         end
       end
     end
@@ -108,31 +109,33 @@ module Smpp
           process_pdu(pdu) if pdu
         rescue Exception => e
           logger.error "Error receiving data: #{e}\n#{e.backtrace.join("\n")}"
-          if @delegate.respond_to?(:data_error)
-            @delegate.data_error(e)
-          end
+          run_callback(:data_error, e)
         end
 
       end
     end
-    
+
     # EventMachine::Connection#unbind
     # Invoked by EM when connection is closed. Delegates should consider
     # breaking the event loop and reconnect when they receive this callback.
     def unbind
-      if @delegate.respond_to?(:unbound)
-        @delegate.unbound(self)
-      end
+      run_callback(:unbound, self)
     end
-    
+
     def send_unbind
       write_pdu Pdu::Unbind.new
       @state = :unbound
     end
 
+    def run_callback(cb, *args)
+      if @delegate.respond_to?(cb)
+        @delegate.send(cb, *args)
+      end
+    end
+
     # process common PDUs
     # returns true if no further processing necessary
-    def process_pdu(pdu)      
+    def process_pdu(pdu)
       case pdu
       when Pdu::EnquireLinkResponse
         # nop
@@ -142,7 +145,7 @@ module Smpp
         @state = :unbound
         write_pdu(Pdu::UnbindResponse.new(pdu.sequence_number, Pdu::Base::ESME_ROK))
         close_connection
-      when Pdu::UnbindResponse      
+      when Pdu::UnbindResponse
         logger.info "Unbound OK. Closing connection."
         close_connection
       when Pdu::GenericNack
@@ -154,15 +157,11 @@ module Smpp
           logger.debug "ESM CLASS #{pdu.esm_class}"
           if pdu.esm_class != 4
             # MO message
-            if @delegate.respond_to?(:mo_received)
-              @delegate.mo_received(self, pdu)
-            end
+            run_callback(:mo_received, self, pdu)
           else
             # Delivery report
-            if @delegate.respond_to?(:delivery_report_received)
-              @delegate.delivery_report_received(self, pdu)
-            end
-          end     
+            run_callback(:delivery_report_received, self, pdu)
+          end
           write_pdu(Pdu::DeliverSmResponse.new(pdu.sequence_number))
         rescue => e
           logger.warn "Send Receiver Temporary App Error due to #{e.inspect} raised in delegate"
@@ -173,19 +172,20 @@ module Smpp
         when Pdu::Base::ESME_ROK
           logger.debug "Bound OK."
           @state = :bound
-          if @delegate.respond_to?(:bound)
-            @delegate.bound(self)
-          end
+          run_callback(:bound, self)
         when Pdu::Base::ESME_RINVPASWD
           logger.warn "Invalid password."
-          # scheduele the connection to close, which eventually will cause the unbound() delegate 
+          # schedule the connection to close, which eventually will cause the unbound() delegate
           # method to be invoked.
+          run_callback(:invalid_password, self)
           close_connection
         when Pdu::Base::ESME_RINVSYSID
           logger.warn "Invalid system id."
+          run_callback(:invalid_system_id, self)
           close_connection
         else
           logger.warn "Unexpected BindTransceiverResponse. Command status: #{pdu.command_status}"
+          run_callback(:unexpected_error, self)
           close_connection
         end
       when Pdu::SubmitSmResponse
@@ -195,14 +195,10 @@ module Smpp
         end
         if pdu.command_status != Pdu::Base::ESME_ROK
           logger.error "Error status in SubmitSmResponse: #{pdu.command_status}"
-          if @delegate.respond_to?(:message_rejected)
-            @delegate.message_rejected(self, mt_message_id, pdu)
-          end
+          run_callback(:message_rejected, self, mt_message_id, pdu)
         else
           logger.info "Got OK SubmitSmResponse (#{pdu.message_id} -> #{mt_message_id})"
-          if @delegate.respond_to?(:message_accepted)
-            @delegate.message_accepted(self, mt_message_id, pdu)
-          end        
+          run_callback(:message_accepted, self, mt_message_id, pdu)
         end
       when Pdu::SubmitMultiResponse
         mt_message_id = @ack_ids[pdu.sequence_number]
@@ -211,42 +207,61 @@ module Smpp
         end
         if pdu.command_status != Pdu::Base::ESME_ROK
           logger.error "Error status in SubmitMultiResponse: #{pdu.command_status}"
-          if @delegate.respond_to?(:message_rejected)
-            @delegate.message_rejected(self, mt_message_id, pdu)
-          end
+          run_callback(:message_rejected, self, mt_message_id, pdu)
         else
           logger.info "Got OK SubmitMultiResponse (#{pdu.message_id} -> #{mt_message_id})"
-          if @delegate.respond_to?(:message_accepted)
-            @delegate.message_accepted(self, mt_message_id, pdu)
-          end
+          run_callback(:message_accepted, self, mt_message_id, pdu)
         end
       when Pdu::BindReceiverResponse
         case pdu.command_status
         when Pdu::Base::ESME_ROK
           logger.debug "Bound OK."
           @state = :bound
-          if @delegate.respond_to?(:bound)
-            @delegate.bound(self)
-          end
+          run_callback(:bound, self)
+        when Pdu::Base::ESME_RINVPASWD
+          logger.warn "Invalid password."
+          run_callback(:invalid_password, self)
+          # scheduele the connection to close, which eventually will cause the unbound() delegate
+          # method to be invoked.
+          close_connection
+        when Pdu::Base::ESME_RINVSYSID
+          logger.warn "Invalid system id."
+          run_callback(:invalid_system_id, self)
+          close_connection
+        else
+          logger.warn "Unexpected BindReceiverResponse. Command status: #{pdu.command_status}"
+          run_callback(:unexpected_error, self)
+          close_connection
+        end
+      when Pdu::BindTransmitterResponse
+        case pdu.command_status
+        when Pdu::Base::ESME_ROK
+          logger.debug "Bound OK."
+          @state = :bound
+          run_callback(:bound, self)
         when Pdu::Base::ESME_RINVPASWD
           logger.warn "Invalid password."
-          # scheduele the connection to close, which eventually will cause the unbound() delegate 
+          run_callback(:invalid_password, self)
+          # schedule the connection to close, which eventually will cause the unbound() delegate
           # method to be invoked.
           close_connection
         when Pdu::Base::ESME_RINVSYSID
           logger.warn "Invalid system id."
+          run_callback(:invalid_system_id, self)
           close_connection
         else
           logger.warn "Unexpected BindReceiverResponse. Command status: #{pdu.command_status}"
+          run_callback(:unexpected_error, self)
           close_connection
         end
       else
         logger.warn "(#{self.class.name}) Received unexpected PDU: #{pdu.to_human}."
+        run_callback(:unexpected_pdu, self, pdu)
         close_connection
       end
     end
 
-    private  
+    private
     def write_pdu(pdu)
       logger.debug "<- #{pdu.to_human}"
       hex_debug pdu.data, "<- "
@@ -256,12 +271,12 @@ module Smpp
     def read_pdu(data)
       pdu = nil
       # we may either receive a new request or a response to a previous response.
-      begin        
+      begin
         pdu = Pdu::Base.create(data)
         if !pdu
           logger.warn "Not able to parse PDU!"
         else
-          logger.debug "-> " + pdu.to_human          
+          logger.debug "-> " + pdu.to_human
         end
         hex_debug data, "-> "
       rescue Exception => ex
@@ -278,7 +293,7 @@ module Smpp
     def Base.hex_debug(data, prefix = "")
       logger.debug do
         message = "Hex dump follows:\n"
-        hexdump(data).each_line do |line| 
+        hexdump(data).each_line do |line|
           message << (prefix + line.chomp + "\n")
         end
         message
@@ -303,6 +318,6 @@ module Smpp
       }
       output << ' '*(((2+width-ascii.size)*(2*group+1))/group.to_f).ceil+ascii
       output[1..-1]
-    end    
+    end
   end
 end

data/lib/smpp/encoding/utf8_encoder.rb

@@ -5,7 +5,7 @@ module Smpp
 
     # This class is not required by smpp.rb at all, you need to bring it in yourself.
     # This class also requires iconv, you'll need to ensure it is installed.
-    class Utf8Encoder 
+    class Utf8Encoder
 
       EURO_TOKEN = "_X_EURO_X_"
 

data/lib/smpp/optional_parameter.rb

@@ -23,7 +23,10 @@ class Smpp::OptionalParameter
       tag, length, remaining_bytes = data.unpack('H4na*')
       tag = tag.hex
 
-      raise "invalid data, cannot parse optional parameters" if tag == 0 or length.nil?
+      if tag == 0 || length.nil?
+        Smpp::Base.logger.error "invalid data, cannot parse optional parameters tag: #{tag} length:#{length}"
+        length = length.to_i
+      end
 
       value = remaining_bytes.slice!(0...length)
 

data/lib/smpp/pdu/base.rb

@@ -115,7 +115,7 @@ module Smpp::Pdu
     def Base.optional_parameters_to_buffer(optionals)
       output = ""
       optionals.each do |tag, optional_param|
-        length = optional_param.value.length
+        length = optional_param.value.to_s.length
         buffer = []
         buffer += [tag >> 8, tag & 0xff]
         buffer += [length >> 8, length & 0xff]

data/lib/smpp/pdu/deliver_sm.rb

@@ -114,12 +114,20 @@ class Smpp::Pdu::DeliverSm < Smpp::Pdu::Base
     # For example, Tele2 (Norway):
     # "<msisdn><shortcode>?id:10ea34755d3d4f7a20900cdb3349e549 sub:001 dlvrd:001 submit date:0611011228 done date:0611011230 stat:DELIVRD err:000 Text:abc'!10ea34755d3d4f7a20900cdb3349e549"
     if options[:esm_class] == 4
+      # id is in the mandatory part
       msg_ref_match = short_message.match(/id:([^ ]*)/)
+      # id is not found, search it in the optional part
+      msg_ref_match = remaining_bytes.match(/id:([^ ]*)/) if !msg_ref_match
+      
       if msg_ref_match
         options[:msg_reference] = msg_ref_match[1]
       end
       
+      # stat is the mandatory part
       stat_match = short_message.match(/stat:([^ ]*)/)
+      # stat is not found, search it in the optional part
+      stat_match = remaining_bytes.match(/stat:([^ ]*)/) if !stat_match
+      
       if stat_match
         options[:stat] = stat_match[1]
       end

data/lib/smpp/server.rb

@@ -13,7 +13,7 @@ class Smpp::Server < Smpp::Base
   # a proc to invoke for delivery reports,
   # and optionally a hash-like storage for pending delivery reports.
   def initialize(config, received_messages = [], sent_messages = [])
-    super(config)
+    super(config, nil)
     @state = :unbound
     @received_messages = received_messages
     @sent_messages = sent_messages

data/lib/smpp/transmitter.rb

@@ -0,0 +1,64 @@
+# The SMPP Transmitter maintains a unidirectional connection to an SMSC.
+# Provide a config hash with connection options to get started.
+# See the sample_gateway.rb for examples of config values.
+
+class Smpp::Transmitter < Smpp::Base
+
+  attr_reader :ack_ids
+
+  # Send an MT SMS message. Delegate will receive message_accepted callback when SMSC
+  # acknowledges, or the message_rejected callback upon error
+  def send_mt(message_id, source_addr, destination_addr, short_message, options={})
+    logger.debug "Sending MT: #{short_message}"
+    if @state == :bound
+      pdu = Pdu::SubmitSm.new(source_addr, destination_addr, short_message, options)
+      write_pdu(pdu)
+
+      # keep the message ID so we can associate the SMSC message ID with our message
+      # when the response arrives.
+      @ack_ids[pdu.sequence_number] = message_id
+    else
+      raise InvalidStateException, "Transmitter is unbound. Cannot send MT messages."
+    end
+  end
+
+  def send_concat_mt(message_id, source_addr, destination_addr, message, options = {})
+      if @state == :bound
+        # Split the message into parts of 134 characters.
+        parts = []
+        while message.size > 0 do
+          parts << message.slice!(0..133)
+        end
+        0.upto(parts.size-1) do |i|
+          udh = sprintf("%c", 5)            # UDH is 5 bytes.
+          udh << sprintf("%c%c", 0, 3)      # This is a concatenated message
+          udh << sprintf("%c", message_id)  # The ID for the entire concatenated message
+          udh << sprintf("%c", parts.size)  # How many parts this message consists of
+
+          udh << sprintf("%c", i+1)         # This is part i+1
+
+          combined_options = {
+            :esm_class => 64,               # This message contains a UDH header.
+            :udh => udh
+          }.merge(options)
+
+          pdu = Smpp::Pdu::SubmitSm.new(source_addr, destination_addr, parts[i], combined_options)
+          write_pdu(pdu)
+        end
+      else
+        raise InvalidStateException, "Transmitter is unbound. Cannot send MT messages."
+      end
+    end
+
+  def send_bind
+    raise IOError, 'Transmitter already bound.' unless unbound?
+    pdu = Pdu::BindTransmitter.new(
+        @config[:system_id],
+        @config[:password],
+        @config[:system_type],
+        @config[:source_ton],
+        @config[:source_npi],
+        @config[:source_address_range])
+    write_pdu(pdu)
+  end
+end

data/lib/smpp/version.rb

@@ -0,0 +1,3 @@
+module Smpp
+  VERSION = "0.6.4"
+end

metadata

@@ -1,8 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: anjlab-ruby-smpp
 version: !ruby/object:Gem::Version
-  version: 0.6.3
-  prerelease: 
+  version: 0.6.4
 platform: ruby
 authors:
 - Ray Krueger
@@ -10,52 +9,75 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-27 00:00:00.000000000 Z
+date: 2013-12-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: eventmachine
-  requirement: &70113962531680 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.10.0
   type: :runtime
   prerelease: false
-  version_requirements: *70113962531680
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.10.0
 - !ruby/object:Gem::Dependency
-  name: jeweler
-  requirement: &70113962531200 !ruby/object:Gem::Requirement
-    none: false
+  name: bundler
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.3'
   type: :development
   prerelease: false
-  version_requirements: *70113962531200
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.3'
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70113962530720 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: test-unit
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70113962530720
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Ruby implementation of the SMPP protocol, based on EventMachine. SMPP
   is a protocol that allows ordinary people outside the mobile network to exchange
   SMS messages directly with mobile operators.
-email: raykrueger@gmail.com
+email:
+- raykrueger@gmail.com
 executables: []
 extensions: []
-extra_rdoc_files:
-- CHANGELOG
-- CONTRIBUTORS.txt
-- README.rdoc
+extra_rdoc_files: []
 files:
+- ".gitignore"
+- ".travis.yml"
 - CHANGELOG
 - CONTRIBUTORS.txt
 - Gemfile
@@ -97,6 +119,8 @@ files:
 - lib/smpp/receiver.rb
 - lib/smpp/server.rb
 - lib/smpp/transceiver.rb
+- lib/smpp/transmitter.rb
+- lib/smpp/version.rb
 - lib/sms.rb
 - test/delegate.rb
 - test/encoding_test.rb
@@ -109,27 +133,37 @@ files:
 - test/submit_sm_test.rb
 - test/transceiver_test.rb
 homepage: http://github.com/raykrueger/ruby-smpp
-licenses: []
+licenses:
+- MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: anjlab-ruby-smpp
-rubygems_version: 1.8.17
+rubyforge_project: 
+rubygems_version: 2.2.0
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Ruby implementation of the SMPP protocol, based on EventMachine.
-test_files: []
+test_files:
+- test/delegate.rb
+- test/encoding_test.rb
+- test/optional_parameter_test.rb
+- test/pdu_parsing_test.rb
+- test/receiver_test.rb
+- test/responsive_delegate.rb
+- test/server.rb
+- test/smpp_test.rb
+- test/submit_sm_test.rb
+- test/transceiver_test.rb