ruby_astm 0.0.8 → 0.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3e6d0a24cedc951783379aa035d1f69af7485396
-  data.tar.gz: d98fa138030445458fafac8fd0ee991a5eb4a9c4
+  metadata.gz: 72ade802a6dc078a0d52242e6e76d6f3a2eb1be6
+  data.tar.gz: 58909cfdb8d0ab54b9bf363030f8025827ae314d
 SHA512:
-  metadata.gz: 9b283bb3d88c6c2c384e5ed064bd3df70c64abbff6d2ef386a8baa68c4a13f6ee8e68451e70a6e0656cb446dc05f9891c9afc7d6a01aa4fd113d4cb622398daf
-  data.tar.gz: 3ad48b3e7a8517e13fecd732870b9e0c679256260097df2c11921246faeb58a09521a93d5613f64e28c5e46d98a4a44f43983072a6361f1de6086601b8db4b07
+  metadata.gz: 3e188721bcbe685dbbc312f7d7dff054c571b27993a8f022866464657e1a01e54bc2469ae5e47105491c5a2eaff057713adb159a7951e0edb2ed19030c657588
+  data.tar.gz: 9383ecbdb2f21986b2642881871601ab0fd46848bb338a4e7ffc603b8acdbf15994cb596a710b88ec1792bdf0fac2549bd8047ab9cf4822e7e317364844b792a

data/lib/ruby_astm/order.rb

@@ -37,11 +37,11 @@ class Order
 	def initialize(args)
 		if args[:line]
 			line = args[:line]
-			if line.fields[2]
+			if !line.fields[2].strip.blank?
 				line.fields[2].strip.scan(/(?<specimen_id>[^\^]+)/) { |specimen_id|
 					self.id ||= specimen_id
 				}
-			elsif line.fields[3]
+			elsif !line.fields[3].strip.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}
 			end

data/lib/ruby_astm/result.rb

@@ -11,7 +11,7 @@ class Result
 	def initialize(args)
 		if args[:line]
 			line = args[:line]
-			line.fields[2].scan(/\^+(?<name>[A-Za-z0-9\%\#]+)\^?(?<dilution>\d+)?/) { |name,dilution|  
+			line.fields[2].scan(/\^+(?<name>[A-Za-z0-9\%\#-]+)\^?(?<dilution>\d+)?/) { |name,dilution|  
 				self.name = lookup_mapping(name)
 				self.dilution = dilution
 			}

metadata

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