comunika_gsm 0.1.17 → 0.1.18

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a65f11023e8462fd4c0b07fbecbda675059c3b74
-  data.tar.gz: 7cabb73cef987b46008b205a2c59148e74991fbf
+  metadata.gz: 96133aa9b5099b0c1c96538546aef17cdd961efd
+  data.tar.gz: caa32b6a6c5ee877247071632a85a9e89d636c33
 SHA512:
-  metadata.gz: 8dbe026adab1436b5f5c5b3c469330ec84120f91befbb7e1f1be3ca9b81a1a0c1ef836f60d6884a42a66cbc29cee17429ba7eee090a1e11bbc3202fe3b88b1c3
-  data.tar.gz: 203473ac5d57d11088b91065071c98e714e1039f59338e833e609211c23644f8312cc1930bba9fc419e9b9deaf4f4c4dae04ee15d283f3cc2897fb1a349d44d0
+  metadata.gz: 02f0eba8fa068927bb2e29f8a4d5ca9a2dcb504f07e96a61d51b5299634e357ef832802dc270dc92e75a501f9998559107df6c2b5834dbc72f6a1e979ab9004f
+  data.tar.gz: 3ca6bfed477a44a179bd507b3e45b63e43ccfd8d52667463185e81b3281973d04cc45d1c12392d25970535373a963bd995261f078174e6b890256d00299225f7

data/lib/comunika_gsm/gsm2.rb

@@ -44,6 +44,9 @@ module ComunikaGsm
 
     def wait
       buffer = @@port.read
+      while buffer.length == 0
+        buffer = @@port.read
+      end
       puts buffer if @@debug
       @@port.flush()
       buffer
@@ -51,39 +54,39 @@ module ComunikaGsm
 
     def close
       puts "Fechando conexão"
-      @@port.close
+      @@port.close if @@port
       @status = false
     end
 
-    def send_sms(msg)
-      return {id: nil, status: "ERROR", code: "304"} if msg[:number].length == 0
-      return {id: nil, status: "ERROR", code: "304"} if msg[:number].length < 11
-      return {id: nil, status: "ERROR", code: "503"} if msg[:message].length == 0
+    def send_sms(number,message,params = {})
+      if number.length == 0 || number.length < 11 || message.length == 0
+        return {id: nil, status: "ERROR", code: "304"}
+      else
+        ## GENERATE PDU TO MESSAGE ##
+        pdu = PDU.encode(:number => "+55" + number, :message => message, :smsc => params[:smsc])
 
-      ## GENERATE PDU TO MESSAGE ##
-      pdu = PDU.encode(:number => msg[:number].prepend("+55"), :smsc => msg[:smsc], :message => msg[:message])
+        cmd("AT+CMGS=#{pdu[:size]}\r")
+        res = cmd("#{pdu[:pdu]}#{26.chr}")
 
-      cmd("AT+CMGS=#{pdu[:size]}\r")
-      res = cmd("#{pdu[:pdu]}#{26.chr}")
+        sleep 3
+        while res.length == 0
+          res = wait
+        end
 
-      sleep 3
-      while res.length == 0
-        res = wait
-      end
+        if res.include?('+CMGS')
+          res = res.scan(/\+(\S+)\: (\d+)\r\n/)
+          status = 'OK'
+          code = "-1"
+          id = res.first[1]
+        elsif res.include?('+CMS')
+          res = res.scan(/\+CMS (\S+)\: (\d+)/).first
+          status = 'ERROR'
+          code = res[1]
+          id = nil
+        end
 
-      if res.include?('+CMGS')
-        res = res.scan(/\+(\S+)\: (\d+)\r\n/)
-        status = 'OK'
-        code = "-1"
-        id = res.first[1]
-      elsif res.include?('+CMS')
-        res = res.scan(/\+CMS (\S+)\: (\d+)/).first
-        status = 'ERROR'
-        code = res[1]
-        id = nil
+        {:id => id, :code => code, :status => status}
       end
-
-      {:id => id, :code => code, :status => status}
     end
 
     def messages

data/lib/comunika_gsm/version.rb

@@ -1,3 +1,3 @@
 module ComunikaGsm
-  VERSION = "0.1.17"
+  VERSION = "0.1.18"
 end

metadata

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