ruby_ucp 0.2.0 → 0.3.0

data/CHANGELOG

@@ -1,5 +1,8 @@
 ============ RELEASED ==============
 
+= 0.3.0 (2011-10-21)
+* fixed issues #10, #13, #14, #15
+
 = 0.2.0 (2011-02-06)
 * miscelaneous cleanup
 * basic documentation of methods in Ucp::Util::UCP
@@ -39,6 +42,3 @@
 
 = 0.4.0
 * add samples
-
-= 0.3.0
-* methods documentation

data/Rakefile

@@ -67,7 +67,7 @@ end
 
 spec = Gem::Specification.new do |s|
   s.name = 'ruby_ucp'
-  s.version = '0.2.0'
+  s.version = '0.3.0'
   s.has_rdoc = true
   s.extra_rdoc_files = ['README', 'LICENSE']
   s.summary = 'EMI/UCP protocol library'

data/VERSION

@@ -1 +1 @@
-0.2.0
+0.3.0

data/lib/performance/stresser.rb

@@ -0,0 +1,81 @@
+=begin
+Ruby library implementation of EMI/UCP protocol v4.6 for SMS
+Copyright (C) 2011, Sergio Freire <sergio.freire@gmail.com>
+
+This library is free software; you can redistribute it and/or
+modify it under the terms of the GNU Lesser General Public
+License as published by the Free Software Foundation; either
+version 2.1 of the License, or (at your option) any later version.
+
+This library is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+Lesser General Public License for more details.
+
+You should have received a copy of the GNU Lesser General Public
+License along with this library; if not, write to the Free Software
+Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+=end
+
+=begin
+this file actually contais a LOT of garbage... used just to test things while developing
+i left so you can take a look of concrete examples, while I build clean samples along
+with tests
+=end
+
+
+
+$KCODE = 'UTF8'
+require 'jcode'
+require "rubygems"
+require "ruby_ucp"
+include Ucp::Util
+require "benchmark"
+
+
+def bench(test_name,test_code,*args)
+    total_runs = 1000
+    t=Benchmark.realtime { total_runs.times do; test_code.call(*args); end }
+    puts "#{test_name}: #{(total_runs/t).to_i} req/sec"
+end
+
+
+
+def test_parse_str
+   ustr=2.chr+"01/00357/O/51/961234567/1234/////////////////4/1072/0031003200330034003500360037003800390030003100320033003400350036003700380039003000310032003300340035003600370038003900300031003200330034003500360037003800390030003100320033003400350036003700380039003000310032003300340035003600370038003900300031003200330034003500360037//////////0106050003450201020108///01"+3.chr
+   ucp=UCP.parse_str(ustr)
+end
+
+def test_make_multi_ucps(msg_size)
+  UCP.make_multi_ucps(1235,961234568,"1234567890"*msg_size)
+end
+
+def test_ucp30_basic_submit(msg_size)
+  ucp=Ucp30Operation.new
+  ucp.basic_submit(1234, 961234567, "z"*msg_size)
+end
+
+
+puts "== Ruby UCP methods benchmark =="
+
+bench("UCP.parse_str()",method(:test_parse_str))
+bench("UCP.make_multi_ucps(sms_len=10)",method(:test_make_multi_ucps),1)
+bench("UCP.make_multi_ucps(sms_len=100)",method(:test_make_multi_ucps),10)
+bench("UCP.make_multi_ucps(sms_len=300)",method(:test_make_multi_ucps),30)
+
+puts "== == =="
+
+bench("Ucp30Operation.basic_submit(sms_len=10)",method(:test_ucp30_basic_submit),10)
+bench("Ucp30Operation.basic_submit(sms_len=100)",method(:test_ucp30_basic_submit),100)
+bench("Ucp30Operation.basic_submit(sms_len=300)",method(:test_ucp30_basic_submit),300)
+
+puts "== == =="
+
+=begin
+    Benchmark.bm(7) do |x|
+      x.report("for:")   { n.times do; ustr=2.chr+"01/00357/O/51/961234567/1234/////////////////4/1072/0031003200330034003500360037003800390030003100320033003400350036003700380039003000310032003300340035003600370038003900300031003200330034003500360037003800390030003100320033003400350036003700380039003000310032003300340035003600370038003900300031003200330034003500360037//////////0106050003450201020108///01"+3.chr
+ucp=UCP.parse_str(ustr); end }
+      x.report("times:") { n.times do   ; a = "1"; end }
+      x.report("upto:")  { 1.upto(n) do ; a = "1"; end }
+    end
+=end

data/lib/ruby_ucp.rb

@@ -65,4 +65,4 @@ require "ucp/util/sms_request.rb"
 require "ucp/util/ucp.rb"
 require "ucp/util/ucp_server.rb"
 require "ucp/util/ucs2_packed_msg.rb"
-
+require "ucp/util/auth_request.rb"

data/lib/samples/main.rb

@@ -100,15 +100,18 @@ server.set_authentication_handler(method(:auth_handler))
 cliente=UcpClient.new("localhost",port,{:login=>8006,:password=>"timor"})
 #sent=cliente.send_message(1234,961234567,"1234567890"*17+"ola custa 1€ sabias?")
 
+
 ans=cliente.send_alert("961234567","0100")
-puts "ans: #{ans}"
+puts "ans_send_alert: #{ans}"
+
 s="1234567890"*8+"1€"
 sent=cliente.send_message(1234,961234567,s)
 puts "sent: #{sent}"
 ucp=Ucp30Operation.new
 ucp.basic_submit(1234, 961234567, "ola 1€éuro Ç!@\'\"#\$%&/()=<>,.-;:*+[]")
 ans=cliente.send_sync(ucp)
-puts "ans: #{ans}"
+puts "--------------------------"
+puts "ans_send_sync: #{ans}"
 cliente.close
 server.stop
 exit

data/lib/ucp/pdu/ucp51_operation.rb

@@ -58,7 +58,7 @@ class Ucp::Pdu::Ucp51Operation < Ucp::Pdu::UCP5x
  def parse_xser
    @xservices.each { |xser|
 
-     puts "xser_id: #{xser[0,2]}"
+#     puts "xser_id: #{xser[0,2]}"
      
      if xser[0,2].eql?("01")
         header=xser[4,xser[2,2].to_i(16)*2]
@@ -128,7 +128,7 @@ class Ucp::Pdu::Ucp51Operation < Ucp::Pdu::UCP5x
     # UCP51 supports IRA encoded SMS and 16 bits UCS2
     # for now assume IRA
     if !message.nil?
-      msg=UCP.ascii2ira(message)
+      msg=UCP.ascii2ira(message).encoded
     end
     mt=3
 

data/lib/ucp/util/ucp.rb

@@ -65,7 +65,7 @@ class Ucp::Util::UCP
     add_char(0x00,"@")
     add_char(0x01,"£")
     add_char(0x02,"$")
-    #add_char(0x03," ")
+    add_char(0x03,"¥")
     add_char(0x04,"è")
     add_char(0x05,"é")
     add_char(0x06,"ù")
@@ -73,12 +73,27 @@ class Ucp::Util::UCP
     add_char(0x08,"ò")
     add_char(0x09,"Ç")
     add_char(0x0A,"\n")
-    #add_char(0x0B," ")
-    #add_char(0x0C," ")
+    add_char(0x0B,"Ø")
+    add_char(0x0C,"ø")
     add_char(0x0D,"\r")
-    #add_char(0x0E,"A")
-    #add_char(0x0F,"a")
-
+    add_char(0x0E,"Å")
+    add_char(0x0F,"å")
+
+    add_char(0x10, "Δ")
+    add_char(0x11, "_")
+    add_char(0x12, "Φ")
+    add_char(0x13, "Γ")
+    add_char(0x14, "Λ")
+    add_char(0x15, "Ω")
+    add_char(0x16, "Π")
+    add_char(0x17, "Ψ")
+    add_char(0x18, "Σ")
+    add_char(0x19, "Θ")
+    add_char(0x1A, "Ξ")
+    # 0x1B is escape sequence for extended characters
+    add_char(0x1C, "Æ")
+    add_char(0x1D, "æ")
+    add_char(0x1E, "ß")
     add_char(0x1F,"É")
 
 
@@ -87,7 +102,7 @@ class Ucp::Util::UCP
     add_char(0x21,"!")
     add_char(0x22,'"')
     add_char(0x23,"#")
-    #add_char(0x24," ")
+    add_char(0x24,"¤")
     add_char(0x25,"%")
     add_char(0x26,"&")
     add_char(0x27,"'")

data/lib/ucp/util/ucp_server.rb

@@ -99,12 +99,19 @@ class Ucp::Util::UcpServer
               end
 
               reply_ucp=UCP.make_ucp_result(ucp)
-              reply_ucp.ack("ok")
+              if reply_ucp.operation == "31" || reply_ucp.operation == "60"
+                reply_ucp.ack("ok")
+              else
+                smscid="#{ucp.get_field(:adc)}:#{Time.now.strftime("%d%m%y%H%M%S")}"
+                reply_ucp.ack("",smscid)
+              end
 
               #puts "reply #{reply_ucp.to_s}"
               s.print reply_ucp.to_s
               puts "Ssent: #{reply_ucp.to_s}\n"
             end
+          rescue Exception=>e
+            puts "Error: #{e.backtrace}"
           ensure
             puts "*** #{name}:#{port} disconnected/closed"
             s.close # close socket on error

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: ruby_ucp
 version: !ruby/object:Gem::Version 
-  hash: 23
+  hash: 19
   prerelease: false
   segments: 
   - 0
-  - 2
+  - 3
   - 0
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors: 
 - Sergio Freire
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-06 00:00:00 +00:00
+date: 2011-10-21 00:00:00 +01:00
 default_executable: 
 dependencies: []
 
@@ -35,6 +35,7 @@ files:
 - Rakefile
 - Rakefile.orig
 - VERSION
+- lib/performance/stresser.rb
 - lib/ruby_ucp.rb
 - lib/samples/main.rb
 - lib/ucp/base.rb