country_state_select 2.0.0 → 3.0.0

data/test/dummy/config/locales/simple_form.en.yml

@@ -0,0 +1,31 @@
+en:
+  simple_form:
+    "yes": 'Yes'
+    "no": 'No'
+    required:
+      text: 'required'
+      mark: '*'
+      # You can uncomment the line below if you need to overwrite the whole required html.
+      # When using html, text and mark won't be used.
+      # html: '<abbr title="required">*</abbr>'
+    error_notification:
+      default_message: "Please review the problems below:"
+    # Examples
+    # labels:
+    #   defaults:
+    #     password: 'Password'
+    #   user:
+    #     new:
+    #       email: 'E-mail to sign in.'
+    #     edit:
+    #       email: 'E-mail.'
+    # hints:
+    #   defaults:
+    #     username: 'User name to sign in.'
+    #     password: 'No special characters, please.'
+    # include_blanks:
+    #   defaults:
+    #     age: 'Rather not say'
+    # prompts:
+    #   defaults:
+    #     age: 'Select your age'

data/test/dummy/config/routes.rb

@@ -1,58 +1,4 @@
 Dummy::Application.routes.draw do
-  resources :users
-
-  # The priority is based upon order of creation: first created -> highest priority.
-  # See how all your routes lay out with "rake routes".
-
-  # You can have the root of your site routed with "root"
-  root 'users#index'
-
-  # Example of regular route:
-  #   get 'products/:id' => 'catalog#view'
-
-  # Example of named route that can be invoked with purchase_url(id: product.id)
-  #   get 'products/:id/purchase' => 'catalog#purchase', as: :purchase
-
-  # Example resource route (maps HTTP verbs to controller actions automatically):
-  #   resources :products
-
-  # Example resource route with options:
-  #   resources :products do
-  #     member do
-  #       get 'short'
-  #       post 'toggle'
-  #     end
-  #
-  #     collection do
-  #       get 'sold'
-  #     end
-  #   end
-
-  # Example resource route with sub-resources:
-  #   resources :products do
-  #     resources :comments, :sales
-  #     resource :seller
-  #   end
-
-  # Example resource route with more complex sub-resources:
-  #   resources :products do
-  #     resources :comments
-  #     resources :sales do
-  #       get 'recent', on: :collection
-  #     end
-  #   end
-
-  # Example resource route with concerns:
-  #   concern :toggleable do
-  #     post 'toggle'
-  #   end
-  #   resources :posts, concerns: :toggleable
-  #   resources :photos, concerns: :toggleable
-
-  # Example resource route within a namespace:
-  #   namespace :admin do
-  #     # Directs /admin/products/* to Admin::ProductsController
-  #     # (app/controllers/admin/products_controller.rb)
-  #     resources :products
-  #   end
+  resources :locations
+  root 'locations#index'
 end

data/test/dummy/db/migrate/20140724080030_create_locations.rb

@@ -0,0 +1,10 @@
+class CreateLocations < ActiveRecord::Migration
+  def change
+    create_table :locations do |t|
+      t.string :test_country
+      t.string :test_state
+
+      t.timestamps
+    end
+  end
+end

data/test/dummy/db/migrate/20151024160724_add_test_city_to_locations.rb

@@ -0,0 +1,5 @@
+class AddTestCityToLocations < ActiveRecord::Migration
+  def change
+    add_column :locations, :test_city, :string
+  end
+end

data/test/dummy/db/schema.rb

@@ -11,17 +11,14 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 20140728203606) do
+ActiveRecord::Schema.define(version: 20151024160724) do
 
-  create_table "users", force: true do |t|
-    t.string   "name"
-    t.string   "email"
-    t.integer  "country_id"
-    t.integer  "state_id"
+  create_table "locations", force: :cascade do |t|
+    t.string   "test_country"
+    t.string   "test_state"
     t.datetime "created_at"
     t.datetime "updated_at"
-    t.string   "state_name"
-    t.string   "country_name"
+    t.string   "test_city"
   end
 
 end

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

@@ -1,44 +1,167 @@
-$(document).on('ready page:load', function () {
-  
-  $("#country_id").change(function() {
-    var country = $('#country_id option:selected').text()
-    var options = '';
-    $('#state_name').html('');
-    find_csc('/find_states', $("#country_id").val());
-  });
-  var find_csc = function(url, id){
+function CountryStateSelect(options) {
+
+  var state_id = options['state_id'];
+  var country_id = options['country_id'];
+  var city_id = options['city_id'];
+
+  var state_name = $('#' + state_id).attr('name');
+  var state_class = $('#' + state_id).attr('class');
+
+  var city_name = $('#' + city_id).attr('name');
+  var city_class = $('#' + city_id).attr('class');
+
+
+  return statesDropdown();
+
+  // ====== ***** METHODS ***** ===================================================================== //
+
+  function statesDropdown() {
+
+    addChosenToCountry();
+    addChosenToState();
+    addChosenToCity();
+
+    $("#" + country_id).change(function () {
+      return findStates($(this).val());
+    });
+
+  }
+
+  function citiesDropdown() {
+     $("#" + state_id).change(function () {
+      return findCities($("#" + state_id).val(),$("#" + country_id).val());
+    });
+  }
+
+  function addChosenToState(){
+    if (chosenIsRequired && stateIsNotText()) {
+      $('#' + state_id).chosen();
+    }
+  }
+
+  function addChosenToCity(){
+
+    if (chosenIsRequired && cityIsNotText()) {
+      $('#' + city_id).chosen();
+    }
+  }
+
+  function stateIsNotText(){
+    return !$('#' + state_id).is("[type=text]");
+  }
+
+  function cityIsNotText(){
+    return !$('#' + city_id).is("[type=text]");
+  }
+
+  function addChosenToCountry(){
+    if (chosenIsRequired) {
+      $('#' + country_id).chosen();
+    }
+  }
+
+  function removeChosenFromFields(){
+    if (chosenIsRequired) {
+      $("#" + options['state_id'] + "_chosen").remove();
+    }
+  }
+
+  function removeChosenFromCityFields(){
+    if (chosenIsRequired) {
+      $("#" + options['city_id'] + "_chosen").remove();
+    }
+  }
+
+  function chosenIsRequired(){
+    return options.hasOwnProperty("chosen_ui") && options['chosen_ui'];
+  }
+
+  function findStates(id) {
+
+    //Remove all Chosen from existing fields
+    removeChosenFromFields();
+
+    //Perform AJAX request to get the data; on success, build the dropdown
+    $.ajax({
+      url: "/find_states",
+      type: 'post',
+      dataType: 'json',
+      cache: false,
+      data: {country_id: id},
+      success: function (data) { buildStatesDropdown(data) }
+    });
+  }
+
+  function findCities(state_id, country_id) {
+
+    //Remove all Chosen from existing fields
+    removeChosenFromCityFields();
+
+    //Perform AJAX request to get the data; on success, build the dropdown
     $.ajax({
-      url: url,
+      url: "/find_cities",
       type: 'post',
+
       dataType: 'json',
       cache: false,
       data: {
-        country_id: id 
+        country_id: country_id,
+        state_id: state_id
       },
-      success:function(data) {
-        create_select(data) ;
-      }
+      success: function (data) { buildCitiesDropdown(data) }
     });
   }
-  var create_select = function(data){
-    if (data.length === 0){
-      $html = "<input id='state_name' name="+ name +" class="+class_name+" type='text' value='' />"
-    }else{
-      name = $('#state_name').attr('name');
-      class_name = $('#state_name').attr('class');
-      $html= '<select class='+class_name+' id="state_name" name='+name+' >'		
-      $html+='<option selected=\"selected\" >'+data[0][1]+'</option>';
-      
-      for ( var idcount = 1; idcount < data.length; idcount++) {
-	    $html+='<option>'+data[idcount][1]+'</option>';
-	  }
-      $html+='</select>';		   
-    }
-    
-    $('#state_name').replaceWith($html);
-    if (class_name === 'chosen-select' && data.length >0){
-      $('.'+class_name+'').chosen();
-    }
-   
-   } 
-});
+
+  //Build the HTML for our dropdown menus
+  function buildStatesDropdown(data) {
+
+    if (data.length === 0) {
+      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 + '" >';
+
+      for (i = 0; i < data.length; i++) {
+        html += '<option value='+data[i][0]+'>' + data[i][1] + '</option>';
+      }
+
+      html += '</select>';
+    }
+
+    $('#' + state_id).replaceWith(html);
+
+    //This has to happen AFTER we've replaced the dropdown or text
+    if (data.length > 0) {
+      addChosenToState();
+    }
+
+    // [142] FIXME # Is there any other way to call city method , it is adding change method in every state change 
+    if(typeof city_name !== "undefined" ){
+      citiesDropdown();
+    };
+
+  }
+
+  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 + '" >';
+
+      for (i = 0; i < data.length; i++) {
+        html += '<option>' + data[i] + '</option>';
+      }
+
+      html += '</select>';
+    }
+
+    $('#' + city_id).replaceWith(html);
+
+    //This has to happen AFTER we've replaced the dropdown or text
+    if (data.length > 0) {
+      addChosenToCity();
+    }
+
+  }
+
+}

metadata

@@ -1,31 +1,73 @@
 --- !ruby/object:Gem::Specification
 name: country_state_select
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 3.0.0
 platform: ruby
 authors:
 - Arvind Vyas
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-04 00:00:00.000000000 Z
+date: 2015-10-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: rails
+  name: bundler
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.6'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.6'
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '10.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '10.0'
+- !ruby/object:Gem::Dependency
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '3.0'
-  type: :runtime
+        version: '0'
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: city-state
+  name: pry
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -39,34 +81,63 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: bundler
+  name: simple_form
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.6'
-  type: :development
+        version: '3.2'
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.6'
+        version: '3.2'
 - !ruby/object:Gem::Dependency
-  name: rake
+  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
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  type: :development
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: Can list out country and according to that can list state dynamically.
+description: Country State Select is a Ruby Gem that aims to make Country and State/Province
+  selection a cinch in Ruby on Rails environments.
 email:
 - arvindvyas07@gmail.com
 executables: []
@@ -83,38 +154,35 @@ files:
 - config/routes.rb
 - country_state_select.gemspec
 - lib/country_state_select.rb
-- lib/country_state_select/cst_data.rb
 - lib/country_state_select/engine.rb
 - lib/country_state_select/engine3.rb
 - lib/country_state_select/railtie.rb
 - 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/users.js.coffee
-- test/dummy/app/assets/stylesheets/application.css
-- test/dummy/app/assets/stylesheets/scaffolds.css.scss
-- test/dummy/app/assets/stylesheets/users.css.scss
+- 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/users_controller.rb
+- test/dummy/app/controllers/locations_controller.rb
+- test/dummy/app/form/location_form.rb
 - test/dummy/app/helpers/application_helper.rb
-- test/dummy/app/helpers/users_helper.rb
 - test/dummy/app/mailers/.keep
 - test/dummy/app/models/.keep
 - test/dummy/app/models/concerns/.keep
-- test/dummy/app/models/user.rb
+- test/dummy/app/models/location.rb
 - test/dummy/app/views/layouts/application.html.erb
-- test/dummy/app/views/users/_form.html.erb
-- test/dummy/app/views/users/edit.html.erb
-- test/dummy/app/views/users/index.html.erb
-- test/dummy/app/views/users/index.json.jbuilder
-- test/dummy/app/views/users/new.html.erb
-- test/dummy/app/views/users/show.html.erb
-- test/dummy/app/views/users/show.json.jbuilder
+- 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
@@ -132,12 +200,13 @@ files:
 - 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_users.rb
-- test/dummy/db/migrate/20140728194622_add_state_name_to_users.rb
-- test/dummy/db/migrate/20140728203606_add_country_name_to_user.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
@@ -149,20 +218,16 @@ files:
 - test/dummy/public/favicon.ico
 - test/dummy/public/robots.txt
 - test/dummy/test/controllers/.keep
-- test/dummy/test/controllers/users_controller_test.rb
 - test/dummy/test/fixtures/.keep
-- test/dummy/test/fixtures/users.yml
 - test/dummy/test/helpers/.keep
-- test/dummy/test/helpers/users_helper_test.rb
 - test/dummy/test/integration/.keep
 - test/dummy/test/mailers/.keep
 - test/dummy/test/models/.keep
-- test/dummy/test/models/user_test.rb
 - 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.git
+homepage: https://github.com/aldefouw/country_state_select.git
 licenses:
 - MIT
 metadata: {}
@@ -185,5 +250,73 @@ rubyforge_project:
 rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
-summary: This is to list country and state.
-test_files: []
+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