sms_serial 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2218e40033ca0ee896ded51cb8b596405c686eb9e58344b69c1a5143850657e9
-  data.tar.gz: 6ba62af5a95cdf967e25033f337abaea4a6be9f42a516e1174f4185863bbd386
+  metadata.gz: 4e5a10cce55b72c9b41594ef88286e54a7b6e4bdd28932b15dbe4569881f0972
+  data.tar.gz: bb6155c5d9aef10ededbe6b997db728159362a0ac615c4a6c0daaa6227408b41
 SHA512:
-  metadata.gz: b113fa9f96def320338e1acdb868254b098bbca025169b7981e5ddd75029bc0610ba59f075644132a827b83d52cdbb72b6f6d21ebbddd62bf3979b581ea0a98d
-  data.tar.gz: 7f4ae90d700dd22100913d10f5fd033546d710346ec0242beb2a7c5d4de85fec1687e97cf5ef8f2dbac60f7a88e3a02ec051df13bf2a3ef2e9744e6ee209f338
+  metadata.gz: f8b3838457059f336cfa0b6df438b1a3864d1214dcd9b300fe7f25b36382892e665beabd3100db84dfb64bb1af3951754c600ffaa7b9fb3f32d6cd6d8e90d20b
+  data.tar.gz: 79c1c779d0d1c560c1c70b7a927b368007a5d1a49f210668c0db64e6beb7a778ec14c27545361efa57191e458f31131fa339c533a64b8cf9c83b476d2c8fc3d5

data/lib/sms_serial.rb

@@ -20,7 +20,6 @@ class SmsSerial
     @debug = debug
     @sp = SerialPort.new dev, 115200    
     puts 'running ' + "SmsSerial".highlight 
-    @buffer = []
 
     @t = Thread.new {
 
@@ -49,22 +48,24 @@ class SmsSerial
 
     puts 'inside count'.info if @debug
 
-    r = cmd 'CPMS?'
-    puts 'r: ' + r.inspect if @debug
-    total = r.lines[2].split(',')[1].to_i
-    puts ('message count: ' + total.to_s).debug if @debug
-
-    total
+    cmd 'CPMS?' do |r|
+      puts 'r: ' + r.inspect if @debug
+      total = r.lines[2].split(',')[1].to_i
+      puts ('message count: ' + total.to_s).debug if @debug
 
+      total
+    end
+    
   end
 
   def delete(idx)
 
-    r = cmd 'CMD'
-    total = r.lines[2].split(',')[1].to_i
-    puts ('message count: ' + total.to_s).debug if @debug
+    cmd 'CMD' do |r|
+      total = r.lines[2].split(',')[1].to_i
+      puts ('message count: ' + total.to_s).debug if @debug
 
-    total
+      total
+    end
 
   end
 
@@ -84,18 +85,15 @@ class SmsSerial
     @sp.write %Q(AT+CMGL="ALL"\r\n)
     n.times.map {r = read_buffer; parse_msg(r)}
 
-    if n < 1 then
-      r = read_buffer
-      []
-    end
+    flush_output() if n < 1
+
   end
 
   # read an SMS message
   #
   def read(idx=1)
 
-    r = cmd 'CMGR=' + idx.to_s
-    parse_msg r
+    cmd('CMGR=' + idx.to_s) {|r| parse_msg r }
 
   end
 
@@ -106,11 +104,16 @@ class SmsSerial
   def cmd(s)
 
     @sp.write "AT+%s\r\n" % [s]
-    sleep 1.5 # give the command time to be processed by the SIM module
-    r = ''
+    sleep 1.5 # give the above command time to be processed by the SIM module
+    
     r = read_buffer
 
-    return r
+    block_given? ? yield(r) : r
+  end
+
+  def flush_output()
+    r = read_buffer
+    []
   end
 
   def read_buffer()
@@ -125,12 +128,9 @@ class SmsSerial
 
     raise SmsSerialError, "Message not found" unless heading
 
-    a = CSV.parse(heading)
-    sender, sent = a.first.values_at(1,3)
-    msg = {header: {sender: sender, sent: Time.parse(sent)}, 
-      body: r.lines[4].rstrip}
+    sender, sent = CSV.parse(heading).first.values_at(1,3)
+    {sender: sender, sent: Time.parse(sent), body: r.lines[4].rstrip}
 
   end
 
 end
-

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sms_serial
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - James Robertson
@@ -35,7 +35,7 @@ cert_chain:
   EYzIL92BZpCZCtjvESIrEv5VJgAmyveQNNU5h8mCJUtl5niL+zFr9No3bLdleGKx
   h+73cUmDE6yvcIa2oIkbUrre
   -----END CERTIFICATE-----
-date: 2019-09-02 00:00:00.000000000 Z
+date: 2019-09-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: c32