eba 1.5.6 → 1.6.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 764378712fdd296f175fff65f704622dc0a9b7e4
-  data.tar.gz: f67894df06ad96cb905843b0dcfd48a093f103d7
+  metadata.gz: 7c7437b7166b2464059e5f0e07851117f01a41c5
+  data.tar.gz: 63d4b2dbd88f8f87f62100023cb1b37d3b540bb9
 SHA512:
-  metadata.gz: a78bee6636ad03907a120ab33ca379160843195c91e225c3970eddbf5b8ea5efa260971cb80e5a651cc9cfc37e63d73bd114fe4630c0a96a5b7aada68b53bf1b
-  data.tar.gz: ed3fc2f8783bf2059abef4c7dda98910ce24526e59223354ead18b62115b2d0310eb0121f6bddb52ce216b05cb477f6ad827cf05c2c075b1706556f6df11f6e7
+  metadata.gz: 161b14dbffb33ab76d91e20c904207ceeeca55fa8833125a8eff534ababa897463d0f4fbe971b00a543bb77d92bca56c9cbc790022630bac4377b77451cc38b1
+  data.tar.gz: a43ef4c0ee3167f42fd80fd53b8865bd38efab45cb048f2ce6b0aed8aee6a5ea138862862898070be73a34c1e8ade9e6261a4a53602476a7db0eef411a76f8ee

data/lib/eba/bcb.rb

@@ -8,21 +8,21 @@ require_relative "data"
 class BCB < Encoder
 
 	################################################################################################
-	# 											       #
-	# You MUST supply a valid certificate in order for the connection to work!		       #
-	# The certificate you are looking for is located in this webpage:			       #
-	# 	http://www.bcb.gov.br/?CERTDIG							       #
-	#											       #
-	# It will the most recent one which looks something like:				       #
-	#	Cadeia de CAs de *.bcb.gov.br (yyyy)						       #
-	#											       #
-	# You then have to generate a public key from this crt file,				       #
-	# you can do so by following this StackOverflow post:					       #
-	#	http://stackoverflow.com/questions/5244129/use-rsa-private-key-to-generate-public-key  #
-	#											       #
-	# With all this done, you will be able to access freely this 				       #
+	# 											       																																 #
+	# You MUST supply a valid certificate in order for the connection to work!		       					 #
+	# The certificate you are looking for is located in this webpage:			       									 #
+	# 	http://www.bcb.gov.br/?CERTDIG							       																				 #
+	#											       																																	 #
+	# It will the most recent one which looks something like:				       												 #
+	#	Cadeia de CAs de *.bcb.gov.br (yyyy)						       																			 #
+	#											       																																	 #
+	# You then have to generate a public key from this crt file,				       										 #
+	# you can do so by following this StackOverflow post:					       													 #
+	#	http://stackoverflow.com/questions/5244129/use-rsa-private-key-to-generate-public-key  			 #
+	#											       																																	 #
+	# With all this done, you will be able to access freely this 				       										 #
 	# service, without much hassle.	Don't forget to upvote such an useful answer.                  #
-	#											       #
+	#											       																																	 #
 	################################################################################################
 
 	def initialize(path_to_certificate)
@@ -34,8 +34,8 @@ class BCB < Encoder
 
 
 		@service = Savon.client({wsdl: "https://www3.bcb.gov.br/sgspub/JSP/sgsgeral/FachadaWSSGS.wsdl",
-					ssl_cert_file: @pub_key,
-					headers: {'Accept-Encoding' => 'gzip, deflate'}})
+														 ssl_cert_file: @pub_key,
+														 headers: {'Accept-Encoding' => 'gzip, deflate'}})
 	end
 
 	# List of all operations available for the webservice,
@@ -76,12 +76,14 @@ class BCB < Encoder
 		return result
 	end
 
-	def build_bcb_data(name, code, periodicity, unit, day, month, year, value)
-		is_unseasoned = name.include? " - com ajuste sazonal"
+	def build_bcb_data(name, code, periodicity, unit, day, month, year, value, is_unseasoned)
+		if is_unseasoned == nil then
+			is_unseasoned = name.include? " - com ajuste sazonal"
 
-		if is_unseasoned then
-			name.slice! " - com ajuste sazonal"
-		end		
+			if is_unseasoned then
+				name.slice! " - com ajuste sazonal"
+			end		
+		end
 
 		encoded_name = encode(name)
 		encoded_periodicity = encode(periodicity)
@@ -92,8 +94,8 @@ class BCB < Encoder
 		encoded_value = encode(value)
 		
 		return Data_bcb.new(encoded_name, code, encoded_periodicity,
-				    encoded_unit, encoded_day, encoded_month,
-				    encoded_year, encoded_value, is_unseasoned)
+				    						encoded_unit, encoded_day, encoded_month,
+				    						encoded_year, encoded_value, is_unseasoned)
 	end
 
 	def get_last_value(series_code)
@@ -102,7 +104,10 @@ class BCB < Encoder
 		rescue
 			return nil
 		end
-		xmlResult = Nokogiri::XML(response.to_hash[:get_ultimo_valor_xml_response][:get_ultimo_valor_xml_return], nil, 'UTF-8')
+
+		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,
 		# the translation for the fields, in order, are:
@@ -112,16 +117,16 @@ class BCB < Encoder
 		# DIA = DAY
 		# MES = MONTH
 		# ANO = YEAR
-		# VALOR = VALUE
-
-		return build_bcb_data(xmlResult.search("NOME").text, 
-				      series_code, 
-				      xmlResult.search("PERIODICIDADE").text, 
-				      xmlResult.search("UNIDADE").text, 
-				      xmlResult.search("DIA").text, 
-				      xmlResult.search("MES").text, 
-				      xmlResult.search("ANO").text, 
-				      xmlResult.search("VALOR").text) 
+		# 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, nil) 
 	end
 
 	# Ensure that date is in the format dd/MM/YYY
@@ -148,8 +153,8 @@ class BCB < Encoder
 
 				# Build the  message from the start of the historical series
 				message = { in0: {long: codes}, 
-					    in1: date, 
-					    in2: Time.now.strftime('%d/%m/%Y').to_s}
+					    			in1: date, 
+					    			in2: Time.now.strftime('%d/%m/%Y').to_s}
 
 				# try and catch, as some series can be discontinued or a code may be broken
 				begin
@@ -159,7 +164,7 @@ class BCB < Encoder
 					puts "\n\nError requesting! #{erro}\n\n"
 				end
 
-				i = 0	
+				i = 0
 
 				result.css("SERIE").each do |serie|
 					# recover identifying data from the getLastValue method,
@@ -184,12 +189,12 @@ class BCB < Encoder
 								ano = data[1]
 							end 
 
-							data_collection << build_bcb_data(base_data.name, 
-						   			     	          array[i], 
-		 			  				   	          base_data.periodicity, 
-	   							   	                  base_data.unit, 
-						        	     	                  dia, mes, ano, 
-				   		    	        	 		  item.css("VALOR").text)
+							data_collection << build_bcb_data(base_data.name, codes[i], 
+		 			  				   	          							base_data.periodicity, 
+	 				  							   	                  base_data.unit, 
+							        	     	                  dia, mes, ano, 
+				   								    	        	 		  item.css("VALOR").text,
+																								base_data.seasonally_adjusted)
 						end
 					end
 

data/lib/eba/data.rb

@@ -3,7 +3,7 @@
 # information.
 class Data_bcb
 	@name = ""
-	@periodicity = 0
+	@periodicity = ""
 	@unit = ""
 	@date = ""
 	@value = 0.0	
@@ -17,7 +17,7 @@ class Data_bcb
 
 		@name = series_name
 		@pk = series_code
-		@periodicity = series_periodicity
+		@periodicity = series_periodicity.to_s
 		@unit = series_unit
 		@date = standardizes_date(series_day, series_month, series_year)
 		@value = series_value.to_f
@@ -27,8 +27,54 @@ class Data_bcb
 	# Return an "identification key" with data which should 
 	# be unique to a series (grouped).
 	def key()
-		return @name + @periodicity.to_s + @unity
+		return @name + @periodicity.to_s + @unit
 	end
+
+	def is_valid?
+	
+		if @name == nil or @name == '' then
+			puts "Found invalid name! Value is '#{@name}'"
+			return false
+		end
+
+		if @periodicity == nil or @periodicity == '' or @periodicity.length > 1 then
+			puts "Found invalid periodicity! Value is '#{@periodicity}'"
+			return false
+		end
+		
+		if @unit == nil or @unit == '' then
+			puts "Found invalid unit! Value is '#{@unit}'"
+			return false
+		end
+
+		if @date == nil or @date == '' then
+			puts "Found invalid date! Value is '#{@date}'"
+			return false
+		else
+			if !(DateTime.parse(@date).to_date != nil rescue false) then
+				puts "Found invalid date! Value is '#{@date}'"
+				return false
+			end
+		end
+
+		if @value == nil then
+			puts "Found invalid value! Value is '#{@value}'"
+			return false
+		else
+			if !(@value.to_f != nil rescue false) then
+				puts "Found invalid value! Value is '#{@value}'"	
+				return false
+			end
+		end
+
+		if @pk == nil or  @pk <= 0 then
+			puts "Found invalid pk! Value is '#{@pk}'"
+			return false
+		end
+
+		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

data/lib/eba/version.rb

@@ -5,7 +5,7 @@ module Eba
   # ff - commits on feature
   # hh - commits on hotfix
 
-  VERSION = "1.5.6"
+  VERSION = "1.6.7"
 
   #Version 1.0.1
   #
@@ -49,4 +49,11 @@ module Eba
 
 	#Version 1.5.6
 	# fixes identification and handling of seazonaly adjusted data points.
+
+	#Version 1.6.7
+	# Treats exception caused by the character '&' on Nokogiri conversion.
+	# Correctly identifies and classifies seasonally adjusted data.
+	#
+	# Adds verifications of validity for data-type.
+	# Changes tests in order to incorporate validity detection.
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: eba
 version: !ruby/object:Gem::Version
-  version: 1.5.6
+  version: 1.6.7
 platform: ruby
 authors:
 - Rafael Campos Cruz
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2017-02-06 00:00:00.000000000 Z
+date: 2017-02-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement