i18n_country_select 1.1.3 → 1.1.4

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (6) hide show
  1. checksums.yaml +4 -4
  2. data/README.rdoc +2 -0
  3. data/lib/i18n_country_select/form_helpers.rb +5 -5
  4. data/lib/i18n_country_select/instance_tag.rb +5 -1
  5. data/lib/i18n_country_select/version.rb +1 -1
  6. metadata +30 -6
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: a630ee211dbe68bfa42524a53fe7ef3e0a956e7d
4
- data.tar.gz: a72913c529cabe38e2f5a94abdc8288e3da818e1
3
+ metadata.gz: 028c8665a7e08597e3ee81e05fdcbe9fd3f3d4ed
4
+ data.tar.gz: d91a51f16c576ecf4466a97c8a039f49f6623b91
5
5
  SHA512:
6
- metadata.gz: d3cccfa79e33a85d9f5a4173dce36ea9b911b3be3f13276b84665735c558c21f19e6e5a0f3e20a2a77f14ab8d06ff83e9427a7ef97974405a498efff852d183c
7
- data.tar.gz: 7acf949c4970e597a23307bf13a6ed9164e91edd5584165a274b520a72a3b7a8675381536d6ae2a3adf54b461273b8a615e07e683caa226b35838ee29dcb60c5
6
+ metadata.gz: 396672d7f30555f95e9938e1fe1f57139ed916402f57a0ca97f2c86148f3a6b94d778ddd047c4c82f2ec8613916c3006d8fc04d7a964c8d4a42159590983e5d3
7
+ data.tar.gz: 9654cc73ada7a5f7f7137284b65eabe568e732157a3984731783fa7783fa00ee997bf5990fe04e935f96db0302615ea18aef295b79d2e956258f7b12553c01cf
data/README.rdoc CHANGED
@@ -39,10 +39,12 @@ Supplying priority countries to be placed at the top of the list:
39
39
  * Björn Wilmsmann (https://github.com/BjoernKW)
40
40
  * https://github.com/durandom
41
41
  * Stefan Slaveykov (https://github.com/wizardone)
42
+ * Leonardo D. Schlossmacher (https://github.com/leods92)
42
43
 
43
44
  Based on the deprecated country_code_select by: Russ Smith (russ@bashme.org) and Frank Wambutt (frank@mo-stud.io)
44
45
 
45
46
  == Version History
47
+ * 1.1.4 - Fixed options being ignored when running Rails 4
46
48
  * 1.1.3 - Removed Netherlands Antilles. Added Bonaire, Curacao, Sint Maarten, and South Sudan
47
49
  * 1.1.2 - Adding Thread variable to speed up rendering
48
50
  * 1.1.1 - Bumping required version of country translations
data/lib/i18n_country_select/form_helpers.rb CHANGED
@@ -3,11 +3,11 @@ module I18nCountrySelect
3
3
  def country_code_select(object_name, method, priority_countries = nil, options = {}, html_options = {})
4
4
  if Rails::VERSION::MAJOR >= 4
5
5
  instance_tag = ActionView::Helpers::Tags::Select.new(object_name, method, self, [], options, html_options)
6
- return instance_tag.to_country_code_select_tag(priority_countries, options.delete(:object), html_options)
7
- else
8
- instance_tag = ActionView::Helpers::InstanceTag.new(object_name, method, self, options.delete(:object))
9
- return instance_tag.to_country_code_select_tag(priority_countries, options, html_options)
10
- end
6
+ instance_tag.to_country_code_select_tag(priority_countries, html_options)
7
+ else
8
+ instance_tag = ActionView::Helpers::InstanceTag.new(object_name, method, self, options.delete(:object))
9
+ instance_tag.to_country_code_select_tag(priority_countries, html_options, options)
10
+ end
11
11
  end
12
12
  end
13
13
  end
data/lib/i18n_country_select/instance_tag.rb CHANGED
@@ -2,7 +2,11 @@ module I18nCountrySelect
2
2
  module InstanceTag
3
3
  include Countries
4
4
 
5
- def to_country_code_select_tag(priority_countries, options = {}, html_options = {})
5
+ def to_country_code_select_tag(priority_countries, html_options = {}, options = {})
6
+ # Rails 4 stores options sent when creating an InstanceTag.
7
+ # Let's use them!
8
+ options = @options if defined?(@options)
9
+
6
10
  country_code_select(priority_countries, options, html_options)
7
11
  end
8
12
 
data/lib/i18n_country_select/version.rb CHANGED
@@ -1,3 +1,3 @@
1
1
  module I18nCountrySelect
2
- VERSION = "1.1.3"
2
+ VERSION = "1.1.4"
3
3
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: i18n_country_select
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.1.3
4
+ version: 1.1.4
5
5
  platform: ruby
6
6
  authors:
7
7
  - Brian McQuay (brian@onomojo.com)
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2014-05-28 00:00:00.000000000 Z
11
+ date: 2014-07-26 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: i18n
@@ -28,6 +28,9 @@ dependencies:
28
28
  name: i18n-country-translations
29
29
  requirement: !ruby/object:Gem::Requirement
30
30
  requirements:
31
+ - - ~>
32
+ - !ruby/object:Gem::Version
33
+ version: '1.0'
31
34
  - - '>='
32
35
  - !ruby/object:Gem::Version
33
36
  version: 1.0.3
@@ -35,6 +38,9 @@ dependencies:
35
38
  prerelease: false
36
39
  version_requirements: !ruby/object:Gem::Requirement
37
40
  requirements:
41
+ - - ~>
42
+ - !ruby/object:Gem::Version
43
+ version: '1.0'
38
44
  - - '>='
39
45
  - !ruby/object:Gem::Version
40
46
  version: 1.0.3
@@ -42,6 +48,9 @@ dependencies:
42
48
  name: unicode_utils
43
49
  requirement: !ruby/object:Gem::Requirement
44
50
  requirements:
51
+ - - ~>
52
+ - !ruby/object:Gem::Version
53
+ version: '1.0'
45
54
  - - '>='
46
55
  - !ruby/object:Gem::Version
47
56
  version: 1.0.0
@@ -49,6 +58,9 @@ dependencies:
49
58
  prerelease: false
50
59
  version_requirements: !ruby/object:Gem::Requirement
51
60
  requirements:
61
+ - - ~>
62
+ - !ruby/object:Gem::Version
63
+ version: '1.0'
52
64
  - - '>='
53
65
  - !ruby/object:Gem::Version
54
66
  version: 1.0.0
@@ -56,6 +68,9 @@ dependencies:
56
68
  name: rails
57
69
  requirement: !ruby/object:Gem::Requirement
58
70
  requirements:
71
+ - - ~>
72
+ - !ruby/object:Gem::Version
73
+ version: '3.0'
59
74
  - - '>='
60
75
  - !ruby/object:Gem::Version
61
76
  version: 3.0.0
@@ -63,6 +78,9 @@ dependencies:
63
78
  prerelease: false
64
79
  version_requirements: !ruby/object:Gem::Requirement
65
80
  requirements:
81
+ - - ~>
82
+ - !ruby/object:Gem::Version
83
+ version: '3.0'
66
84
  - - '>='
67
85
  - !ruby/object:Gem::Version
68
86
  version: 3.0.0
@@ -70,6 +88,9 @@ dependencies:
70
88
  name: rspec-rails
71
89
  requirement: !ruby/object:Gem::Requirement
72
90
  requirements:
91
+ - - ~>
92
+ - !ruby/object:Gem::Version
93
+ version: '2.7'
73
94
  - - '>='
74
95
  - !ruby/object:Gem::Version
75
96
  version: 2.7.0
@@ -77,6 +98,9 @@ dependencies:
77
98
  prerelease: false
78
99
  version_requirements: !ruby/object:Gem::Requirement
79
100
  requirements:
101
+ - - ~>
102
+ - !ruby/object:Gem::Version
103
+ version: '2.7'
80
104
  - - '>='
81
105
  - !ruby/object:Gem::Version
82
106
  version: 2.7.0
@@ -101,14 +125,14 @@ executables: []
101
125
  extensions: []
102
126
  extra_rdoc_files: []
103
127
  files:
128
+ - MIT-LICENSE
129
+ - README.rdoc
130
+ - lib/i18n_country_select.rb
104
131
  - lib/i18n_country_select/countries.rb
105
132
  - lib/i18n_country_select/form_builder.rb
106
133
  - lib/i18n_country_select/form_helpers.rb
107
134
  - lib/i18n_country_select/instance_tag.rb
108
135
  - lib/i18n_country_select/version.rb
109
- - lib/i18n_country_select.rb
110
- - README.rdoc
111
- - MIT-LICENSE
112
136
  homepage: https://github.com/onomojo/i18n_country_select
113
137
  licenses:
114
138
  - MIT
@@ -130,7 +154,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
130
154
  version: 1.3.5
131
155
  requirements: []
132
156
  rubyforge_project: '[none]'
133
- rubygems_version: 2.0.6
157
+ rubygems_version: 2.2.2
134
158
  signing_key:
135
159
  specification_version: 4
136
160
  summary: I18n country select helper