effective_form_inputs 1.0.4 → 1.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 268cef64a10eb121ee7ed9cbc56e80b37e6072fe
-  data.tar.gz: 217dcdf851e1d1ef92ec40d85b80beec818e413e
+  metadata.gz: 1f902d1b47f8f42634665e3f866708573532a4eb
+  data.tar.gz: 447661ba85bf6b67274d762b4f135a3bfa90a22e
 SHA512:
-  metadata.gz: d8bafe99402fc8d137cc1177417c077041a592ca477870e5ed2e49d7c380756b493f54d1689ec8be2c8611aae66192f5745c9006e0586c784061a66302515059
-  data.tar.gz: 8d97d9ac3fdd8011164fc022a5742b3ddcf44f88ee0b0e90cb6c29d89b4b5dad03a37fb7767eff5ba9496540f6bdd20be3e8c6e3548b9862bd7ec9008af093d1
+  metadata.gz: dcf849517c895cf279b678db02583ed25c27589e2f8ca51ad91f1be63e989fa61cf2326ee9209ccc1d01ff29e5262831b4e2ebb5908afe2c64a9667c8f7c1115
+  data.tar.gz: 95a8268916ad69957724cea6f3779328d81ef1a7d7f9a737e8a1245a72549f3229d9bcc3725e5b3927bacd45013151b81bb7848f4cac47154804dad404000c2c

data/README.md

@@ -396,6 +396,12 @@ To add a css class to the select2 container or dropdown:
 :dropdownClass => 'custom-dropdown-class'
 ```
 
+### Additional
+
+Call with `single_selected: true` to ensure only the first selected option tag will be `<option selected="selected">`.
+
+This can be useful when displaying multiple options with an identical value.
+
 ### Working with dynamic options
 
 The following information applies to `effective_select` only, and is not part of the standard select2 API.
@@ -705,6 +711,20 @@ As a SimpleForm input:
     :buttons => true
 ```
 
+### Inline
+
+Pass `inline: true` to the input options to render the radio buttons inline.
+
+As a SimpleForm input:
+
+```ruby
+= simple_form_for @user do |f|
+  = f.input :breakfast,
+    :as => :effective_radio_buttons,
+    :collection => ['eggs', 'toast', 'bacon'],
+    :inline => true
+```
+
 ### Images
 
 Pass `images: []` as an array of strings with the same length as the collection to render image buttons.

data/app/assets/stylesheets/effective_radio_buttons/input.scss

@@ -23,3 +23,27 @@ div.effective_radio_buttons.image_radio_buttons {
     border: 3px solid #009bc9;
   }
 }
+
+div.effective_radio_buttons.inline_radio_buttons {
+  label.control-label { display: block; }
+
+  label.radio-inline {
+    padding-top: 7px;
+    padding-bottom: 7px;
+  }
+}
+
+div.effective_radio_buttons.button_radio_buttons {
+  input { display: none; }
+}
+
+.btn-group.effective_radio_buttons > .btn.radio-first:not(:first-child):not(:last-child):not(.dropdown-toggle) {
+  border-bottom-left-radius: 4px;
+  border-top-left-radius: 4px;
+}
+
+form.form-horizontal {
+  .btn-group.effective_radio_buttons {
+    display: block;
+  }
+}

data/app/models/inputs/effective_radio_buttons/input.rb

@@ -23,17 +23,28 @@ module Inputs
       end
 
       def render_item(builder)
-        if options[:nested_boolean_style] == :nested || options[:buttons]
+        if options[:inline] || options[:buttons]
+          item = builder.radio_button + item_image_or_text(builder)
+        elsif options[:nested_boolean_style] == :nested
           item = builder.label { builder.radio_button + item_image_or_text(builder) }
         else
           item = builder.radio_button + builder.label { item_image_or_text(builder) }
         end
 
+        if options[:buttons]
+          @button_index ||= -1; @button_index += 1
+        end
+
         if options[:item_wrapper_tag]
           active = (builder.object.send(options[:value_method]).to_s == value.to_s)
 
           content_tag(options[:item_wrapper_tag], item,
-            class: ['btn', 'btn-default', options[:item_wrapper_class], ('active' if active)].flatten.uniq.join(' ')
+            class: [
+              options[:item_wrapper_class],
+              ('btn btn-default' if options[:buttons]),
+              ('radio-first' if options[:buttons] && @button_index == 0),
+              ('active' if active)
+            ].flatten.compact.uniq.join(' ')
           )
         else
           item
@@ -71,6 +82,18 @@ module Inputs
         options[:checked] || super
       end
 
+      def options
+        @effective_radio_buttons_options ||= super().tap do |options|
+          options[:item_wrapper_class] = Array(options[:item_wrapper_class]).flatten.uniq
+
+          if options[:inline] || options[:buttons]
+            options[:item_wrapper_tag] = :label unless options[:buttons]
+            options[:item_wrapper_class] = 'radio-inline'
+          end
+
+        end
+      end
+
       private
 
       def initialize_and_validate_images!

data/app/models/inputs/effective_radio_buttons_input.rb

@@ -12,15 +12,25 @@ if defined?(SimpleForm)
       options[:value_method] = value_method
       options[:nested_boolean_style] = :nested if nested_boolean_style?
 
+      # Wrapper
+      options[:wrapper_html] ||= {}
+      options[:wrapper_html][:class] = Array(options[:wrapper_html][:class])
+
       if options[:images]
-        options[:wrapper_html] ||= {}
-        options[:wrapper_html][:class] = "#{options[:wrapper_html][:class]} image_radio_buttons".strip
-      elsif options[:buttons]
-        options[:wrapper_html] ||= {}
-        options[:wrapper_html][:class] = "#{options[:wrapper_html][:class]} button_radio_buttons btn-group".strip
+        options[:wrapper_html][:class] << 'image_radio_buttons'
+      end
+
+      if options[:buttons]
+        options[:wrapper_html][:class] << 'button_radio_buttons btn-group inline_radio_buttons'
         options[:wrapper_html][:data] = { toggle: 'buttons' }
       end
 
+      if options[:inline] && !options[:buttons]
+        options[:wrapper_html][:class] << 'inline_radio_buttons'
+      end
+
+      options[:wrapper_html][:class] = options[:wrapper_html][:class].join(' ')
+
       Inputs::EffectiveRadioButtons::Input.new(object, object_name, template, attribute_name, input_options, (merge_wrapper_options(input_html_options, wrapper_options) || {})).to_html
     end
 

data/app/models/inputs/effective_select/input.rb

@@ -31,6 +31,12 @@ module Inputs
           html += hidden_field(@object_name, polymorphic_id_method, value: polymorphic_id_value)
         end
 
+        if options[:single_selected]
+          if html.sub!('selected="selected"', "selected='selected'")
+            html.gsub!('selected="selected"', '')
+          end
+        end
+
         html
       end
 
@@ -112,6 +118,8 @@ module Inputs
               elsif value.first.respond_to?(options[:value_method])  # This is probably a belongs_to ActiveRecord object
                 options[:selected] = value.map { |value| (value.public_send(options[:value_method]) rescue value) }
               end
+            when Integer
+              options[:selected] = value
             else  # Value is not an Array
               if options[:polymorphic]
                 options[:selected] = polymorphic_value(value)

data/lib/effective_form_inputs/version.rb

@@ -1,3 +1,3 @@
 module EffectiveFormInputs
-  VERSION = '1.0.4'.freeze
+  VERSION = '1.0.5'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_form_inputs
 version: !ruby/object:Gem::Version
-  version: 1.0.4
+  version: 1.0.5
 platform: ruby
 authors:
 - Code and Effect
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-04-18 00:00:00.000000000 Z
+date: 2017-04-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails