Skip to content

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also compare across forks.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also compare across forks.
...
Checking mergeability… Don’t worry, you can still create the pull request.
Commits on Jan 23, 2012
@stefanpenner stefanpenner Gemification of country_select 69567dd
Commits on Mar 01, 2012
@oz oz html_safe the default options Strings
This gem broke while playing with:
    - rails ~>3.2
    - simple_form ~>2.0

The <option> tags are all unsafe and escaped, this is a simple enough fix
for that.
01b60a1
Commits on Mar 02, 2012
@stefanpenner stefanpenner Merge pull request #1 from oz/patch-1
html_safe the default options Strings (Fixes ~> Rails 3.2 related issues)
1b20654
@stefanpenner stefanpenner version bump 7ce2fb0
Commits on Apr 04, 2012
@stefanpenner stefanpenner improve docs 109615d
Commits on Jun 03, 2012
@stefanpenner stefanpenner VERSION BUMP 5847f20
Commits on Jul 17, 2012
@stefanpenner stefanpenner remove Netherlands Antilles 394163c
Commits on Jul 18, 2012
@stefanpenner stefanpenner Add "Curacao" and "Sint Maarten" b6747fd
@stefanpenner stefanpenner version bump 6ea54ce
Commits on Sep 18, 2012
@slbug slbug rails 4 support 60f9b2c
Commits on Oct 16, 2012
@stefanpenner stefanpenner Fix Readme 74cabd4
@stefanpenner stefanpenner more Readme cleanup a2b3147
Commits on Dec 23, 2012
@stefanpenner stefanpenner Merge pull request #7 from slbug/master
Rails 4 support (first pass at this, hopefully someone has a chance to clean this up going forward.)
b7a4786
Commits on Dec 27, 2012
Rafael Mendonça França Do not change the ActionView::Helpers::Tags::Base class.
Is better to create a new class inherited from Base.

This was the whole point when I created the Tags classes on Rails.

Also the previous implementation was overriding a very important method
of tags, the add_default_name_and_id.
a04e27f
@stefanpenner stefanpenner Merge pull request #9 from rafaelfranca/rails_4_implementation
Changed the implementation for Rails 4
71982f9
@stefanpenner stefanpenner Version bump to 0.1.0 f32df29
@stefanpenner stefanpenner bump version 8d68eeb
Commits on Dec 28, 2012
@stefanpenner stefanpenner Simplicity, eh? ef0447e
@stefanpenner stefanpenner bump c02005e
@stefanpenner stefanpenner Fix Spelling mistake: d2e4a16
@stefanpenner stefanpenner bump 65b7252
Commits on Jan 09, 2013
@joemsak joemsak Add initial tests for CountrySelect
fixes stefanpenner/country_select#10

Using RSpec

CountrySelect was reformatted purely cosmetically
for readability which aided in writing clear tests
c990217
@stefanpenner stefanpenner Merge pull request #13 from neotericdesign/merge-add-tests
Add initial tests for CountrySelect
eb16ea9
Commits on May 19, 2013
@stefanpenner stefanpenner fix tests 823b573
@stefanpenner stefanpenner Update Readme
- minor cleanup
- syntax highlighting
- running tests
c2f0f16
@stefanpenner stefanpenner default rake task now runs tests (for travis) 0edd347
@stefanpenner stefanpenner add .travis.yml for multiple ruby versions 64666fb
@stefanpenner stefanpenner run tests across multiple versions of rails 764c128
@scudco scudco Use country codes to standardize around ISO 3166 3837058
@stefanpenner stefanpenner Merge pull request #16 from scudco/country-codes
Use country codes to standardize around ISO 3166
488f3ef
@stefanpenner stefanpenner Update README.md e79ffd4
@stefanpenner stefanpenner fix rails 4 warnings e586634
@stefanpenner stefanpenner fix rails 4 tests a90fd76
@stefanpenner stefanpenner add appraisal runs to travis bb820b5
@scudco scudco Update documentation to make clear that values are now codes 694c57b
Commits on May 24, 2013
@scudco scudco Make appraisal a development dependency rather than runtime 62cf2d6
@stefanpenner stefanpenner Merge pull request #18 from scudco/remove-appraisal-runtime-dependency
Remove appraisal runtime dependency
d261dc8
Commits on Jun 09, 2013
@scudco scudco Fix gemspec 56b7cbb
@stefanpenner stefanpenner Merge pull request #22 from scudco/fix-gemspec
Fix gemspec
07a2ca5
Commits on Jul 04, 2013
@scudco scudco Revert back to original API of full country names b206f92
@scudco scudco Allow ISO 3166 alpha2 codes to be optionally used 01c055a
@scudco scudco Update Appraisals to actionpack 4.0.0 88da1c6
@scudco scudco Update appraisal gemfiles 9aae953
@scudco scudco Fix specs for actionpack 4.0 847aa2b
@scudco scudco Add appraisal to README fce2d90
@scudco scudco Fix actionpack development dependency for ruby < 1.9.3 154d2c0
@scudco scudco Update README with instructions on how to load country name from iso …
…code
b117c6b
@scudco scudco Use 1.8 hash syntax to not be totally snooty 8194761
@scudco scudco Allow failures on ruby-head due to a bug in ruby-head 735ae7e
Commits on Jul 05, 2013
@scudco scudco Keep the rubies in order-ish a238d9d
@stefanpenner stefanpenner Merge pull request #24 from scudco/optional-iso
Make the use of ISO codes as values optional
8b9878c
Commits on Jul 06, 2013
@scudco scudco Release v1.2.0 be3618c
Commits on Jul 11, 2013
@MSchmidt MSchmidt Add option to always use iso codes 7110422
@MSchmidt MSchmidt Update README to reflect new global iso codes option 1838d1e
Commits on Jul 12, 2013
@MSchmidt MSchmidt Make iso code option spec actually test the right thing dea9e22
Commits on Jul 26, 2013
@kennethkalmer kennethkalmer Added Zimbabwe/ZW
Zimbabwe is on the https://en.wikipedia.org/wiki/ISO_3166-1 list, yet it disappeared here
653dcdc
@stefanpenner stefanpenner Merge pull request #26 from kennethkalmer/patch-1
Added Zimbabwe/ZW
2778d46
Commits on Oct 27, 2013
@bradleypriest bradleypriest Uppercase ISO codes 4948b6e
@stefanpenner stefanpenner Merge pull request #32 from bradleypriest/uppercase
Uppercase ISO codes
1559ec9
@stefanpenner stefanpenner update locks 3f5e521
@stefanpenner stefanpenner after the test runs make sure to cleanup global flags 33c8784
@stefanpenner stefanpenner Merge branch 'pr/25' 1774f94
Commits on Oct 28, 2013
@auzroz auzroz Added simple and verbose Countries GEM dependency. 40fb4ca
Commits on Oct 29, 2013
@stefanpenner stefanpenner Merge pull request #34 from auzroz/master
Simple and verbose integration of hexorx/Countries
9c79378
@auzroz auzroz Enabled random order in RSpec 6cfbbac
@auzroz auzroz Updated ISO ecxample in README 2634eb9
@stefanpenner stefanpenner Merge pull request #35 from auzroz/master
Updated RSpec random order and README example.
f24a5f8
@auzroz auzroz Added country localization based on hexorx/countries 25121ef
Commits on Nov 06, 2013
@georgepalmer georgepalmer Return countries in alphabetical order in select 3ca648c
@stefanpenner stefanpenner Merge pull request #38 from georgepalmer/master
Return countries in alphabetical order in select
b2709ef
Commits on Jan 27, 2014
@scudco scudco Use `Thread.current` for thread-safeness for now
  * This should probably be changed to use
    [RequestStore](https://github.com/steveklabnik/request_store) since
    I can imagine that `country_select` is used across so many servers
  * I removed `CountrySelect.locale=` because that should be handled
    with `I18n.locale`. I have, however, kept the getter and it just
    returns `I18n.locale`. This seemed the right choice from a
    testing/API-completeness perspective.
31a55a2
@scudco scudco Remove unused `DEFAULTS` c933179
@scudco scudco Add seeded default hash back. :derp: 239ee47
Commits on Jan 28, 2014
@scudco scudco Triage Travis CI configuration
  * Use latest rubies for travis
  * Switch to travis-handled rbx version; add dependent gems
  * Use latest appraisal gem that supports Bundler platforms
  * Update appraisal gemfiles to use latest appraisal
  * Add fragile rubies to allowable failures in travis-ci
318840c
@scudco scudco Triage Travis CI configuration
  * Use latest rubies for travis
  * Switch to travis-handled rbx version; add dependent gems
  * Use latest appraisal gem that supports Bundler platforms
  * Update appraisal gemfiles to use latest appraisal
  * Add fragile rubies to allowable failures in travis-ci
d1cbd2d
@stefanpenner stefanpenner Merge pull request #45 from scudco/triage-travis-ci
Triage Travis CI configuration
24d448e
@scudco scudco Add .ruby-version to .gitignore 4400d31
@scudco scudco Add actionpack 4.1 to Appraisals d27a4d3
@auzroz auzroz Merge pull request #1 from scudco/auzroz-localization
Fixup some of the Thread safety issues
456cf7c
@scudco scudco Do not attempt to appraise actionpack 4.x on Ruby < 1.9.3 e8f8d69
@scudco scudco Compare string with regex instead :P 9f463c7
@scudco scudco Merge pull request #37 from auzroz/localization
Added country localization based on hexorx/countries
3d4c609
@scudco scudco Update README code examples 52eff97
@scudco scudco Bump version to 1.3.0
  * Automatically localize via `I18n.locale` and the `countries` gem
  * Add support for `locale` option in `country_select` helper
dce285d
@scudco scudco Store config directly in `Thread.current` key 2bbf195
@scudco scudco Update appraisal gemfiles f2a536e
@scudco scudco Merge pull request #46 from scudco/1.3.0-release-prep
[WIP] 1.3.0 release prep
1b88fac
@scudco scudco Fix rubygems warnings in gemspec ce78cf1
@scudco scudco Fix gemspec dependencies and update appraisal gemfiles d437417
Commits on Jan 29, 2014
@scudco scudco Add link to example application to README 2399a55
@scudco scudco Reorder README sections 5f33432
@scudco scudco Remove support for old actionpack and ruby versions 29f1128
@scudco scudco Prep for 2.0.0
  * Removed support for actionpack < 4.0
  * Removed support for Ruby < 1.9.3
  * ISO-3166 alpha-2 codes are now always on, stored in uppercase
    (e.g., US)
d8a5ce9
@scudco scudco Remove jruby-18mode from Travis CI config a3b5837
@scudco scudco Remove ree from Travis CI config e2c2de4
@scudco scudco Downcase ISO codes to be backwards-compatible with 1.x
  * ISO codes will be upcased in 2.0.0
4f31104
Commits on Feb 14, 2014
@michaelem michaelem Use namespaced countries gem in order to not pollute namespace. 51ac2df
@stefanpenner stefanpenner Merge pull request #48 from lomography/master
Use namespaced countries gem in order to not pollute namespace.
a67ae46
Commits on Feb 17, 2014
@espen espen version 1.x uses lowercase for country codes d92fc9c
Commits on Feb 18, 2014
@scudco scudco Merge remote-tracking branch 'upstream/master' into two-point-oh dbae8ff
@scudco scudco Add upgrading instructions f2217db
@scudco scudco Remove code supporting Rails < 4 80316e9
@scudco scudco Cleanup rspec syntax a bit ea73062
@scudco scudco Merge pull request #49 from espen/patch-1
version 1.x uses lowercase for country codes
b1f3b2a
Commits on Mar 02, 2014
@scudco scudco Rewrite to match current form helpers interface 231fb81
Commits on Mar 03, 2014
@scudco scudco Added Rails 3 support back c80e424
@scudco scudco Add Rails <3.2 support back c7b3542
@scudco scudco Add encoding header back to main file :| 9e96f31
@scudco scudco Add encoding header to spec file e736b58
@scudco scudco Merge remote-tracking branch 'upstream/master' into 2.0.0
Conflicts:
	README.md
1920a5e
@scudco scudco Bump beta version e607971
@scudco scudco Update CHANGELOG.md to reflect latest API 436b0c6
Commits on Mar 08, 2014
@scudco scudco Merge pull request #51 from stefanpenner/2.0.0
Put 2.0.0 Beta into master
125c4d9
Commits on Mar 12, 2014
@lenart lenart Add documentation for supplying html options 164e64a
Commits on Mar 24, 2014
@zarqman zarqman don't sort :priority_countries 56e49f7
Commits on Mar 28, 2014
@scudco scudco Merge pull request #53 from lenart/master
Add documentation for supplying html options
1324c4a
@scudco scudco Merge pull request #56 from zarqman/dont_sort_priority_countries
don't sort :priority_countries
bcfacf2
Commits on Jun 05, 2014
@romaingweb romaingweb Discard countries from options with :except 82c27a2
Commits on Jun 16, 2014
@MikeRogers0 MikeRogers0 Updating the Gemfile reference
Rubygems was giving me a different country_select which was different.
cbe3557
@stefanpenner stefanpenner Merge pull request #63 from MikeRogers0/master
Updating the Gemfile reference
d0c4530
Commits on Jun 28, 2014
@petergoldstein petergoldstein Fix broken rbx key, upgrade 2.1.x version 543e03b
@petergoldstein petergoldstein Update to use the released Appraisal. Allow development work with Rai…
…ls 4.x
c94b1aa
@petergoldstein petergoldstein Update gemfiles 42c6a69
@petergoldstein petergoldstein Remove lockfiles so that Travis can update gem versions as needed b6079d4
@petergoldstein petergoldstein Update Travis to use gemfiles for different ActionPacks 9fa8f85
@stefanpenner stefanpenner Merge pull request #66 from petergoldstein/feature/update_gemfiles
Update Travis to use Appraisal gems
b70dda2
@stefanpenner stefanpenner Merge pull request #65 from petergoldstein/feature/travis_updates
Fix broken rbx key, upgrade 2.1.x version in .travis.yml
ad53059
@stefanpenner stefanpenner Merge pull request #62 from romaingweb/except_countries
Discard countries from options with :except
20b9ef1
Commits on Aug 10, 2014
@scudco scudco Add support for 1.x syntax in order to support gems dependent on coun…
…try_select
68b89a6
@scudco scudco Add support for country names to support formtastic 0773ceb
@scudco scudco Add fixes for Rails 3 aac2569
@scudco scudco Update CHANGELOG.md e6c5dc3
@scudco scudco Merge pull request #67 from scudco/add-legacy-syntax-support
Add support for 1.x syntax in order to support dependent gems
9497df5
@scudco scudco Update README links 3fb6354
Commits on Aug 11, 2014
@scudco scudco Update documentation to mention 1.x syntax compatibility 48f5283
@scudco scudco Bump version 799d886
@scudco scudco Fix warnings from rubygems 89e0e89
Commits on Aug 25, 2014
@scudco scudco Bump to 2.0.0 1d0d635
Commits on Sep 08, 2014
@scudco scudco Add Rails 4.2 and edge support, update gems
  * Replace Appraisal with WWTD
    * thoughtbot/appraisal#73
0b35f36
Commits on Sep 17, 2014
@scudco scudco Raise exception when passed an unknown country name or code 6ee10c6
@scudco scudco Merge pull request #75 from scudco/fix-undefined-method-first
Raise exception when passed an unknown country name or code
e85441e
@scudco scudco Fix prompt and include_blank support in Rails 3.2 b887b6d
Commits on Sep 18, 2014
@scudco scudco Merge pull request #72 from scudco/fix-rails3-select-options
Rails 3.2 prompt and include_blank support
cf47061
@scudco scudco Update changelog for next version 4093064
@scudco scudco Bump to 2.0.1 edf6e7a
@scudco scudco Update gemfiles for tests 6ad511b
@scudco scudco Add custom format support 8f8010c
@scudco scudco Fix CHANGELOG formatting b851716
Commits on Sep 29, 2014
@scudco scudco Merge pull request #70 from scudco/custom-formats
Add custom format support
d62b4b1
@scudco scudco Bump to 2.1.0 683707c
@scudco scudco Fix gemfiles.lock 7975503
Commits on Nov 13, 2014
@barrywoolgar barrywoolgar Update README.md
Corrected syntax for supplying additional HTML options, added separate example for pre-selecting a particular country
9af2729
Commits on Nov 14, 2014
@scudco scudco Merge pull request #83 from barrywoolgar/patch-1
Update README.md
585e953
Commits on Dec 22, 2014
@oliverklee oliverklee [TASK] Configure Travis for better build performance
* set sudo: false to allow usage of their new container-based infrastructure
* enable bundler caching
ede0eb1
@scudco scudco Merge pull request #87 from braingourmets/task/travis-performance
[TASK] Configure Travis for better build performance
d3ba0b9
Commits on Feb 02, 2015
@paolodona paolodona Don't re-instantiate the country object if not required
This is a small performance improvement, we don't need to re-instantiate a county object if already looked up at line 70

```
if country = ISO3166::Country.new(code_or_name)
```

PS: ```ISO3166::Country.new``` creates new instances every time:

````
irb(main):004:0> ISO3166::Country.new('IT').object_id
=> 70160945975800
irb(main):005:0> ISO3166::Country.new('IT').object_id
=> 70160945381520
````
2209ecb
@scudco scudco Triage poor performance by preventing usage of countries gem v0.10.0 fb65171
Commits on Feb 03, 2015
@scudco scudco Merge pull request #94 from scudco/triage-countries-gem
Triage poor performance by preventing usage of countries gem v0.10.0
6663fb9
@scudco scudco Bump to v2.1.1 069ee6e
@scudco scudco Update Gemfiles.lock a7f241e
@scudco scudco Update travis to have latest rubies 85b0741
@scudco scudco Update gemfiles.lock df599af
@scudco scudco Exclude older rubies from latest rails 67cb5fe
@scudco scudco Merge pull request #95 from scudco/update-gemfiles
Update gemfiles.lock
5aeb88d
@paolodona paolodona better syntax
only fetch country object when necessary
e2314e4
@scudco scudco Merge pull request #93 from paolodona/master
Don't re-instantiate the country object if not required
6263fba
@Carpetsmoker Carpetsmoker Sort unicode characters; fixes issue #78 ff1092e
@scudco scudco Simplify sort syntax a bit 0d4518d
@scudco scudco Merge pull request #97 from scudco/bluerail-unicode-sort
Sort unicode characters; fixes issue #78
68ae9f9
Commits on Mar 16, 2015
@kirillplatonov kirillplatonov Update countries gem 27b0a29
@scudco scudco Merge pull request #101 from kirillplatonov/master
Update countries gem
b400d67
Commits on Mar 19, 2015
@scudco scudco Bump minor version since a major dependency has changed minor versions f5837c3
@scudco scudco Update gemfiles 87d7a25
@scudco scudco Update 'United States of America' to 'United States'
  * This is why we use country codes now ;)
0dda536
@scudco scudco Update to Ruby 2.2.1 in travis config f99faa5
Commits on Apr 07, 2015
@lurraca lurraca Support for Formatting the text and value
Fix #100
a0a4d92
@scudco scudco Merge pull request #102 from lurraca/master
Support for Formatting the text and value
335b228
Commits on May 27, 2015
Jacob Maine Mark priority countries as selected only once 7c17133
@scudco scudco Merge pull request #103 from citizencode/master
Mark priority countries as selected only once
fad7c1d
Commits on Jun 23, 2015
@stefanpenner stefanpenner Update README.md 20f83bd