rails_bootstrap_form 0.6.1 → 0.6.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 34303679b08cf0617516305e5b4e1f21d8c201ffcd9f4cc8eb90f26a587a7f7a
-  data.tar.gz: 4e01e2321eb0318e222e802ce84e8c63648296c50e78de5de9f3c8e14be9570e
+  metadata.gz: f33d8a7c5b5a17656dc325d688c903ccfdc7780ef400340b9980dfd2a341d164
+  data.tar.gz: eff2f3c9613d598feca7192fbc973452a544215840e92e662f30e3e4462922ed
 SHA512:
-  metadata.gz: c7f4349d0933eeea1f1965df83eb80ec0fd83392a3a47e2299214a797ec36e5c198e647d727969443779d60910741f91b49f88973a6ebcf6d93a29302f308b46
-  data.tar.gz: adab966d0ca4b8064094e7e941296d95e75e594452384e9cb6e7370ca19fd288a4e9d9cea1e56dbf7981804ef58f9cafc1398d1e0203bb1eefb80004f27ab18d
+  metadata.gz: 7ef75e441c851217ba6ba93a69f693547cac3726b4481b8a400c7a93653e1831aef21e9e6f6c18581809c3c402e9fc560b416a9949ebd44c36251b72c7b73771
+  data.tar.gz: 4d73c166848a01b13bff4be90b41dfd6269e9a58d53765068451884a96d50aabee903109680ee7453659baf95163558918d249004801560299006bdc7af6f40b

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    rails_bootstrap_form (0.6.1)
+    rails_bootstrap_form (0.6.2)
       actionpack (~> 7.0)
       activemodel (~> 7.0)
 

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

@@ -14,7 +14,7 @@
       <%= form.collection_radio_buttons :fruit_id, ::Fruit.all, :id, :name, {checked: form.object.fruit_id} %>
       <%= form.color_field :favorite_color %>
       <%= form.collection_check_boxes :skill_ids, ::Skill.all, :id, :name %>
-      <%= form.fields_for :address, include_id: false, bootstrap_form: {layout: :horizontal} do |address_form| %>
+      <%= form.fields_for :address, include_id: false do |address_form| %>
         <%= address_form.text_area :street %>
         <%= address_form.text_field :state %>
         <%= address_form.grouped_collection_select :city, ::Country.includes(:cities), :cities, :name, :id, :name, {include_blank: "Select city"} %>

data/lib/rails_bootstrap_form/bootstrap_form_builder.rb

@@ -15,16 +15,28 @@ module RailsBootstrapForm
     attr_accessor :bootstrap_form_options
 
     def initialize(object_name, object, template, options)
-      @bootstrap_form_options = RailsBootstrapForm::BootstrapFormOptions.new(options.delete(:bootstrap_form))
+      @bootstrap_form_options = RailsBootstrapForm::BootstrapFormOptions.new(options[:bootstrap_form])
       apply_default_form_options(options)
       super(object_name, object, template, options)
     end
 
+    def fields_for(record_name, record_object = nil, fields_options = {}, &block)
+      fields_options = fields_for_options(record_object, fields_options)
+      record_object = nil if record_object.is_a?(Hash) && record_object.extractable_options?
+      super(record_name, record_object, fields_options, &block)
+    end
+
     def apply_default_form_options(options)
       options[:html] ||= {}
       options[:html].reverse_merge!(RailsBootstrapForm.config.default_form_attributes)
     end
 
-    private :apply_default_form_options
+    def fields_for_options(record_object, fields_options)
+      field_options = record_object if record_object.is_a?(Hash) && record_object.extractable_options?
+      field_options = {bootstrap_form: options[:bootstrap_form]}.deep_merge!(field_options)
+      field_options
+    end
+
+    private :apply_default_form_options, :fields_for_options
   end
 end

data/lib/rails_bootstrap_form/helpers/labels.rb

@@ -9,7 +9,7 @@ module RailsBootstrapForm
 
       def self.included(base_class)
         def draw_label(attribute, options, bootstrap_options)
-          unless bootstrap_options.skip_label
+          unless bootstrap_options.skip_label && !bootstrap_options.floating
             label_options = {
               class: label_classes(attribute, bootstrap_options)
             }

data/lib/rails_bootstrap_form/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rails_bootstrap_form
 version: !ruby/object:Gem::Version
-  version: 0.6.1
+  version: 0.6.2
 platform: ruby
 authors:
 - Harshal LADHE (shivam091)