ruby_astm 1.4.6 → 1.4.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: cd2c1d542ca88df2907a1ced3c504be478562cc1
-  data.tar.gz: 9498ee9636238cf9320c2d7da27ac3dd117eca40
+SHA256:
+  metadata.gz: 2e92b2e6071300c63a2c9cf237c68daf4e139a8806e451382eb3ad84b5ff7143
+  data.tar.gz: '08e321353b2f109d2994ab9f6e12720f564e4cff195b95fae4a6cc4b69145f1b'
 SHA512:
-  metadata.gz: c33a3270c4e96663b714eef93522f282474f77ab220bc4dd53eccc625eac332c224944403237469c93f5cc2b95f7c0063102c2be2fa80a43408d6287665a34e7
-  data.tar.gz: feca986fc7ade45225533c15671aa221e8285b30d5a1868a7ab46c92c385e584a738dae65ddb07c239d7e238f141b752242d1f2fcd86e4134544e2f0a96e568b
+  metadata.gz: 8a41a9637d497c4135adc2f846b45cfaefaa0b878259380c81440c7a32b6fcc098c7f2cfd99e0269d995cc6540f2d7760dcb66e4106af81a0690c58a5f1b382b
+  data.tar.gz: a743e98d90ed2a7c022ac75a8a64c42987f717e61e679a3ba5ed5cdaf4a70a16231544dcfdd34bb7e4a5920bfa6ab98250dabbab508577d2a34f8dc47bf1401f

data/lib/publisher/real_time_db.rb

@@ -21,6 +21,7 @@ class RealTimeDb
 	attr_accessor :connection
 	attr_accessor :work_allotment_hash
 	attr_accessor :private_key_hash
+	attr_accessor :expires_at
 
 	WORK_TYPES = {
 		"IMMUNO" => "",
@@ -39,6 +40,7 @@ class RealTimeDb
 		$service_account_email = self.private_key_hash["client_email"]
 		$private_key = OpenSSL::PKey::RSA.new self.private_key_hash["private_key"]
 		  now_seconds = Time.now.to_i
+		  self.expires_at = now_seconds + (60*30)
 		  payload = {:iss => $service_account_email,
 		             :sub => $service_account_email,
 		             :aud => self.private_key_hash["token_uri"],
@@ -100,14 +102,12 @@ class RealTimeDb
 	## if the barcode exists,
 	## otherwise create it.
 	def barcode_exists?(barcode)
-		begin
-			self.connection.get(ENDPOINT, :orderBy => 'barcode', :equalTo => barcode)
-		rescue
-			## reestablish the connection
+		current_time = Time.now.to_i
+		if current_time > self.expires_at
 			self.connection = RestFirebase.new :site => SITE_URL,
                      :secret => SECRET, :auth =>generate_access_token
-			true
 		end
+			self.connection.get(ENDPOINT, :orderBy => 'barcode', :equalTo => barcode)
 	end
 
 	## idea is simple

data/lib/ruby_astm/result.rb

@@ -12,7 +12,7 @@ class Result
 		if line = args[:line]
 
 			unless line.fields[2].blank?
-				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)
 					

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ruby_astm
 version: !ruby/object:Gem::Version
-  version: 1.4.6
+  version: 1.4.7
 platform: ruby
 authors:
 - Bhargav Raut
@@ -44,14 +44,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 5.2.3
+        version: 5.2.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 5.2.3
+        version: 5.2.2
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
@@ -150,6 +150,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: This gem provides a server that can handle communication from medical
   instruments that send/receive information on the ASTM protocol.
 email: bhargav.r.raut@gmail.com
@@ -200,7 +214,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.14.4
+rubygems_version: 2.7.8
 signing_key: 
 specification_version: 4
 summary: A Ruby gem to interface with Medical instruments that work on the ASTM protocol