country_state_select 3.0.0 → 3.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2c7cc9e30bebe46054458ff4145604012db5eeba
-  data.tar.gz: f378530aece9b4763fdfec46e6963c29ae3a038e
+  metadata.gz: dc1e45ac3197072daa429452d164001f6e29ae40
+  data.tar.gz: 4faff126bd82fd8a8a4f15305dfdaff2ba8921ec
 SHA512:
-  metadata.gz: 49807b5fe4c87a700b8f45eac6fbafbcdf7bab75beec9c94b70afaf7750074d5a1cd41e8aede34b20b119ec79bbbaabee7aa878763b3c789370e5df3690ad831
-  data.tar.gz: ccd794e1caf34f5ab5ac01910cd055e6f88c2ea348dd297bfdb177dd10fde1466282e032e4277c2959439fc814286b3ae27f775d12d68ba5cd80f6e2538e31fb
+  metadata.gz: 72674f4b8ca1ba0becb2a7df2b4db2e48415ffaa89e815145de07c498a4d5d24977580c9ea64a6c3d427e6b2336ff9ebfd3c03cf986dad0f867587b54e05ce3b
+  data.tar.gz: c9ccee4383931e5d2e8cca3845afb36d0db02c7a2b198d3b3c71dd83eea2d171d6bf17ee18dde8f78f012f23a5f00854b1cc939740afb8c910a5c7168b1643c9

data/country_state_select.gemspec

@@ -10,7 +10,7 @@ Gem::Specification.new do |spec|
   spec.email         = ["arvindvyas07@gmail.com"]
   spec.summary       = %q{Dynamically select Country and State.}
   spec.description   = %q{Country State Select is a Ruby Gem that aims to make Country and State/Province selection a cinch in Ruby on Rails environments.}
-  spec.homepage      = "https://github.com/aldefouw/country_state_select.git"
+  spec.homepage      = "https://github.com/arvindvyas/Country-State-Select"
   spec.license       = "MIT"
 
   spec.files         = `git ls-files -z`.split("\x0")

data/lib/country_state_select.rb

@@ -25,6 +25,13 @@ module CountryStateSelect
     states
   end
 
+   #Return either the City (String) or Cities (Array)
+  def self.cities_collection(f, options)
+    cities = collect_cities(f.object.send(options[:state]))
+    cities
+  end
+
+
   #Return the collected States for a given Country
   def self.collect_states(country)
     CS.states(country).collect {|p| [ p[1], p[0] ] }.compact
@@ -32,7 +39,11 @@ module CountryStateSelect
 
   #Return the cities of given state and country
   def self.collect_cities(state_id = '', country_id = '')
-    CS.cities(state_id.to_sym, country_id.to_sym)
+    if state_id.nil? || country_id.nil?
+      []
+    else
+      CS.cities(state_id.to_sym, country_id.to_sym)
+    end
   end
 
   #Return a hash for use in the simple_form
@@ -43,6 +54,13 @@ module CountryStateSelect
     options
   end
 
+  def self.city_options(options)
+    cities =  cities_collection(options[:form], options[:field_names])
+    options = options.merge(collection: cities)
+    options = options.merge(:as => :string) if cities.class == String
+    options
+  end
+
 end
 
 case ::Rails.version.to_s

data/lib/country_state_select/version.rb

@@ -1,3 +1,3 @@
 module CountryStateSelect
-  VERSION = "3.0.0"
+  VERSION = "3.0.1"
 end

data/test/dummy/app/views/locations/_form.html.erb

@@ -3,8 +3,7 @@
     <%= f.input :test_country, label: "Country", collection: CountryStateSelect.countries_collection %>
 
     <%= f.input :test_state, CountryStateSelect.state_options(label: "State / Province", form: f, field_names: { :country => :test_country, :state => :home_state } ) %>
-
-    <%= f.input :test_city, label: "State / Province" %>
+    <%= f.input :test_city, CountryStateSelect.city_options(label: "City ", form: f, field_names: {  :state => :test_state, :city => :home_city } ) %>
 
     <br /><br />
 

data/vendor/assets/javascript/country_state_select.js.erb

@@ -14,7 +14,6 @@ function CountryStateSelect(options) {
   return statesDropdown();
 
   // ====== ***** METHODS ***** ===================================================================== //
-
   function statesDropdown() {
 
     addChosenToCountry();
@@ -63,6 +62,7 @@ function CountryStateSelect(options) {
   function removeChosenFromFields(){
     if (chosenIsRequired) {
       $("#" + options['state_id'] + "_chosen").remove();
+      $("#" + options['city_id'] + "_chosen").remove();
     }
   }
 
@@ -80,6 +80,7 @@ function CountryStateSelect(options) {
 
     //Remove all Chosen from existing fields
     removeChosenFromFields();
+    findCities('','')
 
     //Perform AJAX request to get the data; on success, build the dropdown
     $.ajax({
@@ -127,6 +128,7 @@ function CountryStateSelect(options) {
       html += '</select>';
     }
 
+
     $('#' + state_id).replaceWith(html);
 
     //This has to happen AFTER we've replaced the dropdown or text

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: country_state_select
 version: !ruby/object:Gem::Version
-  version: 3.0.0
+  version: 3.0.1
 platform: ruby
 authors:
 - Arvind Vyas
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-30 00:00:00.000000000 Z
+date: 2015-12-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -227,7 +227,7 @@ files:
 - test/dummy/vendor/assets/javascripts/.keep
 - test/dummy/vendor/assets/stylesheets/.keep
 - vendor/assets/javascript/country_state_select.js.erb
-homepage: https://github.com/aldefouw/country_state_select.git
+homepage: https://github.com/arvindvyas/Country-State-Select
 licenses:
 - MIT
 metadata: {}