eba 1.0.2.3 → 1.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c3cc4b38dcc1309fddf405fc467605d8a5fbad72
-  data.tar.gz: 50ecdaefb89d5799a4c2f604016fcbe238361f33
+  metadata.gz: bf8749b76c5de0c62ecf47f0a883a2e8f867106f
+  data.tar.gz: 4fb8d1d541e15f620474e6de1f1e04531f4c54bf
 SHA512:
-  metadata.gz: eef17380a0b997937472409619111bef0da85f529ec1cc37d7040bbe54b91b03e4d9b0d6c9759d1b3983456997f10abc53d5738f0c3d578c70d22c94037bc75e
-  data.tar.gz: a82a757016801e0129989f28cd0523d1132f257c48439db6cc1610e026e631ff00cc5db650c9106a1307791fae204ae9f0420efcb57d45317bc97bf7e2a1b520
+  metadata.gz: 18b1a068a9c03f6cf7abd8236cd1606da5bbf8ab15f7faac38fdfc686eb86a8ba8d20f47603d87c89d706641a40a8a1bf2e01479d69e6917a863a868064fd344
+  data.tar.gz: fd8d96d343bcf6d1970b4cc064cf015f2dd22e30b3c0ba348a24a277ebaa2636e90872fd3299918e22c9a42c5f6ce587de85c37a3adc896276193cfd8743e328

data/lib/eba/bcb.rb

@@ -34,16 +34,31 @@ 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,
-	# useful for expanding the gem
+	# useful for expanding the gem.
 	def list_operations()
 		return @service.operations
 	end
 
+	# Removes all invalid series from an array.
+	#
+	# An invalid series has last value.
+	def purge_invalid_series(array_of_codes)
+		result = []
+
+		array_of_codes.each do |code|
+			if get_last_value(code) != nil
+				result << code
+			end
+		end
+
+		return result 
+	end
+
 	def get_last_value(series_code)
 		begin
 			response = @service.call(:get_ultimo_valor_xml, message: {in0: "#{series_code}"})
@@ -73,57 +88,57 @@ class BCB < Encoder
 
 	# Ensure that date is in the format dd/MM/YYY
 	def get_all_data_for_array(array_of_codes, date)
-		results = {}
+		result = nil
 		codes = Array.new()
 		data_collection = Array.new()
 
-		array_of_codes.each do |code|
-			codes << code.to_s
+		# 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.		
+		array_of_codes.each_slice(50).to_a.each do |array|
+			array = purge_invalid_series(array)
 
 			# Build the  message from the start of the historical series
-			message = { in0: {long: codes}, 
+			message = { in0: {long: array}, 
 				    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
-				# 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.
 				response = @service.call(:get_valores_series_xml, message: message)
-				results[code] = Nokogiri::XML(response.to_hash[:get_valores_series_xml_response] \
+				result = Nokogiri::XML(response.to_hash[:get_valores_series_xml_response] \
 										   [:get_valores_series_xml_return])
-			rescue	
-				results[code] = nil
-				puts "Failure trying to extract #{code}"
+
+			rescue Exception => erro
+				puts "Error requesting! #{erro}"
 			end
 
-			codes.clear	
-		end
+			i = 0
+
+			result.css("SERIE").each do |serie|
+				# recover identifying data from the getLastValue method,
+				# as the get_valores_series_xml desn't have identifying data
+				# as series name, periodicity, etc. 
+				base_data = get_last_value(array[i])
+				comp = 'name="ID" value="' + array[i].to_s + '"'
+ 
+				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)
+					end
+				end
 
-		results.each do |code, result|
-			# recover identifying data from the getLastValue method,
-			# as the get_valores_series_xml desn't have identifying data
-			# as series name, periodicity, etc. 
-			base_data = get_last_value(code)				
-	
-			if result != nil then
-			  # Encode enforces data data is being read as UTF-8, as 
-			  # portuguese uses a huge ammount of special characters and
-			  # accentuations.
-			  result.css("ITEM").each do |item|
-				  data_collection << Data_bcb.new(encode(base_data.name), 
-				   		     	         code, 
-	 	  				   	         base_data.periodicity, 
-	   					   	         encode(base_data.unit), 
-					             	         "1", 
-					       		         item.css("DATA").text.split("/")[0], 
-					  	       	         item.css("DATA").text.split("/")[1], 
-				   		    	         item.css("VALOR").text)
+				i = i + 1
 			end
-		       end
 		end
 
 		return data_collection 

data/lib/eba/version.rb

@@ -2,33 +2,35 @@ module Eba
   # For documentation purposes:
   # VERSION = mm.dd.ff.hh
   # mm - commits on master
-  # dd - commits on development
   # ff - commits on feature
   # hh - commits on hotfix
 
-  VERSION = "1.0.2.3"
+  VERSION = "1.3.3"
 
-  #Version 1.0.0.1
+  #Version 1.0.1
   #
   # Updater gemspec.
   # Added classes Encoder and DataBCB for user.
 
-  #Version 1.0.1.1
+  #Version 1.1.1
   # List operations now returns a string instead of printing the methods of the webservice.
   # get_last_value in BCB will return nil if the supplied code is invalid.
   # get_all_data_for_array will now return data for an invalid code, but will still prompt an error mesage.
   # added rspec tests, guarantying consistency
   # spec/valid_certificate contains a certificate which is valid at this moment (2016-11-22)
 
-  #Version 1.0.1.2
+  #Version 1.1.2
   # Now get_all_data_for_array also expects a valid date in the format dd/MM/YYYY.
 
 
-  #Version 1.0.1.3
+  #Version 1.1.3
   # Removed the removal of '.' character from value, it was actually losing data.
   # Changed DataBCB class name to Data_bcb, to keep with the standard snake case.
   # updated spec tests accordingly.  
 
-  #Version 1.0.2.3
+  #Version 1.2.3
   # Added HTTP compression to Savon requests.
+
+  #Version 1.3.3
+  # get_all_data_for_array extracts data now as bulk, in order to make better use of the compression.
 end

metadata

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