rails_bootstrap_form 0.4.0 → 0.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 25354c2cb11c5971bf3435e2415ca37c0fcfabeeb45cd269a8dbecba7d582fd7
-  data.tar.gz: f695f139348b6fb1f2c054e90f79c6d5c53805ec047ac6d239df946a09039278
+  metadata.gz: 5874a38745d73c1b0bb05c751711cdc380be8684c71187069e07224e9d40333a
+  data.tar.gz: ffe2043c13700e6015d7741b51550c52642098c412f29b1921a7e98ed20ec9cf
 SHA512:
-  metadata.gz: ed91e2feb0354818a43161b165ed8bba83b8e29a9f3013d2a3f7df54e23158768332d2381f36132399dedb7531a65abcd9234a70814c9b05f63c6af3ed66c245
-  data.tar.gz: ea1cf098b34f86c6f5ca4bb1cfc6031a93f81865515e484f6322934e33673b9980c053ccf02db70d302feb520e8766998678505f3e406b805b426dada7d000ee
+  metadata.gz: 657b116576955954f11ecd923cd61277613bd732d7b986effe3d5b908ed38531549413baa47436167fd7d675fb5aab709863cc53bfb19f99d4a39abb2148de63
+  data.tar.gz: '09d24eb35c72a56c834d0031ce85152e1a0241a1d4614dc69ebb5bc820b45780380d80132a9c882086b6524d8bb9fd5826d41c339f45bd87b335fcb0ceb97eeb'

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    rails_bootstrap_form (0.4.0)
+    rails_bootstrap_form (0.4.2)
 
 GEM
   remote: http://rubygems.org/

data/demo/app/models/city.rb

@@ -0,0 +1,17 @@
+# -*- encoding: utf-8 -*-
+# -*- frozen_string_literal: true -*-
+# -*- warn_indent: true -*-
+
+class City < ApplicationRecord
+  DEFAULT_OPTIONS = {
+    "India" => ["Mumbai", "New Delhi", "Kolkata", "Chennai"],
+    "Ireland" => ["Dublin", "Galway", "Cork", "Belfast"],
+    "United States" => ["New York", "Los Angeles", "San Francisco", "Chicago"],
+    "United Kingdom" => ["London", "Edinburgh", "Manchester", "Bristol"],
+    "Spain" => ["Barcelona", "Madrid", "Seville", "Granada"],
+    "France" => ["Paris", "Nice", "Lyon", "Marseille"],
+    "Canada" => ["Toronto", "Montreal", "Vancouver", "Calgary"],
+  }.freeze
+
+  belongs_to :country
+end

data/demo/app/models/country.rb

@@ -14,4 +14,5 @@ class Country < ApplicationRecord
   ].freeze
 
   has_many :addresses, dependent: :restrict_with_exception
+  has_many :cities, dependent: :destroy
 end

data/demo/app/views/users/_vertical_form.html.erb

@@ -13,16 +13,18 @@
       <%= form.range_field :excellence %>
       <%= form.url_field :blog_url %>
       <%= form.color_field :favorite_color %>
-      <%= form.select :fruit_id, options_for_select(::Fruit.pluck(:name, :id), form.object.fruit_id), {include_blank: "Select Favorite Fruit"} %>
+      <%= form.select :fruit_id, options_for_select(::Fruit.pluck(:name, :id), form.object.fruit_id),
+          {include_blank: "Select Favorite Fruit"} %>
       <%= form.collection_check_boxes :skill_ids, ::Skill.all, :id, :name do |b| %>
         <%= b.check_box + b.text %>
       <% end %>
       <%= form.fields_for :address, include_id: false do |address_form| %>
         <%= address_form.text_area :street %>
         <%= address_form.text_field :state %>
-        <%= address_form.text_field :city %>
+        <%= address_form.grouped_collection_select :city, ::Country.all, :cities, :name, :id, :name %>
         <%= address_form.text_field :postal_code %>
-        <%= address_form.select :country_id, options_for_select(::Country.pluck(:name, :id), address_form.object.country_id), {include_blank: "Select Country", bootstrap_form: {}} %>
+        <%= address_form.select :country_id, options_for_select(::Country.pluck(:name, :id), address_form.object.country_id),
+            {include_blank: "Select Country", bootstrap_form: {}} %>
       <% end %>
       <div class="mt-3">
         <%= form.submit "Register", class: "btn btn-primary" %>

data/demo/db/migrate/20230516044126_create_cities.rb

@@ -0,0 +1,13 @@
+# -*- encoding: utf-8 -*-
+# -*- frozen_string_literal: true -*-
+# -*- warn_indent: true -*-
+
+class CreateCities < ActiveRecord::Migration[7.0]
+  def change
+    create_table :cities do |t|
+      t.string :name
+      t.references :country
+      t.timestamps
+    end
+  end
+end

data/demo/db/schema.rb

@@ -10,7 +10,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema[7.0].define(version: 2023_05_14_061100) do
+ActiveRecord::Schema[7.0].define(version: 2023_05_16_044126) do
   create_table "addresses", primary_key: "user_id", force: :cascade do |t|
     t.integer "country_id"
     t.string "street"
@@ -23,6 +23,14 @@ ActiveRecord::Schema[7.0].define(version: 2023_05_14_061100) do
     t.index ["user_id"], name: "index_addresses_on_user_id"
   end
 
+  create_table "cities", force: :cascade do |t|
+    t.string "name"
+    t.integer "country_id"
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
+    t.index ["country_id"], name: "index_cities_on_country_id"
+  end
+
   create_table "countries", force: :cascade do |t|
     t.string "name"
     t.datetime "created_at", null: false

data/demo/db/seeds.rb

@@ -13,3 +13,10 @@ end
 ::Skill::DEFAULT_OPTIONS.each do |skill|
   ::Skill.find_or_create_by(name: skill)
 end
+
+::City::DEFAULT_OPTIONS.each do |country, cities|
+  country = ::Country.find_by(name: country)
+  country.present? && cities.each do |city|
+    country.cities.find_or_create_by(name: city)
+  end
+end

data/lib/rails_bootstrap_form/inputs.rb

@@ -40,7 +40,7 @@ module RailsBootstrapForm
 
     DATE_SELECT_HELPERS.each do |field_tag_name|
       define_method(field_tag_name) do |attribute, options = {}, html_options = {}, &block|
-        options = options.reverse_merge(bootstrap_form: {field_class: "form-select"})
+        options = {bootstrap_form: {field_class: "form-select"}}.deep_merge!(options)
 
         field_wrapper_builder(attribute, options, html_options) do
           tag.div(class: control_specific_class(field_tag_name)) do
@@ -51,7 +51,7 @@ module RailsBootstrapForm
     end
 
     def select(attribute, choices = nil, options = {}, html_options = {}, &block)
-      options = options.reverse_merge(bootstrap_form: {field_class: "form-select"})
+      options = {bootstrap_form: {field_class: "form-select"}}.deep_merge!(options)
 
       field_wrapper_builder(attribute, options, html_options) do
         super(attribute, choices, options, html_options, &block)
@@ -59,34 +59,42 @@ module RailsBootstrapForm
     end
 
     def collection_select(attribute, collection, value_method, text_method, options = {}, html_options = {})
-      options = options.reverse_merge(bootstrap_form: {field_class: "form-select"})
+      options = {bootstrap_form: {field_class: "form-select"}}.deep_merge!(options)
 
       field_wrapper_builder(attribute, options, html_options) do
         super(attribute, collection, value_method, text_method, options, html_options)
       end
     end
 
-    def range_field(attribute, options = {})
-      options = options.reverse_merge(bootstrap_form: {field_class: "form-range"})
+    def grouped_collection_select(attribute, collection, group_method, group_label_method, option_key_method, option_value_method, options = {}, html_options = {})
+      options = {bootstrap_form: {field_class: "form-select"}}.deep_merge!(options)
 
-      field_wrapper_builder(attribute, options) do
-        super(attribute, options)
+      field_wrapper_builder(attribute, options, html_options) do
+        super(attribute, collection, group_method, group_label_method, option_key_method, option_value_method, options, html_options)
       end
     end
 
-    def color_field(attribute, options = {})
-      options = options.reverse_merge(bootstrap_form: {field_class: "form-control form-control-color"})
+    def time_zone_select(attribute, priority_zones = nil, options = {}, html_options = {})
+      options = {bootstrap_form: {field_class: "form-select"}}.deep_merge!(options)
+
+      field_wrapper_builder(attribute, options, html_options) do
+        super(attribute, priority_zones, options, html_options)
+      end
+    end
+
+    def range_field(attribute, options = {})
+      options = {bootstrap_form: {field_class: "form-range"}}.deep_merge!(options)
 
       field_wrapper_builder(attribute, options) do
         super(attribute, options)
       end
     end
 
-    def time_zone_select(attribute, priority_zones = nil, options = {}, html_options = {})
-      options = options.reverse_merge(bootstrap_form: {field_class: "form-select"})
+    def color_field(attribute, options = {})
+      options = {bootstrap_form: {field_class: "form-control form-control-color"}}.deep_merge!(options)
 
-      field_wrapper_builder(attribute, options, html_options) do
-        super(attribute, priority_zones, options, html_options)
+      field_wrapper_builder(attribute, options) do
+        super(attribute, options)
       end
     end
 

data/lib/rails_bootstrap_form/version.rb

@@ -3,6 +3,6 @@
 # -*- warn_indent: true -*-
 
 module RailsBootstrapForm
-  VERSION = "0.4.0".freeze
+  VERSION = "0.4.2".freeze
   REQUIRED_RAILS_VERSION = "~> 7.0".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rails_bootstrap_form
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.2
 platform: ruby
 authors:
 - Harshal LADHE (shivam091)
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-05-15 00:00:00.000000000 Z
+date: 2023-05-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: generator_spec
@@ -56,6 +56,7 @@ files:
 - demo/app/mailers/application_mailer.rb
 - demo/app/models/address.rb
 - demo/app/models/application_record.rb
+- demo/app/models/city.rb
 - demo/app/models/country.rb
 - demo/app/models/fruit.rb
 - demo/app/models/skill.rb
@@ -97,6 +98,7 @@ files:
 - demo/db/migrate/20230514055840_create_addresses.rb
 - demo/db/migrate/20230514060556_create_skills.rb
 - demo/db/migrate/20230514061100_create_user_skills.rb
+- demo/db/migrate/20230516044126_create_cities.rb
 - demo/db/schema.rb
 - demo/db/seeds.rb
 - demo/public/favicon.ico