sms_serial 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4e5a10cce55b72c9b41594ef88286e54a7b6e4bdd28932b15dbe4569881f0972
-  data.tar.gz: bb6155c5d9aef10ededbe6b997db728159362a0ac615c4a6c0daaa6227408b41
+  metadata.gz: 2a75b0d87e21e0b2c7d3c7d1ea5e85842c16aa04e3f7116e966e1eda99c74be3
+  data.tar.gz: b13eae5dc152fa3da533dbaa07e391ec7362372dbedaab3206f837f91de895e6
 SHA512:
-  metadata.gz: f8b3838457059f336cfa0b6df438b1a3864d1214dcd9b300fe7f25b36382892e665beabd3100db84dfb64bb1af3951754c600ffaa7b9fb3f32d6cd6d8e90d20b
-  data.tar.gz: 79c1c779d0d1c560c1c70b7a927b368007a5d1a49f210668c0db64e6beb7a778ec14c27545361efa57191e458f31131fa339c533a64b8cf9c83b476d2c8fc3d5
+  metadata.gz: 615c227c6f9ee357102113ec97f7495d2ac0ac10ac926f576a58832a60e6c49790ca4fff0f2ef95b7398b635b3d2ec0e35e9ba2a3d8c13fc44779bf3b85201c7
+  data.tar.gz: 17cb01a5a135599c331b6de88afd66004aee074182e3cd2a0516f5121df4ac48119183db07e47635c7f420b06bc5b244f4fffb4daa6bf8de85d31df8783bb96e

checksums.yaml.gz.sig

@@ -1,4 +1,3 @@
-ez�5�/�v�vH0~���ؐ<
h0��:w�֝P3�d4��o)*􆁰�Λ3���Oڒ�(%�>��y��C��yV@F.�����
-~��l�l�d��o�Dl;oз�#��Y��^���O���!ޖ
-"�1a�����д�;��w
-��|����3h'�"�T.2Wȧr�UB�֟c��ı�0�MX�����J}N�|�����}�����*EG��{N��CU������@�����D�-���͟��$;��Y��z&Km�jx��z'p|&�J�$�5�0��5%���1o`A�D�Dٱ9q{���%����M�̣Y�	,q��	yIk�c��h��.�?
+������͚���Q�{�^�^�Jw�8Z��SsHe�e�c�ܯ��Ċ������Ҍ��ԝS��Ĕ�Rre�r�(o�	8u�a̴O\�J%�ç�
+��P�:�=Ǯ|Ͼ9�5����Ւ Ҁ$�o��8 <�uQC�n�O�	C�L�TZ��-�_EWQm�7�$:�=�N6�
+X������GEV�\([���I:���ׯz&Ӧ�AƐQ��������Ӗܵ��_֭�j�N�r�t_���2�F��h��{Y�7�LcE�JAn�n�G����|�ڴ�ٰ�'6߫����m��*�1c��WƂ�C�Tq�னe+���+.1�m�X�}"cnFd���Ā3&T�^��q{��p�(M�i�

data/lib/sms_serial.rb

@@ -14,6 +14,7 @@ end
 class SmsSerial
   using ColouredText
 
+  attr_reader :t
 
   def initialize(dev='/dev/ttyUSB0', callback: nil, debug: false)
 
@@ -29,12 +30,16 @@ class SmsSerial
 
         message = @sp.read
         if message.length > 0
-
+    
+          callback.call(message) if callback and @debug
+    
           if message =~ /^\+CMTI:/ then
             callback.call(message.lines[2]) if callback
           else
 
+            Thread.current[:v] ||= []
             Thread.current[:v]  << message 
+
           end
         end
       end
@@ -103,8 +108,10 @@ class SmsSerial
   #
   def cmd(s)
 
-    @sp.write "AT+%s\r\n" % [s]
-    sleep 1.5 # give the above command time to be processed by the SIM module
+    puts ('inside cmd s: ' + s.inspect).debug if @debug
+    r2 = @sp.write "AT+%s\r\n" % [s]
+    puts 'r2: ' + r2.inspect if @debug
+    puts '@t[:v] ' + @t[:v].inspect if @debug
     
     r = read_buffer
 
@@ -117,18 +124,28 @@ class SmsSerial
   end
 
   def read_buffer()
-    @t[:v].any? ? @t[:v].shift : ''
+    
+    sleep 2 if @debug
+
+    puts 'inside read_buffer @t[:v]: ' + @t[:v].inspect if @debug
+    r = ''
+    @t[:v].any? ? (r += @t[:v].shift until @t[:v].empty?).to_s : r = ''
+    
+    puts 'read_buffer r: ' + r.inspect if @debug
+    r
+    
   end
 
   def parse_msg(r)
 
     puts ('parse_msg r: ' + r.inspect).debug if @debug
     return if r.empty?
-    heading = r.lines[2][/\+CMG[RL]: (?:\d+,)?(.*)/,1]
+    heading = r.lines[2][/\+CMG[RL]: (?:[^,]+,)?(.*)/,1]
+    puts ('heading: ' + heading.inspect).debug if @debug
 
     raise SmsSerialError, "Message not found" unless heading
 
-    sender, sent = CSV.parse(heading).first.values_at(1,3)
+    sender, sent = CSV.parse(heading).first.values_at(0,2)
     {sender: sender, sent: Time.parse(sent), body: r.lines[4].rstrip}
 
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sms_serial
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - James Robertson