country_state_select 3.0.3 → 3.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA256:
-  metadata.gz: ed85481d4b3d53c004780c6136710874ff664538cc4d5d71d921535c27dedc87
-  data.tar.gz: 6e2afd926d0a4279653e67411960a4429062dacdded56779e7d7f0b17682e453
+SHA1:
+  metadata.gz: 9721f200c33320a2fdacc02a1633c7881b593f82
+  data.tar.gz: 5ccc8d878cab7fa4863f7e7a877eb2d56960dd07
 SHA512:
-  metadata.gz: 2799319fef3bd6077c7b57d51b6f4360c074914dfafe43ee92a1a994b006a19bcf3c73b91307a4e3e533945289e74863bb5933f7162f0be316959d5541bf9432
-  data.tar.gz: 841f91d1f43dfbdf20e3bd6c1e4aca56b9d90ca46272ebb40e73e9f298cb3cbf56d2c7e66190cac9c090ca3a89426ff6cb2ebfb9be05dc5b6a00ded427e73d44
+  metadata.gz: 19affba4514b97e47f676057d643a3c46f81a032150cc6b835869f5c26225ec5e64f92e2ee07ebfc402417de2f25d22f22cb7cda1d972556f19a5a7cca67c562
+  data.tar.gz: b2f49f14dd0f225a83dd2368bdc73dfc24711043f6218dadecef831febf91453343656aacd45b44ac61f5fb18ee3b135d7576e4e3cf65e10b12751367a5ba0a8

data/.travis.yml

@@ -3,7 +3,7 @@ language: ruby
 rvm:
   - 1.9.3
   - 2.0.0
-  - 2.1.2
+  - 2.6.5
 script:
   # ---if you written test cases then write commands here to run
 

data/README.md

@@ -26,7 +26,9 @@ Then run
 
 
 Don't forget to restart your server after you install it.
-
+## Setup Gem
+if not autoloaded than please add in your application.js
+      //= require country_state_select
 
 ## chosen JavaScript assets
   The application makes use of the chosen-rails library for a better user experience.  This can be disabled if desired.  

data/Rakefile

@@ -1,2 +1 @@
-require "bundler/gem_tasks"
-
+require 'bundler/gem_tasks'

data/app/controllers/country_state_select/cscs_controller.rb

@@ -1,11 +1,11 @@
-#@author : Arvind Vyas
+# @author : Arvind Vyas
 module CountryStateSelect
   class CscsController < ApplicationController
     def find_states
-      csc =   CS.states(params[:country_id])
+      csc = CS.states(params[:country_id])
 
-       respond_to do |format|
-         format.json { render :json => csc.to_a}
+      respond_to do |format|
+        format.json { render json: csc.to_a }
       end
     end
 
@@ -14,8 +14,8 @@ module CountryStateSelect
       cities = CS.cities(params[:state_id].to_sym, params[:country_id].to_sym)
 
       respond_to do |format|
-         format.json { render :json => cities.to_a}
+        format.json { render json: cities.to_a }
       end
     end
   end
-end
+end

data/config/routes.rb

@@ -1,6 +1,6 @@
 Rails.application.routes.draw do
-  scope :module => "country_state_select" do
+  scope module: 'country_state_select' do
     post 'find_states' => 'cscs#find_states'
     post 'find_cities' => 'cscs#find_cities'
   end
-end
+end

data/country_state_select.gemspec

@@ -4,23 +4,23 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'country_state_select/version'
 
 Gem::Specification.new do |spec|
-  spec.name          = "country_state_select"
+  spec.name          = 'country_state_select'
   spec.version       = CountryStateSelect::VERSION
-  spec.authors       = ["Arvind Vyas"]
-  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/arvindvyas/Country-State-Select"
-  spec.license       = "MIT"
+  spec.authors       = ['Arvind Vyas']
+  spec.email         = ['arvindvyas07@gmail.com']
+  spec.summary       = 'Dynamically select Country and State.'
+  spec.description   = '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/arvindvyas/Country-State-Select'
+  spec.license       = 'MIT'
 
   spec.files         = `git ls-files -z`.split("\x0")
   spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
-  spec.require_paths = ["lib"]
+  spec.require_paths = ['lib']
 
-  spec.add_development_dependency "bundler", "~> 1.6"
-  spec.add_development_dependency "rake", "~> 10.0"
-  spec.add_development_dependency "rspec"
+  spec.add_development_dependency 'bundler', '~> 1.6'
+  spec.add_development_dependency 'rake', '~> 10.0'
+  spec.add_development_dependency 'rspec'
   spec.add_development_dependency 'pry'
 
   spec.add_runtime_dependency 'rails'

data/lib/country_state_select.rb

@@ -1,77 +1,68 @@
-require "country_state_select/version"
-require "city-state"
-require "rails"
+require 'country_state_select/version'
+require 'city-state'
+require 'rails'
 
 module CountryStateSelect
-
-  #Collect the Countries
+  # Collect the Countries
   def self.countries_collection
-    CS.countries.except!(:COUNTRY_ISO_CODE).collect {|p| [ p[ 1], p[0] ] }.compact
+    CS.countries.except!(:COUNTRY_ISO_CODE).collect { |p| [p[1], p[0]] }.compact
   end
 
-  #Pass array of unwanted countries to get back all except those in the array
+  # Pass array of unwanted countries to get back all except those in the array
   def self.countries_except(*except)
     countries_collection.collect { |c| c unless except.include?(c[1]) }.compact
   end
 
-  #Return either the State (String) or States (Array)
+  # Return either the State (String) or States (Array)
   def self.states_collection(f, options)
     states = collect_states(f.object.send(options[:country]))
-    return f.object.send(options[:state]) if states.size == 0
+    return f.object.send(options[:state]) if states.empty?
     states
   end
 
-   #Return either the City (String) or Cities (Array)
+  # 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
+  # Return the collected States for a given Country
   def self.collect_states(country)
-    CS.states(country).collect {|p| [ p[1], p[0] ] }.compact
+    CS.states(country).collect { |p| [p[1], p[0]] }.compact
   end
 
-  #Return the cities of given state and country
+  # Return the cities of given state and country
   def self.collect_cities(state_id = '', country_id = '')
-    if state_id.nil? || country_id.nil?
-      []
-    else
-      CS.cities(state_id.to_sym, country_id.to_sym)
-    end
+    return [] if state_id.nil? || country_id.nil?
+    CS.cities(state_id.to_sym, country_id.to_sym)
   end
 
-  #Return a hash for use in the simple_form
+  # Return a hash for use in the simple_form
   def self.state_options(options)
     states = states_collection(options[:form], options[:field_names])
-    options = self.merge_hash(options, states)
+    options = merge_hash(options, states)
   end
 
-  #Return a hash for use in the simple_form
+  # Return a hash for use in the simple_form
   def self.city_options(options)
     cities =  cities_collection(options[:form], options[:field_names])
-    options = self.merge_hash(options, cities)
+    options = merge_hash(options, cities)
   end
 
   # Create hash to use in the simple_form
   def self.merge_hash(options, collections)
     options = options.merge(collection: collections)
-    options = options.merge(:as => :string) if collections.class == String
+    options = options.merge(as: :string) if collections.class == String
     options
   end
-
 end
 
 case ::Rails.version.to_s
-  when /^5/
-    require 'country_state_select/engine'
-  when /^4/
-    require 'country_state_select/engine'
-  when /^3\.[12]/
-    require 'country_state_select/engine3'
-  when /^3\.[0]/
-    require 'country_state_select/railtie'
-  else
-    raise 'Unsupported rails version'
+when /[4-6]/
+  require 'country_state_select/engine'
+when /^3\.[12]/
+  require 'country_state_select/engine3'
+when /^3\.[0]/
+  require 'country_state_select/railtie'
+else
+  raise 'Unsupported rails version'
 end

data/lib/country_state_select/version.rb

@@ -1,3 +1,3 @@
 module CountryStateSelect
-  VERSION = "3.0.3"
+  VERSION = '3.0.5'.freeze
 end

data/spec/country_state_select_spec.rb

@@ -1,31 +1,29 @@
 require 'spec_helper'
 
 describe CountryStateSelect do
-
   describe '#countries_collection' do
     it 'does not include :COUNTRY_ISO_CODE' do
-      expect(CountryStateSelect.countries_collection).not_to include([:COUNTRY_ISO_CODE=>"country_name"])
+      expect(CountryStateSelect.countries_collection).not_to include([COUNTRY_ISO_CODE: 'country_name'])
     end
 
-    it "returns an array" do
+    it 'returns an array' do
       method_call = CountryStateSelect.countries_collection
       expect(method_call.class).to eq(Array)
     end
 
-    it "returns the value first and the key second" do
+    it 'returns the value first and the key second' do
       method_call = CountryStateSelect.countries_collection
-      expect(method_call[0][0]).to eq("Andorra")
+      expect(method_call[0][0]).to eq('Andorra')
       expect(method_call[0][1]).to eq(:AD)
     end
   end
 
-  describe "#countries_except" do
-    let(:us) { ["United States", :US] }
-    let(:sm) { ["Saint Martin", :MF] }
-    let(:exceptions) {  [us, sm]  }
+  describe '#countries_except' do
+    let(:us) { ['United States', :US] }
+    let(:sm) { ['Saint Martin', :MF] }
+    let(:exceptions) { [us, sm] }
 
     it 'does include the United States ordinarily' do
-      binding.pry
       expect(CountryStateSelect.countries_except([])).to include(us)
     end
 
@@ -37,17 +35,17 @@ describe CountryStateSelect do
       expect(CountryStateSelect.countries_except(exceptions)).not_to include(exceptions)
     end
 
-    it "returns the same result as #countries_collection if no exceptions are passed" do
-      expect(CountryStateSelect.countries_except()).to eq(CountryStateSelect.countries_collection)
+    it 'returns the same result as #countries_collection if no exceptions are passed' do
+      expect(CountryStateSelect.countries_except).to eq(CountryStateSelect.countries_collection)
     end
   end
 
   describe '#states_collection' do
-    let(:f) { double( object: { }  ) }
+    let(:f) { double(object: {}) }
     let(:options) { { country: 'country_field_name', state: 'state_field_name' } }
 
-    it "should return 51 elements when we query for the United States" do
-      expect(f.object).to receive(:country_field_name).and_return('US') #Set the form Country Field to US
+    it 'should return 51 elements when we query for the United States' do
+      expect(f.object).to receive(:country_field_name).and_return('US') # Set the form Country Field to US
 
       method_call = CountryStateSelect.states_collection(f, options)
 
@@ -55,8 +53,8 @@ describe CountryStateSelect do
       expect(method_call.size).to eq(51)
     end
 
-    it "should return a String when we query for Saint Martin" do
-      expect(f.object).to receive(:country_field_name).and_return('MF') #Set the form Country Field to MF for Saint Martin
+    it 'should return a String when we query for Saint Martin' do
+      expect(f.object).to receive(:country_field_name).and_return('MF') # Set the form Country Field to MF for Saint Martin
       expect(f.object).to receive(:state_field_name).and_return('')
 
       method_call = CountryStateSelect.states_collection(f, options)
@@ -66,27 +64,27 @@ describe CountryStateSelect do
     end
 
     it "should return the 'State from Form' if the Country requested returns no States" do
-      expect(f.object).to receive(:country_field_name).and_return('MF') #Set the form Country Field to MF for Saint Martin
+      expect(f.object).to receive(:country_field_name).and_return('MF') # Set the form Country Field to MF for Saint Martin
       expect(f.object).to receive(:state_field_name).and_return('State from Form')
 
       method_call = CountryStateSelect.states_collection(f, options)
 
-      expect(method_call).to eq("State from Form")
+      expect(method_call).to eq('State from Form')
     end
   end
 
   describe '#states_options' do
-    let(:f) { double( object: {} ) }
-    let(:options) { { form: f,  label: "State / Province", field_names: { :country => :country_field_name, :state => :state_field_name } } }
+    let(:f) { double(object: {}) }
+    let(:options) { { form: f, label: 'State / Province', field_names: { country: :country_field_name, state: :state_field_name } } }
 
-    it "should return a Hash" do
+    it 'should return a Hash' do
       expect(f.object).to receive(:country_field_name).and_return('US')
 
       method_call = CountryStateSelect.state_options(options)
       expect(method_call.class).to eq(Hash)
     end
 
-    it "should contain a key-value pair of as: => :string if no states are returned for the country" do
+    it 'should contain a key-value pair of as: => :string if no states are returned for the country' do
       expect(f.object).to receive(:country_field_name).and_return('MF')
       expect(f.object).to receive(:state_field_name).and_return('')
 
@@ -102,7 +100,7 @@ describe CountryStateSelect do
       expect(method_call).not_to have_key(:as)
     end
 
-    it "should have a label if one has been set" do
+    it 'should have a label if one has been set' do
       expect(f.object).to receive(:country_field_name).and_return('US')
 
       method_call = CountryStateSelect.state_options(options)
@@ -110,7 +108,7 @@ describe CountryStateSelect do
       expect(method_call[:label]).to eq(options[:label])
     end
 
-    it "should contain a collection of type Array if a country has states" do
+    it 'should contain a collection of type Array if a country has states' do
       expect(f.object).to receive(:country_field_name).and_return('US')
 
       method_call = CountryStateSelect.state_options(options)
@@ -118,7 +116,7 @@ describe CountryStateSelect do
       expect(method_call[:collection].class).to eq(Array)
     end
 
-    it "should contain a collection of type String if a country has no states" do
+    it 'should contain a collection of type String if a country has no states' do
       expect(f.object).to receive(:country_field_name).and_return('MF')
       expect(f.object).to receive(:state_field_name).and_return('')
 
@@ -129,45 +127,42 @@ describe CountryStateSelect do
   end
 
   describe '#collect_states' do
-    it "returns an array" do
+    it 'returns an array' do
       method_call = CountryStateSelect.collect_states('US')
       expect(method_call.class).to eq(Array)
     end
 
-    it "returns the diffrent value for the key and value" do
+    it 'returns the diffrent value for the key and value' do
       method_call = CountryStateSelect.collect_states('US')
       expect(method_call[0][0]).not_to eq(method_call[0][1])
     end
 
-    it "returns the value part of the key-value pair" do
+    it 'returns the value part of the key-value pair' do
       method_call = CountryStateSelect.collect_states('US')
-      expect(method_call.first.first).to eq("Alaska")
+      expect(method_call.first.first).to eq('Alaska')
     end
 
-    it "returns an empty array if there are no states in that Country" do
+    it 'returns an empty array if there are no states in that Country' do
       method_call = CountryStateSelect.collect_states('MF')
       expect(method_call).to eq([])
     end
   end
 
   describe '#collect_cities' do
-
-    it "returns an array" do
+    it 'returns an array' do
       method_call = CountryStateSelect.collect_cities(:mp, :in)
       expect(method_call.class).to eq(Array)
     end
 
-    it "it should return same value if city is not duplicate with state with out sending country" do
+    it 'it should return same value if city is not duplicate with state with out sending country' do
       city_without_country = CountryStateSelect.collect_cities(:mp, '')
       city_with_country = CountryStateSelect.collect_cities(:mp, :in)
       expect(city_without_country).to eq(city_with_country)
     end
 
-
-    it "returns an empty array if there are no states in that Country" do
+    it 'returns an empty array if there are no states in that Country' do
       method_call = CountryStateSelect.collect_cities('', '')
       expect(method_call).to eq([])
     end
   end
-
-end
+end

data/spec/spec_helper.rb

@@ -4,5 +4,5 @@ require 'pry'
 require 'country_state_select'
 
 RSpec.configure do |config|
-  #add configuration here
-end
+  # add configuration here
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: country_state_select
 version: !ruby/object:Gem::Version
-  version: 3.0.3
+  version: 3.0.5
 platform: ruby
 authors:
 - Arvind Vyas
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-11-27 00:00:00.000000000 Z
+date: 2019-10-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -118,72 +118,6 @@ files:
 - lib/country_state_select/version.rb
 - spec/country_state_select_spec.rb
 - spec/spec_helper.rb
-- test/dummy/.gitignore
-- test/dummy/Gemfile
-- test/dummy/README.rdoc
-- test/dummy/Rakefile
-- test/dummy/app/assets/images/.keep
-- test/dummy/app/assets/javascripts/application.js
-- test/dummy/app/assets/javascripts/locations.coffee
-- test/dummy/app/assets/stylesheets/application.scss
-- test/dummy/app/assets/stylesheets/locations.css.scss
-- test/dummy/app/controllers/application_controller.rb
-- test/dummy/app/controllers/concerns/.keep
-- test/dummy/app/controllers/locations_controller.rb
-- test/dummy/app/form/location_form.rb
-- test/dummy/app/helpers/application_helper.rb
-- test/dummy/app/mailers/.keep
-- test/dummy/app/models/.keep
-- test/dummy/app/models/concerns/.keep
-- test/dummy/app/models/location.rb
-- test/dummy/app/views/layouts/application.html.erb
-- test/dummy/app/views/locations/_form.html.erb
-- test/dummy/app/views/locations/index.html.erb
-- test/dummy/app/views/locations/new.html.erb
-- test/dummy/app/views/locations/show.html.erb
-- test/dummy/bin/bundle
-- test/dummy/bin/rails
-- test/dummy/bin/rake
-- test/dummy/config.ru
-- test/dummy/config/application.rb
-- test/dummy/config/boot.rb
-- test/dummy/config/database.yml
-- test/dummy/config/environment.rb
-- test/dummy/config/environments/development.rb
-- test/dummy/config/environments/production.rb
-- test/dummy/config/environments/test.rb
-- test/dummy/config/initializers/backtrace_silencers.rb
-- test/dummy/config/initializers/filter_parameter_logging.rb
-- test/dummy/config/initializers/inflections.rb
-- test/dummy/config/initializers/mime_types.rb
-- test/dummy/config/initializers/secret_token.rb
-- test/dummy/config/initializers/session_store.rb
-- test/dummy/config/initializers/simple_form.rb
-- test/dummy/config/initializers/wrap_parameters.rb
-- test/dummy/config/locales/en.yml
-- test/dummy/config/locales/simple_form.en.yml
-- test/dummy/config/routes.rb
-- test/dummy/db/migrate/20140724080030_create_locations.rb
-- test/dummy/db/migrate/20151024160724_add_test_city_to_locations.rb
-- test/dummy/db/schema.rb
-- test/dummy/db/seeds.rb
-- test/dummy/lib/assets/.keep
-- test/dummy/lib/tasks/.keep
-- test/dummy/log/.keep
-- test/dummy/public/404.html
-- test/dummy/public/422.html
-- test/dummy/public/500.html
-- test/dummy/public/favicon.ico
-- test/dummy/public/robots.txt
-- test/dummy/test/controllers/.keep
-- test/dummy/test/fixtures/.keep
-- test/dummy/test/helpers/.keep
-- test/dummy/test/integration/.keep
-- test/dummy/test/mailers/.keep
-- test/dummy/test/models/.keep
-- test/dummy/test/test_helper.rb
-- test/dummy/vendor/assets/javascripts/.keep
-- test/dummy/vendor/assets/stylesheets/.keep
 - vendor/assets/javascript/country_state_select.js.erb
 homepage: https://github.com/arvindvyas/Country-State-Select
 licenses:
@@ -205,76 +139,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 2.4.6
 signing_key: 
 specification_version: 4
 summary: Dynamically select Country and State.
 test_files:
 - spec/country_state_select_spec.rb
 - spec/spec_helper.rb
-- test/dummy/.gitignore
-- test/dummy/Gemfile
-- test/dummy/README.rdoc
-- test/dummy/Rakefile
-- test/dummy/app/assets/images/.keep
-- test/dummy/app/assets/javascripts/application.js
-- test/dummy/app/assets/javascripts/locations.coffee
-- test/dummy/app/assets/stylesheets/application.scss
-- test/dummy/app/assets/stylesheets/locations.css.scss
-- test/dummy/app/controllers/application_controller.rb
-- test/dummy/app/controllers/concerns/.keep
-- test/dummy/app/controllers/locations_controller.rb
-- test/dummy/app/form/location_form.rb
-- test/dummy/app/helpers/application_helper.rb
-- test/dummy/app/mailers/.keep
-- test/dummy/app/models/.keep
-- test/dummy/app/models/concerns/.keep
-- test/dummy/app/models/location.rb
-- test/dummy/app/views/layouts/application.html.erb
-- test/dummy/app/views/locations/_form.html.erb
-- test/dummy/app/views/locations/index.html.erb
-- test/dummy/app/views/locations/new.html.erb
-- test/dummy/app/views/locations/show.html.erb
-- test/dummy/bin/bundle
-- test/dummy/bin/rails
-- test/dummy/bin/rake
-- test/dummy/config.ru
-- test/dummy/config/application.rb
-- test/dummy/config/boot.rb
-- test/dummy/config/database.yml
-- test/dummy/config/environment.rb
-- test/dummy/config/environments/development.rb
-- test/dummy/config/environments/production.rb
-- test/dummy/config/environments/test.rb
-- test/dummy/config/initializers/backtrace_silencers.rb
-- test/dummy/config/initializers/filter_parameter_logging.rb
-- test/dummy/config/initializers/inflections.rb
-- test/dummy/config/initializers/mime_types.rb
-- test/dummy/config/initializers/secret_token.rb
-- test/dummy/config/initializers/session_store.rb
-- test/dummy/config/initializers/simple_form.rb
-- test/dummy/config/initializers/wrap_parameters.rb
-- test/dummy/config/locales/en.yml
-- test/dummy/config/locales/simple_form.en.yml
-- test/dummy/config/routes.rb
-- test/dummy/db/migrate/20140724080030_create_locations.rb
-- test/dummy/db/migrate/20151024160724_add_test_city_to_locations.rb
-- test/dummy/db/schema.rb
-- test/dummy/db/seeds.rb
-- test/dummy/lib/assets/.keep
-- test/dummy/lib/tasks/.keep
-- test/dummy/log/.keep
-- test/dummy/public/404.html
-- test/dummy/public/422.html
-- test/dummy/public/500.html
-- test/dummy/public/favicon.ico
-- test/dummy/public/robots.txt
-- test/dummy/test/controllers/.keep
-- test/dummy/test/fixtures/.keep
-- test/dummy/test/helpers/.keep
-- test/dummy/test/integration/.keep
-- test/dummy/test/mailers/.keep
-- test/dummy/test/models/.keep
-- test/dummy/test/test_helper.rb
-- test/dummy/vendor/assets/javascripts/.keep
-- test/dummy/vendor/assets/stylesheets/.keep