eba 1.4.3 → 1.5.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 12867683eab5685d635272ce08a2857c4714adc6
-  data.tar.gz: '009c7d7fe4cb54f729406f61cf0351e8cc2d5660'
+  metadata.gz: 55af898e71af162b85311da79aa89d7548475f16
+  data.tar.gz: 8d4c33a83231025fb5c94b6d70123db580f27619
 SHA512:
-  metadata.gz: 52e3078553a8edfa92b3de8b953fee15715aa2e489a1c9ea7f76e11b64cf5f4f8c7fe6fc34fc7ff969f246a394901163a392ea93629bbd12a80088dd6fcad71d
-  data.tar.gz: fe4844fd3f732e39d8f77eb416bf99bfca6e3f1480d17933d3267d15bb99ae44864bc36b99165facd62038b6ba1be7bd59743a0ef4c0a0951c2a8cadb19bcaec
+  metadata.gz: 3451a3d6aadbae4f38a11b7292535ebf52829398a48cf94c26a4faf03df66d114069c8dde10fa6b03288d4e1c8de8c9de493d33eae90bddb72300abc25aeaf1c
+  data.tar.gz: 0ad0448c43666985704b8c8337ee07bf0e90ba551257caa0a83e96a650e16ce6262aa04ea29e7178d83e2114136afc221dd7f1ffbf1f437059587c2802ea3064

data/lib/eba/bcb.rb

@@ -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,6 +76,26 @@ class BCB < Encoder
 		return result
 	end
 
+	def build_bcb_data(name, code, periodicity, unit, day, month, year, value)
+		encoded_name = encode(name)
+		encoded_periodicity = encode(periodicity)
+		encoded_unit = encode(unit)
+		encoded_day = encode(day)
+		encoded_month = encode(month)
+		encoded_year = encode(year)
+		encoded_value = encode(value)
+
+		is_unseasoned = name.include? " - com ajuste sazonal"
+
+		if is_unseasoned then
+			name.slice! " - com ajuste sazonal"
+		end
+		
+		return Data_bcb.new(encoded_name, code, encoded_periodicity,
+				    encoded_unit, encoded_day, encoded_month,
+				    encoded_year, encoded_value, is_unseasoned)
+	end
+
 	def get_last_value(series_code)
 		begin
 			response = @service.call(:get_ultimo_valor_xml, message: {in0: "#{series_code}"})
@@ -93,14 +113,14 @@ class BCB < Encoder
 		# MES = MONTH
 		# ANO = YEAR
 		# VALOR = VALUE
-		return Data_bcb.new(encode(xmlResult.search("NOME").text), 
-				   series_code, 
-				   encode(xmlResult.search("PERIODICIDADE").text), 
-				   encode(xmlResult.search("UNIDADE").text), 
-				   encode(xmlResult.search("DIA").text), 
-				   encode(xmlResult.search("MES").text), 
-				   encode(xmlResult.search("ANO").text), 
-				   encode(xmlResult.search("VALOR").text)) 
+		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) 
 	end
 
 	# Ensure that date is in the format dd/MM/YYY
@@ -151,14 +171,26 @@ class BCB < Encoder
  
 					if serie.inspect.include? comp
 						serie.css("ITEM").each do |item|
-							data_collection << Data_bcb.new(encode(base_data.name), 
-						   			     	        array[i], 
-		 			  				   	        base_data.periodicity, 
-	   							   	                encode(base_data.unit), 
-						        	     	                "1", 
-					       			        	        item.css("DATA").text.split("/")[0], 
-					  	       			         	item.css("DATA").text.split("/")[1], 
-				   		    	        	 		item.css("VALOR").text)
+							dia = "1"
+							mes = "1"
+							ano = "1"
+							data = item.css("DATA").text.split("/")
+
+							if base_data.periodicity == 'D' then
+								dia = data[0]
+								mes = data[1]
+								ano = data[2]
+							else
+								mes = data[0]
+								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)
 						end
 					end
 

data/lib/eba/data.rb

@@ -8,11 +8,12 @@ class Data_bcb
 	@date = ""
 	@value = 0.0	
 	@pk = 0
+	@seasonally_adjusted = false
 
 	# 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)
+		       series_day, series_month, series_year, series_value, seasonally_adjusted)
 
 		@name = series_name
 		@pk = series_code
@@ -20,6 +21,7 @@ class Data_bcb
 		@unit = series_unit
 		@date = standardizes_date(series_day, series_month, series_year)
 		@value = series_value.to_f
+		@seasonally_adjusted = seasonally_adjusted
 	end	
 	
 	# Return an "identification key" with data which should 
@@ -56,6 +58,10 @@ 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)
@@ -73,7 +79,11 @@ class Data_bcb
 	end
 	
 	def print()
-		return "Name: #{@name}\nBCB Code: #{@pk}\nPeriodicity: #{@periodicity}\nUnit: #{@unit}\nDate: #{@date}   Value: #{@value}\n"
+		return "Name: #{@name}\n" + 
+		       "BCB Code: #{@pk}\n" + 
+		       "Periodicity: #{@periodicity}\n" + 
+		       "Unit: #{@unit}   Seasonally Adjusted? #{@seasonally_adjusted ? 'YES' : 'NO'}\n" + 
+		       "Date: #{@date}   Value: #{@value}\n"
 	end
 
 	# Simple comparission between two DataBCB objects.
@@ -81,6 +91,6 @@ class Data_bcb
 		return (@name == data_bcb.name and @pk == data_bcb.pk \
 		    and @periodicity == data_bcb.periodicity \
 		    and @unit == data_bcb.unit and @date == data_bcb.date \
-		    and @value = data_bcb.value)
+		    and @value = data_bcb.value and @seasonally_adjusted == data_bcb.seasonally_adjusted)
 	end
 end

data/lib/eba/version.rb

@@ -5,7 +5,7 @@ module Eba
   # ff - commits on feature
   # hh - commits on hotfix
 
-  VERSION = "1.4.3"
+  VERSION = "1.5.3"
 
   #Version 1.0.1
   #
@@ -36,4 +36,8 @@ module Eba
 
   #Version 1.4.3
   # get_all_data_for_array now handles different periodicities for any ammount of codes.
+
+  #Version 1.5.3
+  # adds flag in data to mark seasonally adjusted data
+  # adds detection for seasonally adjusted data
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: eba
 version: !ruby/object:Gem::Version
-  version: 1.4.3
+  version: 1.5.3
 platform: ruby
 authors:
 - Rafael Campos Cruz
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-12-12 00:00:00.000000000 Z
+date: 2016-12-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler