eba 2.0.1 → 2.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9139840c48d380ebc7f4bd5eb6b85a67e4ddfa2f
-  data.tar.gz: 390f470ad98f6b9c505e6987d8bd4f0412966541
+  metadata.gz: c56777e9040d1597b33becb8043eb514fa610ebc
+  data.tar.gz: 382aa6bf66a61e127f215535594b9b59f5433f0d
 SHA512:
-  metadata.gz: cd9bff1a14300d59f1de9631353710ba86b3a12ee2b9bd9f5dd7c6fc8b39fae50daeea998d5f5c573361eed7e4c00b57eeead6e5684153447e6adcf5529259d5
-  data.tar.gz: c2e8642c495dcf63e6b6b85a098f785b8a77e42f111595e948c4e20c5a9224ea7b0e790eb70c4b91baafa3a49162aba99b6821b2d119644f531bb4a0f1b8e969
+  metadata.gz: 4dc1de3cb1aa0d03cc2990dda14c2dcb5c01667b8e2fce69698e008252c9cfecbea67a70f421378ed776ccc6b7f9eafc8444000be8022b9bb9a7e55c1ce88c14
+  data.tar.gz: efde2e490fde9f0c2fe212e4853f8e2a2d37d92b9712eddf749bce4d5277990c18e7a5d3ff2c9071b753137624bbb38f29f00e55a11cffebf9316999278f05f2

data/lib/eba/bcb.rb

@@ -21,6 +21,7 @@ class BCB < Helper
 
 	def initialize(path_to_ca_certificate)
 		@ca = path_to_ca_certificate
+		@attempts = 0
 		connect_to_service()
 	end
 
@@ -88,56 +89,69 @@ class BCB < Helper
 		# VALOR = VALUe
 
 		return build_bcb_data(xmlResult.search("NOME").text.sub("-_1532_-", "&"), 
-				      										series_code, 
-																	xmlResult.search("PERIODICIDADE").text, 
-																	xmlResult.search("UNIDADE").text.sub("-_1532_-", "&"), 
-																	xmlResult.search("DIA").text, 
-																	xmlResult.search("MES").text, 
-																	xmlResult.search("ANO").text, 
-																	xmlResult.search("VALOR").text, false) 
+				      						series_code, 
+													xmlResult.search("PERIODICIDADE").text, 
+													xmlResult.search("UNIDADE").text.sub("-_1532_-", "&"), 
+													xmlResult.search("DIA").text, 
+													xmlResult.search("MES").text, 
+													xmlResult.search("ANO").text, 
+													xmlResult.search("VALOR").text, false) 
 	end
 
 	# Ensure that date is in the format dd/MM/YYY
-	def get_all_data_for_array(array_of_codes, min_date, max_date = Time.now.strftime('%d/%m/%Y').to_s)
+	def get_all_data_for_array(array_of_codes, min_date, max_date = Time.now.strftime('%d/%m/%Y').to_s, slice_size=50)
 		result = nil
-		data_collection = Array.new()		
+		data_collection = []
 
 		# This request has a limit of series he can get at a time, thus
 		# it's way simpler to break a composite requests in various smaller
 		# requests. The Data_bcb class serves as a way to organize such data
 		# and allow the developer to easily identify which series each data
 		# object pertains.		
+
+		if slice_size > 50 then
+			slice_size = 50
+		end
+
 		array_of_codes.each_slice(50).to_a.each do |array|
 			hash = hash_by_periodicity(array)
 
 			hash.each do |periodicity, array|
-				codes = []
-				data_array = []
+				code_x_data = {}
 
 				array.each do |data|
-					data_array <<  data	
-					codes << data.pk
+					code_x_data[data.pk] = data
 				end
 
 				# Build the  message from the start of the historical series
-				message = { in0: {long: codes}, 
-					    			in1: min_date, 
-					    			in2: max_date}
+				message = {in0: {long: code_x_data.keys}, 
+					    		 in1: min_date, 
+					    		 in2: max_date}
 
 				result = send_message(message)
-	
+
 				if result != nil then
 					i = 0	
 
 					result.css("SERIE").each do |serie|
-						extract_an_item(serie, codes[i], data_array[i], data_collection)
+						extract_an_item(serie, code_x_data, data_collection)
 						i = i + 1
 					end
 				end
 			end
 		end
 
-		return data_collection 
+		if data_collection.size == 0 && array_of_codes.size > 0 && @attempts < 5 then
+			@attempts = @attempts + 1
+
+			puts "BCB WARNING: No data returned for #{array_of_codes}. Trying again #{@attempts}/5"
+			sleep(1 * @attempts)
+
+			data_collection = get_all_data_for_array(array_of_codes, min_date, max_date)
+			@attemps = 0
+		end
+
+		data_collection
 	end
 
 	def send_message(message)

data/lib/eba/data.rb

@@ -35,44 +35,43 @@ class Data_bcb
 	end
 
 	def is_valid?
-	
 		if @name == nil or @name == '' then
-			puts "Found invalid name! Value is '#{@name}'"
+			puts "BCB ERROR: Found invalid name! Value is '#{@name}' for #{@pk}."
 			return false
 		end
 
 		if @periodicity == nil or @periodicity == '' or @periodicity.length > 1 then
-			puts "Found invalid periodicity! Value is '#{@periodicity}'"
+			puts "BCB ERROR: Found invalid periodicity! Value is '#{@periodicity}' for #{@pk}."
 			return false
 		end
 		
 		if @unit == nil or @unit == '' then
-			puts "Found invalid unit! Value is '#{@unit}'"
+			puts "BCB ERROR: Found invalid unit! Value is '#{@unit}' for #{@pk}."
 			return false
 		end
 
 		if @date == nil or @date == '' then
-			puts "Found invalid date! Value is '#{@date}'"
+			puts "BCB ERROR: Found invalid date! Value is '#{@date}' for #{@pk}."
 			return false
 		else
 			if !(DateTime.parse(@date).to_date != nil rescue false) then
-				puts "Found invalid date! Value is '#{@date}'"
+				puts "BCB ERROR: Found invalid date! Value is '#{@date}' for #{@pk}."
 				return false
 			end
 		end
 
 		if @value == nil then
-			puts "Found invalid value! Value is '#{@value}'"
+			puts "BCB ERROR: Found invalid value! Value is '#{@value}' for #{@pk}."
 			return false
 		else
 			if !(@value.to_f != nil rescue false) then
-				puts "Found invalid value! Value is '#{@value}'"	
+				puts "BCB ERROR: Found invalid value! Value is '#{@value}' for #{@pk}."	
 				return false
 			end
 		end
 
 		if @pk == nil or  @pk <= 0 then
-			puts "Found invalid pk! Value is '#{@pk}'"
+			puts "BCB ERROR: Found invalid pk! Value is '#{@pk}'"
 			return false
 		end
 

data/lib/eba/helper.rb

@@ -42,33 +42,39 @@ class Helper < Encoder
 		return result 
 	end
 
-	def extract_an_item(serie, code, base_data, data_collection)
+	def extract_an_item(serie, code_x_data_hash, collection)
 		# recover identifying data from the getLastValue method,
 		# as the get_valores_series_xml desn't have identifying data
-		# as series name, periodicity, etc. 
-	 
-		if serie.inspect["name=\"ID\" value=\"#{code}\""] != nil then
-			serie.css("ITEM").each do |item|
-				dia = "01"
-				mes = "1"
-				ano = "1"
-				data = item.css("DATA").text.split("/")
+		# as series name, periodicity, etc. 	 
+		if serie.to_s.inspect["SERIE ID"] != nil then
+			code = serie.to_s.match(/SERIE ID=\"([0-9]+)\"/)[1].to_i
+			base_data = code_x_data_hash[code]
 
-				if base_data.periodicity == 'D' then
-					dia = data[0]
-					mes = data[1]
-					ano = data[2]
-				else
-					mes = data[0]
-					ano = data[1]
-				end 
+			if base_data != nil then
+				serie.css("ITEM").each do |item|
+					dia = "01"
+					mes = "1"
+					ano = "1"
+					data = item.css("DATA").text.split("/")
 
-				data_collection << build_bcb_data(base_data.name, code, 
-																									base_data.periodicity, 
-																									base_data.unit, 
-																									dia, mes, ano, 
-																									item.css("VALOR").text,
-																									base_data.seasonally_adjusted)
+					if base_data.periodicity == 'D' then
+						dia = data[0]
+						mes = data[1]
+						ano = data[2]
+					else
+						mes = data[0]
+						ano = data[1]
+					end 
+
+					collection <<  build_bcb_data(base_data.name, code, 
+																   		  base_data.periodicity, 
+															 					base_data.unit, 
+															 					dia, mes, ano, 
+															 					item.css("VALOR").text,
+															 					base_data.seasonally_adjusted)
+				end	
+			else
+				puts "ERROR BCB: Failure do locate #{code} in the data collection #{code_x_data_hash.keys}"
 			end
 		end
 	end

data/lib/eba/version.rb

@@ -5,7 +5,7 @@ module Eba
   # ff - commits on feature
   # hh - commits on hotfix
 
-  VERSION = "2.0.1"
+  VERSION = "2.0.2"
 
   #Version 1.0.1
   #
@@ -89,4 +89,7 @@ module Eba
 
 	#Version 2.0.1
 	# Removes useless certificate and supplies only CA. 
+
+	#Version 2.0.2
+	# Improves reliability for getting data and identifying it.
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: eba
 version: !ruby/object:Gem::Version
-  version: 2.0.1
+  version: 2.0.2
 platform: ruby
 authors:
 - Rafael Campos Cruz
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2019-01-31 00:00:00.000000000 Z
+date: 2019-10-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement