country_state_select 3.0.2 → 3.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 361ffc00f971f4e6739ba653ec7ab36800aaef54
-  data.tar.gz: 3b0ad3d7908b8d973d40a975e84b186d78810eb6
+SHA256:
+  metadata.gz: ed85481d4b3d53c004780c6136710874ff664538cc4d5d71d921535c27dedc87
+  data.tar.gz: 6e2afd926d0a4279653e67411960a4429062dacdded56779e7d7f0b17682e453
 SHA512:
-  metadata.gz: 7336813ead81567b3eef7963080f037e1a9859cd1e80ec2c8b61dbeb85265a3f3e39b05f75228990281f3aacdc339584685461192b61792c40495ddb4c998f21
-  data.tar.gz: 747c28f7f2a11763eb73950aec6404c6d33d496a42a6ab555f055d080fd1a51bfbe11d4a7ff36a31fb755fae5e91c13f62b0afc7faf1cd6c98392f8e057a9f08
+  metadata.gz: 2799319fef3bd6077c7b57d51b6f4360c074914dfafe43ee92a1a994b006a19bcf3c73b91307a4e3e533945289e74863bb5933f7162f0be316959d5541bf9432
+  data.tar.gz: 841f91d1f43dfbdf20e3bd6c1e4aca56b9d90ca46272ebb40e73e9f298cb3cbf56d2c7e66190cac9c090ca3a89426ff6cb2ebfb9be05dc5b6a00ded427e73d44

data/README.md

@@ -1,4 +1,5 @@
-##Country State Select [![Build Status](https://travis-ci.org/arvindvyas/Country-State-Select.svg?branch=master)](https://travis-ci.org/arvindvyas/Country-State-Select)  [![Code Climate](https://codeclimate.com/github/arvindvyas/Country-State-Select/badges/gpa.svg)](https://codeclimate.com/github/arvindvyas/Country-State-Select)
+## Country State Select 
+[![Build Status](https://travis-ci.org/arvindvyas/Country-State-Select.svg?branch=master)](https://travis-ci.org/arvindvyas/Country-State-Select)  [![Code Climate](https://codeclimate.com/github/arvindvyas/Country-State-Select/badges/gpa.svg)](https://codeclimate.com/github/arvindvyas/Country-State-Select)
 
 Country State Select is a library that provides an easy API to generate Country , State / Province  and City dropdowns for use in forms.
 
@@ -8,10 +9,10 @@ For instance, if a user chooses "United States of America" for a Country dropdow
 
 The data for Countries and States is populated by the excellent [city-state](https://github.com/loureirorg/city-state) gem. 
 
-#Demo Of the Gem
+# Demo
   https://country-state-select.herokuapp.com
 
-#Getting Started
+# Getting Started
 
 Country State Select is released as a Ruby Gem and requires the Rails environment as well.
 
@@ -53,11 +54,11 @@ Don't forget to restart your server after you install it.
 Implementation in a view is simple. 
 
 Just create a simple_form object like so:
-
-    <%= simple_form_for @form_object do |f| 
-      f.button :submit
-    end %>
-    
+```ruby
+<%= simple_form_for @form_object do |f| 
+  f.button :submit
+end %>
+```    
 Once your form object is created, add in fields for your user to select a Country and State / Province.      
 
 ## Country Field
@@ -89,18 +90,19 @@ Any options that are valid in simple_form field can be passed into the options h
 The magic of the library is the JavaScript that is performed on the fields.  This JavaScript needs to be included in order for the proper State / Provinces to be selected based upon your Country selection.  
 
 Add this JavaScript to the page that is loading your form:
-
-    $(document).on('ready page:load', function() {
-      return CountryStateSelect({
-        country_id: "country_field_id",
-        state_id: "state_field_id"
-      });
-    });
-
+```javascript
+$(document).on('ready page:load', function() {
+  return CountryStateSelect({
+    country_id: "country_field_id",
+    state_id: "state_field_id"
+  });
+});
+```
 If you are using CoffeeScript, use the following:
-
-    $(document).on 'ready page:load', ->
-        CountryStateSelect({ country_id: "country_field_id", state_id: "state_field_id" })
+```coffescript
+$(document).on 'ready page:load', ->
+    CountryStateSelect({ country_id: "country_field_id", state_id: "state_field_id" })
+ ```
 
 The country_id accepts the form ID for the country field.  The state_id accepts the form ID for the state field.
 
@@ -115,33 +117,32 @@ The ID being referred to is like the following in a select menu:
 The CountryStateSelect interface offers the option to turn the Chosen library on or off.  
 
 To turn it on, set it to true:
-
-    $(document).on('ready page:load', function() {
-      return CountryStateSelect({
-        chosen_ui: true,
-        chosen_options: { 
-          disable_search_threshold: 10,
-          width: '95%'
-        },
-        ...
-        ...
-        ...
-      });
-    }); 
-
+```javascript
+$(document).on('ready page:load', function() {
+  return CountryStateSelect({
+    chosen_ui: true,
+    chosen_options: { 
+      disable_search_threshold: 10,
+      width: '95%'
+    },
+    ...
+    ...
+    ...
+  });
+}); 
+```
 To turn it off, set it to false:
-
-    $(document).on('ready page:load', function() {
-      return CountryStateSelect({
-        chosen_ui: false,
-        ...
-        ...
-        ...
-      });
-    });
-    
-
-##Contributing to Country State Select
-
+```javascript
+$(document).on('ready page:load', function() {
+  return CountryStateSelect({
+    chosen_ui: false,
+    ...
+    ...
+    ...
+  });
+});
+```    
+
+## Contributing
   Fork, fix, then send a pull request.
  

data/country_state_select.gemspec

@@ -24,8 +24,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'pry'
 
   spec.add_runtime_dependency 'rails'
-  spec.add_runtime_dependency 'simple_form', "~> 3.2"
-  spec.add_runtime_dependency 'chosen-rails', "~> 1.4"
-  spec.add_runtime_dependency 'compass-rails', '~> 2.0.4'
   spec.add_runtime_dependency 'city-state'
 end

data/lib/country_state_select.rb

@@ -1,10 +1,6 @@
 require "country_state_select/version"
 require "city-state"
 require "rails"
-require "sass-rails"
-require "compass-rails"
-require "chosen-rails"
-require "simple_form"
 
 module CountryStateSelect
 
@@ -15,7 +11,7 @@ module CountryStateSelect
 
   #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.second) }.compact
+    countries_collection.collect { |c| c unless except.include?(c[1]) }.compact
   end
 
   #Return either the State (String) or States (Array)
@@ -68,6 +64,8 @@ module CountryStateSelect
 end
 
 case ::Rails.version.to_s
+  when /^5/
+    require 'country_state_select/engine'
   when /^4/
     require 'country_state_select/engine'
   when /^3\.[12]/

data/lib/country_state_select/version.rb

@@ -1,3 +1,3 @@
 module CountryStateSelect
-  VERSION = "3.0.2"
+  VERSION = "3.0.3"
 end

data/spec/country_state_select_spec.rb

@@ -14,8 +14,8 @@ describe CountryStateSelect do
 
     it "returns the value first and the key second" do
       method_call = CountryStateSelect.countries_collection
-      expect(method_call.first.first).to eq("Andorra")
-      expect(method_call.first.second).to eq(:AD)
+      expect(method_call[0][0]).to eq("Andorra")
+      expect(method_call[0][1]).to eq(:AD)
     end
   end
 
@@ -25,6 +25,7 @@ describe CountryStateSelect do
     let(:exceptions) {  [us, sm]  }
 
     it 'does include the United States ordinarily' do
+      binding.pry
       expect(CountryStateSelect.countries_except([])).to include(us)
     end
 
@@ -135,7 +136,7 @@ describe CountryStateSelect do
 
     it "returns the diffrent value for the key and value" do
       method_call = CountryStateSelect.collect_states('US')
-      expect(method_call.first.first).not_to eq(method_call.first.second)
+      expect(method_call[0][0]).not_to eq(method_call[0][1])
     end
 
     it "returns the value part of the key-value pair" do

data/test/dummy/Gemfile

@@ -23,12 +23,12 @@ group :test do
   gem "launchy", "~> 2.4"
   gem "poltergeist", "~> 1.7"
   gem "selenium-webdriver", "~> 2.47"
-  gem "capybara-webkit"
   gem "simplecov", "~> 0.10"
 end
 
+gem 'chosen-rails'
 gem "rails", "~> 4.2"
-gem "pg"
+gem 'pg', '~> 0.18'
 gem "sass-rails", "~> 5.0"
 gem "uglifier", "~> 2.7"
 gem "coffee-rails", "~> 4.1"
@@ -39,6 +39,6 @@ gem "sdoc", "~> 0.4", {:group=>:doc}
 gem "bootstrap-sass", "~> 3.3"
 
 gem "simple_form", "~> 3.2"
-gem "reform", "~> 2.0"
+gem "reform-rails"
 
 gem 'country_state_select', path: '../../'

data/test/dummy/app/assets/javascripts/locations.coffee

@@ -1,2 +1,2 @@
 $(document).on 'ready page:load', ->
-  CountryStateSelect({ chosen_ui: true, country_id: "location_test_country", state_id: "location_test_state", city_id: "location_test_city" })
+  CountryStateSelect({ chosen_ui: true, country_id: "location_test_country", state_id: "location_test_state", city_id: "location_test_city", city_place_holder: "Please select city", state_place_holder: 'Please select state' })

data/test/dummy/config/database.yml

@@ -1,15 +1,24 @@
-
-development:
+default: &default
   adapter: postgresql
   encoding: unicode
-  database: cy_development_one
   pool: 5
-  host: localhost 
-  username: compass
-  password: test123
+  username:
+  password:
+  prepared_statements: false
+
+development:
+  <<: *default
+  database: cst-development
+
+test:
+  <<: *default
+  database: cst_test
+
+staging:
+  <<: *default
+  database: cst_staging
 
 production:
-  adapter: postgresql
-  encoding: unicode
-  database: cy_production
-  pool: 5
+  <<: *default
+  database: cst_release_production
+

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

@@ -10,7 +10,6 @@ function CountryStateSelect(options) {
   var city_name = $('#' + city_id).attr('name');
   var city_class = $('#' + city_id).attr('class');
 
-
   return statesDropdown();
 
   // ====== ***** METHODS ***** ===================================================================== //
@@ -119,6 +118,7 @@ function CountryStateSelect(options) {
       html = '<input id="' + state_id + '" name="' + state_name + '" class="' + state_class + '" type="text"  type="text" value="" >';
     } else {
       html = '<select id="' + state_id + '" name="' + state_name + '" class="' + state_class + '" >';
+      html += '<option>'+ find_select_option_text('state') +'</option>'
 
       for (i = 0; i < data.length; i++) {
         html += '<option value='+data[i][0]+'>' + data[i][1] + '</option>';
@@ -142,13 +142,22 @@ function CountryStateSelect(options) {
 
   }
 
+  function find_select_option_text(type){
+     if (type === 'city'){
+       return options['city_place_holder'];
+     }else{
+       return options['state_place_holder']
+     }
+
+  }
+
   function buildCitiesDropdown(data) {
-    console.log(data)
+
     if (data.length === 0) {
       html = '<input id="' + city_id + '" name="' + city_name + '" class="' + city_class + '" type="text"  type="text" value="" >';
     } else {
       html = '<select id="' + city_id + '" name="' + city_name + '" class="' + city_class + '" >';
-
+      html += '<option>'+ find_select_option_text('city') +'</option>'
       for (i = 0; i < data.length; i++) {
         html += '<option>' + data[i] + '</option>';
       }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: country_state_select
 version: !ruby/object:Gem::Version
-  version: 3.0.2
+  version: 3.0.3
 platform: ruby
 authors:
 - Arvind Vyas
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-17 00:00:00.000000000 Z
+date: 2018-11-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -80,48 +80,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: simple_form
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.2'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.2'
-- !ruby/object:Gem::Dependency
-  name: chosen-rails
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.4'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.4'
-- !ruby/object:Gem::Dependency
-  name: compass-rails
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 2.0.4
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 2.0.4
 - !ruby/object:Gem::Dependency
   name: city-state
   requirement: !ruby/object:Gem::Requirement
@@ -247,7 +205,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: Dynamically select Country and State.