ruby-smpp 0.2.1 → 0.3.0

data/CHANGELOG

@@ -1,3 +1,6 @@
+= 0.3.0
+* Added begin/rescue handling in receive_data to keep the connection alive. Delegates can implement data_error(Exception) and re-raise the error if they wish to break the connection.
+
 = 0.1.3
 * Transition maintenance from August to Ray Krueger
 * Changed the expected signature of transceiver delegates to use the full PDU instead of picking off attributes one by one

data/VERSION

@@ -1 +1 @@
-0.2.1
+0.3.0

data/lib/smpp/base.rb

@@ -88,14 +88,21 @@ module Smpp
           #not complete packet ... break
           break
         end
-        
-        pkt = @data.slice!(0,cmd_length)
 
-        # parse incoming PDU
-        pdu = read_pdu(pkt)
+        pkt = @data.slice!(0,cmd_length)
 
-        # let subclass process it
-        process_pdu(pdu) if pdu
+        begin
+          # parse incoming PDU
+          pdu = read_pdu(pkt)
+
+          # let subclass process it
+          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
+        end
 
       end
     end

data/lib/smpp/pdu/deliver_sm.rb

@@ -19,7 +19,7 @@ class Smpp::Pdu::DeliverSm < Smpp::Pdu::Base
     @destination_addr        = destination_addr
     @esm_class               = options[:esm_class]?options[:esm_class]:0 # default smsc mode
     @protocol_id             = options[:protocol_id]?options[:protocol_id]:0
-    @priority_flag           = options[:priority_flag]?options[:priority_flag]:1
+    @priority_flag           = options[:priority_flag]?options[:priority_flag]:0
     @schedule_delivery_time  = options[:schedule_delivery_time]?options[:schedule_delivery_time]:''
     @validity_period         = options[:validity_period]?options[:validity_period]:''
     @registered_delivery     = options[:registered_delivery]?options[:registered_delivery]:1 # we want delivery notifications

data/lib/smpp/pdu/submit_multi.rb

@@ -24,7 +24,7 @@ class Smpp::Pdu::SubmitMulti < Smpp::Pdu::Base
     dest_addresses          = build_destination_addresses(destination_addr_array,dest_addr_ton,dest_addr_npi,IS_SMEADDR) 
     esm_class               = options[:esm_class]
     protocol_id             = 0
-    priority_flag           = 1
+    priority_flag           = 0
     schedule_delivery_time  = ''
     validity_period         = ''
     registered_delivery     = 1 # we want delivery notifications

data/lib/smpp/pdu/submit_sm.rb

@@ -22,7 +22,7 @@ class Smpp::Pdu::SubmitSm < Smpp::Pdu::Base
     @destination_addr        = destination_addr
     @esm_class               = options[:esm_class]?options[:esm_class]:0 # default smsc mode
     @protocol_id             = options[:protocol_id]?options[:protocol_id]:0
-    @priority_flag           = options[:priority_flag]?options[:priority_flag]:1
+    @priority_flag           = options[:priority_flag]?options[:priority_flag]:0
     @schedule_delivery_time  = options[:schedule_delivery_time]?options[:schedule_delivery_time]:''
     @validity_period         = options[:validity_period]?options[:validity_period]:''
     @registered_delivery     = options[:registered_delivery]?options[:registered_delivery]:1 # we want delivery notifications

data/ruby-smpp.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{ruby-smpp}
-  s.version = "0.2.1"
+  s.version = "0.3.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Ray Krueger", "August Z. Flatby"]
-  s.date = %q{2010-02-15}
+  s.date = %q{2010-06-14}
   s.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.}
   s.email = %q{raykrueger@gmail.com}
   s.extra_rdoc_files = [
@@ -60,7 +60,7 @@ Gem::Specification.new do |s|
   s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
   s.rubyforge_project = %q{ruby-smpp}
-  s.rubygems_version = %q{1.3.5}
+  s.rubygems_version = %q{1.3.6}
   s.summary = %q{Ruby implementation of the SMPP protocol, based on EventMachine.}
   s.test_files = [
     "test/optional_parameter_test.rb",

metadata

@@ -1,7 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: ruby-smpp
 version: !ruby/object:Gem::Version 
-  version: 0.2.1
+  prerelease: false
+  segments: 
+  - 0
+  - 3
+  - 0
+  version: 0.3.0
 platform: ruby
 authors: 
 - Ray Krueger
@@ -10,19 +15,23 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-02-15 00:00:00 -06:00
+date: 2010-06-14 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: eventmachine
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        - 10
+        - 0
         version: 0.10.0
-    version: 
+  type: :runtime
+  version_requirements: *id001
 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
 executables: []
@@ -84,18 +93,20 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: ruby-smpp
-rubygems_version: 1.3.5
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
 summary: Ruby implementation of the SMPP protocol, based on EventMachine.