ruby_astm 1.0.9 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9c41f5303f7e4e0c2897d7c4407df2fe85594f98313e54bed535375b6113cb62
-  data.tar.gz: 1edc251af06f231faf23d792aa487d0b6a1c6a11054e00e892373bede46b23df
+  metadata.gz: b5aad9b688056b23b5252d954ec6f6e53d11decab2e5adbd33251613642f5ee0
+  data.tar.gz: 1b9b7cac6d3122b4cd62a36611a05226254453a124788078ba51ab0ea03f22fd
 SHA512:
-  metadata.gz: 3558047e44fb12208c4509655848cd01b0e1bfe850202d68d2d7d174ef6738d3bfada4c0a8683adffb2d33e611b7a1d3329c2f29c537de4ca3c6a27fed735962
-  data.tar.gz: 10228f02a0b2b8fa87f4e0de2f56159ea73ef3e7e3dcafe556e51163bdd71c9991531c40d7a1b96875b38c0b2387f8f8540133f34a0364530cc265a33f82b2b8
+  metadata.gz: 8ca884192d09d41a0982012a22fd79a832f7737697f1b182ba125e28cfc4a194c4908a62d7e5eae127e4acfa6bdf248a3012d26a5d557fcacdb083625bd1fad2
+  data.tar.gz: 6e1896e259496d069a9aa86e255a38b70c119b4460b3e875958360bbcfc013a86dd88aed79a2a78192c729fad14de321794573bdf4008fe5b0e58a4eaee89fdf

data/lib/ruby_astm/lab_interface.rb

@@ -10,13 +10,18 @@ module LabInterface
   ETX = "\x03"
   EOT = "\x04"
 
+
+
   mattr_accessor :headers
   mattr_accessor :ethernet_server
   mattr_accessor :server_ip
   mattr_accessor :server_port
   mattr_accessor :mapping
   mattr_accessor :respond_to_queries
-  
+
+  ## buffer of incoming data.
+  mattr_accessor :data_buffer
+    
 
   ## returns the root directory of the gem.
   def root
@@ -56,7 +61,9 @@ module LabInterface
 
 	def receive_data(data)
       
-      puts "incoming data bytes."
+      self.data_buffer ||= ''
+
+      #puts "incoming data bytes."
 
       concat = ""
       
@@ -77,10 +84,20 @@ module LabInterface
       end
       
       #puts "concat is:"
+      
       #puts concat.to_s
-      process_text(concat)      
       
-      if data.bytes.to_a[0] == 4
+      self.data_buffer << concat
+
+      ## if the last byte is EOT, then call process text.
+      ## inside that split by line and process one at a time.
+      ##process_text(concat)      
+      
+
+      if data.bytes.to_a[-1] == 4
+        puts self.data_buffer
+        process_text(self.data_buffer)
+        self.data_buffer = ''
         send_data(ENQ)
       elsif data.bytes.to_a[0] == 6
         self.headers[-1].build_responses.each do |response|
@@ -99,7 +116,7 @@ module LabInterface
         end
       else
         ## send the header 
-        puts "--------- SENT ACK -----------"
+        #puts "--------- SENT ACK -----------"
         if self.headers.blank?
           send_data(ACK)
         else
@@ -123,8 +140,6 @@ module LabInterface
   end
 
   def process_text(text)
-      ## should replace carriage returns with new lines, before processing any file.
-      ## or text.
       text.split("\n").each do |l|
 		    line = Line.new({:text => l})
         process_type(line)

data/lib/ruby_astm/order.rb

@@ -36,13 +36,13 @@ class Order
 
 	def set_id(args)
 		if line = args[:line]
-			if !line.fields[2].strip.blank?
+			if !line.fields[2].blank?
 				line.fields[2].strip.scan(/(?<specimen_id>[^\^]+)/) { |specimen_id|
-					self.id ||= specimen_id
+					self.id ||= specimen_id[0]
 				}
-			elsif !line.fields[3].strip.blank?
+			elsif !line.fields[3].blank?
 				## for the sysmex xn-550 this is the regex.
-				line.fields[3].strip.scan(/(?<tube_rack>\d+\^)+(?<patient_id>.+)\^/) { |tube_rack,patient_id|  self.id = patient_id.strip}
+				line.fields[3].strip.scan(/(?<tube_rack>\d+\^)+(?<patient_id>.+)\^/) { |tube_rack,patient_id|  self.id = patient_id.strip} 
 			end
 		else
 			self.id = args[:specimen_id]

metadata

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