rails-countries 1.0.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7f547f8e3c479eeabca9f17f7ccc63224151c9fb8b993640b114ed55574d3eb1
-  data.tar.gz: 3f2afbb5495f46225a1f8dfe96d6f9a0b7ba70b3f788a68c417f80364e64dac6
+  metadata.gz: 3117edd5ad8690c96fcb03b7f35e7ae40ca78aaf835ae4f9e82c8ce386081a0a
+  data.tar.gz: 489cc1d19dfccbe35a52ffc6d3f5044dc697900bdf787eadc15713bda44f788b
 SHA512:
-  metadata.gz: 74a9b9b2f85e3d5c06832d217eea40354f65ad6a5a7d3f9aeb2646d7c99ee985c0d3c528ca201c1810565a3028d19bd7d3df8389fd926a1b7e3714cf2c36fbac
-  data.tar.gz: 3ae151f4dc5e6b2d14ed3b96d54741b83d1846810ebc2ad5ad808b12d1e91821ed3d1f9b6340e4b8459341e5f1fa2bdfda1764ab4ee06ff961925264aea44119
+  metadata.gz: 4203664b3d4e3e84bd8105c35403015e2d522dfc2d8bda6e338826987bcba381a86dab739b62b42bdad2844b0da7df34a621063ebbbdfcacabf62f959e5a638a
+  data.tar.gz: 2945505945c68052c151266d6d966a41a467120aa819dc5201b4ec77f08b371c13d7f2a1850d41b665a6b5cf6fe5b3d2d3d8c78fc4def155d101c99ba7038ac0

data/README.md

@@ -2,9 +2,9 @@
 
 Integration between Rails and [countries](https://github.com/hexorx/countries) gem.
 
-[![Gem Version](https://badge.fury.io/rb/validates-countries.svg)](https://badge.fury.io/rb/validates-countries)
-[![Gem](https://img.shields.io/gem/dt/validates-countries.svg)]()
-[![license](https://img.shields.io/github/license/pedrofurtado/validates-countries.svg)]()
+[![Gem Version](https://badge.fury.io/rb/rails-countries.svg)](https://badge.fury.io/rb/rails-countries)
+[![Gem](https://img.shields.io/gem/dt/rails-countries.svg)]()
+[![license](https://img.shields.io/github/license/pedrofurtado/rails-countries.svg)]()
 
 ## Installation
 
@@ -30,6 +30,10 @@ class Person < ActiveRecord::Base
   validates :my_attribute, countries_alpha2: true
   # or
   validates_countries_alpha2_of :my_attribute
+
+  validates :another_attribute, countries_alpha3: true
+  # or
+  validates_countries_alpha3_of :another_attribute
 end
 ```
 
@@ -41,6 +45,10 @@ class Person
   validates :my_attribute, countries_alpha2: true
   # or
   validates_countries_alpha2_of :my_attribute
+
+  validates :another_attribute, countries_alpha3: true
+  # or
+  validates_countries_alpha3_of :another_attribute
 end
 ```
 
@@ -50,18 +58,27 @@ end
 ```erb
 <%= i18n_country_name_by_alpha2('US') %>
 <%= i18n_country_name_by_alpha2('US', 'pt-BR') %>
+
+<%= i18n_country_name_by_alpha3('USA') %>
+<%= i18n_country_name_by_alpha3('USA', 'pt-BR') %>
 ```
 
 #### Rails Form helpers
 ```erb
 <%= select_tag(:my_attribute, countries_alpha2_options) %>
 <%= select_tag(:my_attribute, countries_alpha2_options('pt-BR')) %>
+
+<%= select_tag(:another_attribute, countries_alpha3_options) %>
+<%= select_tag(:another_attribute, countries_alpha3_options('pt-BR')) %>
 ```
 
 #### SimpleForm
 ```erb
 <%= f.input :my_attribute, collection: countries_alpha2_options %>
 <%= f.input :my_attribute, collection: countries_alpha2_options('pt-BR') %>
+
+<%= f.input :my_attribute, collection: countries_alpha3_options %>
+<%= f.input :my_attribute, collection: countries_alpha3_options('pt-BR') %>
 ```
 
 ## I18n
@@ -73,4 +90,9 @@ en:
   errors:
     messages:
       countries_alpha2_invalid: '%{alpha2} is not valid'
+      countries_alpha3_invalid: '%{alpha3} is not valid'
 ```
+
+## Contribute it!
+
+Help us to improve the features and translations of this gem! Your contribution will be welcome :tada:

data/config/locales/en.yml

@@ -2,3 +2,4 @@ en:
   errors:
     messages:
       countries_alpha2_invalid: '%{alpha2} is not valid'
+      countries_alpha3_invalid: '%{alpha3} is not valid'

data/config/locales/es.yml

@@ -2,3 +2,4 @@ es:
   errors:
     messages:
       countries_alpha2_invalid: '%{alpha2} es invalido'
+      countries_alpha3_invalid: '%{alpha3} es invalido'

data/config/locales/pt-BR.yml

@@ -2,3 +2,4 @@ pt-BR:
   errors:
     messages:
       countries_alpha2_invalid: '%{alpha2} não é válido'
+      countries_alpha3_invalid: '%{alpha3} não é válido'

data/lib/rails-countries/engine.rb

@@ -1,3 +1,5 @@
+require 'rails'
+
 module RailsCountries
   class Engine < ::Rails::Engine
     initializer 'rails-countries.engine' do

data/lib/rails-countries/helpers.rb

@@ -1,3 +1,5 @@
+require 'countries'
+
 module RailsCountries
   module ActionView
     module Helpers
@@ -5,8 +7,16 @@ module RailsCountries
         ISO3166::Country.all.map { |country| [country.translation(locale || I18n.locale), country.alpha2] }
       end
 
+      def countries_alpha3_options(locale = nil)
+        ISO3166::Country.all.map { |country| [country.translation(locale || I18n.locale), country.alpha3] }
+      end
+
       def i18n_country_name_by_alpha2(alpha2, locale = nil)
-        ISO3166::Country.new(alpha2).translation(locale || I18n.locale)
+        ISO3166::Country.new(alpha2)&.translation(locale || I18n.locale)
+      end
+
+      def i18n_country_name_by_alpha3(alpha3, locale = nil)
+        ISO3166::Country.find_country_by_alpha3(alpha3)&.translation(locale || I18n.locale)
       end
     end
   end

data/lib/rails-countries/validators.rb

@@ -1,3 +1,4 @@
+require 'countries'
 require 'active_model'
 
 module ActiveModel
@@ -8,10 +9,20 @@ module ActiveModel
       end
     end
 
+    class CountriesAlpha3Validator < EachValidator
+      def validate_each(record, attribute, value)
+        record.errors.add(attribute, :countries_alpha3_invalid, alpha3: value) if value.present? && (value.is_a?(String) || value.is_a?(Symbol)) && !ISO3166::Country.all.map(&:alpha3).include?(value.to_s)
+      end
+    end
+
     module HelperMethods
       def validates_countries_alpha2_of(*attributes)
         validates_with CountriesAlpha2Validator, _merge_attributes(attributes)
       end
+      
+      def validates_countries_alpha3_of(*attributes)
+        validates_with CountriesAlpha3Validator, _merge_attributes(attributes)
+      end
     end
   end
 end

data/lib/rails-countries/version.rb

@@ -1,3 +1,3 @@
 module RailsCountries
-  VERSION = '1.0.0'.freeze
+  VERSION = '1.1.0'.freeze
 end

data/lib/rails-countries.rb

@@ -1,6 +1,3 @@
-require 'countries'
-require 'rails'
-require 'active_model'
 require 'rails-countries/version'
 require 'rails-countries/helpers'
 require 'rails-countries/engine'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rails-countries
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors:
 - Pedro Furtado
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-07-18 00:00:00.000000000 Z
+date: 2019-07-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails