country_select 4.0.0 → 8.0.1

data/Rakefile

@@ -1,10 +1,36 @@
+# frozen_string_literal: true
+
 require 'bundler/setup'
 require 'rake'
 require 'bundler/gem_tasks'
 
-require 'wwtd/tasks'
-
 require 'rspec/core/rake_task'
 RSpec::Core::RakeTask.new(:spec)
 
-task default: "wwtd:local"
+task default: 'spec'
+
+
+task :update_gemfiles do
+  require 'pry'
+  Dir.glob('gemfiles/*.gemfile').each do |gemfile|
+    puts "Updating #{gemfile}...\n\n"
+    ENV['BUNDLE_GEMFILE']=gemfile
+    puts `bundle install --gemfile=#{gemfile} --no-cache`
+    puts `bundle update --gemfile=#{gemfile}`
+
+    lockfile = "#{gemfile}.lock"
+
+    if File.exist? lockfile
+      parsed_lockfile = Bundler::LockfileParser.new(Bundler.read_file(lockfile))
+      # Ensure lockfile has x86_64-linux
+      if parsed_lockfile.platforms.map(&:to_s).none? {|p| p == 'x86_64-linux' }
+        puts "Adding platform x86_64-linux to #{lockfile}\n\n"
+        puts `bundle lock --add-platform x86_64-linux --gemfile=#{gemfile}`
+      end
+
+      puts ""
+    else
+      raise StandardError.new("Expected #{lockfile} to exist.")
+    end
+  end
+end

data/country_select.gemspec

@@ -8,25 +8,25 @@ Gem::Specification.new do |s|
   s.licenses    = ['MIT']
   s.authors     = ['Stefan Penner']
   s.email       = ['stefan.penner@gmail.com']
-  s.homepage    = 'https://github.com/stefanpenner/country_select'
+  s.homepage    = 'https://github.com/countries/country_select'
   s.summary     = %q{Country Select Plugin}
-  s.description = %q{Provides a simple helper to get an HTML select list of countries.  The list of countries comes from the ISO 3166 standard.  While it is a relatively neutral source of country names, it will still offend some users.}
+  s.description = %q{Provides a simple helper to get an HTML select list of countries. The list of countries comes from the ISO 3166 standard. While it is a relatively neutral source of country names, it will still offend some users.}
 
-  s.rubyforge_project = 'country_select'
+  s.metadata      = { 'bug_tracker_uri' => 'http://github.com/countries/country_select/issues',
+                      'changelog_uri' =>  'https://github.com/countries/country_select/blob/master/CHANGELOG.md',
+                      'source_code_uri' =>  'https://github.com/countries/country_select' }
 
   s.files         = `git ls-files`.split("\n")
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ['lib']
 
-  s.required_ruby_version = '>= 2'
+  s.required_ruby_version = '>= 2.7'
 
-  s.add_development_dependency 'actionpack', '~> 5'
+  s.add_development_dependency 'actionpack', '~> 7.0'
   s.add_development_dependency 'pry', '~> 0'
-  s.add_development_dependency 'rake'
+  s.add_development_dependency 'rake', '~> 13'
   s.add_development_dependency 'rspec', '~> 3'
-  s.add_development_dependency 'wwtd'
 
-  s.add_dependency 'countries', '~> 3.0'
-  s.add_dependency 'sort_alphabetical', '~> 1.0'
+  s.add_dependency 'countries', '~> 5.0'
 end

data/gemfiles/{actionpack5.2.gemfile → actionpack-5.2.gemfile}

@@ -4,9 +4,4 @@ gemspec :path => "../"
 
 gem "railties", "~> 5.2.0"
 gem "actionpack", "~> 5.2.0"
-
-platforms :rbx do
-  gem "racc"
-  gem "rubysl", "~> 2.0"
-  gem "psych"
-end
+gem 'nokogiri', '= 1.14.0.rc1'

data/gemfiles/actionpack-5.2.gemfile.lock

@@ -0,0 +1,99 @@
+PATH
+  remote: ..
+  specs:
+    country_select (8.0.1)
+      countries (~> 5.0)
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    actionpack (5.2.8.1)
+      actionview (= 5.2.8.1)
+      activesupport (= 5.2.8.1)
+      rack (~> 2.0, >= 2.0.8)
+      rack-test (>= 0.6.3)
+      rails-dom-testing (~> 2.0)
+      rails-html-sanitizer (~> 1.0, >= 1.0.2)
+    actionview (5.2.8.1)
+      activesupport (= 5.2.8.1)
+      builder (~> 3.1)
+      erubi (~> 1.4)
+      rails-dom-testing (~> 2.0)
+      rails-html-sanitizer (~> 1.0, >= 1.0.3)
+    activesupport (5.2.8.1)
+      concurrent-ruby (~> 1.0, >= 1.0.2)
+      i18n (>= 0.7, < 2)
+      minitest (~> 5.1)
+      tzinfo (~> 1.1)
+    builder (3.2.4)
+    coderay (1.1.3)
+    concurrent-ruby (1.1.10)
+    countries (5.3.0)
+      unaccent (~> 0.3)
+    crass (1.0.6)
+    diff-lcs (1.5.0)
+    erubi (1.12.0)
+    i18n (1.12.0)
+      concurrent-ruby (~> 1.0)
+    loofah (2.19.1)
+      crass (~> 1.0.2)
+      nokogiri (>= 1.5.9)
+    method_source (1.0.0)
+    minitest (5.17.0)
+    nokogiri (1.14.0.rc1-x86_64-darwin)
+      racc (~> 1.4)
+    nokogiri (1.14.0.rc1-x86_64-linux)
+      racc (~> 1.4)
+    pry (0.14.1)
+      coderay (~> 1.1)
+      method_source (~> 1.0)
+    racc (1.6.2)
+    rack (2.2.5)
+    rack-test (2.0.2)
+      rack (>= 1.3)
+    rails-dom-testing (2.0.3)
+      activesupport (>= 4.2.0)
+      nokogiri (>= 1.6)
+    rails-html-sanitizer (1.4.4)
+      loofah (~> 2.19, >= 2.19.1)
+    railties (5.2.8.1)
+      actionpack (= 5.2.8.1)
+      activesupport (= 5.2.8.1)
+      method_source
+      rake (>= 0.8.7)
+      thor (>= 0.19.0, < 2.0)
+    rake (13.0.6)
+    rspec (3.12.0)
+      rspec-core (~> 3.12.0)
+      rspec-expectations (~> 3.12.0)
+      rspec-mocks (~> 3.12.0)
+    rspec-core (3.12.0)
+      rspec-support (~> 3.12.0)
+    rspec-expectations (3.12.1)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.12.0)
+    rspec-mocks (3.12.1)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.12.0)
+    rspec-support (3.12.0)
+    thor (1.2.1)
+    thread_safe (0.3.6)
+    tzinfo (1.2.10)
+      thread_safe (~> 0.1)
+    unaccent (0.4.0)
+
+PLATFORMS
+  x86_64-darwin-22
+  x86_64-linux
+
+DEPENDENCIES
+  actionpack (~> 5.2.0)
+  country_select!
+  nokogiri (= 1.14.0.rc1)
+  pry (~> 0)
+  railties (~> 5.2.0)
+  rake (~> 13)
+  rspec (~> 3)
+
+BUNDLED WITH
+   2.4.2

data/gemfiles/actionpack-6.0.gemfile

@@ -0,0 +1,7 @@
+source "https://rubygems.org"
+
+gemspec :path => "../"
+
+gem "railties", "~> 6.0.0"
+gem "actionpack", "~> 6.0.0"
+gem 'nokogiri', '= 1.14.0.rc1'

data/gemfiles/actionpack-6.0.gemfile.lock

@@ -0,0 +1,101 @@
+PATH
+  remote: ..
+  specs:
+    country_select (8.0.1)
+      countries (~> 5.0)
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    actionpack (6.0.6)
+      actionview (= 6.0.6)
+      activesupport (= 6.0.6)
+      rack (~> 2.0, >= 2.0.8)
+      rack-test (>= 0.6.3)
+      rails-dom-testing (~> 2.0)
+      rails-html-sanitizer (~> 1.0, >= 1.2.0)
+    actionview (6.0.6)
+      activesupport (= 6.0.6)
+      builder (~> 3.1)
+      erubi (~> 1.4)
+      rails-dom-testing (~> 2.0)
+      rails-html-sanitizer (~> 1.1, >= 1.2.0)
+    activesupport (6.0.6)
+      concurrent-ruby (~> 1.0, >= 1.0.2)
+      i18n (>= 0.7, < 2)
+      minitest (~> 5.1)
+      tzinfo (~> 1.1)
+      zeitwerk (~> 2.2, >= 2.2.2)
+    builder (3.2.4)
+    coderay (1.1.3)
+    concurrent-ruby (1.1.10)
+    countries (5.3.0)
+      unaccent (~> 0.3)
+    crass (1.0.6)
+    diff-lcs (1.5.0)
+    erubi (1.12.0)
+    i18n (1.12.0)
+      concurrent-ruby (~> 1.0)
+    loofah (2.19.1)
+      crass (~> 1.0.2)
+      nokogiri (>= 1.5.9)
+    method_source (1.0.0)
+    minitest (5.17.0)
+    nokogiri (1.14.0.rc1-x86_64-darwin)
+      racc (~> 1.4)
+    nokogiri (1.14.0.rc1-x86_64-linux)
+      racc (~> 1.4)
+    pry (0.14.1)
+      coderay (~> 1.1)
+      method_source (~> 1.0)
+    racc (1.6.2)
+    rack (2.2.5)
+    rack-test (2.0.2)
+      rack (>= 1.3)
+    rails-dom-testing (2.0.3)
+      activesupport (>= 4.2.0)
+      nokogiri (>= 1.6)
+    rails-html-sanitizer (1.4.4)
+      loofah (~> 2.19, >= 2.19.1)
+    railties (6.0.6)
+      actionpack (= 6.0.6)
+      activesupport (= 6.0.6)
+      method_source
+      rake (>= 0.8.7)
+      thor (>= 0.20.3, < 2.0)
+    rake (13.0.6)
+    rspec (3.12.0)
+      rspec-core (~> 3.12.0)
+      rspec-expectations (~> 3.12.0)
+      rspec-mocks (~> 3.12.0)
+    rspec-core (3.12.0)
+      rspec-support (~> 3.12.0)
+    rspec-expectations (3.12.1)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.12.0)
+    rspec-mocks (3.12.1)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.12.0)
+    rspec-support (3.12.0)
+    thor (1.2.1)
+    thread_safe (0.3.6)
+    tzinfo (1.2.10)
+      thread_safe (~> 0.1)
+    unaccent (0.4.0)
+    zeitwerk (2.6.6)
+
+PLATFORMS
+  x86_64-darwin-22
+  x86_64-linux
+
+DEPENDENCIES
+  actionpack (~> 6.0.0)
+  country_select!
+  nokogiri (= 1.14.0.rc1)
+  pry (~> 0)
+  railties (~> 6.0.0)
+  rake (~> 13)
+  rspec (~> 3)
+
+BUNDLED WITH
+   2.4.2

data/gemfiles/actionpack-6.1.gemfile

@@ -0,0 +1,7 @@
+source "https://rubygems.org"
+
+gemspec :path => "../"
+
+gem "railties", "~> 6.1.0"
+gem "actionpack", "~> 6.1.0"
+gem 'nokogiri', '= 1.14.0.rc1'

data/gemfiles/actionpack-6.1.gemfile.lock

@@ -0,0 +1,100 @@
+PATH
+  remote: ..
+  specs:
+    country_select (8.0.1)
+      countries (~> 5.0)
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    actionpack (6.1.7)
+      actionview (= 6.1.7)
+      activesupport (= 6.1.7)
+      rack (~> 2.0, >= 2.0.9)
+      rack-test (>= 0.6.3)
+      rails-dom-testing (~> 2.0)
+      rails-html-sanitizer (~> 1.0, >= 1.2.0)
+    actionview (6.1.7)
+      activesupport (= 6.1.7)
+      builder (~> 3.1)
+      erubi (~> 1.4)
+      rails-dom-testing (~> 2.0)
+      rails-html-sanitizer (~> 1.1, >= 1.2.0)
+    activesupport (6.1.7)
+      concurrent-ruby (~> 1.0, >= 1.0.2)
+      i18n (>= 1.6, < 2)
+      minitest (>= 5.1)
+      tzinfo (~> 2.0)
+      zeitwerk (~> 2.3)
+    builder (3.2.4)
+    coderay (1.1.3)
+    concurrent-ruby (1.1.10)
+    countries (5.3.0)
+      unaccent (~> 0.3)
+    crass (1.0.6)
+    diff-lcs (1.5.0)
+    erubi (1.12.0)
+    i18n (1.12.0)
+      concurrent-ruby (~> 1.0)
+    loofah (2.19.1)
+      crass (~> 1.0.2)
+      nokogiri (>= 1.5.9)
+    method_source (1.0.0)
+    minitest (5.17.0)
+    nokogiri (1.14.0.rc1-x86_64-darwin)
+      racc (~> 1.4)
+    nokogiri (1.14.0.rc1-x86_64-linux)
+      racc (~> 1.4)
+    pry (0.14.1)
+      coderay (~> 1.1)
+      method_source (~> 1.0)
+    racc (1.6.2)
+    rack (2.2.5)
+    rack-test (2.0.2)
+      rack (>= 1.3)
+    rails-dom-testing (2.0.3)
+      activesupport (>= 4.2.0)
+      nokogiri (>= 1.6)
+    rails-html-sanitizer (1.4.4)
+      loofah (~> 2.19, >= 2.19.1)
+    railties (6.1.7)
+      actionpack (= 6.1.7)
+      activesupport (= 6.1.7)
+      method_source
+      rake (>= 12.2)
+      thor (~> 1.0)
+    rake (13.0.6)
+    rspec (3.12.0)
+      rspec-core (~> 3.12.0)
+      rspec-expectations (~> 3.12.0)
+      rspec-mocks (~> 3.12.0)
+    rspec-core (3.12.0)
+      rspec-support (~> 3.12.0)
+    rspec-expectations (3.12.1)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.12.0)
+    rspec-mocks (3.12.1)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.12.0)
+    rspec-support (3.12.0)
+    thor (1.2.1)
+    tzinfo (2.0.5)
+      concurrent-ruby (~> 1.0)
+    unaccent (0.4.0)
+    zeitwerk (2.6.6)
+
+PLATFORMS
+  x86_64-darwin-22
+  x86_64-linux
+
+DEPENDENCIES
+  actionpack (~> 6.1.0)
+  country_select!
+  nokogiri (= 1.14.0.rc1)
+  pry (~> 0)
+  railties (~> 6.1.0)
+  rake (~> 13)
+  rspec (~> 3)
+
+BUNDLED WITH
+   2.4.2

data/gemfiles/actionpack-7.0.gemfile

@@ -0,0 +1,7 @@
+source "https://rubygems.org"
+
+gemspec :path => "../"
+
+gem "railties", "~> 7.0.0"
+gem "actionpack", "~> 7.0.0"
+gem 'nokogiri', '= 1.14.0.rc1'

data/gemfiles/actionpack-7.0.gemfile.lock

@@ -0,0 +1,100 @@
+PATH
+  remote: ..
+  specs:
+    country_select (8.0.1)
+      countries (~> 5.0)
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    actionpack (7.0.4)
+      actionview (= 7.0.4)
+      activesupport (= 7.0.4)
+      rack (~> 2.0, >= 2.2.0)
+      rack-test (>= 0.6.3)
+      rails-dom-testing (~> 2.0)
+      rails-html-sanitizer (~> 1.0, >= 1.2.0)
+    actionview (7.0.4)
+      activesupport (= 7.0.4)
+      builder (~> 3.1)
+      erubi (~> 1.4)
+      rails-dom-testing (~> 2.0)
+      rails-html-sanitizer (~> 1.1, >= 1.2.0)
+    activesupport (7.0.4)
+      concurrent-ruby (~> 1.0, >= 1.0.2)
+      i18n (>= 1.6, < 2)
+      minitest (>= 5.1)
+      tzinfo (~> 2.0)
+    builder (3.2.4)
+    coderay (1.1.3)
+    concurrent-ruby (1.1.10)
+    countries (5.3.0)
+      unaccent (~> 0.3)
+    crass (1.0.6)
+    diff-lcs (1.5.0)
+    erubi (1.12.0)
+    i18n (1.12.0)
+      concurrent-ruby (~> 1.0)
+    loofah (2.19.1)
+      crass (~> 1.0.2)
+      nokogiri (>= 1.5.9)
+    method_source (1.0.0)
+    minitest (5.17.0)
+    nokogiri (1.14.0.rc1-x86_64-darwin)
+      racc (~> 1.4)
+    nokogiri (1.14.0.rc1-x86_64-linux)
+      racc (~> 1.4)
+    pry (0.14.1)
+      coderay (~> 1.1)
+      method_source (~> 1.0)
+    racc (1.6.2)
+    rack (2.2.5)
+    rack-test (2.0.2)
+      rack (>= 1.3)
+    rails-dom-testing (2.0.3)
+      activesupport (>= 4.2.0)
+      nokogiri (>= 1.6)
+    rails-html-sanitizer (1.4.4)
+      loofah (~> 2.19, >= 2.19.1)
+    railties (7.0.4)
+      actionpack (= 7.0.4)
+      activesupport (= 7.0.4)
+      method_source
+      rake (>= 12.2)
+      thor (~> 1.0)
+      zeitwerk (~> 2.5)
+    rake (13.0.6)
+    rspec (3.12.0)
+      rspec-core (~> 3.12.0)
+      rspec-expectations (~> 3.12.0)
+      rspec-mocks (~> 3.12.0)
+    rspec-core (3.12.0)
+      rspec-support (~> 3.12.0)
+    rspec-expectations (3.12.1)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.12.0)
+    rspec-mocks (3.12.1)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.12.0)
+    rspec-support (3.12.0)
+    thor (1.2.1)
+    tzinfo (2.0.5)
+      concurrent-ruby (~> 1.0)
+    unaccent (0.4.0)
+    zeitwerk (2.6.6)
+
+PLATFORMS
+  x86_64-darwin-22
+  x86_64-linux
+
+DEPENDENCIES
+  actionpack (~> 7.0.0)
+  country_select!
+  nokogiri (= 1.14.0.rc1)
+  pry (~> 0)
+  railties (~> 7.0.0)
+  rake (~> 13)
+  rspec (~> 3)
+
+BUNDLED WITH
+   2.4.2

data/lib/country_select/country_select_helper.rb

@@ -6,6 +6,11 @@ module ActionView
           html_options = options
           options = priority_or_options
         else
+          if RUBY_VERSION =~ /^3\.\d\.\d/
+            warn "DEPRECATION WARNING: Setting priority countries with the 1.x syntax is deprecated. Please use the `priority_countries:` option.", uplevel: 1, category: :deprecated
+          else
+            warn "DEPRECATION WARNING: Setting priority countries with the 1.x syntax is deprecated. Please use the `priority_countries:` option.", uplevel: 1
+          end
           options[:priority_countries] = priority_or_options
         end
 

data/lib/country_select/defaults.rb

@@ -0,0 +1,11 @@
+module CountrySelect
+  DEFAULTS = {
+    except: nil,
+    format: :default,
+    locale: nil,
+    only: nil,
+    priority_countries: nil,
+    priority_countries_divider: "-" * 15,
+    sort_provided: true
+  }
+end

data/lib/country_select/formats.rb

@@ -2,6 +2,8 @@ module CountrySelect
   FORMATS = {}
 
   FORMATS[:default] = lambda do |country|
-    country.translations[I18n.locale.to_s] || country.name
+    # Need to use :[] specifically, not :dig, because country.translations is a
+    # ISO3166::Translations object, which overrides :[] to support i18n locale fallbacks
+    country.translations&.send(:[], I18n.locale.to_s) || country.common_name || country.iso_short_name
   end
 end

data/lib/country_select/tag_helper.rb

@@ -3,7 +3,7 @@ module CountrySelect
   module TagHelper
     def country_option_tags
       # In Rails 5.2+, `value` accepts no arguments and must also be called
-      # called with parens to avoid the local variable of the same name
+      # with parens to avoid the local variable of the same name
       # https://github.com/rails/rails/pull/29791
       selected_option = @options.fetch(:selected) do
         if self.method(:value).arity == 0
@@ -19,7 +19,7 @@ module CountrySelect
       }
 
       if priority_countries.present?
-        priority_countries_options = country_options_for(priority_countries, false)
+        priority_countries_options = country_options_for(priority_countries, @options.fetch(:sort_provided, ::CountrySelect::DEFAULTS[:sort_provided]))
 
         option_tags = options_for_select(priority_countries_options, option_tags_options)
         option_tags += html_safe_newline + options_for_select([priority_countries_divider], disabled: priority_countries_divider)
@@ -35,43 +35,42 @@ module CountrySelect
 
     private
     def locale
-      @options[:locale]
+      @options.fetch(:locale, ::CountrySelect::DEFAULTS[:locale])
     end
 
     def priority_countries
-      @options[:priority_countries]
+      @options.fetch(:priority_countries, ::CountrySelect::DEFAULTS[:priority_countries])
     end
 
     def priority_countries_divider
-      @options[:priority_countries_divider] || "-"*15
+      @options.fetch(:priority_countries_divider, ::CountrySelect::DEFAULTS[:priority_countries_divider])
     end
 
     def only_country_codes
-      @options[:only]
+      @options.fetch(:only, ::CountrySelect::DEFAULTS[:only])
     end
 
     def except_country_codes
-      @options[:except]
+      @options.fetch(:except, ::CountrySelect::DEFAULTS[:except])
     end
 
     def format
-      @options[:format] || :default
+      @options.fetch(:format, ::CountrySelect::DEFAULTS[:format])
     end
 
     def country_options
-      country_options_for(all_country_codes, true)
-    end
-
-    def all_country_codes
-      codes = ISO3166::Country.codes
-
       if only_country_codes.present?
-        codes & only_country_codes
+        codes = only_country_codes & ISO3166::Country.codes
+        sort = @options.fetch(:sort_provided, ::CountrySelect::DEFAULTS[:sort_provided])
       elsif except_country_codes.present?
-        codes - except_country_codes
+        codes = ISO3166::Country.codes - except_country_codes
+        sort = true
       else
-        codes
+        codes = ISO3166::Country.codes
+        sort = true
       end
+
+      country_options_for(codes, sort)
     end
 
     def country_options_for(country_codes, sorted=true)
@@ -79,9 +78,8 @@ module CountrySelect
         country_list = country_codes.map do |code_or_name|
           if country = ISO3166::Country.new(code_or_name)
             code = country.alpha2
-          elsif country = ISO3166::Country.find_by_name(code_or_name)
-            code = country.first
-            country = ISO3166::Country.new(code)
+          elsif country = ISO3166::Country.find_country_by_any_name(code_or_name)
+            code = country.alpha2
           end
 
           unless country.present?
@@ -100,11 +98,7 @@ module CountrySelect
         end
 
         if sorted
-          if country_list.respond_to?(:sort_alphabetical)
-            country_list.sort_alphabetical
-          else
-            country_list.sort
-          end
+          country_list.sort_by { |name, code| [I18n.transliterate(name), name] }
         else
           country_list
         end

data/lib/country_select/version.rb

@@ -1,3 +1,3 @@
 module CountrySelect
-  VERSION = '4.0.0'
+  VERSION = '8.0.1'
 end

data/lib/country_select.rb

@@ -1,14 +1,9 @@
 # encoding: utf-8
 
 require 'countries'
-require 'sort_alphabetical'
 
 require 'country_select/version'
+require 'country_select/defaults'
 require 'country_select/formats'
 require 'country_select/tag_helper'
-
-if defined?(ActionView::Helpers::Tags::Base)
-  require 'country_select/country_select_helper'
-else
-  require 'country_select/rails3/country_select_helper'
-end
+require 'country_select/country_select_helper'