effective_bootstrap 0.3.3 → 0.3.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a836e789cb8b0bee567ef732e5b368ca39f8c9ca
-  data.tar.gz: 0f9450c9974758cb363a80324384a870936e5901
+  metadata.gz: 814a553c811fcf629ccae64c8b7600b3c17bd434
+  data.tar.gz: 7582182315089cd457742ec96afec30659ace1f7
 SHA512:
-  metadata.gz: 2106312ad8bb61dd044bd50c63a72db6d7a6c1f05830e2610e3875d21f8de969467d6ca32dae6f5767d2dd3d7a5ef3fcded9f5892195d5070486c6091fd86db3
-  data.tar.gz: f239fc4e6d5afcc5cb75bdf0470f6dfb1f9653b0b5ba6441afaef80bf45b7632ad69c2d3353a9775c36bfb63a50de50064cdaff8dbee234ad4fd99fb95c42a15
+  metadata.gz: a27f9df29e5f7e9912c276a139dd43900a73ad374193d3d47de6e7cf3c16be78f94c60eb169c903b7c9351e7e09ad31c231b848ba842b118ed91abfbd1aeba70
+  data.tar.gz: 68aa49cbba726414afba0c9465fa29f333ae1c88420ca5570bdd950b417515297275848d731ad5c2fc26c1cf38c2d1836c7cbb1889d6859acddaabcf587d3823

data/README.md

@@ -437,6 +437,37 @@ $(document).on 'change', '.something', (event) ->
 
 There is currently no support for using AJAX to load remote data.  This feature is supported by the underlying select2 library and will be implemented here at a future point.
 
+## Custom select_or_text_field
+
+This custom form input is unique. It takes in two different field names, one of them a select, the other a text field.
+
+It enforces an `XOR` between the two fields.
+
+It's intended for selecting a `belongs_to` or using a freeform text field pattern.
+
+This custom form input uses no 3rd party jQuery plugins.
+
+```haml
+= f.select_or_text_field :post_id, :post_text, Post.all
+= f.select_or_text_field :post_id, :post_text, Post.all, hint: 'Both select and text field will see this hint'
+= f.select_or_text_field :post_id, :post_text, Post.all, select: { hint: 'select only options' }, text: { hint: 'text field only options'}
+```
+
+The `f.object` should have two separate attributes, `post_id` and `post_text`.
+
+The javascript form input will enforce XOR, but you can also apply your own validation to also have the same effect as `required: true`
+
+```
+class PostSummary < ApplicationRecord
+  validate do
+    unless (post_id.present? ^ post_text.present?) # xor
+      self.errors.add(:post_id, 'please choose either post or post text')
+      self.errors.add(:post_text, 'please choose either post or post text')
+    end
+  end
+end
+```
+
 ## Custom submit and save
 
 The `f.submit` puts in a wrapper and a default save button, and does the whole icon spin when submit thing.

data/app/assets/javascripts/effective_bootstrap.js

@@ -14,3 +14,4 @@
 //= require ./effective_price/input
 //= require ./effective_radio/input
 //= require ./effective_select/input
+//= require ./effective_select_or_text/input

data/app/assets/javascripts/effective_select_or_text/initialize.js.coffee

@@ -0,0 +1,15 @@
+$(document).on 'click', '[data-effective-select-or-text]', (event) ->
+  $obj = $(event.currentTarget).closest('.effective-select-or-text')
+
+  $visible = $obj.children('.form-group:visible').first()
+  $hidden = $obj.children('.form-group:not(:visible)').first()
+
+  $visible.fadeOut('fast', ->
+    $visible.find('select').val('').trigger('change.select2')
+    $visible.find('input').val('')
+
+    $hidden.slideDown('fast')
+  )
+
+  false
+

data/app/assets/javascripts/effective_select_or_text/input.js

@@ -0,0 +1 @@
+//= require ./initialize

data/app/assets/stylesheets/effective_bootstrap.scss

@@ -8,4 +8,5 @@
 @import 'effective_editor/input';
 @import 'effective_file/input';
 @import 'effective_select/input';
+@import 'effective_select_or_text/input';
 @import 'effective_radio/input';

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

@@ -0,0 +1,6 @@
+.effective-select-or-text {
+  display: flex;
+
+  > .form-group { flex-grow: 1; }
+  > a { margin: 2rem 0 0 1rem; }
+}

data/app/models/effective/form_builder.rb

@@ -106,6 +106,11 @@ module Effective
       Effective::FormInputs::Select.new(name, options, builder: self).to_html
     end
 
+    def select_or_text(name, name_text, choices = nil, *args)
+      options = args.extract_options!.merge!(name_text: name_text, collection: choices)
+      Effective::FormInputs::SelectOrText.new(name, options, builder: self).to_html
+    end
+
     def submit(name = 'Save', options = {}, &block)
       (options = name; name = 'Save') if name.kind_of?(Hash)
       Effective::FormInputs::Submit.new(name, options, builder: self).to_html(&block)

data/app/models/effective/form_inputs/select_or_text.rb

@@ -0,0 +1,56 @@
+module Effective
+  module FormInputs
+    class SelectOrText < Effective::FormInput
+      attr_accessor :name_text
+      attr_accessor :select_collection
+      attr_accessor :select_options
+      attr_accessor :text_options
+
+      VISIBLE = {}
+      HIDDEN = { wrapper: { style: 'display: none;' } }
+
+      def initialize(name, options, builder:)
+        @name_text = options.delete(:name_text) || raise('Please include a text method name')
+        @select_collection = options.delete(:collection) || raise('Please include a collection')
+
+        @select_options = { placeholder: 'Please choose, or...', required: false }
+          .merge(options[:select] || options.presence || {})
+
+        @text_options = { placeholder: 'Enter freeform', required: false }
+          .merge(options[:text] || options[:text_field] || options.presence || {})
+
+        super
+      end
+
+      def to_html(&block)
+        content_tag(:div, class: 'effective-select-or-text') do
+          @builder.select(name, select_collection, select_options) +
+          @builder.text_field(name_text, text_options) +
+          link_to(icon('rotate-ccw'), '#', class: 'effective-select-or-text-switch', title: 'Switch between choice and freeform', 'data-effective-select-or-text': true)
+        end
+      end
+
+      def select?
+        return true if object.errors[name].present?
+        return false if object.errors[name_text].present?
+
+        object.send(name).present? || (object.send(name).blank? && object.send(name_text).blank?)
+      end
+
+      def text?
+        return false if object.errors[name].present?
+
+        object.send(name_text).present? || object.errors[name_text].present?
+      end
+
+      def select_options
+        @select_options.merge(select? ? VISIBLE : HIDDEN)
+      end
+
+      def text_options
+        @text_options.merge(text? ? VISIBLE : HIDDEN)
+      end
+
+    end
+  end
+end

data/lib/effective_bootstrap/version.rb

@@ -1,3 +1,3 @@
 module EffectiveBootstrap
-  VERSION = '0.3.3'.freeze
+  VERSION = '0.3.4'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_bootstrap
 version: !ruby/object:Gem::Version
-  version: 0.3.3
+  version: 0.3.4
 platform: ruby
 authors:
 - Code and Effect
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-12-02 00:00:00.000000000 Z
+date: 2018-12-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -401,6 +401,8 @@ files:
 - app/assets/javascripts/effective_select/input.js
 - app/assets/javascripts/effective_select/overrides.js.coffee
 - app/assets/javascripts/effective_select/select2.js
+- app/assets/javascripts/effective_select_or_text/initialize.js.coffee
+- app/assets/javascripts/effective_select_or_text/input.js
 - app/assets/javascripts/effective_time/initialize.js.coffee
 - app/assets/javascripts/effective_time/input.js
 - app/assets/stylesheets/effective_bootstrap.scss
@@ -422,6 +424,7 @@ files:
 - app/assets/stylesheets/effective_select/input.scss
 - app/assets/stylesheets/effective_select/overrides.scss
 - app/assets/stylesheets/effective_select/select2.css
+- app/assets/stylesheets/effective_select_or_text/input.scss
 - app/assets/stylesheets/effective_time/input.scss
 - app/helpers/effective_bootstrap_helper.rb
 - app/helpers/effective_editor_helper.rb
@@ -451,6 +454,7 @@ files:
 - app/models/effective/form_inputs/remote_link_to.rb
 - app/models/effective/form_inputs/save.rb
 - app/models/effective/form_inputs/select.rb
+- app/models/effective/form_inputs/select_or_text.rb
 - app/models/effective/form_inputs/static_field.rb
 - app/models/effective/form_inputs/submit.rb
 - app/models/effective/form_inputs/text_area.rb