geo_ppp 0.1.1 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 640910fefd461ccfb1d6f049b6dcb89be6140b6e9d07294f6cc010c9ec2cab90
-  data.tar.gz: c9d683f743d6ed7394ecb6cd4062de1e1b351ba8b155ef75a51f5cb5b4fbf06e
+  metadata.gz: 59b31d9484735cd636fc819a81031bf7ca7bf4d1e3830d581751cce9da7b7d56
+  data.tar.gz: 1551dc3c2b3941802fc74b93154e0bfb44d88e404ba0d7afca3bae6936d9e079
 SHA512:
-  metadata.gz: 239f4518d5bde4e5c0e049228a547ece8c0510393b20e8e713b9e95a57d6ff6b99d507385145e80047111c6fcf0ec5e01afe7b6729d5b3197625058e3a965f6e
-  data.tar.gz: 3f9bd443b1c0f4e7a46bf04d1199948c5c098abe7b22d5936bd68edc60fdc11d1936facebcdaa17ce4fa32c9c4ab3ee92a6ceda32a7f1e973bb47ed50b3406a6
+  metadata.gz: e7b4906e940d0f44c3b3d3712c8eae7cbeac898339b1bdf66f7d19cf5a0e1095c3fdcc061acf582f41d37f3e3e04b664eb0324ed49e44dcb4fdad5fd01c0abac
+  data.tar.gz: 6a3a713b4d85f423e4451b0ef2a1ea41fa822bdeb7549761646ebe4e858f6f58c7f41431c2e7f4e1612866fbf2c0bd90849106f25e7320efaba2f9547146d0ba

data/lib/geo_ppp/fetcher.rb

@@ -13,24 +13,35 @@ class GeoPPPFetcher
   private
 
   def self.fetch_geo
-	 response = make_request(GEO_API_URL)
-	 {
-		country_code_iso_alpha2: response['country_code'],
-		country_name: response['country_name']
-	 }
+	 uri = URI(GEO_API_URL)
+	 response = fetch_with_redirect(uri)
+	 handle_response(response)
   end
 
   def self.fetch_ppp(geo)
-	 url = "#{PPP_API_URL}#{geo[:country_code_iso_alpha2]}"
-	 ppp_response = make_request(url)
-	 geo.merge(ppp: ppp_response['ppp'])
+	 uri = URI("#{PPP_API_URL}#{geo.country_code}")
+	 response = fetch_with_redirect(uri)
+	 handle_response(response)
   end
 
-  def self.make_request(url)
-	 uri = URI(url)
-	 response = Net::HTTP.get(uri)
-	 JSON.parse(response)
-  rescue StandardError => e
-	 raise "Failed to fetch data from #{url}: #{e.message}"
+  def self.fetch_with_redirect(uri, limit = 10)
+	  raise 'Too many HTTP redirects' if limit.zero?
+
+	  response = Net::HTTP.get_response(uri)
+	  case response
+	  when Net::HTTPRedirection
+		 new_uri = URI(response['location'])
+		 fetch_with_redirect(new_uri, limit - 1)
+	  else
+		 response
+	  end
+  end
+
+  def self.handle_response(response)
+	  if response.is_a?(Net::HTTPSuccess)
+		 JSON.parse(response.body)
+	  else
+		 raise "HTTP Error: #{response.code} #{response.message}"
+	  end
   end
 end

data/lib/geo_ppp/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module GeoPpp
-  VERSION = "0.1.1"
+  VERSION = "0.1.3"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: geo_ppp
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.3
 platform: ruby
 authors:
 - waruna