country_select 2.5.1 → 2.5.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4cdc05ffd7952e0e2200670bc30d4ea4865bf1b0
-  data.tar.gz: 164d52ac41d5712a9327689bf3ab94ff00ea1352
+  metadata.gz: 1dea784fe1d78c8a7b7d35502636b0de1b64879e
+  data.tar.gz: ca5c6e5be03c82625ae7396a126759b456e5d04f
 SHA512:
-  metadata.gz: c49a22dc727e96450b680ebca19d8ed9ae6dc9dda3b8584bd2748df1a4ec93ed63b4129c5a41ed393d86e6c859521059015ffad07da03a7c34dac1b90fb393ea
-  data.tar.gz: 3c1415cd6311ca97d6a0da0acb5809ceaf223f07af099b6d6471ad9925ccfdab34b48d2160bf8c924c4eb12755f946d0c22c0a79681cf8ee7dd0a5058bbec251
+  metadata.gz: df7361d081db570f9195f0bd04e079a3ddd82a2083bfafb7fe1c9b2c6c20462b986001d17e551b54707a0bf02c5dbef98a178f6a32348b6650160df9e0b8c818
+  data.tar.gz: 1019eeb1f5d5b9b323bed52bb37253a330829ad09093649b86291b070f67a27efd55406dfbd23f889f246638b923e57d86b0bb51bc087a0cdbab30e9c55de450

data/CHANGELOG.md

@@ -1,4 +1,8 @@
-## 2.5.0 2015-11-10
+## 2.5.2 2015-11-10
+
+  * #127 - Fix multi-selects - @jjballano
+
+## 2.5.1 2015-11-10
 
   * #118 - Fix bad require of countries gem that caused issues if you
            already had a `Country` class

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    country_select (2.5.0)
+    country_select (2.5.1)
       countries (~> 1.2.0)
       sort_alphabetical (~> 1.0)
 

data/README.md

@@ -61,6 +61,12 @@ Pre-selecting a particular country:
 country_select("user", "country", selected: "GB")
 ```
 
+Using existing `select` options:
+```ruby
+country_select("user", "country", include_blank: true)
+country_select("user", "country", { include_blank: 'Select a country' }, { class: 'country-select-box' })
+```
+
 Supplying additional html options:
 
 ```ruby

data/gemfiles/actionpack.edge.gemfile.lock

@@ -25,7 +25,7 @@ GIT
 PATH
   remote: ../
   specs:
-    country_select (2.5.0)
+    country_select (2.5.1)
       countries (~> 1.2.0)
       sort_alphabetical (~> 1.0)
 

data/gemfiles/actionpack3.2.gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ../
   specs:
-    country_select (2.5.0)
+    country_select (2.5.1)
       countries (~> 1.2.0)
       sort_alphabetical (~> 1.0)
 

data/gemfiles/actionpack4.0.gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ../
   specs:
-    country_select (2.5.0)
+    country_select (2.5.1)
       countries (~> 1.2.0)
       sort_alphabetical (~> 1.0)
 

data/gemfiles/actionpack4.1.gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ../
   specs:
-    country_select (2.5.0)
+    country_select (2.5.1)
       countries (~> 1.2.0)
       sort_alphabetical (~> 1.0)
 

data/gemfiles/actionpack4.2.gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ../
   specs:
-    country_select (2.5.0)
+    country_select (2.5.1)
       countries (~> 1.2.0)
       sort_alphabetical (~> 1.0)
 

data/lib/country_select/tag_helper.rb

@@ -13,9 +13,8 @@ module CountrySelect
         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)
 
-        if priority_countries_options.map(&:second).include?(option_tags_options[:selected])
-          option_tags_options[:selected] = nil
-        end
+        option_tags_options[:selected] = [option_tags_options[:selected]] unless option_tags_options[:selected].kind_of?(Array)
+        option_tags_options[:selected].delete_if{|selected| priority_countries_options.map(&:second).include?(selected)}
 
         option_tags += html_safe_newline + options_for_select(country_options, option_tags_options)
       else

data/lib/country_select/version.rb

@@ -1,3 +1,3 @@
 module CountrySelect
-  VERSION = "2.5.1"
+  VERSION = "2.5.2"
 end

data/spec/country_select_spec.rb

@@ -77,11 +77,23 @@ describe "CountrySelect" do
     expect(t).to include(tag)
   end
 
-  it "selects only the first matching option" do
-    tag = options_for_select([["United States", "US"],["Uruguay", "UY"]], "US")
-    walrus.country_code = 'US'
-    t = builder.country_select(:country_code, priority_countries: ['LV','US'])
-    expect(t).to_not include(tag)
+  describe "when selected options is not an array" do
+    it "selects only the first matching option" do
+      tag = options_for_select([["United States", "US"],["Uruguay", "UY"]], "US")
+      walrus.country_code = 'US'
+      t = builder.country_select(:country_code, priority_countries: ['LV','US'])
+      expect(t).to_not include(tag)
+    end
+  end
+
+  describe "when selected options is an array" do
+    it "selects all options but only once" do
+      tag = options_for_select([["United States", "US"],["Uruguay", "UY"],["Spain", "ES"]], "US")
+      walrus.country_code = 'US'
+      t = builder.country_select(:country_code, {priority_countries: ['LV','US','ES'], selected: ['UY', 'US']}, multiple: true)
+      expect(t.scan(options_for_select([["United States", "US"]], "US")).length).to be(1)
+      expect(t.scan(options_for_select([["Uruguay", "UY"]], "UY")).length).to be(1)
+    end
   end
 
   it "displays only the chosen countries" do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: country_select
 version: !ruby/object:Gem::Version
-  version: 2.5.1
+  version: 2.5.2
 platform: ruby
 authors:
 - Stefan Penner
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-10 00:00:00.000000000 Z
+date: 2016-03-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionpack