eia 1.1.4 → 1.2.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 78e56f078ce2b8fa4d7f3f8713c445b541f17cea
-  data.tar.gz: b910ec919b2afb31dfe25cce43b516343b4f6fd3
+  metadata.gz: 57da7351d5429bd4717f4a23b1dc368b077b1b5f
+  data.tar.gz: 3118696b19c2f10796286be0beedfbe804eecbf5
 SHA512:
-  metadata.gz: 638f03d3aebcf0c8172aade71a8c66f5e36d5c7f07d626fbf4b22dc1c33246ba88539fb17f73f97a42fccf5b66ae1e94dc0510e0d1744032d5157f6530cd7603
-  data.tar.gz: 8d9b12623b143a7df8480e26d9bbfb33188d2dba897ee0bd61e36e7c31180b9a17df9a1f15d9ac7720715a497eb09911ec558b0b7da2111421e49243b1c641f3
+  metadata.gz: 436af72e95d3a2efee71a95cbb4e1007fe26a357b0034b63cdca906111e5c9168ccb4a87ba256ec9783e4a02584cd76b6743b39615cc53cc356e41b1f8e26ea9
+  data.tar.gz: ad2411716c81fca684d6e39646ebaf8f0b4452abe80ff62949fbc564a0bc9a1bb5b739e3385483fcdb699981ea48d87a5b90209e367fa1df36cdd46a410979e5

data/lib/eia/data.rb

@@ -1,10 +1,13 @@
 class DataIBGE
-	def initialize(table_code, date, variable, location, product, unit, value, periodicity)
+	def initialize(table_code, date, variable, location, classification, unit, value, periodicity)
 		@table_code = table_code
 		@date = standardize_date(date, periodicity)
 		@variable = variable
 		@location = location
-		@product = product
+
+		#is an array
+		@classification = classification
+
 		@unit = unit
 		@value = value
 
@@ -18,11 +21,11 @@ class DataIBGE
 		#date is a four digit number
 		if periodicity == 5 then
 			return "01/01/#{date}"
-		elsif periodicity == 4 then
+		elsif periodicity == 4 or periodicity == 3 then
 			y = date[0..3]
 			m = date[4..5]
 
-			return "01/#{m}/#{y}"
+			return "01/#{m}/#{y}"		
 		else
 			puts "\nError parsing date for DataIBGE. Attempted to parse #{date}.\n"
 			return "ERROR"
@@ -45,8 +48,8 @@ class DataIBGE
 		return @location
 	end
 	
-	def product
-		return @product
+	def classification
+		return @classification
 	end
 
 	def unit
@@ -97,6 +100,11 @@ class DataIBGE
 			return false
 		end
 
+		if @classification == nil or not @classification.class.to_s.eql? "Array" then
+			puts "Classification is invalid. Value is nil."
+			return false
+		end
+
 		return true 
 	end
 end

data/lib/eia/ibge.rb

@@ -65,12 +65,14 @@ class IBGE
 		begin
 			output = JSON.parse(json_string)
 			heading = output.delete_at(0)
-			identifier = heading["D1C"]
+			identifier = heading["D1N"]
 
 			if identifier.include? "Trimestre Móvel" then
 				periodicity = 4
 			elsif identifier.include? "Ano" then
 				periodicity = 5
+			elsif identifier.include? "Mês" then
+				periodicity = 2
 			else
 				puts "Error! Unexpected case! Found is: #{identifier}. Report to the dev team."
 				return Array.new
@@ -82,7 +84,7 @@ class IBGE
 				data = nil
 				date = nil
 				variable = nil
-				product = nil
+				classification = Array.new
 				location = nil
 				unit = nil
 				val = nil
@@ -95,18 +97,20 @@ class IBGE
 							variable = value
 						when "D3N" #location
 							location = value
-						when "D4N" #product
-							product = value
 						when "MN" #unit
 							unit = value
 						when "V" #value
 							val = value.to_f
 						else
-							#This information is discarded
+							if key.include? "D" and key.include? "N" and key[1].to_i > 3 then
+								classification << "#{heading[key]}: #{value}"
+							end
+							#Else this information is discarded
 					end
 				end
 
-				data_array << DataIBGE.new(table_code, date, variable, location, product, unit, val, periodicity)
+				data_array << DataIBGE.new(table_code, date, variable, location, 
+																	 classification, unit, val, periodicity)
 			end	
 			
 			return data_array	

data/lib/eia/version.rb

@@ -1,5 +1,5 @@
 module Eia
-  VERSION = "1.1.4"
+  VERSION = "1.2.5"
 
 #Standard for version: xx.yy.zz
 # xx - release
@@ -39,4 +39,8 @@ module Eia
 # Adds getter for periodicity in data type, which I had forgot.
 # Also adds periodicity to integrity verification.
 
+# Version 1.2.5
+# Adds a new date classification for data.
+# Renames procut as classification, as it's according what actual data in the source is like.
+# Properly identifies classifications and stores then.
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: eia
 version: !ruby/object:Gem::Version
-  version: 1.1.4
+  version: 1.2.5
 platform: ruby
 authors:
 - rCamposCruz
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2017-02-14 00:00:00.000000000 Z
+date: 2017-02-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement