lleidasms 1.0.2 → 1.1.0

data/README.md

@@ -1,83 +1,100 @@
-# Lleidasms
-A [Lleida.net](http://lleida.net/) SMS gateway for Ruby.
-
-# Description
-Receive and send standar and premium SMS/MMS using [Lleida.net](http://lleida.net/) services.
-
-#Features
-  - client class
-  - gateway superclass for new client implementations
-
-#Installation
-##From the command line.
-
-```shell
-  gem install lleidasms
-```
-
-##Using Gemfile.
-
-1 Add to your application Gemfile
-
-```ruby
-gem 'lleidasms'
-```
-
-2 Type
-
-```shell
-  bundle install
-```
-
-# Examples
-## Demo
-```shell
-  lleidasms YOUR_USER YOUR_PASSWORD
-```
-
-or
-
-```shell
-  lleidasms_client YOUR_USER YOUR_PASSWORD
-```
-
-## Using default client class
-```ruby
-  sms = Lleidasms::Client.new
-  sms.connect <YOUR_USER>, <YOUR_PASSWORD>
-  puts sms.saldo
-  sms.close
-```
-
-## Creating a new client
-```ruby
-	class SMS < Lleidasms::Gateway
-	  event :INCOMINGMO, :new_sms
-
-	  def new_sms label, cmd, args
-	    id    = args.shift
-	    time  = args.shift
-	    from  = args.shift
-	    to    = args.shift
-	    sms   = args.join(' ')
-	    puts "  id #{id}"
-	    puts "  time #{time}"
-	    puts "  from #{from}"
-	    puts "  to #{to}"
-	    puts "  sms #{sms}"
-	    cmd_incomingmoack id, label
-	  end
-	end
-
-	sms = SMS.new
-	sms.connect
-	sms.listener
-	sms.cmd_login <YOUR_USER>, <YOUR_PASSWORD>
-
-	while sms.conected?
-		# Some tasks
-	end
-```
-
-# License
-Released under the MIT license: [http://www.opensource.org/licenses/MIT](http://www.opensource.org/licenses/MIT)
+
+#Lleidasms
+  A [Lleida.net](http://lleida.net/) SMS gateway for Ruby.
+
+#Description
+  Receive and send standar and premium SMS/MMS using [Lleida.net](http://lleida.net/) services.
+
+##Features
+  - client class
+  - gateway superclass for new client implementations
+
+##Protocol implementation (78%)
+  - Comandos Generales (100%)
+  	* implemented: saldo, ping, pong, infonum, tarifa, quit
+  - Comandos para el envíıo de MT simples (100%)
+  	* implemented: submit, bsubmit, usubmit, fsubmit, fbsubmit, fusubmit, dsubmit, dbsubmit, dusubmit, dfsubmit, dbfsubmit, dfusubmit, waplink, dst, msg, filemsg, mmsmsg, envia, acuseon, acuseoff, acuse, acuseack, trans
+  - Comandos para la recepcion de SMS (NO Premium) (100%)
+  	* implemented: allowanswer, incomingmo, incomingmoack
+  - Comandos para la recepcion de SMS (Premium) (0%)
+  	* implemented: none
+  	* TODO: deliver, resp, bresp, waplinkresp
+  - Comandos para la resolucion de MSIDSN (0%)
+  	* implemented: none
+  	* TODO: checkall, rcheckall, checknetwork, rchecknetwork
+
+More info in [Lleida.net Developers Network](http://soporte.lleida.net/?p=35)
+
+#Installation
+##From the command line
+
+```shell
+  gem install lleidasms
+```
+
+##Using Gemfile
+
+1 Add to your application Gemfile
+
+```ruby
+gem 'lleidasms'
+```
+
+2 Type
+
+```shell
+  bundle install
+```
+
+# Examples
+## Demo
+```shell
+  lleidasms YOUR_USER YOUR_PASSWORD
+```
+
+or
+
+```shell
+  lleidasms_client YOUR_USER YOUR_PASSWORD
+```
+
+## Using default client class
+```ruby
+  sms = Lleidasms::Client.new
+  sms.connect <YOUR_USER>, <YOUR_PASSWORD>
+  puts sms.saldo
+  sms.close
+```
+
+## Creating a new client
+```ruby
+	class SMS < Lleidasms::Gateway
+	  event :INCOMINGMO, :new_sms
+
+	  def new_sms label, cmd, args
+	    id    = args.shift
+	    time  = args.shift
+	    from  = args.shift
+	    to    = args.shift
+	    sms   = args.join(' ')
+	    puts "  id #{id}"
+	    puts "  time #{time}"
+	    puts "  from #{from}"
+	    puts "  to #{to}"
+	    puts "  sms #{sms}"
+	    cmd_incomingmoack id, label
+	  end
+	end
+
+	sms = SMS.new
+	sms.connect
+	sms.listener
+	sms.cmd_login <YOUR_USER>, <YOUR_PASSWORD>
+
+	while sms.conected?
+		# Some tasks
+	end
+```
+
+# License
+Released under the MIT license: [http://www.opensource.org/licenses/MIT](http://www.opensource.org/licenses/MIT)

data/Rakefile

@@ -7,3 +7,8 @@ desc "Run all tests"
 task :test do
   exec "rspec --color"
 end
+
+desc "Generate docs"
+task :rdoc do
+  exec "rdoc --all"
+end

data/lib/lleidasms/client.rb

@@ -3,56 +3,344 @@ require "gateway"
 
 module Lleidasms
   class Client < Lleidasms::Gateway
-		event :ALL, :new_event
+    event :all, :new_event
+    event :acuse, :new_acuse
+    event :incomingmo, :new_incomingmo
 
     attr_accessor :timeout
 
-    def connect(user, password, timeout = 2.4)
-    	super()
-    	listener
-      cmd_login(user, password)
+    def connect user, password, timeout = 2.4
+      super()
+      listener
+      cmd_login user, password
       self.timeout= timeout
+      @acuse = []
+      @incomingmo = []
     end
 
-		def saldo()
-			cmd_saldo
-			return false unless wait_for(last_label)
-			return @response_args[0]
-		end
+    def saldo
+      cmd_saldo
+      return false unless wait_for last_label
+      return @response_args[0]
+    end
+
+    # *number*
+    #   The telephone number
+    def tarifa number
+      cmd_tarifa number
+      return false unless wait_for last_label
+      return @response_args
+    end
+
+    # *number*
+    #   The telephone number
+    # *message*
+    #   The string to send
+    # *opts*
+    #   - nowait: (default false) no wait for response
+    #   - sender: The sender telephone number
+    #   - date: Date and time to send message in format YYYYMMDDhhmm[+-]ZZzz
+    #   - encode
+    #       * :ascii (default)
+    #       * :binary message is in base64 encoded
+    #       * :base64 message is in base64 encoded
+    #       * :unicode message is in unicode and base64 encoded
+    def send_sms number, message, opts={}
+      wait       =!(opts[:nowait] || false)
+      encode    =  opts[:encode] || :ascii
+      sender    =  opts[:sender] || false
+      datetime  =  opts[:date]   || false
+
+      case encode
+        when :binary || :base64
+          encode = 'B'
+        when :unicode
+          encode = 'U'
+        else # :ascii
+          encode = ''
+      end
+
+      if sender
+        sender = "#{sender} "
+        custom = 'F'
+      else
+        custom = ''
+      end
+
+      if datetime
+        datetime = "#{datetime} "
+        date = 'D'
+      else
+        date = ''
+      end
+
+      cmd_raw "#{date}#{custom}#{encode}SUBMIT", "#{datetime}#{sender}#{number} #{message}"
+
+      if wait
+        wait_for last_label
+        return false if @response_cmd.eql? 'NOOK'
+        return "#{@response_args[0]}.#{@response_args[1]}".to_f
+      end
+    end
+
+    # *number*
+    #   The telephone number
+    # *url*
+    #   The URL to content. Usually a image, tone or application
+    # *message*
+    #   Information text before downloading content
+    def send_waplink number, url, message
+      cmd_waplink number, url, message
+
+      if wait
+        wait_for last_label
+        return false if @response_cmd.eql? 'NOOK'
+        return "#{@response_args[0]}.#{@response_args[1]}".to_f
+      end
+    end
+
+    # Add telephone numbers into the massive send list.
+    # It is recommended not to send more than 50 in each call
+    #
+    # Return TRUE if ok
+    #   - see accepted in *last_addressees_accepted*
+    #   - see rejected in *last_addressees_rejected*
+    def add_addressee addressees, wait = true
+      @addressees_accepted = false
+      @addressees_rejected = false
+      if addressees.kind_of?(Array)
+        addressees = addressees.join ' '
+      end
+
+      cmd_dst addressees
+
+      while wait && !@addressees_accepted
+        wait_for last_label
+        return false if !add_addressee_results
+      end
+    end
+
+    def last_addressees_accepted
+      return @addressees_accepted
+    end
+
+    def last_addressees_rejected
+      return @addressees_rejected
+    end
+
+    # Set the message for the massive send list
+    def msg message, wait = true
+      cmd_msg message
+      return false unless wait_for(last_label) if wait
+      return @response_args
+    end
+
+    # Set file content (base64 encded) as message for the massive send list
+    #  *data* file contenten base64 encoded
+    # Available types:
+    #  * :jpeg        image JPEG
+    #  * :gif         image GIF
+    #  * :midi        polyfonic melody MIDI
+    #  * :sp_midi     polyfonic melody SP-MIDI
+    #  * :amr         sound AMR
+    #  * :mp3         sound MP3
+    #  * :gpp         video 3GP
+    #  * :java        application JAVA
+    #  * :symbian     application Symbian
+    def filemsg type, data, wait = true
+      cmd_filemsg type, data
+      return false unless wait_for(last_label) if wait
+      return @response_args
+    end
+
+    # Set file content (base64 encded) as message for the massive send list
+    #  *data* file contenten base64 encoded
+    #  *title* Information title before downloading content
+    #  *message* Information text before downloading content
+    # Available types:
+    #  * :jpeg        image JPEG
+    #  * :gif         image GIF
+    #  * :midi        polyfonic melody MIDI
+    #  * :sp_midi     polyfonic melody SP-MIDI
+    #  * :amr         sound AMR
+    #  * :mp3         sound MP3
+    #  * :gpp         video 3GP
+    #  * :java        application JAVA
+    #  * :symbian     application Symbian
+    def mmsmsg type, data, title, message, wait = true
+      cmd_mmsmsg type, data, title, message
+      return false unless wait_for(last_label) if wait
+      return @response_args
+    end
 
-		def tarifa(numero)
-			cmd_tarifa numero
-			return false unless wait_for(last_label)
-			return @response_args
-		end
+    # Send message/file to the massive send list
+    def send_all wait = true
+      cmd_envia
 
-		def send_sms(wait = true)
-			saldo
-			wait_for(last_label) if wait
-		end
+      if wait
+        wait_for last_label
+        return false if @response_cmd.eql? 'NOOK'
+        return "#{@response_args[0]}.#{@response_args[1]}".to_f
+      end
+    end
+
+    # *opts*
+    #   - nowait: (default false) no wait for response
+    #   - cert: true/false (default false) use certificated confirmations
+    #   - lang
+    #       * :es Spanish (default)
+    #       * :ca Catalan
+    #       * :en English
+    #       * :fr French
+    #       * :de German
+    #       * :it Italian
+    #       * :nl Dutch
+    #       * :pt Portuguese
+    #       * :pl Polish
+    #       * :se Swedish
+    def acuseon opts={}
+      wait      =!(opts[:nowait]  || false)
+      lang      =  opts[:lang]    || false
+      cert      =  opts[:cert]    || false
+      email     =  opts[:email]   || 'INTERNAL'
+
+      cmd_acuseon lang, cert ? 'D' : false, email
+
+      return false unless wait_for(last_label) if wait
+      true
+    end
+
+    def acuseoff wait = true
+      cmd_acuseoff
+      return false unless wait_for(last_label) if wait
+      true
+    end
+
+    def acuse?
+      @acuse.count > 0
+    end
+
+    def incomingmo?
+      @incomingmo.count > 0
+    end
+
+    # Return hash or false
+    #   - :id
+    #   - :destino
+    #   - :timestamp_acuse
+    #   - :estado
+    #       * :acked     Entregado a la operadora correctamente
+    #       * :buffred   Telefono apagado o fuera de cobertura
+    #       * :failed    El mensaje no se puede entregar en destino
+    #       * :delivrd   El mesaje ha sido entregado en destino
+    #   - :timestamp_envio
+    #   - :texto
+    def acuse
+      return false unless acuse?
+      row = @acuse.shift
+      return {
+          id: row[0],
+          destino: row[1],
+          timestamp_acuse: row[2],
+          estado: row[3].to_sym,
+          timestamp_envio: row[4],
+          texto: row[5] || ''
+        }
+    end
+
+    # - wait: (default false) no wait for response
+    # - action
+    #     * :begin
+    #     * :end
+    #     * :abort
+    def trans action, wait = true
+      return false unless cmd_trans action
+      if wait
+        wait_for last_label
+        return false if @response_cmd.eql? 'NOOK'
+        return false if @response_args[1].eql? 'NOOK'
+        return true if @response_args[0].eql? 'INICIAR'
+        return true if @response_args[0].eql? 'ABORTAR'
+        return "#{@response_args[2]}.#{@response_args[3]}".to_f
+      end
+    end
+
+    def trans_begin wait = true
+      trans :begin, wait
+    end
+
+    def trans_end wait = true
+      trans :end, wait
+    end
+
+    def trans_abort wait = true
+      trans :abort, wait
+    end
+
+    def allowanswer on = true, wait = true
+      cmd_allowanswer on
+      wait_for last_label if wait
+    end
+
+    # Return hash or false
+    #   - :id
+    #   - :timestamp
+    #   - :remitente
+    #   - :destino
+    #   - :texto
+    def incomingmo
+      return false unless incomingmo?
+      row = @incomingmo.shift
+      return {
+          id: row.shift,
+          timestamp: row.shift,
+          remitente: row.shift,
+          destino: row.shift,
+          texto: row.join(' ')
+        }
+    end
 
     private
-    def new_event(label, cmd, args)
-    	@event_label = label
-    	@event_cmd   = cmd
-    	@event_args  = args
+    def add_addressee_results
+      @addressees_rejected = @response_cmd_hash['REJDST'] if @response_cmd_hash['REJDST']
+      @addressees_accepted = @response_cmd_hash['OK'] if @response_cmd_hash['OK']
+      return false if @response_cmd.eql? 'NOOK'
+      return true
+    end
+
+    def new_event label, cmd, args
+      @event_label = label
+      @event_cmd   = cmd
+      @event_args  = args
       if @wait_for_label.eql? @event_label
         @wait = false
-      	@response_label = label
-      	@response_cmd   = cmd
-      	@response_args  = args
+        @response_label = label
+        @response_cmd   = cmd
+        @response_args  = args
+        @response_cmd_hash[cmd] = args
       end
     end
 
-    def wait_for(label)
+    def wait_for label
+      @response_cmd_hash = {}
       @wait_for_label = label.to_s
       @wait = true
       t = Time.new
-    	while @wait do
+      while @wait do
          sleep 0.2
          return false if @timeout < (Time.new - t)
-    	end
-    	return true
+      end
+      return true
+    end
+
+    def new_acuse label, cmd, args
+      @acuse << args
+      cmd_acuseack args[0]
+    end
+
+    def new_incomingmo label, cmd, args
+      @incomingmo << args
+      cmd_incomingmoack args[0]
     end
 
   end

data/lib/lleidasms/gateway.rb

@@ -5,7 +5,7 @@ require "io/wait"
 module Lleidasms
   class Gateway
     # Client
-    def initialize(host = 'sms.lleida.net', port = 2048)
+    def initialize host = 'sms.lleida.net', port = 2048
       @host = host
       @port = port
       @my_label = 0
@@ -16,33 +16,33 @@ module Lleidasms
       $output_buffer = String.new
 
       $reader      = lambda do |line|
-      	$input_buffer << line.strip
-      	parser
+        $input_buffer << line.strip
+        parser
       end
       $writer      = lambda do |buffer|
-      	$server.puts "#{buffer}\r\n"
-      	puts "<#{buffer}\r\n"
-      	buffer.replace("")
+        $server.puts "#{buffer}\r\n"
+        puts "<#{buffer}\r\n"
+        buffer.replace ''
       end
     end
 
     def connect
       begin
-      	$server = TCPSocket.new(@host, @port)
-      	$conected = true
+        $server = TCPSocket.new @host, @port
+        $conected = true
       rescue
         $conected = false
-      	puts "Unable to open a connection."
-      	exit
+        puts "Unable to open a connection."
+        exit
       end
     end
 
     def listener
-      Thread.new($server) do |socket|
-      	while line = socket.gets
-      		$reader[line]
-      	end
-      	close!
+      Thread.new $server  do |socket|
+        while line = socket.gets
+          $reader[line]
+        end
+        close!
       end
     end
 
@@ -63,26 +63,26 @@ module Lleidasms
     # Callbacks
     $callbacks = {}
 
- 	  def self.event(name, method_name)
- 	  	$callbacks[name] = [] unless $callbacks[name]
+     def self.event name, method_name
+       $callbacks[name] = [] unless $callbacks[name]
       $callbacks[name] << method_name
-		end
+    end
 
-		def do_event(name)
-			run_event name.to_sym, @label, @cmd, @args
-		end
+    def do_event name
+      run_event name.to_sym, @label, @cmd, @args
+    end
 
-		def run_event(name, *args)
-      run_event_for(name.to_sym, self, *args)
+    def run_event name, *args
+      run_event_for name.to_sym, self, *args
     end
 
-    def run_event_for(name, scope, *args)
-    	return unless $callbacks[name.to_sym]
+    def run_event_for name, scope, *args
+      return unless $callbacks[name.to_sym]
       $callbacks[name.to_sym].each do |callback|
         if callback.kind_of? Symbol
-          scope.send(callback, *args)
+          scope.send callback, *args
         else
-          scope.instance_exec(*args, &callback)
+          scope.instance_exec *args, &callback
         end
       end
     end
@@ -97,86 +97,248 @@ module Lleidasms
       @my_label
     end
 
+    def cmd_raw cmd, args, label_response = new_label
+      $writer[label_response + " #{cmd} #{args}"]
+    end
+
     # CMD Generales
-    def cmd_login(user, password, label_response = new_label)
+    def cmd_login user, password, label_response = new_label
       $writer[label_response + " LOGIN #{user} #{password}"]
     end
 
-    def cmd_ping(time = Time.now.to_i.to_s, label_response = new_label)
+    def cmd_ping time = Time.now.to_i.to_s, label_response = new_label
       $writer[label_response + " PING "+ time]
     end
 
-    def cmd_pong(time = Time.now.to_i.to_s, label_response = new_label)
+    def cmd_pong time = Time.now.to_i.to_s, label_response = new_label
       $writer[label_response + " PONG "+ time]
     end
 
-    def cmd_saldo(label_response = new_label)
+    def cmd_saldo label_response = new_label
       $writer[label_response + " SALDO"]
     end
 
-    def cmd_infonum(numero, label_response = new_label)
-      $writer[label_response + " INFONUM #{numero}"]
+    def cmd_infonum number, label_response = new_label
+      $writer[label_response + " INFONUM #{number}"]
     end
 
-    def cmd_tarifa(numero, label_response = new_label)
-      $writer[label_response + " TARIFA #{numero}"]
+    def cmd_tarifa number, label_response = new_label
+      $writer[label_response + " TARIFA #{number}"]
     end
 
-    def cmd_quit(label_response = new_label)
+    def cmd_quit label_response = new_label
       $writer[label_response + " QUIT"]
     end
     # CMD Generales end
 
     # CMD Envios MT
+    def cmd_submit number, message, label_response = new_label
+      $writer[label_response + " SUBMIT #{number} #{message}"]
+    end
+
+    def cmd_bsubmit number, message, label_response = new_label
+      $writer[label_response + " BSUBMIT #{number} #{message}"]
+    end
+
+    def cmd_usubmit number, message, label_response = new_label
+      $writer[label_response + " USUBMIT #{number} #{message}"]
+    end
+
+    def cmd_fsubmit number, message, label_response = new_label
+      $writer[label_response + " FSUBMIT #{number} #{message}"]
+    end
+
+    def cmd_fbsubmit number, message, label_response = new_label
+      $writer[label_response + " FBSUBMIT #{number} #{message}"]
+    end
+
+    def cmd_fusubmit number, message, label_response = new_label
+      $writer[label_response + " FUSUBMIT #{number} #{message}"]
+    end
+
+    def cmd_waplink number, message, label_response = new_label
+      $writer[label_response + " WAPLINK #{number} #{message}"]
+    end
+
+    def cmd_dst numbers, label_response = new_label
+      $writer[label_response + " DST #{numbers}"]
+    end
+
+    def cmd_msg message, label_response = new_label
+      $writer[label_response + " MSG #{message}"]
+    end
+
+    #  *data* file contenten base64 encoded
+    # Available types:
+    #  * :jpeg        image JPEG
+    #  * :gif         image GIF
+    #  * :midi        polyfonic melody MIDI
+    #  * :sp_midi     polyfonic melody SP-MIDI
+    #  * :amr         sound AMR
+    #  * :mp3         sound MP3
+    #  * :gpp         video 3GP
+    #  * :java        application JAVA
+    #  * :symbian     application Symbian
+    def cmd_filemsg type, data, label_response = new_label
+      mime = mimetype type
+      $writer[label_response + " FILEMSG #{mime} #{data}"] if mime
+    end
+
+    #  *data* file contenten base64 encoded
+    #  *title* Information title before downloading content
+    #  *message* Information text before downloading content
+    # Available types:
+    #  * :jpeg        image JPEG
+    #  * :gif         image GIF
+    #  * :midi        polyfonic melody MIDI
+    #  * :sp_midi     polyfonic melody SP-MIDI
+    #  * :amr         sound AMR
+    #  * :mp3         sound MP3
+    #  * :gpp         video 3GP
+    #  * :java        application JAVA
+    #  * :symbian     application Symbian
+    def cmd_mmsmsg type, data, title, message, label_response = new_label
+      mime = mimetype type
+      $writer[label_response + " MMSMSG #{mime} #{data} #{title}|#{message}"] if mime
+    end
+
+    def cmd_envia label_response = new_label
+      $writer[label_response + " ENVIA"]
+    end
     # CMD Envios MT end
 
     # CMD Recepcion SMS (no premium)
-    def cmd_allowanswer(allow = true, label_response = new_label)
+    def cmd_allowanswer allow = true, label_response = new_label
       $writer[label_response + " ALLOWANSWER " + (allow ? 'ON' : 'OFF')]
     end
 
-    def cmd_incomingmoack(m_id, label_response = new_label)
+    def cmd_incomingmoack m_id, label_response = new_label
       $writer[label_response + " INCOMINGMOACK #{m_id}"]
     end
+
+    # *opts*
+    #   - cert: true/false (default false) use certificated confirmations
+    #       * false (default)
+    #       * :d Default Service
+    #   - lang
+    #       * :es Spanish (default)
+    #       * :ca Catalan
+    #       * :en English
+    #       * :fr French
+    #       * :de German
+    #       * :it Italian
+    #       * :nl Dutch
+    #       * :pt Portuguese
+    #       * :pl Polish
+    #       * :se Swedish
+    #   - mode
+    #       * email to send notification
+    #       * INTERNAL to use ACUSE
+    def cmd_acuseon lang=false, cert=false, mode = 'INTERNAL', label_response = new_label
+      l = lang ? "lang=#{lang.to_s.upcase} " : ''
+      c = cert ? "cert_type=#{cert.to_s.upcase} " : ''
+      $writer[label_response + " ACUSEON #{l}#{c}#{mode}"]
+    end
+
+    def cmd_acuseoff label_response = new_label
+      $writer[label_response + " ACUSEOFF"]
+    end
+
+    def cmd_acuseack id, label_response = new_label
+      $writer[label_response + " ACUSEACK #{id}"]
+    end
+
+    # - action
+    #     * :begin
+    #     * :end
+    #     * :abort
+    def cmd_trans action, label_response = new_label
+      type = case action
+        when :begin
+          'INICIAR'
+        when :end
+          'FIN'
+        when :abort
+          'ABORTAR'
+        else
+          return false
+      end
+      $writer[label_response + " TRANS #{type}"]
+    end
     # CMD Recepcion SMS (no premium) end
 
     # CMD Recepcion SMS (premium)
     # CMD Recepcion SMS (premium) end
 
-		def parser
-			until $input_buffer.empty?
-				line = $input_buffer.shift
-				puts ">#{line}\r\n"
-				@args = line.split(' ')
-				@label = @args.shift
-				@cmd   = @args.shift
-
-				case @cmd
-				# CMD Generales
-				when 'OK'
-				when 'NOOK'
-				when 'RSALDO'
-				when 'PING'
-				  cmd_pong @args[0], @label
-				when 'PONG'
-				  cmd_ping @args[0], @label
-				when 'RINFONUM'
-				when 'RTARIFA'
-				when 'BYE'
-					close!
+    def parser
+      until $input_buffer.empty?
+        line = $input_buffer.shift
+        puts ">#{line}\r\n"
+        @args = line.split ' '
+        @label = @args.shift
+        @cmd   = @args.shift
+        case @cmd
+        # CMD Generales
+        when 'OK'
+        when 'NOOK'
+        when 'RSALDO'
+        when 'PING'
+          cmd_pong @args[0], @label
+        when 'PONG'
+          cmd_ping @args[0], @label
+        when 'RINFONUM'
+        when 'RTARIFA'
+        when 'BYE'
+          close!
         # CMD Envios MT
-
+        when 'SUBMITOK'
+        when 'BSUBMITOK'
+        when 'USUBMITOK'
+        when 'FSUBMITOK'
+        when 'FBSUBMITOK'
+        when 'FUSUBMITOK'
+        when 'WAPLINKOK'
+        when 'REJDST'
+        when 'ACUSE'
+        when 'ACUSEACKR'
+        when 'RTRANS'
         # CMD Recepcion SMS (no premium)
         when 'INCOMINGMO'
 
         # CMD Recepcion SMS (premium)
 
-				else
+        else
           # unknow
-				end
-				do_event(@cmd)
-				do_event(:all)
-			end
-		end
+        end
+        do_event @cmd.downcase
+        do_event :all
+      end
+    end
+
+    private
+    def mimetype type
+      case type
+        when :jpeg
+          'image/jpg'
+        when :gif
+          'image/gif'
+        when :midi
+          'audio/midi'
+        when :sp_midi
+          'audio/sp-midi'
+        when :amr
+          'audio/amr'
+        when :mp3
+          'audio/mpeg'
+        when :gpp
+          'video/3gpp'
+        when :java
+          'application/java-archive'
+        when :symbian
+          'application/vnd.symbian.instal'
+        else
+          false
+      end
+    end
   end
 end

data/lib/lleidasms/version.rb

@@ -1,3 +1,3 @@
 module Lleidasms
-  VERSION = "1.0.2"
+  VERSION = "1.1.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: lleidasms
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-21 00:00:00.000000000Z
+date: 2012-02-23 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &15864760 !ruby/object:Gem::Requirement
+  requirement: &17522540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,7 +21,7 @@ dependencies:
         version: 2.7.0
   type: :development
   prerelease: false
-  version_requirements: *15864760
+  version_requirements: *17522540
 description: Receive and send standar and premium SMS/MMS using Lleida.net services.
 email:
 - mabarroso@mabarroso.com