comunika_gsm 0.1.26 → 0.1.27

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 717beda74b5fbfc2aa3d9707ad88405ebdb6d28d
-  data.tar.gz: 7acc93a732ff29b6077efb438bc10ad489b66987
+  metadata.gz: 316087df89662febc0b11a4b79949a5a8ca07895
+  data.tar.gz: d91e4b5cef87d9adf91888b5b27317bc34bc712c
 SHA512:
-  metadata.gz: e1fd2dd26aeab6e2c93a07a7c62091d0809810ab5301e0bc2cc79128ff8b34303a8ce15eb5b5d91231af5808476ca1ebbe37994967cf26aaa8dc68c3b8f6e07e
-  data.tar.gz: 7249ecfa3de3561d2869d4894f1df7817be7b0fd71c758178ad45ecf1940ef88e53a099c7538ad17015a6e8725c4bf10a02628a045b881a9ac0259d0be2fb089
+  metadata.gz: 89d2dd57711efa2c42e1c5d9d61b914a79fd0767200747ed412c3b8cb648aaf0c4cdc5176fd3d6b12db7ada5d454ca385d067370b2686c7a90f9a52a8d7c2ded
+  data.tar.gz: 9f93f03e4e7e0c1f0988b9fc697390ea699148fa2f859ce45ffe95616f1947ef4c683e3444b4d51cb99945162fb1280db5ca296f869cceb061881ed23b2bb0ba

data/lib/comunika_gsm/gsm2.rb

@@ -1,26 +1,27 @@
 module ComunikaGsm
   class GSM2
-    attr_accessor :status, :imei, :iccid, :provider, :signal_level, :msgs
+    attr_accessor :status, :imei, :iccid, :provider, :signal_level, :busy, :last_send_at, :port, :debug
 
-    def initialize(params = {})
+    def initialize(port,params = {})
       raise "Invalid params" if params.empty?
+      self.busy = false
       
       begin
-        @@port = SerialPort.new("/dev/#{params[:port]}",19200,8,1, SerialPort::NONE)
-        @@port.read_timeout = params[:read_timeout] || 150 ## Set timeout of command
+        self.port = SerialPort.new("/dev/#{port}",19200,8,1, SerialPort::NONE)
+        self.port.read_timeout = params[:read_timeout] || 150 ## Set timeout of command
 
-        @@debug = params[:debug] || false
+        self.debug = params[:debug] || false
 
         res = cmd("ATE0\r\n") ## Set echo off
         if res.length > 0
           cmd("AT+CMGF=0\r\n") ## Set PDU mode
-          @status = true
+          self.status = true
 
-          if params[:load_settings]
-            alpha(:imei)
-            alpha(:iccid)
-            alpha(:provider)
-            alpha(:signal_level)
+          if params[:load_infos]
+            info("imei")
+            info("iccid")
+            info("provider")
+            info("signal_level")
           end
         else
           return @status = false
@@ -33,44 +34,45 @@ module ComunikaGsm
 
     def cmd(c)
       begin
-        @@port.write(c)
+        self.port.write(c)
         normalize(c,wait)
       rescue => ex
         puts ex
-        @status = false
-        #close
+        self.status = false
+        close if self.port
       end
     end
 
     def wait
-      buffer = @@port.read
-      puts buffer if @@debug
-      @@port.flush()
+      buffer = self.port.read
+      puts buffer if self.debug
+      self.port.flush()
       buffer
     end
 
     def close
-      puts "Fechando conexão" if @@debug
-      @@port.close if @@port
-      @status = false
+      puts "Fechando conexão" if self.debug
+      self.port.close if self.port
+      self.status = false
     end
 
     def send_sms(num,msg,params = {})
-      puts "-- Send message to #{num} -- msg #{msg}"
-      if num.length == 0 || num.length < 11 || msg.length == 0
+      self.busy = true
+      puts "-- Send message to #{num} -- msg #{msg}" if self.debug
+      if num.length == 0 || num.length < 11 || num.length > 11 || msg.length == 0
         {id: nil, status: "ERROR", code: "600"}
       else
         ## GENERATE PDU TO MESSAGE ##
-        pdu = PDU.encode(:number => "+55" + num, :message => msg, :smsc => params[:smsc])
+        pdu = PDU.encode("+55" + num, msg, :smsc => params[:smsc])
 
         cmd("AT+CMGS=#{pdu[:size]}\r")
         res = cmd("#{pdu[:pdu]}#{26.chr}")
 
-        puts "--- Resultado do envio: #{res}" if @@debug
+        puts "--- Resultado do envio: #{res}" if self.debug
      
         sleep 3
-        while res.to_s.length == 0
-          puts "--- Esperando resultado envio: #{res}" if @@debug
+        while res.length == 0
+          puts "--- Esperando resultado envio: #{res}" if self.debug
           res = wait
         end
 
@@ -86,28 +88,34 @@ module ComunikaGsm
           id = nil
         end
 
+        self.busy = false
+        self.last_send_at = Time.now
         {:id => id, :code => code, :status => status}
       end
     end
 
     def messages
+      self.busy = true
       sms = cmd("AT+CMGL=4\r\n")
-      @msgs = sms.scan(/\+CMGL\:\s*?(\d+),\s*?(\d+),.*?\,s*?(\d+)\r\n(.*)/)
+      msgs = sms.scan(/\+CMGL\:\s*?(\d+),\s*?(\d+),.*?\,s*?(\d+)\r\n(.*)/)
 
       ## IDS: 0 - ID, 1 -- ,2 - size, 3 - PDU
-      @msgs.collect!{ |m| PDU::PDUDecode.new(connection: self, id: m[0], size: m[2], pdu: m[3].chomp).decode }# rescue nil
+      self.busy = false
+      msgs.collect!{ |m| PDU::PDUDecode.new(connection: self, id: m[0], size: m[2], pdu: m[3].chomp).decode }# rescue nil
     end
 
-    def alpha(type)
+    def info(type)
       case type
-      when :imei
-        @imei = cmd("AT+CGSN\r\n")
-      when :iccid
-        @iccid = cmd("AT+CRSM=176,12258,0,0,10\r\n")
-      when :provider
-        @provider = cmd("AT+COPS?\r\n")
-      when :signal_level
-        @signal_level = cmd("AT+CSQ\r\n")
+      when "imei"
+        self.imei = cmd("AT+CGSN\r\n")
+      when "iccid"
+        self.iccid = cmd("AT+CRSM=176,12258,0,0,10\r\n")
+      when "provider"
+        self.provider = cmd("AT+COPS?\r\n")
+      when "signal_level"
+        self.signal_level = cmd("AT+CSQ\r\n")
+      when "port"
+        self.port
       else
         cmd("AT\r\n")
       end

data/lib/comunika_gsm/pdu.rb

@@ -1,10 +1,10 @@
 module ComunikaGsm
   module PDU
     include ComunikaGsm
-    def self.encode(params)
-      return unless params[:message]
-      return unless params[:number]
-      result = @@pdu_converter.call("stringToPDU",params[:message],params[:number],params[:smsc] || '',params[:ecoding] || 7,params[:sms_class] || 1,params[:valid],params[:deliver] || true,params[:valid_flag] || false)
+    def self.encode(num, message, params = {})
+      return unless message
+      return unless num
+      result = @@pdu_converter.call("stringToPDU",message,num,params[:smsc] || '',params[:ecoding] || 7,params[:sms_class] || 1,params[:valid],params[:deliver] || true,params[:valid_flag] || false)
       self.parse_json(result)
     end
 

data/lib/comunika_gsm/version.rb

@@ -1,3 +1,3 @@
 module ComunikaGsm
-  VERSION = "0.1.26"
+  VERSION = "0.1.27"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: comunika_gsm
 version: !ruby/object:Gem::Version
-  version: 0.1.26
+  version: 0.1.27
 platform: ruby
 authors:
 - Jefferson Silva
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-10-30 00:00:00.000000000 Z
+date: 2017-10-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler