simple_form_bootstrap3 0.3.3 → 0.3.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 97e47cd816c1b496af49ac16f4067a58533cbf3c
-  data.tar.gz: 48402dd434343af059cc8a17d21ed9e46f405351
+  metadata.gz: 725a4c5ceb7e09aafd93b13edf45b8b18efeceea
+  data.tar.gz: bb00d269b04df3d96cb6150460f1f212df0c0df0
 SHA512:
-  metadata.gz: 6dba10f376c231067077ac6b124b18839e6ec0671151ebfc2a5fbada885d6a05957f73a6ef70fbf06acf53958f4a4da974041f35191e4728b8f44334842a10b7
-  data.tar.gz: 51f2447d805ae76ed8925839df10dd80e76d5bae862f8ce9cbe73960d778f07342ecbd9d4cd14ee7ffb008d07485c8f7850a78f2b61786b59074f358d6038198
+  metadata.gz: 842bd2ada6aaec277889c21b889deb8dfa204b35e17be6af1b21f6e57daf5a0f31926881115524eea93f5de0f4fa5d573f55dccdf0ee5a66fc0b7d876aaa13e0
+  data.tar.gz: 1456a0266c5023159a2b3d4410e226ddfef771429e0b26bbb91a582dba7c7a8d9a2b3de53ae828540b9756dd20b852fa6301552984e407523076ea427529bcbe

data/lib/simple_form/default_form_builder.rb

@@ -23,31 +23,39 @@ module SimpleForm
     end
 
     def collection_check_boxes(method, collection, value_method, text_method, options = {}, html_options = {}, &block)
-      options[:collection_wrapper_tag] ||= :div
-      options[:collection_wrapper_class] ||= 'form-group'
-      options[:item_wrapper_tag] ||= :div
-      options[:item_wrapper_class] ||= 'checkbox'
+      options[:collection_wrapper_tag] = :div unless options.key? :collection_wrapper_tag
+      options[:collection_wrapper_class] = 'form-group' unless options.key? :collection_wrapper_class
+      if options[:inline]
+        options[:item_wrapper_tag] = nil
+      else
+        options[:item_wrapper_tag] = :div unless options.key? :item_wrapper_tag
+        options[:item_wrapper_class] = 'checkbox' unless options.key? :item_wrapper_class
+      end
 
       if block_given?
         super
       else
         super do |input|
-          input.label { input.check_box + input.text }
+          input.label(options[:inline] ? { class: 'checkbox-inline' } : {} ) { input.check_box + input.text }
         end
       end
     end
 
     def collection_radio_buttons(method, collection, value_method, text_method, options = {}, html_options = {}, &block)
-      options[:collection_wrapper_tag] ||= :div
-      options[:collection_wrapper_class] ||= 'form-group'
-      options[:item_wrapper_tag] ||= :div
-      options[:item_wrapper_class] ||= 'radio'
+      options[:collection_wrapper_tag] = :div unless options.key? :collection_wrapper_tag
+      options[:collection_wrapper_class] = 'form-group' unless options.key? :collection_wrapper_class
+      if options[:inline]
+        options[:item_wrapper_tag] = nil
+      else
+        options[:item_wrapper_tag] = :div unless options.key? :item_wrapper_tag
+        options[:item_wrapper_class] = 'radio' unless options.key? :item_wrapper_class
+      end
 
       if block_given?
         super
       else
         super do |input|
-          input.label { input.radio_button + input.text }
+          input.label(options[:inline] ? { class: 'radio-inline' } : {} ) { input.radio_button + input.text }
         end
       end
     end

data/lib/simple_form/horizontal_form_builder.rb

@@ -14,11 +14,13 @@ module SimpleForm
     end
 
     def collection_check_boxes(method, collection, value_method, text_method, options = {}, html_options = {}, &block)
+      raise ::ArgumentError, 'Inline is unsupported for horizontal form' if options.key? :inline
       options[:item_wrapper_class] ||= 'col-sm-offset-3 col-sm-9 col-md-offset-3 col-md-9 col-lg-offset-2 col-lg-10 checkbox'
       super
     end
 
     def collection_radio_buttons(method, collection, value_method, text_method, options = {}, html_options = {}, &block)
+      raise ::ArgumentError, 'Inline is unsupported for horizontal form' if options.key? :inline
       options[:item_wrapper_class] ||= 'col-sm-offset-3 col-sm-9 col-md-offset-3 col-md-9 col-lg-offset-2 col-lg-10 radio'
       super
     end

data/lib/simple_form_bootstrap3/version.rb

@@ -1,3 +1,3 @@
 module SimpleFormBootstrap3
-  VERSION = "0.3.3"
+  VERSION = "0.3.4"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: simple_form_bootstrap3
 version: !ruby/object:Gem::Version
-  version: 0.3.3
+  version: 0.3.4
 platform: ruby
 authors:
 - Yuriy Kolodovskyy
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-15 00:00:00.000000000 Z
+date: 2014-09-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bootstrap-sass