eia 1.7.7 → 1.8.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: dd8bfd08a528e92e26e21aee4c01e5b6cc400442
-  data.tar.gz: ea36ed67452ac6bad34e0a9490c303df4104193f
+  metadata.gz: b39f689896df3554aed8dcba31994601e6fb5b44
+  data.tar.gz: fb4ee86b9737775a94d01f14fedbf18279565e03
 SHA512:
-  metadata.gz: af14c4edb24694ba78ff5fa9395257e2089191df7c0f8954c415e691d200f2676b9e09bc76d2d87093aa8b01fa02114af39e42924d89f18c890fa9c08db71ab2
-  data.tar.gz: 41485fe726bff6fde8a7ba66e72a04e4b156bdafff1da80b9e0567a4b38020fc2a1f3502c888430f13b634935434c0b418c5349d38b96283d57e7f641fb6e372
+  metadata.gz: ac3d266b1d529ce66e1d27350aebea1109013f2bfcff8b2ef08b10940af7466d232b8c3098f3ad1ab5166e06b25797d6e402aaa0db54997b1f0bd88129c158f6
+  data.tar.gz: 1a104c1484427a8a5ec6570d6cdf1e92e88a0135e3a7937d955736f5135c1e9d0ca2f170c63bc030e4545b8b8fb251a10096083a0063220c4e2f08c72cfc4955

data/lib/eia/data.rb

@@ -1,4 +1,7 @@
 class DataIBGE
+	attr_accessor :table_code, :date, :variable, :location, :classification,
+								:unit, :value, :periodicity
+
 	def initialize(table_code, date, variable, location, classification, unit, value, periodicity)
 		@table_code = table_code
 		@date = standardize_date(date, periodicity)
@@ -13,8 +16,9 @@ class DataIBGE
 
 		#The standard is:
 		# 2 : "Mês"
-		# 4 : "Trimestral Móvel"
+		# 4 : "Trimestre"
 		# 5 : "Ano"
+		# 6 : "Trimestre Módel"
 		@periodicity = periodicity 
 	end
 
@@ -22,7 +26,8 @@ class DataIBGE
 		#date is a four digit number
 		if periodicity == 5 then
 			return "01/01/#{date}"
-		elsif periodicity == 4 or periodicity == 2 then
+
+		elsif [2, 4, 6].include?(periodicity) then
 			y = date[0..3]
 			m = date[4..5]
 
@@ -33,38 +38,6 @@ class DataIBGE
 		end
 	end
 
-	def table_code
-		return @table_code
-	end
-
-	def date
-		return @date
-	end
-
-	def variable
-		return @variable
-	end
-
-	def location
-		return @location
-	end
-	
-	def classification
-		return @classification
-	end
-
-	def unit
-		return @unit
-	end
-	
-	def value
-		return @value.to_f
-	end
-
-	def periodicity
-		return @periodicity
-	end
-
 	def is_valid?
 		if @table_code == '' or @table_code == nil or @table_code.to_i <= 0 then
 			puts "Invalid table code supplied. Value is #{@table_code}."

data/lib/eia/ibge.rb

@@ -69,7 +69,9 @@ class IBGE
 			heading = output.delete_at(0)
 			identifier = heading["D1N"]
 
-			if identifier.include? "Trimestre Móvel" or identifier.eql? "Trimestre" then
+			if identifier.include? "Trimestre Móvel" then 
+				periodicity = 6
+			elsif identifier.eql? "Trimestre" then
 				periodicity = 4
 			elsif identifier.include? "Ano" then
 				periodicity = 5

data/lib/eia/version.rb

@@ -1,5 +1,5 @@
 module Eia
-  VERSION = "1.7.7"
+  VERSION = "1.8.7"
 
 #Standard for version: xx.yy.zz
 # xx - release
@@ -62,4 +62,7 @@ module Eia
 
 # Version 1.7.7
 # Improves logging by adding backtrace.
+
+# Version 1.8.7
+# Indentifies 'Trimestre móvel' as code 6 for periodicity, differing it from 'Trimestre'.
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: eia
 version: !ruby/object:Gem::Version
-  version: 1.7.7
+  version: 1.8.7
 platform: ruby
 authors:
 - rCamposCruz
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2018-04-18 00:00:00.000000000 Z
+date: 2018-11-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement