ruby_astm 1.2.5 → 1.2.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c8929f2849304da9211d8a1bc5dda4f531d86b1efd93c0961c5911fd850b166c
-  data.tar.gz: 2582f498e916278c9795fbe3dd9438223e9c890eb19094c50ea8ca4b8bb38f7c
+  metadata.gz: 34dfde956008c06eeb01284d7094a1a641eeee761688883c15973d82b27b395b
+  data.tar.gz: e82af600dfdb7f790e3f18282a14b2963cd307a9eaa9281b6f00bc1a8c72edd3
 SHA512:
-  metadata.gz: 1f646e07f6c22da4abc05758095158743b1e19995beff2f90392369e2445141a3afe2ea620bd977cedc0ec79cd6d2158f5b760c527aed13af401d56c7b3a8c30
-  data.tar.gz: da45a2cfd005e8353e5df652e536499876684f9cb7eff7f1d89b5d246f982ed640ea47355b838e4c367df545062cf62a7d74049ad4e73618009e05f2e6895926
+  metadata.gz: 137bbe38d4e0273d68db494c313a969d6bda3e6ce078e048551364b2f086e7358edde9236ce21aeb8e2484d0d205b92804813b3c1a4858d7dc3da0d5bc59c955
+  data.tar.gz: 283cac2f5215effe5d55d379f8984b37caac8bd15fa7aa6d44b6a3e803ce2c28697444203ba4d7bd465fe7231d0ba3f68b396c0cc91e8a6d3a635238e6a50c5c

data/lib/ruby_astm/lab_interface.rb

@@ -22,6 +22,9 @@ module LabInterface
   mattr_accessor :usb_parity
   mattr_accessor :mid_frame_end_detected
 
+  ## gather bytes to store for us to test.
+  mattr_accessor :test_data_bytes
+
 
 
   mattr_accessor :headers
@@ -50,6 +53,8 @@ module LabInterface
   end
 
 
+
+
   def terminator
     "L|1|N\r"
   end
@@ -91,50 +96,57 @@ module LabInterface
   end
 
   def is_mid_frame_end?(bytes_array)
+
+    ## if you get 13,10,2 anywhere, ignore that and the subsequent digit.
+    bytes_indices_to_delete = []
     unless bytes_array.blank?
-      if bytes_array.size >= 6
-        if bytes_array[-6..-1] == [23,65,52,13,10,2]
-          self.mid_frame_end_detected = true
-          return self.mid_frame_end_detected
+      bytes_array.each_with_index{|val,key|
+        if bytes_array.size >= (key + 2)
+          if bytes_array[key..(key+2)] == [13,10,2]
+            bytes_indices_to_delete.push(key - 3)
+            bytes_indices_to_delete.push(key - 2)
+            bytes_indices_to_delete.push(key - 1)
+            bytes_indices_to_delete.push(key)
+            bytes_indices_to_delete.push(key + 1)
+            bytes_indices_to_delete.push(key + 2)
+          end
         end
-      end
+      }
     end
-    return false
+    bytes_indices_to_delete
   end
 
-	def receive_data(data)
-      
-
-    begin
+  def pre_process_bytes(byte_arr,concat)
 
+      puts byte_arr.to_s
+      indices_to_delete = is_mid_frame_end?(byte_arr)
+      #puts "indices to delete"
+      #puts indices_to_delete.to_s
 
-      self.data_buffer ||= ''
-
-      #puts "incoming data bytes."
-
-      concat = ""
-      
-      #puts data.bytes.to_a.to_s
-
-
-      ## if the bytes end in 13,10,2
-      ## that means frame ends and restarts
-      ## ignore those three bytes
-      byte_arr = data.bytes.to_a
-      #puts "byte arr is:"
-      #puts byte_arr
-
-      if is_mid_frame_end?(byte_arr)
-        #puts "mid frame end is true---------------!!!!!!!!!!"
-        byte_arr = byte_arr[0..-7]
-        #puts "byte arr BECOMES mid frame end is true---------------!!!!!!!!!!"
-        #puts byte_arr.pack('c*')
-      elsif self.mid_frame_end_detected == true
-        ## we ignore the frame number.
+      if self.mid_frame_end_detected == true
+        #puts "deletected mid fram is true, so deleting first byte before delete"
+        #puts byte_arr.to_s
         byte_arr = byte_arr[1..-1]
+        #puts "after deleteing"
+        #puts byte_arr.to_s
         self.mid_frame_end_detected = false
       end
 
+      unless indices_to_delete.blank?
+        if byte_arr[(indices_to_delete[-1] + 1)]
+          #puts "before deleting frame number "
+          #puts byte_arr.to_s
+          byte_arr.delete_at((indices_to_delete[-1] + 1))
+          #puts "after deleting"
+          #puts byte_arr.to_s
+        else
+          self.mid_frame_end_detected = true
+        end
+      end
+      #puts "byte arr before reject"
+      byte_arr = byte_arr.reject.with_index{|c,i|  indices_to_delete.include? i}
+      
+
       byte_arr.each do |byte|
         x = [byte].pack('c*').force_encoding('UTF-8')
         if x == "\r"
@@ -148,6 +160,31 @@ module LabInterface
           concat+=x
         end
       end
+
+      concat
+
+  end
+
+	def receive_data(data)
+      
+
+    begin
+
+
+      self.data_buffer ||= ''
+
+      #puts "incoming data bytes."
+
+      concat = ""
+      
+   
+      byte_arr = data.bytes.to_a
+      self.test_data_bytes ||= []
+      self.test_data_bytes.push(byte_arr)
+    
+      concat = pre_process_bytes(byte_arr,concat)
+
+     
       
       #puts "concat is:"
       
@@ -163,6 +200,10 @@ module LabInterface
       if data.bytes.to_a[-1] == 4
         #puts "GOT EOT --- PROCESSING BUFFER, AND CLEARING."
         process_text(self.data_buffer)
+        #root_path = File.dirname __dir
+        #puts "root path #{root_path}"
+        #IO.write((File.join root_path,'test','resources','roche_multi_frame_bytes.txt'),self.test_data_bytes.to_s)
+        #puts self.test_data_bytes.flatten.to_s
         self.data_buffer = ''
         if self.headers[-1].queries.blank?
           #puts "no queries in header so sending ack after getting EOT and processing the buffer"
@@ -240,6 +281,7 @@ module LabInterface
       puts "text is:"
       puts text
       text.split("\n").each do |l|
+        puts "doing line:#{l}" 
 		    line = Line.new({:text => l})
         process_type(line)
       end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ruby_astm
 version: !ruby/object:Gem::Version
-  version: 1.2.5
+  version: 1.2.6
 platform: ruby
 authors:
 - Bhargav Raut