nation 0.0.5 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 919a6b7114c62d61e9f362d93f07b87ba0c2e5aa7fed0633fea60f4b73890e0f
-  data.tar.gz: c4305c45e0294a96db4c58d31392dcb246f7e5d4853a91e765cd8ea3d33c86ff
+  metadata.gz: 20d614ce29d37ec18dc41ff56188d925cbff4d10dc41969c1c958b825cb3e550
+  data.tar.gz: d317a145851f9d0d131e0f9782506c499f9dc11df14b21e70979e925a7f715c7
 SHA512:
-  metadata.gz: 459bcccdf3277af98693970595d38a79fdf4987bfd81a03680b19dc2f2a9cf27081bf01e4b446df9f3b4dabe3ab5194400b0f23d8057769ed89f601876c17a3a
-  data.tar.gz: 34fbf6d7708f52f2fa061087699513a52a0d3720d644e72e58772dfa790a064d34f667ca34315ae4808c6f8cbef92c35e6de5a1a2d94ea5df37e48d5619b44f8
+  metadata.gz: 625c600081c285a356480bdfd39cc531543f538156af18a413fd021630ba4a5b5084530c32ca136209dab07e1c37fc967258cf5382a192f2bd5b0a9295392c7f
+  data.tar.gz: f1ec14a71e3500f247552fdea40c325b9b418d39d8b8fcb389a29f71bd039ba342186e78975a9ed9d55aa94989275eda284eb6c6b9310e679366f49e55d722fa

data/lib/nation.rb

@@ -1,33 +1,33 @@
-class Nation
+require 'net/http'
+require 'json'
+require './nation/basic_info'
+require './nation/detailed_info'
+require_relative'./nation/classes/print_file'
 
-  def initialize
-    @stored_info = {}
+class Nation
+  def initialize(nation_name)
+    @nation_info = {}
+    @nation_name = nation_name
+    @nation_code = standarize(nation_name)
   end
 
-  def nation_info(nation_name)
-    nation_name = nation_name.downcase.split.map(&:capitalize).join("_")
-    general = NationGeneral.new(nation_name)
-    nation_general = general.get_raw_data 
-
-    info = NationInfo.new(nation_name)
-    info_country = info.get_raw_data
-
-     @stored_info = {:name => nation_general[0], :capital => nation_general[1], :continent => nation_general[2], :region => nation_general[3], :population => nation_general[4], :languages => nation_general[5], :about_country => info_country}
-
-     @stored_info
+  def get_info
+    basic_info = BasicInfo.new.get(@nation_code)
+    detailed_info = DetailedInfo.new.get(@nation_name)
 
+    @nation_info = basic_info.merge(detailed_info)
   end
 
-  def info_to_json
-    JsonFile.convert_json_file(@stored_info)    
+  def print_file(ext_file)
+    PrintFile.print_nation_info(@nation_info, ext_file)
   end
+  
+  private 
+  def standarize(full_name)
+    uri = URI.parse("http://country.io/names.json")
+    response = Net::HTTP.get(uri)
 
-  def info_to_html
-    HtmlFile.convert_html_file(@stored_info)
+    nation_code = JSON.parse(response).select{|k, v| v == full_name}.keys[0]
   end
-end
 
-require './nation/nation_general'
-require './nation/nation_info'
-require './nation/templates/json_file'
-require './nation/templates/html_file'
+end

data/lib/nation/basic_info.rb

@@ -0,0 +1,20 @@
+require 'net/http'
+require 'json'
+require_relative "modules/get_info"
+
+# API Documentation: https://restcountries.eu/#sources
+
+class BasicInfo
+    include GetInfo
+
+    def get(nation_code)
+        api_endpoint = "https://restcountries.eu/rest/v2/name/#{nation_code}?fullText=true"
+        response = get_api_info(api_endpoint).first
+
+        raise "Country info not avaliable" if response.class != Hash
+
+        languages = response["languages"].map{|k, v| k["name"]}
+        country_basic_info = {"name": response["name"], "capital": response["capital"], "continent": response["region"],
+        "region": response["subregion"], "population": response["population"], "languages": languages}
+    end
+end

data/lib/nation/classes/print_file.rb

@@ -0,0 +1,15 @@
+require_relative '../templates/html_file'
+require_relative '../templates/json_file'
+
+class PrintFile
+  def self.print_nation_info(nation_object, ext_file)
+    case ext_file
+    when "html"
+      HtmlFile.convert_html_file(nation_object) 
+    when "json"
+      JsonFile.convert_json_file(nation_object)
+    else
+      raise "File extention not supported yet. Extension #{ext_file}"
+    end
+  end
+end

data/lib/nation/detailed_info.rb

@@ -0,0 +1,18 @@
+require 'net/http'
+require 'json'
+require_relative "modules/get_info"
+
+# # API Documentation: https://www.mediawiki.org/wiki/API:Main_page
+
+class DetailedInfo
+    include GetInfo
+    
+    def get(nation_name)
+        nation_name = nation_name.downcase.split.map(&:capitalize).join("_")
+        api_endpoint = "https://en.wikipedia.org/w/api.php?action=query&format=json&prop=extracts&titles=#{nation_name}&formatversion=2&exsentences=10&exlimit=1&explaintext=1"
+        response = get_api_info(api_endpoint)
+
+        raise "Not detailed info found for country #{nation_name}" if response["query"]["pages"][0]["missing"]
+        country_detailed_info = {"detailed_info": response["query"]["pages"][0]["extract"]}
+    end
+end

data/lib/nation/modules/get_info.rb

@@ -0,0 +1,11 @@
+require 'net/http'
+require 'json'
+
+module GetInfo
+    private
+    
+    def get_api_info(url)
+        uri = URI.parse(url)
+        JSON.parse(Net::HTTP.get(uri))
+    end
+end

data/lib/nation/templates/html_file.rb

@@ -1,9 +1,9 @@
-class Nation::HtmlFile
+class HtmlFile
   def self.convert_html_file(json_object)
     path = "./nation_files/html" 
     file_name = "#{json_object[:name]}_info_#{Time.now.strftime("%d%m%Y%H%M")}"
 
-    Dir.mkdir(path) if Dir.exist?(path) == false
+    # Dir.mkdir(path) if Dir.exist?(path) == false
 
     html = File.new("#{path}/#{file_name}.html", "w+")
 

data/lib/nation/templates/json_file.rb

@@ -1,13 +1,13 @@
 require 'json'
 
-class Nation::JsonFile
+class JsonFile
   def self.convert_json_file(json_object)
 
     path = "./nation_files/json" 
     file_name = "#{json_object[:name]}_info_#{Time.now.strftime("%d%m%Y%H%M")}.json"
     Dir.mkdir(path) if Dir.exist?(path) == false
 
-    File.open("#{path}/#{file_name}", "w") do |f|
+    File.open("#{path}/#{file_name}", "w+") do |f|
       f.write(json_object.to_json)
     end
   end

data/specs/nation_spec.rb

@@ -0,0 +1,14 @@
+require 'rspec'
+require 'nation'
+
+RSpec.describe Nation do
+  describe 'nation_info' do
+    it "returns a hash with the information gathering" do
+      expect(Nation.new.nation_info("Mexico").class).to eq(Hash)
+    end
+
+    it "returns the correct information of the country" do
+      expect(Nation.new.nation_info("Mexico").class).to eq(JSON.parse(File.open("./spec_files/mexico.json").read).class)
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: nation
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.1.1
 platform: ruby
 authors:
 - Mario Martinez
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-02-05 00:00:00.000000000 Z
+date: 2020-02-10 00:00:00.000000000 Z
 dependencies: []
 description: A basic but useful country info extractor
 email: mario1105mtz@gmail.com
@@ -17,11 +17,13 @@ extensions: []
 extra_rdoc_files: []
 files:
 - lib/nation.rb
-- lib/nation/nation_general.rb
-- lib/nation/nation_images.rb
-- lib/nation/nation_info.rb
+- lib/nation/basic_info.rb
+- lib/nation/classes/print_file.rb
+- lib/nation/detailed_info.rb
+- lib/nation/modules/get_info.rb
 - lib/nation/templates/html_file.rb
 - lib/nation/templates/json_file.rb
+- specs/nation_spec.rb
 homepage: https://rubygems.org/gems/nation
 licenses:
 - MIT

data/lib/nation/nation_general.rb

@@ -1,39 +0,0 @@
-require 'net/http'
-require 'json'
-
-# API Documentation: https://restcountries.eu/#sources
-class Nation::NationGeneral
-  def initialize(nation_name)
-    @nation_name = " "
-    case nation_name
-    when "United_States", "United_States_Of_America"
-      @nation_name = "USA"
-    when "United_Kingdom"
-      @nation_name = "UK"
-    else
-      @nation_name = nation_name
-    end
-  end
-
-  def get_raw_data
-    uri = URI.parse("https://restcountries.eu/rest/v2/name/#{@nation_name}?fullText=true")
-    raw_data =  Net::HTTP.get(uri)
-
-    extract_info(raw_data)
-  end
-
-  def extract_info(raw_data)
-    json_info = JSON.parse(raw_data)
-    to_hash = Hash[*json_info]
-    to_hash.length
-
-    raise "Country not avaliable" if to_hash.length == 1
-
-    languages = to_hash["languages"].map{|k, v| k["name"]}
-    # Structure of array [country_name, country_capital, country_continent, country_region,
-    # country_population, country_languages]
-    extracted_info = [to_hash["name"], to_hash["capital"], to_hash["region"], to_hash["subregion"], to_hash["population"], languages]
-
-    extracted_info
-  end
-end

data/lib/nation/nation_info.rb

@@ -1,30 +0,0 @@
-require 'net/http'
-require 'json'
-
-# API Documentation: https://www.mediawiki.org/wiki/API:Main_page
-class Nation::NationInfo
-  def initialize(nation_name)
-    @nation_name = nation_name
-  end
-
-  def get_raw_data
-    uri = URI.parse("https://en.wikipedia.org/w/api.php?action=query&format=json&prop=extracts&titles=#{@nation_name}&formatversion=2&exsentences=10&exlimit=1&explaintext=1")
-    raw_data = JSON.parse(Net::HTTP.get(uri))
-
-    extract_info(raw_data)
-  end
-
-  def extract_info(raw_data)
-    hash_data = Hash[*raw_data]
-
-#   raise "Country not avaliable" if raise_error_field[0]["fromencoded"] == false
-
-    weird_hash = hash_data[["batchcomplete", true]]
-    weird_hash =  weird_hash[1]["pages"] || weird_hash[0]["pages"]
-    weird_hash = Hash[*weird_hash]
-
-    country_info = weird_hash["extract"]
-
-    country_info
-  end
-end