eba 2.0.2 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c56777e9040d1597b33becb8043eb514fa610ebc
-  data.tar.gz: 382aa6bf66a61e127f215535594b9b59f5433f0d
+  metadata.gz: 0f04a70c1137e9cac4b3d1d0ed11cc96a1b6b38b
+  data.tar.gz: f1a9fea0d47d4b88ed2052684b46f480f50b3a7a
 SHA512:
-  metadata.gz: 4dc1de3cb1aa0d03cc2990dda14c2dcb5c01667b8e2fce69698e008252c9cfecbea67a70f421378ed776ccc6b7f9eafc8444000be8022b9bb9a7e55c1ce88c14
-  data.tar.gz: efde2e490fde9f0c2fe212e4853f8e2a2d37d92b9712eddf749bce4d5277990c18e7a5d3ff2c9071b753137624bbb38f29f00e55a11cffebf9316999278f05f2
+  metadata.gz: 94a9d22b5394f400e9279f670fa75e42abb52070465e92a48d788befc53bee0e95fa67b5c1547359448a26efc8c0dbece52584625b708b4cd679198afb38321f
+  data.tar.gz: f6468f3cd7cfd3d2a73a4e0bdae468465097d23cf5a93f6ef85bb4b15e8bf10d43110bc3b90cbf2c95de5d93066d99318661fc9e8991707231e76adb53417c38

data/lib/eba/bcb.rb

@@ -69,13 +69,25 @@ class BCB < Helper
 	def get_last_value(series_code)
 		begin
 			response = @service.call(:get_ultimo_valor_xml, message: {in0: "#{series_code}"})
+		rescue HTTP::ConnectionError => e
+			puts "BCB Warning: hangup from source trying to get last value. Waiting and trying again."
+			sleep(1)
+
+			return get_last_value(series_code)
+
+		rescue OpenSSL::SSL::SSLError => e
+			puts "BCB Warning: hangup from source trying to get last value. Waiting and trying again."
+			sleep(1)
+
+			return get_last_value(series_code)
+
 		rescue Exception => e
+			puts "BCB ERROR: #{e.message}\n#{e.backtrace}\n#{e.class}"
 			return Data_bcb.invalid_data()
 		end
 
 		response = response.to_hash[:get_ultimo_valor_xml_response][:get_ultimo_valor_xml_return].sub("&", 
 																																																"-_1532_-")
-
 		xmlResult = Nokogiri::XML(response)
 
 		# As it's a brazillian database it's column identifications are in portuguese,
@@ -87,15 +99,7 @@ class BCB < Helper
 		# MES = MONTH
 		# ANO = YEAR
 		# 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) 
+		build_bcb_data(xmlResult) 
 	end
 
 	# Ensure that date is in the format dd/MM/YYY
@@ -123,35 +127,38 @@ class BCB < Helper
 					code_x_data[data.pk] = data
 				end
 
-				# Build the  message from the start of the historical series
-				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, code_x_data, data_collection)
-						i = i + 1
-					end
+				scry_for_interval(min_date, max_date, code_x_data).each do |data|
+					data_collection << data
 				end
 			end
 		end
 
-		if data_collection.size == 0 && array_of_codes.size > 0 && @attempts < 5 then
-			@attempts = @attempts + 1
+		data_collection
+	end
+
+	def scry_for_interval(min_date, max_date, code_x_data)
+		dc = []
+
+		# Build the  message from the start of the historical series
+		message = {in0: {long: code_x_data.keys}, 
+			    		 in1: min_date, 
+			    		 in2: max_date}
+
+		result = send_message(message)
 
-			puts "BCB WARNING: No data returned for #{array_of_codes}. Trying again #{@attempts}/5"
-			sleep(1 * @attempts)
+		if result != nil then
+			result.css("SERIE").each do |serie|
+				extract_an_item(serie, code_x_data, dc)
+			end
 
-			data_collection = get_all_data_for_array(array_of_codes, min_date, max_date)
-			@attemps = 0
+			if dc.size == 0 && code_x_data.keys.size > 0 then
+				result.css("SERIE").each do |serie|
+					extract_an_item(serie, code_x_data, dc)
+				end
+			end
 		end
 
-		data_collection
+		dc
 	end
 
 	def send_message(message)
@@ -161,6 +168,18 @@ class BCB < Helper
 		begin
 			response = @service.call(:get_valores_series_xml, message: message)	
 			result = Nokogiri::XML(response.to_hash[:get_valores_series_xml_response][:get_valores_series_xml_return])
+		rescue HTTP::ConnectionError => e
+			puts "BCB Warning: hangup from source trying to get all data. Waiting and trying again."
+			sleep(1)
+
+			result = send_message(message)
+
+		rescue OpenSSL::SSL::SSLError => e
+			puts "BCB Warning: hangup from source trying to get last value. Waiting and trying again."
+			sleep(1)
+
+			result = sent_message(message)
+
 		rescue Exception => erro
 			result = nil
 		end

data/lib/eba/data.rb

@@ -2,6 +2,8 @@
 # making it easier to group lots of data in a coese way, without lost of
 # information.
 class Data_bcb
+	attr_accessor :seasonally_adjusted, :name, :unit, :value, :periodicity
+
 	@name = ""
 	@periodicity = ""
 	@unit = ""
@@ -12,17 +14,36 @@ class Data_bcb
 
 	# Initialization is expected to express the state of a single row of 
 	# data inside the BCB's Database.
-	def initialize(series_name, series_code, series_periodicity, series_unit, 
-		       series_day, series_month, series_year, series_value, seasonally_adjusted)
-
-		@name = series_name
-		@pk = series_code
-		@periodicity = series_periodicity.to_s
-		@unit = series_unit
-		@date = standardizes_date(series_day, series_month, series_year)
-		@value = series_value.to_f
-		@seasonally_adjusted = seasonally_adjusted
-	end	
+	def initialize(xmlResult)
+		if xmlResult.class.to_s.eql? 'Array' then
+			series_name, series_code, series_periodicity, series_unit, 
+			series_day, series_month, series_year, series_value, seasonally_adjusted = xmlResult
+
+			@name = series_name
+			@pk = series_code
+			@periodicity = series_periodicity.to_s
+			@unit = series_unit
+			@date = standardizes_date(series_day, series_month, series_year)
+			@value = series_value.to_f
+			@seasonally_adjusted = seasonally_adjusted
+
+		else
+			begin
+				@name = xmlResult.search("NOME").text.sub("-_1532_-", "&")
+				@pk = xmlResult.search("CODIGO").text.to_i
+				@periodicity = xmlResult.search("PERIODICIDADE").text
+				@unit = xmlResult.search("UNIDADE").text.sub("-_1532_-", "&")
+				@date = standardizes_date(xmlResult.search("DIA").text, 
+																	xmlResult.search("MES").text, 
+																	xmlResult.search("ANO").text)
+				@value = xmlResult.search("VALOR").text
+				@seasonally_adjusted = false 
+			rescue => e
+				puts e.message
+				puts e.backtrace
+			end
+		end
+	end
 	
 	# Return an "identification key" with data which should 
 	# be unique to a series (grouped).
@@ -31,7 +52,7 @@ class Data_bcb
 	end
 
 	def self.invalid_data()
-		Data_bcb.new(nil, nil, nil, nil, 1, 1, 1900, 0, false)
+		Data_bcb.new([nil, nil, nil, nil, 1, 1, 1900, 0, false])
 	end
 
 	def is_valid?
@@ -77,7 +98,6 @@ class Data_bcb
 
 		return true
 	end
-
 	
 	# Note that there are no set methods in this class,
 	# I built it in such a way that you are only intended
@@ -107,10 +127,6 @@ class Data_bcb
 		return @value
 	end
 
-	def seasonally_adjusted
-		return @seasonally_adjusted
-	end
-
 	# The Webservice will always supply the date in three separate fields,
 	# this methods aim to convert it to a standard dd.mm.YYYY string.
 	def standardizes_date(day, month, year)

data/lib/eba/helper.rb

@@ -5,26 +5,23 @@ class Helper < Encoder
 	def initialize()
 	end
 
-	def build_bcb_data(name, code, periodicity, unit, day, month, year, value, is_unseasoned)
-		if name[" - com ajuste sazonal"] != nil then
-			is_unseasoned = true
+	def build_bcb_data(xml_result)
+		d = Data_bcb.new(xml_result)
 
-			if is_unseasoned then
-				name.slice!(" - com ajuste sazonal")
+		if d.name[" - com ajuste sazonal"] != nil then
+			d.seasonally_adjusted = true
+
+			if d.seasonally_adjusted then
+				d.name.slice!(" - com ajuste sazonal")
 			end		
 		end
 
-		encoded_name = encode(name)
-		encoded_periodicity = encode(periodicity)
-		encoded_unit = encode(unit)
-		encoded_day = day
-		encoded_month = month
-		encoded_year = year
-		encoded_value = encode(value)
+		d.name = encode(d.name)
+		d.periodicity = encode(d.periodicity)
+		d.unit = encode(d.unit)
+		d.value = encode(d.value)
 		
-		return Data_bcb.new(encoded_name, code, encoded_periodicity,
-				    						encoded_unit, encoded_day, encoded_month,
-				    						encoded_year, encoded_value, is_unseasoned)
+		return d
 	end
 
 	# Removes all invalid series from an array.
@@ -66,12 +63,12 @@ class Helper < Encoder
 						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)
+					collection <<  Data_bcb.new([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}"

data/lib/eba/version.rb

@@ -5,7 +5,7 @@ module Eba
   # ff - commits on feature
   # hh - commits on hotfix
 
-  VERSION = "2.0.2"
+  VERSION = "2.1.0"
 
   #Version 1.0.1
   #
@@ -92,4 +92,7 @@ module Eba
 
 	#Version 2.0.2
 	# Improves reliability for getting data and identifying it.
+
+	#Version 2.1.0
+	# Implements handling of disconnects caused by the BCB webservice, getting data again and logging the event.
 end

metadata

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