restcountry 0.3.1 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e7d334d4e378ba7a4ffdf7f3dd3b35b329a5b1db
-  data.tar.gz: cb6678bfa84b5192423e7cc0b377350387fd9794
+  metadata.gz: d4529a0a454e36b402e477bd82abfd26025be28d
+  data.tar.gz: 87527b89b7c60e2a7bbe34966210ab82e052d8a1
 SHA512:
-  metadata.gz: 6bb19216eef2e41243af8a499cb7205d98ed200e9c8ab83c307b6dc23a7c01355fadcaf3d83b5c39efb4a11f9e6ec36db1b3ffdb18e0b7be6ee09859eb4f2b36
-  data.tar.gz: 49c68cc58e80ba987e96281ea6324684e375b4c0dd89afbddc5ee9de4f51b5b483efe42fef5b62be1594e20c0ae7dd4f8ecb5337f93b50ebeedc2ff0f175b828
+  metadata.gz: 70ecb83e3b2b26a77987a46125587cd821dbde8667f61f0213af1f16cf263201011062131df36511e6347b071bd40b7ceaa846cf657d61bf55f2e73a9a51c35e
+  data.tar.gz: 1ba09405164a70b72b1b9c591cd286a22d0f3628adf0f9d98ce0782c1acb299418a97f2955c14bc1b27ef83b047e77f45b64a3ede49a5edb22c15ad4733dbe0b

data/lib/restcountry/country.rb

@@ -52,8 +52,8 @@ module Restcountry
     end
 
     def self.find(name)
-      response = get_response('name', name)
-      response.success? ? new(JSON.parse(response.body).first) : []
+      countries = get_response('name', name)
+      new(countries.first) unless countries.empty?
     end
 
     def self.find_by_name(name)
@@ -61,42 +61,43 @@ module Restcountry
     end
 
     def self.find_by_currency(currency)
-      response = get_response('currency', currency)
-      countries = response.success? ? JSON.parse(response.body) : []
+      countries = get_response('currency', currency)
       countries.map { |attributes| new(attributes) }
     end
 
     def self.find_by_capital(capital)
-      response = get_response('capital', capital)
-      response.success? ? new(JSON.parse(response.body).first) : []
+      countries = get_response('capital', capital)
+      new(countries.first) unless countries.empty?
     end
 
     def self.find_by_region(region)
-      response = get_response('region', region)
-      countries = response.success? ? JSON.parse(response.body) : []
+      countries = get_response('region', region)
+      countries.map { |attributes| new(attributes) }
+    end
+
+    def self.find_by_subregion(subregion)
+      countries = get_response('subregion', subregion)
       countries.map { |attributes| new(attributes) }
     end
 
     def self.find_by_lang(lang)
-      response = get_response('lang', lang)
-      countries = response.success? ? JSON.parse(response.body) : []
+      countries = get_response('lang', lang)
       countries.map { |attributes| new(attributes) }
     end
 
     def self.find_by_callingcode(callingcode)
-      response = get_response('callingcode', callingcode)
-      countries = response.success? ? JSON.parse(response.body) : []
+      countries = get_response('callingcode', callingcode)
       countries.map { |attributes| new(attributes) }
     end
 
     def self.all
-      response = get_response('all')
-      countries = response.success? ? JSON.parse(response.body) : []
+      countries = get_response('all')
       countries.map { |attributes| new(attributes) }
     end
   private
     def self.get_response(api, action=nil)
-      Faraday.get("#{API_URL}/#{api.to_s}/#{action}")
+      response = Faraday.get(URI.parse(URI.encode("#{API_URL}/#{api.to_s}/#{action}")))
+      return response.success? ? JSON.parse(response.body) : []
     end
   end
 end

data/lib/restcountry/version.rb

@@ -1,3 +1,3 @@
 module Restcountry
-  VERSION = "0.3.1"
+  VERSION = "0.4.0"
 end

data/spec/restcountry_spec.rb

@@ -55,4 +55,11 @@ describe Restcountry do
       expect(countries.first.name).to eq('Italy')
     end
   end
+
+  it 'get name Armenia from first country of subregion "western asia"' do
+    VCR.use_cassette 'find_by_subregion' do
+      countries = Restcountry::Country.find_by_subregion('western asia')
+      expect(countries.first.name).to eq('Armenia')
+    end
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: restcountry
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.4.0
 platform: ruby
 authors:
 - Davide Santangelo