eia 1.0.1 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c1eff9eb923274d2c74f7118cbcbfedf811797d8
-  data.tar.gz: 0ed4c7783fa7deafe3ff6ee7c7641b852c3b1cf3
+  metadata.gz: fee65d85a6c1c6b22fc59b8680d9c30ceb8854f8
+  data.tar.gz: 840613cddc7e0cbae6e0f96e66824e877bd37dee
 SHA512:
-  metadata.gz: 61cf88c0aec526f5b1942b12cf0a52397710c4e22fef84c3a7de0c9fadd7190cb2910b175bf7b54c3c40dd188cf175135c5b8f193885bbecb2c164e600bff124
-  data.tar.gz: 9116b28d1511939004ada9ede003a32a2b752266a808289a9d65db86d5b9bef0983e457a0a79f9b79d21e062d483cdb19373ff2107f030c5e2d0a9b03c56d500
+  metadata.gz: c738248a794f00a71396884f11f2ea63e5afd9853b1b87e37f80758c825856231fde995d7f34f2c8e6920f527576298fe651685825f6ac3ea36e6329e544009e
+  data.tar.gz: b0c9eb06339443361a9eaae986b7849cb0b80000dd513890e28b2e2a925c98c6ea36a9f41206bb6ff184fe26b81c4e1d8cd9ae1836a66c624853a66001511c72

data/lib/eia/data.rb

@@ -1,5 +1,6 @@
 class DataIBGE
-	def initialize(date, variable, location, product, unit, value, periodicity)
+	def initialize(table_code, date, variable, location, product, unit, value, periodicity)
+		@table_code = table_code
 		@date = standardize_date(date, periodicity)
 		@variable = variable
 		@location = location
@@ -28,6 +29,10 @@ class DataIBGE
 		end
 	end
 
+	def table_code
+		return @table_code
+	end
+
 	def date
 		return @date
 	end
@@ -53,6 +58,11 @@ class DataIBGE
 	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}."
+			return false
+		end
+
 		if @date == '' or @date == "ERROR" or @date == nil then
 			puts "Date found is invalid. Value is '#{@date}'."
 			return false

data/lib/eia/ibge.rb

@@ -58,10 +58,10 @@ class IBGE
 			url += "/c#{ws[0]}/#{ws[1]}"
 		end
 	
-		return consume_json(Net::HTTP.get(URI(url)))
+		return consume_json(Net::HTTP.get(URI(url)), code)
 	end
 
-	def consume_json(json_string)
+	def consume_json(json_string, table_code)
 		begin
 			output = JSON.parse(json_string)
 			heading = output.delete_at(0)
@@ -106,7 +106,7 @@ class IBGE
 					end
 				end
 
-				data_array << DataIBGE.new(date, variable, location, product, unit, val, periodicity)
+				data_array << DataIBGE.new(table_code, date, variable, location, product, unit, val, periodicity)
 			end	
 			
 			return data_array	

data/lib/eia/version.rb

@@ -1,5 +1,5 @@
 module Eia
-  VERSION = "1.0.1"
+  VERSION = "1.1.1"
 
 #Standard for version: xx.yy.zz
 # xx - release
@@ -26,4 +26,7 @@ module Eia
 # Version 1.0.1
 # Fixes periodicty, as to be able to relate possible periodicities from 0 to 5
 
+# Version 1.1.1
+# adds table_code to data type
+
 end

metadata

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