effective_bootstrap 0.2.3 → 0.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a9a6d951deeba08d113ac19bdfed662eb48c9692
-  data.tar.gz: 6643a8efbff7d4d5fccf3fc12f3bd804eca6926d
+  metadata.gz: dbcd85ec412ee04f3a0cd56458b24a615c7bc0b7
+  data.tar.gz: a4e5e7b632e4d5c486e68fd3acabf6f1e72bcd61
 SHA512:
-  metadata.gz: 42711f03fa1bbb0ca9d0225988f5c0ce707c04d6981077b7a31f1d9172ec3647561a99940382df742847976b4f4900745f5a921665bba38cc6521079ab4a5a55
-  data.tar.gz: a2c063827ca23869e1c61bda8dd0d278aad5ab0bf101b2b6df5d79357cdf329f00cb0691694d517be5d362c01467c96a67214ffe42e4da6eec4aa03109c43f44
+  metadata.gz: e808ddfb63187adf28e906b459e2387b38f69f5d47c9f0b9bece57b588c8d47559693f413b9fcbc2df3fb731bd11c329f9602b5591c852e0744907f04bbe04ba
+  data.tar.gz: 132f566a29c1cb27b8bba080e8fa14c90dc15deb08d5df4c4ebb93f8e8933b814afd6b72f562d9dc8ccbb2af1c33096c5794084ad68130de1d8c00a9483baa97

data/README.md

@@ -255,6 +255,18 @@ More info is available here:
 
 http://eonasdan.github.io/bootstrap-datetimepicker/Events/
 
+## Custom percent_field
+
+This custom form input uses no 3rd party jQuery plugins.
+
+It displays a percentage formatted value `100` or `12.500` but posts the "percentage as integer" value of `100000` or `12500` to the server.
+
+It's like the price field, but 3 digits instead of 2.
+
+```haml
+= f.percent_field :percent
+```
+
 ## Custom price_field
 
 This custom form input uses no 3rd party jQuery plugins.

data/app/assets/javascripts/effective_bootstrap.js

@@ -8,6 +8,7 @@
 //= require ./effective_checks/input
 //= require ./effective_editor/input
 //= require ./effective_file/input
+//= require ./effective_percent/input
 //= require ./effective_phone/input
 //= require ./effective_price/input
 //= require ./effective_radio/input

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

@@ -0,0 +1,39 @@
+# Prevent non-currency buttons from being pressed
+$(document).on 'keydown', "input[type='text'].effective_percent", (event) ->
+  allowed = ['0', '1', '2', '3', '4', '5', '6', '7', '8', '9', '-', '.']
+
+  if event.key && event.key.length == 1 && event.metaKey == false && allowed.indexOf(event.key) == -1
+    event.preventDefault()
+
+# Assign the hidden input a value of 100x value
+$(document).on 'change keyup', "input[type='text'].effective_percent", (event) ->
+  $input = $(event.target)
+  value = $input.val()
+
+  unless value == ''
+    value = (parseFloat(value || 0.00) * 1000.00).toFixed(0)
+
+  $input.siblings("input[type='hidden']").first().val(value)
+
+# Format the value for display as percentage
+$(document).on 'change', "input[type='text'].effective_percent", (event) ->
+  $input = $(event.target)
+  value = $input.siblings("input[type='hidden']").first().val()
+  max = 100000 # 100% is our max value
+
+  unless value == ''
+    value = parseInt(value || 0)
+
+    if value > max # 100% is our max value
+      value = max
+      $input.siblings("input[type='hidden']").first().val(max)
+
+    if value < -max # -100% is our min value
+      value = -max
+      $input.siblings("input[type='hidden']").first().val(-max)
+
+    value = (value / 1000.0) if value != 0
+    value = value.toFixed(3).toString()
+    value = value.replace('.000', '') if value.endsWith('.000')
+
+  $input.val(value)

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

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

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

@@ -10,7 +10,7 @@ $(document).on 'change keyup', "input[type='text'].effective_price", (event) ->
   $input = $(event.target)
   value = $input.val().replace(/,/g, '')
 
-  unless $input.data('include-blank') && value == ''
+  unless value == ''
     value = (parseFloat(value || 0.00) * 100.00).toFixed(0)
 
   $input.siblings("input[type='hidden']").first().val(value)
@@ -19,10 +19,19 @@ $(document).on 'change keyup', "input[type='text'].effective_price", (event) ->
 $(document).on 'change', "input[type='text'].effective_price", (event) ->
   $input = $(event.target)
   value = $input.siblings("input[type='hidden']").first().val()
+  max = 2000000000
 
-  unless $input.data('include-blank') && value == ''
+  unless value == ''
     value = parseInt(value || 0)
 
+    if value > max # 20 million is our max value
+      value = max
+      $input.siblings("input[type='hidden']").first().val(max)
+
+    if value < -max # -20 million is our min value
+      value = -max
+      $input.siblings("input[type='hidden']").first().val(-max)
+
   if isNaN(value) == false && value != ''
     value = (value / 100.0) if value != 0
 

data/app/helpers/effective_bootstrap_helper.rb

@@ -13,9 +13,11 @@ module EffectiveBootstrapHelper
   # variations can be :dropup, :dropleft, :dropright
   # split can be true, false
   # right is to right align things
-  def dropdown(variation: nil, split: true, btn: 'btn-outline-primary', right: false, &block)
+  def dropdown(variation: nil, split: true, btn_class: nil, right: false, &block)
     raise 'expected a block' unless block_given?
 
+    btn_class = btn_class.presence || 'btn-outline-primary'
+
     @_dropdown_link_tos = []; yield
 
     return @_dropdown_link_tos.first if @_dropdown_link_tos.length <= 1
@@ -23,7 +25,7 @@ module EffectiveBootstrapHelper
     retval = if split
       first = @_dropdown_link_tos.first
       menu = content_tag(:div, @_dropdown_link_tos[1..-1].join.html_safe, class: ['dropdown-menu', ('dropdown-menu-right' if right)].compact.join(' '))
-      split = content_tag(:button, class: "btn #{btn} dropdown-toggle dropdown-toggle-split", type: 'button', 'data-toggle': 'dropdown', 'aria-haspopup': true, 'aria-expanded': false) do
+      split = content_tag(:button, class: "btn #{btn_class} dropdown-toggle dropdown-toggle-split", type: 'button', 'data-toggle': 'dropdown', 'aria-haspopup': true, 'aria-expanded': false) do
         content_tag(:span, 'Toggle Dropdown', class: 'sr-only')
       end
 
@@ -59,15 +61,17 @@ module EffectiveBootstrapHelper
     concat link_to(label, path, options)
   end
 
-  # # Works with dots do and dropdown do
+  # Works with dots do and dropdown do
   def dropdown_link_to(label, path, options = {})
+    btn_class = options.delete(:btn_class).presence || 'btn-outline-primary'
+
     unless @_dropdown_link_tos
       options[:class] = [options[:class], 'dropdown-item'].compact.join(' ')
       return link_to(label, path, options)
     end
 
     if @_dropdown_link_tos.length == 0
-      options[:class] = [options[:class], 'btn btn-outline-primary'].compact.join(' ') unless options[:class].to_s.include?('btn-')
+      options[:class] = [options[:class], 'btn', btn_class].compact.join(' ')
     else
       options[:class] = [options[:class], 'dropdown-item'].compact.join(' ')
     end

data/app/models/effective/form_builder.rb

@@ -77,6 +77,10 @@ module Effective
       Effective::FormInputs::PasswordField.new(name, options, builder: self).to_html { super(name, options) }
     end
 
+    def percent_field(name, options = {})
+      Effective::FormInputs::PercentField.new(name, options, builder: self).to_html
+    end
+
     def phone_field(name, options = {})
       Effective::FormInputs::PhoneField.new(name, options, builder: self).to_html { super(name, options) }
     end

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

@@ -36,8 +36,8 @@ module Effective
         include_blank = options[:input].delete(:include_blank)
 
         @collection_options = {
-          checked: (checked || selected || passed_value || value),
-          selected: (selected || checked || passed_value || value),
+          checked: (checked || selected || passed_value || polymorphic_value || value),
+          selected: (selected || checked || passed_value || polymorphic_value || value),
           include_blank: include_blank
         }.compact
       end
@@ -80,38 +80,36 @@ module Effective
       def assign_options_collection!
         collection = options[:input].delete(:collection)
 
-        grouped = collection.kind_of?(Hash) && collection.values.all? { |v| v.respond_to?(:to_a) }
+        grouped = collection.kind_of?(Hash) && collection.values.first.respond_to?(:to_a)
 
         if grouped? && !grouped && collection.present?
           raise "Grouped collection expecting a Hash {'Posts' => Post.all, 'Events' => Event.all} or a Hash {'Posts' => [['Post A', 1], ['Post B', 2]], 'Events' => [['Event A', 1], ['Event B', 2]]}"
         end
 
-        if grouped
-          collection.transform_values! { |group| group.to_a }
+        if polymorphic? && !grouped && collection.present?
+          raise "Polymorphic collection expecting a Hash {'Posts' => Post.all, 'Events' => Event.all}"
         end
 
-        if polymorphic?
-          if grouped
-            collection.values.each do |group|
-              group.transform_values! { |obj| [obj.to_s, "#{obj.class.model_name}_#{obj.id}"] }
-            end
+        @options_collection = (
+          if polymorphic?
+            collection.inject({}) { |h, (k, group)| h[k] = group.map { |obj| [obj.to_s, "#{obj.class.model_name}_#{obj.id}"] }; h }
+          elsif grouped
+            collection.inject({}) { |h, (k, group)| h[k] = group.map { |obj| obj }; h }
           else
-            collection.transform_values! { |obj| [obj.to_s, "#{obj.class.model_name}_#{obj.id}"] }
+            collection.map { |obj| obj }
           end
-        end
-
-        @options_collection = collection.to_a
+        )
       end
 
       def assign_options_collection_methods!
         options[:input].reverse_merge!(
-          if grouped? && polymorphic?
+          if polymorphic?
             { group_method: :last, group_label_method: :first, option_key_method: :second, option_value_method: :first }
           elsif grouped?
             { group_method: :last, group_label_method: :first, option_key_method: :second, option_value_method: :first }
-          elsif options_collection[0].kind_of?(Array)
+          elsif options_collection.first.kind_of?(Array)
             { label_method: :first, value_method: :second }
-          elsif options_collection[0].kind_of?(ActiveRecord::Base)
+          elsif options_collection.first.kind_of?(ActiveRecord::Base)
             { label_method: :to_s, value_method: :id }
           else
             { label_method: :to_s, value_method: :to_s }
@@ -128,7 +126,8 @@ module Effective
       end
 
       def polymorphic_value
-        "#{object.class.model_name}_#{object.id}" if object
+        return nil unless polymorphic?
+        "#{value.class.model_name}_#{value.id}" if value
       end
 
       def polymorphic_type_value

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

@@ -10,7 +10,7 @@ module Effective
       end
 
       def input_js_options
-        { format: format, showTodayButton: false, showClear: false, useCurrent: 'hour', disabledDates: disabled_dates.presence }.compact
+        { format: format, showTodayButton: false, showClear: false, useCurrent: 'hour', disabledDates: disabled_dates.presence, minDate: min_date.presence, maxDate: max_date.presence }.compact
       end
 
       def input_group_options

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

@@ -10,7 +10,7 @@ module Effective
       end
 
       def input_js_options
-        { format: format, sideBySide: true, showTodayButton: false, showClear: false, useCurrent: 'hour', disabledDates: disabled_dates.presence }.compact
+        { format: format, sideBySide: true, showTodayButton: false, showClear: false, useCurrent: 'hour', disabledDates: disabled_dates.presence, minDate: min_date.presence, maxDate: max_date.presence }.compact
       end
 
       def input_group_options
@@ -37,22 +37,17 @@ module Effective
 
       def disabled_dates
         return @disabled_dates unless @disabled_dates.nil?
+        @disabled_dates ||= Array(options.delete(:disabledDates)).map { |obj| parse_object_date(obj) }.flatten.compact
+      end
+
+      def max_date
+        return @max_date unless @max_date.nil?
+        @max_date = parse_object_date(options.delete(:maxDate))
+      end
 
-        @disabled_dates ||= (
-          Array(options.delete(:disabledDates)).map do |obj|
-            if obj.respond_to?(:strftime)
-              obj.strftime('%F')
-            elsif obj.kind_of?(Range) && obj.first.respond_to?(:strftime)
-              [obj.first].tap do |dates|
-                dates << (dates.last + 1.day) until (dates.last + 1.day) > obj.last
-              end
-            elsif obj.kind_of?(String)
-              obj
-            else
-              raise 'unexpected disabledDates data. Expected a DateTime, Range of DateTimes or String'
-            end
-          end.flatten.compact
-        )
+      def min_date
+        return @min_date unless @min_date.nil?
+        @min_date = parse_object_date(options.delete(:minDate))
       end
 
       def not_date_linked?
@@ -65,6 +60,24 @@ module Effective
         @am_pm = options.key?(:am_pm) ? options.delete(:am_pm) : true
       end
 
+      private
+
+      def parse_object_date(obj)
+        if obj.respond_to?(:strftime)
+          obj.strftime('%F')
+        elsif obj.kind_of?(Range) && obj.first.respond_to?(:strftime)
+          [obj.first].tap do |dates|
+            dates << (dates.last + 1.day) until (dates.last + 1.day) > obj.last
+          end
+        elsif obj.kind_of?(String)
+          obj
+        elsif obj.nil?
+          obj
+        else
+          raise "unexpected date object #{obj}. Expected a DateTime, Range of DateTimes or String"
+        end
+      end
+
     end
   end
 end

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

@@ -0,0 +1,33 @@
+module Effective
+  module FormInputs
+    class PercentField < Effective::FormInput
+
+      def build_input(&block)
+        @builder.hidden_field(name, value: percent_to_integer, id: tag_id + '_value_as_integer') +
+        @template.text_field_tag(name, percent_to_s, options[:input].merge(id: tag_id, name: nil))
+      end
+
+      def input_group_options
+        { input_group: { class: 'input-group' }, prepend: content_tag(:span, icon('percent'), class: 'input-group-text') }
+      end
+
+      def input_html_options
+        { class: 'form-control effective_percent', autocomplete: 'off' }
+      end
+
+      private
+
+      def percent_to_integer
+        return nil unless value
+        value.kind_of?(Integer) ? value : ('%.3f' % (value / 1000.0))
+      end
+
+      def percent_to_s
+        return nil unless value
+        str = value.kind_of?(Integer) ? ('%.3f' % (value / 1000.0)) : value.to_s
+        str.gsub('.000', '')
+      end
+
+    end
+  end
+end

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

@@ -12,26 +12,21 @@ module Effective
       end
 
       def input_html_options
-        { class: 'form-control effective_price', maxlength: 14, autocomplete: 'off', 'data-include-blank': include_blank? }
+        { class: 'form-control effective_price', autocomplete: 'off' }
       end
 
       private
 
       def price
-        return (include_blank? ? 0 : nil) unless value
+        return nil unless value
         value.kind_of?(Integer) ? value : ('%.2f' % (value / 100.0))
       end
 
       def currency
-        return (include_blank? ? 0.00 : nil) unless value
+        return nil unless value
         value.kind_of?(Integer) ? ('%.2f' % (value / 100.0)) : value
       end
 
-      def include_blank? # default false
-        return @include_blank unless @include_blank.nil?
-        @include_blank = (options.delete(:include_blank) || false)
-      end
-
     end
   end
 end

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

@@ -5,9 +5,10 @@
 module Effective
   module FormInputs
     class Select < CollectionInput
+      INCLUDE_NULL = 'Blank (null)'
 
       def build_input(&block)
-        html = if grouped? && polymorphic?
+        html = if polymorphic?
           @builder.grouped_collection_select(polymorphic_id_method, options_collection, group_method, group_label_method, option_key_method, option_value_method, collection_options, html_options)
         elsif grouped?
           @builder.grouped_collection_select(name, options_collection, group_method, group_label_method, option_key_method, option_value_method, collection_options, html_options)
@@ -32,7 +33,7 @@ module Effective
           theme: 'bootstrap',
           minimumResultsForSearch: 6,
           width: 'style',
-          placeholder: (input_html_options.delete(:placeholder) || 'Please choose'),
+          placeholder: (options.delete(:placeholder) || 'Please choose'),
           allowClear: (true if include_blank?),
           tokenSeparators: ([',', ';', '\n', '\t'] if tags?),
           tags: (true if tags?),
@@ -47,16 +48,50 @@ module Effective
           'effective_select',
           'form-control',
           ('polymorphic' if polymorphic?),
-          ('grouped' if grouped?),
+          ('grouped' if (grouped? || polymorphic?)),
           ('hide-disabled' if hide_disabled?),
           ('tags-input' if tags?),
         ].compact.join(' ')
 
-        { class: classes, multiple: (true if multiple?), include_blank: (true if include_blank?) }.compact
+        { class: classes, multiple: (true if multiple?), include_blank: (true if include_blank?), include_null: include_null }.compact
+      end
+
+      def assign_options_collection!
+        super
+
+        return unless include_null
+
+        # Check for singles - transform the array
+        if options_collection.kind_of?(Array) && !options_collection.first.respond_to?(:to_a) # [:admin, :member]
+          @options_collection = options_collection.map { |obj| [obj, obj] }
+        end
+
+        if options_collection.kind_of?(Array) && options_collection.first.respond_to?(:to_a)
+          options_collection.push(['---------------', '-', disabled: 'disabled'])
+          options_collection.push([include_null, 'nil'])
+        end
+
+        if options_collection.kind_of?(Hash)
+          options_collection[include_null] = [[include_null, 'nil']]
+        end
+
+        options_collection
       end
 
       private
 
+      def include_null
+        return @include_null unless @include_null.nil?
+
+        obj = options.delete(:include_null)
+
+        @include_null = case obj
+        when nil then false
+        when true then INCLUDE_NULL
+        else obj
+        end
+      end
+
       def include_blank?
         return @include_blank unless @include_blank.nil?
         @include_blank = (options.key?(:include_blank) ? options.delete(:include_blank) : true) && !multiple?

data/lib/effective_bootstrap/version.rb

@@ -1,3 +1,3 @@
 module EffectiveBootstrap
-  VERSION = '0.2.3'.freeze
+  VERSION = '0.2.4'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_bootstrap
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.2.4
 platform: ruby
 authors:
 - Code and Effect
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-10-22 00:00:00.000000000 Z
+date: 2018-10-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -387,6 +387,8 @@ files:
 - app/assets/javascripts/effective_editor/quill.js
 - app/assets/javascripts/effective_file/initialize.js.coffee
 - app/assets/javascripts/effective_file/input.js
+- app/assets/javascripts/effective_percent/initialize.js.coffee
+- app/assets/javascripts/effective_percent/input.js
 - app/assets/javascripts/effective_phone/initialize.js.coffee
 - app/assets/javascripts/effective_phone/input.js
 - app/assets/javascripts/effective_phone/jquery.maskedInput.js
@@ -440,6 +442,7 @@ files:
 - app/models/effective/form_inputs/form_group.rb
 - app/models/effective/form_inputs/number_field.rb
 - app/models/effective/form_inputs/password_field.rb
+- app/models/effective/form_inputs/percent_field.rb
 - app/models/effective/form_inputs/phone_field.rb
 - app/models/effective/form_inputs/price_field.rb
 - app/models/effective/form_inputs/radios.rb