rest_countries 1.0.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c859f16c16ef81060943f21b0d506cd239c1712c2a76420fa93f46ccef47f18d
-  data.tar.gz: 1f691366dfb05e221b1efa18702998536cb7cbd394efb0e48b422f4a7fce584d
+  metadata.gz: 7728ecd48316ab130211f869f6c55819e2ead6797b1a471ef6f77391c3cc8737
+  data.tar.gz: 27dbd592a4026c441a218e91516e9741a0f8f319b2caadb348d29efa60cb8739
 SHA512:
-  metadata.gz: d5b87300db3674a74e170fc6c4a1c71a5094065e4f3196aa614859e26663b60b3c5c3644d3ad022a61ad6b693d9d3185cb67889d2416f04ea6c62abde2c5b8aa
-  data.tar.gz: 4f82e38de329457884b8dab1c4baa73e3014dd791d231b6af27dc802878824686a92728391dc5de298cdcaacb965f61474901e577acb48a202c4e1590a5a924b
+  metadata.gz: 670b1debe8d681879f9e0e15057b2071579a3686393950e70a0b2eec7bb68deb058b507a5a27164cdab3c628bea738bee02ca384eb8a554be60ac740b311c041
+  data.tar.gz: beb1d2e14ced9b4a33322cce52f1efaf27f4c644baeb42c7fb6a4f7336a8383e2ed7579e8afdd261f9f8a3fb073c0305709792c5f8809c685a2dcabe2d5afed8

data/README.md

@@ -58,6 +58,8 @@ The client then gives you access to the endpoints
 
 ### Region
 
+Search by region: Africa, Americas, Asia, Europe, Oceania
+
     $ client.region(region)
 
 ### Subregions

data/lib/rest_countries/client.rb

@@ -1,5 +1,5 @@
 require "faraday"
-# require "faraday_middleware"
+require "uri"
 
 module RestCountries
   class Client
@@ -7,14 +7,22 @@ module RestCountries
 
     attr_reader :adapter
 
-    def initialize(adapter: Faraday.default_adapter)
+    def initialize(adapter: Faraday.default_adapter, max_retries: 3, retry_interval: 1, timeout: 10, open_timeout: 5)
       @adapter = adapter
+      @max_retries = max_retries
+      @retry_interval = retry_interval
+      @timeout = timeout
+      @open_timeout = open_timeout
     end
 
     def connection
       @connection ||= Faraday.new(BASE_URL) do |conn|
         conn.request :json
         conn.response :json, content_type: "application/json"
+        conn.request :retry, max: @max_retries, interval: @retry_interval,
+          exceptions: [Faraday::ConnectionFailed, Faraday::TimeoutError]
+        conn.options.timeout = @timeout
+        conn.options.open_timeout = @open_timeout
         conn.adapter adapter
       end
     end
@@ -32,7 +40,8 @@ module RestCountries
 
     # Search by country’s full name. It can be the common or official value
     def fullname(country_name)
-      response = connection.get("name/#{country_name}?fullText=true")
+      encoded_name = URI.encode_www_form_component(country_name)
+      response = connection.get("name/#{encoded_name}?fullText=true")
       handle_response(response)
     end
 
@@ -68,19 +77,22 @@ module RestCountries
 
     # Search by capital city
     def capital(capital)
-      response = connection.get("capital/#{capital}")
+      encoded_capital = URI.encode_www_form_component(capital)
+      response = connection.get("capital/#{encoded_capital}")
       handle_response(response)
     end
 
     # Search by region
     def region(region)
-      response = connection.get("region/#{region}")
+      encoded_region = URI.encode_www_form_component(region)
+      response = connection.get("region/#{encoded_region}")
       handle_response(response)
     end
 
     # Search by subregions
     def subregion(subregion)
-      response = connection.get("subregion/#{subregion}")
+      encoded_subregion = URI.encode_www_form_component(subregion)
+      response = connection.get("subregion/#{encoded_subregion}")
       handle_response(response)
     end
 
@@ -99,10 +111,17 @@ module RestCountries
     private
 
     def handle_response(response)
-      if response.success?
+      case response.status
+      when 200...300
         response.body
+      when 404
+        raise NotFoundError, "Country not found"
+      when 400...500
+        raise ClientError, "Client error: #{response.status}"
+      when 500...600
+        raise ServerError, "Server error: #{response.status}"
       else
-        raise "Error fetching data: #{response.status}"
+        raise "Unexpected response: #{response.status}"
       end
     end
   end

data/lib/rest_countries/error.rb

@@ -1,3 +1,6 @@
 module RestCountries
   class Error < StandardError; end
+  class NotFoundError < Error; end
+  class ClientError < Error; end
+  class ServerError < Error; end
 end

data/lib/rest_countries/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module RestCountries
-  VERSION = "1.0.0"
+  VERSION = "1.0.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rest_countries
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors:
 - Mae Ann Sacedon Cimafranca
@@ -44,6 +44,7 @@ files:
 - lib/rest_countries/client.rb
 - lib/rest_countries/error.rb
 - lib/rest_countries/version.rb
+- rest_countries-1.0.0.gem
 - sig/rest_countries.rbs
 - ting API Requests
 homepage: https://github.com/cimafrancamae/rest_countries