effective_form_inputs 1.2.6 → 1.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: f1bc6bc4e4dd8b9f47f184c3084520c675b98048
-  data.tar.gz: 4622b3fc38c58ebea44de3a4aeb01f92fbe36838
+SHA256:
+  metadata.gz: 88550b46987c90edb9bb01a20d3ff521935692a6dd80d7ebeaeb6d0c24f45722
+  data.tar.gz: fad585a100bdc29d3a7be5b8030fe715ea922081f1e59fc47f53788c65cbe648
 SHA512:
-  metadata.gz: 5eee846f4cc189d5ff1ea06bd3b991fea50bb75312b4cab43fb4a8696664957656c37fa3de06d6c9aac0a7e70b7da9f7cc84206b5661b309d91f9055cff13431
-  data.tar.gz: f914da9f59d83f0ee60f2fc56a4a295b26bbf18698c8c86b91a597824d7b4689120fa1370f0e34d45a6bee4576aceb7c5219e10702e1d8f66a238963b2df5154
+  metadata.gz: 226e750f1e9b3af3dbd3e32b370e07a2d73812fa2a15b464ce8a87031f253a9f00d5e7b5356ad44e4469ac9b433be01693b2e928587d215232383764b7a938f3
+  data.tar.gz: 541baa0cb0c066f3f1d55ef17601f05b0981849891341871a812c2c4810bfc90ab8b2ffa023b841d6d843fd4b87e6dc8bf1c62420f3dbc4e0b225c617296ba37

data/app/assets/config/effective_form_inputs_manifest.js

@@ -0,0 +1,2 @@
+//= link_directory ../javascripts .js
+//= link_directory ../stylesheets .css

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

@@ -63,12 +63,15 @@ initCkeditor = (textarea) ->
     filebrowserBrowseUrl: '/effective/assets'
     filebrowserImageBrowseUrl: '/effective/assets?only=images'
     toolbar_full: [
-      { name: 'definedstyles', items: ['Format'] },
       { name: 'html', items: ['ShowBlocks'] },
       { name: 'justify', items: ['JustifyLeft', 'JustifyCenter', 'JustifyRight']}
-      { name: 'basicstyles', items: ['Bold', 'Italic', 'Underline'] },
+      { name: 'basicstyles', items: ['Bold', 'Italic', 'Underline', 'Strike', 'Subscript', 'Superscript'] },
       { name: 'insert', items: ['Link', 'Table', '-', 'Image', 'oembed', 'EffectiveAssets'] },
       { name: 'lists', items: ['NumberedList', 'BulletedList', '-', 'Outdent', 'Indent'] },
+      '/'
+      { name: 'definedstyles', items: ['Format'] },
+      { name: 'styles', items: ['Styles', 'RemoveFormat'] },
+      { name: 'colors', items: ['TextColor', 'BGColor'] }
     ],
     toolbar_simple: [
       { name: 'definedstyles', items: ['Format'] },

data/app/helpers/effective_bootstrap3_helper.rb

@@ -104,18 +104,25 @@ module EffectiveBootstrap3Helper
   end
 
   def glyphicon_tag(icon, options = {})
-    if icon.to_s.start_with?('glyphicon-')
-      content_tag(:span, '', {class: "glyphicon #{icon}"}.merge(options))
-    else
-      content_tag(:span, '', {class: "glyphicon glyphicon-#{icon}"}.merge(options))
+    icon = icon.to_s.sub('glyphicon-', '')
+
+    icon = case icon
+    when 'destroy' then 'trash'
+    when 'show' then 'eye-open'
+    when 'settings' then 'cog'
+    when 'approve' then 'ok'
+    when 'decline' then 'remove'
+    else icon
     end
+
+    content_tag(:span, '', {class: "glyphicon glyphicon-#{icon}"}.merge(options))
   end
 
+
   def glyphicon_to(icon, path, options = {})
-    content_tag(:a, options.merge(href: path)) do
-      glyphicon_tag(icon)
-    end
+    content_tag(:a, glyphicon_tag(icon), options.merge(href: path))
   end
+
   alias_method :bootstrap_icon_to, :glyphicon_to
   alias_method :glyph_icon_to, :glyphicon_to
 

data/app/models/effective/{form_input.rb → form_builder_input.rb}

@@ -1,5 +1,5 @@
 module Effective
-  class FormInput
+  class FormBuilderInput
 
     def initialize(object, object_name, template, method, opts, html_opts = {})
       @object = object

data/app/models/{inputs/effective_date_picker/input.rb → effective/form_builder_inputs/effective_date_picker.rb}

@@ -1,6 +1,6 @@
-module Inputs
-  module EffectiveDatePicker
-    class Input < Effective::FormInput
+module Effective
+  module FormBuilderInputs
+    class EffectiveDatePicker < Effective::FormBuilderInput
       delegate :content_tag, :text_field_tag, :to => :@template
 
       def default_input_js
@@ -65,4 +65,3 @@ module Inputs
     end
   end
 end
-

data/app/models/{inputs/effective_date_time_picker/input.rb → effective/form_builder_inputs/effective_date_time_picker.rb}

@@ -1,6 +1,6 @@
-module Inputs
-  module EffectiveDateTimePicker
-    class Input < Effective::FormInput
+module Effective
+  module FormBuilderInputs
+    class EffectiveDateTimePicker < Effective::FormBuilderInput
       delegate :content_tag, :text_field_tag, :to => :@template
 
       def default_input_js
@@ -59,4 +59,3 @@ module Inputs
     end
   end
 end
-

data/app/models/{inputs/effective_email/input.rb → effective/form_builder_inputs/effective_email.rb}

@@ -1,6 +1,6 @@
-module Inputs
-  module EffectiveEmail
-    class Input < Effective::FormInput
+module Effective
+  module FormBuilderInputs
+    class EffectiveEmail < Effective::FormBuilderInput
       delegate :content_tag, :email_field_tag, :to => :@template
 
       def default_input_html
@@ -25,4 +25,3 @@ module Inputs
     end
   end
 end
-

data/app/models/{inputs/effective_panel_select/input.rb → effective/form_builder_inputs/effective_panel_select.rb}

@@ -4,9 +4,9 @@
 # Only supports one category, and one kind of objects
 # No polymorphic stuff
 
-module Inputs
-  module EffectivePanelSelect
-    class Input < Effective::FormInput
+module Effective
+  module FormBuilderInputs
+    class EffectivePanelSelect < Effective::FormBuilderInput
       delegate :grouped_collection_select, :hidden_field_tag, :text_field_tag, :render, to: :@template
 
       def default_options

data/app/models/{inputs/effective_price/input.rb → effective/form_builder_inputs/effective_price.rb}

@@ -1,6 +1,6 @@
-module Inputs
-  module EffectivePrice
-    class Input < Effective::FormInput
+module Effective
+  module FormBuilderInputs
+    class EffectivePrice < Effective::FormBuilderInput
       delegate :content_tag, :number_to_currency, :text_field_tag, :hidden_field_tag, :to => :@template
 
       def default_options
@@ -53,4 +53,3 @@ module Inputs
     end
   end
 end
-

data/app/models/{inputs/effective_radio_buttons/input.rb → effective/form_builder_inputs/effective_radio_buttons.rb}

@@ -1,6 +1,6 @@
-module Inputs
-  module EffectiveRadioButtons
-    class Input < Effective::FormInput
+module Effective
+  module FormBuilderInputs
+    class EffectiveRadioButtons < Effective::FormBuilderInput
       delegate :collection_radio_buttons, :content_tag, :label_tag, :radio_button_tag, :image_tag, :to => :@template
 
       BOOLEAN_COLLECTION = [['Yes', true], ['No', false]]
@@ -113,4 +113,3 @@ module Inputs
     end
   end
 end
-

data/app/models/{inputs/effective_select/input.rb → effective/form_builder_inputs/effective_select.rb}

@@ -1,6 +1,6 @@
-module Inputs
-  module EffectiveSelect
-    class Input < Effective::FormInput
+module Effective
+  module FormBuilderInputs
+    class EffectiveSelect < Effective::FormBuilderInput
       delegate :collection_select, :grouped_collection_select, :hidden_field, :to => :@template
 
       def default_options

data/app/models/{inputs/effective_static_control/input.rb → effective/form_builder_inputs/effective_static_control.rb}

@@ -1,6 +1,6 @@
-module Inputs
-  module EffectiveStaticControl
-    class Input < Effective::FormInput
+module Effective
+  module FormBuilderInputs
+    class EffectiveStaticControl < Effective::FormBuilderInput
       delegate :content_tag, :to => :@template
 
       def default_input_html
@@ -25,4 +25,3 @@ module Inputs
     end
   end
 end
-

data/app/models/{inputs/effective_tel/input.rb → effective/form_builder_inputs/effective_tel.rb}

@@ -1,6 +1,6 @@
-module Inputs
-  module EffectiveTel
-    class Input < Effective::FormInput
+module Effective
+  module FormBuilderInputs
+    class EffectiveTel < Effective::FormBuilderInput
       delegate :content_tag, :telephone_field_tag, :to => :@template
 
       DEFAULT_TEL_MASK = '(999) 999-9999? x99999'
@@ -62,4 +62,3 @@ module Inputs
     end
   end
 end
-

data/app/models/{inputs/effective_time_picker/input.rb → effective/form_builder_inputs/effective_time_picker.rb}

@@ -1,6 +1,6 @@
-module Inputs
-  module EffectiveTimePicker
-    class Input < Effective::FormInput
+module Effective
+  module FormBuilderInputs
+    class EffectiveTimePicker < Effective::FormBuilderInput
       delegate :content_tag, :text_field_tag, :to => :@template
 
       def default_input_js
@@ -44,4 +44,3 @@ module Inputs
     end
   end
 end
-

data/app/models/{inputs/effective_url/input.rb → effective/form_builder_inputs/effective_url.rb}

@@ -1,6 +1,6 @@
-module Inputs
-  module EffectiveUrl
-    class Input < Effective::FormInput
+module Effective
+  module FormBuilderInputs
+    class EffectiveUrl < Effective::FormBuilderInput
       FA_FIELD_NAMES = ['facebook', 'google', 'linkedin', 'twitter', 'vimeo', 'youtube']
 
       delegate :content_tag, :url_field_tag, :to => :@template
@@ -84,4 +84,3 @@ module Inputs
     end
   end
 end
-

data/lib/effective_form_inputs.rb

@@ -1,5 +1,6 @@
 require 'effective_form_inputs/engine'
 require 'effective_form_inputs/version'
+require 'effective_form_inputs/form_builder_inputs'
 
 module EffectiveFormInputs
 end

data/lib/effective_form_inputs/engine.rb

@@ -2,22 +2,24 @@ module EffectiveFormInputs
   class Engine < ::Rails::Engine
     engine_name 'effective_form_inputs'
 
-    config.autoload_paths += Dir["#{config.root}/app/models/**/"]
+    config.autoload_paths += Dir[
+      "#{config.root}/lib/validators/",
+      "#{config.root}/lib/effective_form_inputs/inputs",
+
+    ]
+
+    config.eager_load_paths += Dir[
+      "#{config.root}/lib/validators/",
+      "#{config.root}/lib/effective_form_inputs/inputs",
+    ]
 
     initializer 'effective_form_inputs.action_view' do |app|
       Rails.application.config.to_prepare do
         ActiveSupport.on_load :action_view do
-          ActionView::Helpers::FormBuilder.send(:include, Effective::FormBuilderInputs)
+          ActionView::Helpers::FormBuilder.send(:include, ::Effective::FormBuilderInputs)
         end
       end
     end
 
-    initializer 'effective_form_inputs.check_for_effective_bootstrap' do |app|
-      Rails.application.config.to_prepare do
-        if defined?(EffectiveBootstrap)
-          raise 'effective_form_inputs and effective_bootstrap cannot be run alongside eachother. Sorry.'
-        end
-      end
-    end
   end
 end

data/lib/effective_form_inputs/form_builder_inputs.rb

@@ -0,0 +1,50 @@
+module Effective
+  module FormBuilderInputs
+    def effective_ckeditor_text_area(method, options_tag = nil, options = {}, html_options = {})
+      EffectiveCkeditorTextArea.new(@object, @object_name, @template, method, options, html_options).to_html
+    end
+
+    def effective_date_time_picker(method, options = {})
+      EffectiveDateTimePicker.new(@object, @object_name, @template, method, options, options).to_html
+    end
+
+    def effective_date_picker(method, options = {})
+      EffectiveDatePicker.new(@object, @object_name, @template, method, options, options).to_html
+    end
+
+    def effective_panel_select(method, options_tag = nil, options = {}, html_options = {})
+      options[:collection] = options_tag
+      EffectivePanelSelect.new(@object, @object_name, @template, method, options, html_options).to_html
+    end
+
+    def effective_price(method, options = {})
+      EffectivePrice.new(@object, @object_name, @template, method, options, options).to_html
+    end
+
+    def effective_radio_buttons(method, options = {})
+      EffectiveRadioButtons.new(@object, @object_name, @template, method, options, options).to_html
+    end
+
+    def effective_static_control(method, options = {})
+      EffectiveStaticControl.new(@object, @object_name, @template, method, options, options).to_html
+    end
+
+    def effective_select(method, options_tag = nil, options = {}, html_options = {})
+      options[:collection] = options_tag
+      EffectiveSelect.new(@object, @object_name, @template, method, options, html_options).to_html
+    end
+
+    def effective_tel(method, options_tag = nil, options = {}, html_options = {})
+      EffectiveTel.new(@object, @object_name, @template, method, options, html_options).to_html
+    end
+
+    def effective_time_picker(method, options = {})
+      EffectiveTimePicker.new(@object, @object_name, @template, method, options, options).to_html
+    end
+
+    def effective_url(method, options_tag = nil, options = {}, html_options = {})
+      EffectiveUrl.new(@object, @object_name, @template, method, options, html_options).to_html
+    end
+
+  end
+end

data/{app/models → lib/effective_form_inputs}/inputs/effective_ckeditor_text_area_input.rb

@@ -5,7 +5,7 @@ if defined?(SimpleForm)
 
   class EffectiveCkeditorTextAreaInput < SimpleForm::Inputs::StringInput
     def input(wrapper_options = nil)
-      Inputs::EffectiveCkeditorTextArea::Input.new(object, object_name, template, attribute_name, input_options, (merge_wrapper_options(input_html_options, wrapper_options) || {})).to_html
+      Effective::FormBuilderInputs::EffectiveCkeditorTextArea.new(object, object_name, template, attribute_name, input_options, (merge_wrapper_options(input_html_options, wrapper_options) || {})).to_html
     end
   end
 

data/{app/models → lib/effective_form_inputs}/inputs/effective_date_picker_input.rb

@@ -5,7 +5,7 @@ if defined?(SimpleForm)
 
   class EffectiveDatePickerInput < SimpleForm::Inputs::StringInput
     def input(wrapper_options = nil)
-      Inputs::EffectiveDatePicker::Input.new(object, object_name, template, attribute_name, input_options, (merge_wrapper_options(input_html_options, wrapper_options) || {})).to_html
+      Effective::FormBuilderInputs::EffectiveDatePicker.new(object, object_name, template, attribute_name, input_options, (merge_wrapper_options(input_html_options, wrapper_options) || {})).to_html
     end
   end
 

data/{app/models → lib/effective_form_inputs}/inputs/effective_date_time_picker_input.rb

@@ -5,7 +5,7 @@ if defined?(SimpleForm)
 
   class EffectiveDateTimePickerInput < SimpleForm::Inputs::StringInput
     def input(wrapper_options = nil)
-      Inputs::EffectiveDateTimePicker::Input.new(object, object_name, template, attribute_name, input_options, (merge_wrapper_options(input_html_options, wrapper_options) || {})).to_html
+      Effective::FormBuilderInputs::EffectiveDateTimePicker.new(object, object_name, template, attribute_name, input_options, (merge_wrapper_options(input_html_options, wrapper_options) || {})).to_html
     end
   end
 

data/{app/models → lib/effective_form_inputs}/inputs/effective_email_input.rb

@@ -5,7 +5,7 @@ if defined?(SimpleForm)
 
   class EffectiveEmailInput < SimpleForm::Inputs::StringInput
     def input(wrapper_options = nil)
-      Inputs::EffectiveEmail::Input.new(object, object_name, template, attribute_name, input_options, (merge_wrapper_options(input_html_options, wrapper_options) || {})).to_html
+      Effective::FormBuilderInputs::EffectiveEmail.new(object, object_name, template, attribute_name, input_options, (merge_wrapper_options(input_html_options, wrapper_options) || {})).to_html
     end
   end
 

data/{app/models → lib/effective_form_inputs}/inputs/effective_panel_select_input.rb

@@ -11,7 +11,7 @@ if defined?(SimpleForm)
       options[:label_method] = label_method unless options[:polymorphic]
       options[:value_method] = value_method unless options[:polymorphic]
 
-      Inputs::EffectivePanelSelect::Input.new(object, object_name, template, attribute_name, input_options, (merge_wrapper_options(input_html_options, wrapper_options) || {})).to_html
+      Effective::FormBuilderInputs::EffectivePanelSelect.new(object, object_name, template, attribute_name, input_options, (merge_wrapper_options(input_html_options, wrapper_options) || {})).to_html
     end
   end
 

data/{app/models → lib/effective_form_inputs}/inputs/effective_price_input.rb

@@ -5,7 +5,7 @@ if defined?(SimpleForm)
 
   class EffectivePriceInput < SimpleForm::Inputs::StringInput
     def input(wrapper_options = nil)
-      Inputs::EffectivePrice::Input.new(object, object_name, template, attribute_name, input_options, (merge_wrapper_options(input_html_options, wrapper_options) || {})).to_html
+      Effective::FormBuilderInputs::EffectivePrice.new(object, object_name, template, attribute_name, input_options, (merge_wrapper_options(input_html_options, wrapper_options) || {})).to_html
     end
   end
 

data/{app/models → lib/effective_form_inputs}/inputs/effective_radio_buttons_input.rb

@@ -31,7 +31,7 @@ if defined?(SimpleForm)
 
       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
+      Effective::FormBuilderInputs::EffectiveRadioButtons.new(object, object_name, template, attribute_name, input_options, (merge_wrapper_options(input_html_options, wrapper_options) || {})).to_html
     end
 
   end

data/lib/effective_form_inputs/inputs/effective_select_input.rb

@@ -0,0 +1,38 @@
+# = simple_form_for @thing do |f|
+#   = f.input :category, :as => :effective_select
+
+if defined?(SimpleForm)
+
+  class EffectiveSelectInput < SimpleForm::Inputs::CollectionSelectInput
+    def input(wrapper_options = nil)
+      label_method, value_method = (detect_collection_methods rescue [:to_s, :to_s])
+
+      options[:collection] = collection
+      options[:label_method] = label_method unless options[:polymorphic]
+      options[:value_method] = value_method unless options[:polymorphic]
+
+      Effective::FormBuilderInputs::EffectiveSelect.new(object, object_name, template, attribute_name, input_options, (merge_wrapper_options(input_html_options, wrapper_options) || {})).to_html
+    end
+
+    # Apply ActsAsArchived behavior.
+    def collection
+      @collection ||= begin
+        collection = translate(options.delete(:collection)) || self.class.boolean_collection
+        collection.respond_to?(:call) ? collection.call : collection.to_a
+      end
+    end
+
+    def translate(collection)
+      return collection unless object.respond_to?(:new_record?)
+      return collection unless collection.respond_to?(:klass) && collection.klass.respond_to?(:acts_as_archived?)
+
+      if object.new_record?
+        collection.unarchived
+      else
+        collection.unarchived.or(collection.archived.where(collection.klass.primary_key => object.send(attribute_name)))
+      end
+    end
+
+  end
+
+end

data/{app/models → lib/effective_form_inputs}/inputs/effective_static_control_input.rb

@@ -5,7 +5,7 @@ if defined?(SimpleForm)
 
   class EffectiveStaticControlInput < SimpleForm::Inputs::StringInput
     def input(wrapper_options = nil)
-      Inputs::EffectiveStaticControl::Input.new(object, object_name, template, attribute_name, input_options, (merge_wrapper_options(input_html_options, wrapper_options) || {})).to_html
+      Effective::FormBuilderInputs::EffectiveStaticControl.new(object, object_name, template, attribute_name, input_options, (merge_wrapper_options(input_html_options, wrapper_options) || {})).to_html
     end
   end
 

data/{app/models → lib/effective_form_inputs}/inputs/effective_tel_input.rb

@@ -5,7 +5,7 @@ if defined?(SimpleForm)
 
   class EffectiveTelInput < SimpleForm::Inputs::StringInput
     def input(wrapper_options = nil)
-      Inputs::EffectiveTel::Input.new(object, object_name, template, attribute_name, input_options, (merge_wrapper_options(input_html_options, wrapper_options) || {})).to_html
+      Effective::FormBuilderInputs::EffectiveTel.new(object, object_name, template, attribute_name, input_options, (merge_wrapper_options(input_html_options, wrapper_options) || {})).to_html
     end
   end
 

data/{app/models → lib/effective_form_inputs}/inputs/effective_time_picker_input.rb

@@ -5,7 +5,7 @@ if defined?(SimpleForm)
 
   class EffectiveTimePickerInput < SimpleForm::Inputs::StringInput
     def input(wrapper_options = nil)
-      Inputs::EffectiveTimePicker::Input.new(object, object_name, template, attribute_name, input_options, (merge_wrapper_options(input_html_options, wrapper_options) || {})).to_html
+      Effective::FormBuilderInputs::EffectiveTimePicker.new(object, object_name, template, attribute_name, input_options, (merge_wrapper_options(input_html_options, wrapper_options) || {})).to_html
     end
   end
 

data/{app/models → lib/effective_form_inputs}/inputs/effective_url_input.rb

@@ -7,7 +7,7 @@ if defined?(SimpleForm)
 
   class EffectiveUrlInput < SimpleForm::Inputs::StringInput
     def input(wrapper_options = nil)
-      Inputs::EffectiveUrl::Input.new(object, object_name, template, attribute_name, input_options, (merge_wrapper_options(input_html_options, wrapper_options) || {})).to_html
+      Effective::FormBuilderInputs::EffectiveUrl.new(object, object_name, template, attribute_name, input_options, (merge_wrapper_options(input_html_options, wrapper_options) || {})).to_html
     end
   end
 

data/lib/effective_form_inputs/version.rb

@@ -1,3 +1,3 @@
 module EffectiveFormInputs
-  VERSION = '1.2.6'.freeze
+  VERSION = '1.4.0'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_form_inputs
 version: !ruby/object:Gem::Version
-  version: 1.2.6
+  version: 1.4.0
 platform: ruby
 authors:
 - Code and Effect
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2018-09-08 00:00:00.000000000 Z
+date: 2021-06-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -38,6 +38,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 3.1.0
+- !ruby/object:Gem::Dependency
+  name: sassc
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Collection of Form Inputs
 email:
 - info@codeandeffect.com
@@ -47,6 +61,7 @@ extra_rdoc_files: []
 files:
 - MIT-LICENSE
 - README.md
+- app/assets/config/effective_form_inputs_manifest.js
 - app/assets/javascripts/effective_ckeditor_text_area/initialize.js.coffee
 - app/assets/javascripts/effective_ckeditor_text_area/input.js
 - app/assets/javascripts/effective_date_picker/initialize.js.coffee
@@ -82,52 +97,51 @@ files:
 - app/assets/stylesheets/effective_form_inputs.scss
 - app/assets/stylesheets/effective_panel_select/input.scss
 - app/assets/stylesheets/effective_radio_buttons/input.scss
-- app/assets/stylesheets/effective_select/bootstrap-theme.css
+- app/assets/stylesheets/effective_select/bootstrap-theme.scss
 - 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/select2.scss
 - app/assets/stylesheets/effective_time_picker/input.scss
 - app/helpers/effective_bootstrap3_helper.rb
 - app/helpers/effective_form_inputs_helper.rb
-- app/models/effective/form_builder_inputs.rb
-- app/models/effective/form_input.rb
-- app/models/inputs/effective_ckeditor_text_area/input.rb
-- app/models/inputs/effective_ckeditor_text_area_input.rb
-- app/models/inputs/effective_date_picker/input.rb
-- app/models/inputs/effective_date_picker_input.rb
-- app/models/inputs/effective_date_time_picker/input.rb
-- app/models/inputs/effective_date_time_picker_input.rb
-- app/models/inputs/effective_email/input.rb
-- app/models/inputs/effective_email_input.rb
-- app/models/inputs/effective_panel_select/input.rb
-- app/models/inputs/effective_panel_select_input.rb
-- app/models/inputs/effective_price/input.rb
-- app/models/inputs/effective_price_input.rb
-- app/models/inputs/effective_radio_buttons/input.rb
-- app/models/inputs/effective_radio_buttons_input.rb
-- app/models/inputs/effective_select/input.rb
-- app/models/inputs/effective_select_input.rb
-- app/models/inputs/effective_static_control/input.rb
-- app/models/inputs/effective_static_control_input.rb
-- app/models/inputs/effective_tel/input.rb
-- app/models/inputs/effective_tel_input.rb
-- app/models/inputs/effective_time_picker/input.rb
-- app/models/inputs/effective_time_picker_input.rb
-- app/models/inputs/effective_url/input.rb
-- app/models/inputs/effective_url_input.rb
-- app/validators/effective_email_validator.rb
-- app/validators/effective_tel_validator.rb
-- app/validators/effective_url_validator.rb
+- app/models/effective/form_builder_input.rb
+- app/models/effective/form_builder_inputs/effective_date_picker.rb
+- app/models/effective/form_builder_inputs/effective_date_time_picker.rb
+- app/models/effective/form_builder_inputs/effective_email.rb
+- app/models/effective/form_builder_inputs/effective_panel_select.rb
+- app/models/effective/form_builder_inputs/effective_price.rb
+- app/models/effective/form_builder_inputs/effective_radio_buttons.rb
+- app/models/effective/form_builder_inputs/effective_select.rb
+- app/models/effective/form_builder_inputs/effective_static_control.rb
+- app/models/effective/form_builder_inputs/effective_tel.rb
+- app/models/effective/form_builder_inputs/effective_time_picker.rb
+- app/models/effective/form_builder_inputs/effective_url.rb
 - app/views/effective/effective_panel_select/_input.html.haml
 - app/views/effective/style_guide/_effective_form_inputs.html.haml
 - lib/effective_form_inputs.rb
 - lib/effective_form_inputs/engine.rb
+- lib/effective_form_inputs/form_builder_inputs.rb
+- lib/effective_form_inputs/inputs/effective_ckeditor_text_area_input.rb
+- lib/effective_form_inputs/inputs/effective_date_picker_input.rb
+- lib/effective_form_inputs/inputs/effective_date_time_picker_input.rb
+- lib/effective_form_inputs/inputs/effective_email_input.rb
+- lib/effective_form_inputs/inputs/effective_panel_select_input.rb
+- lib/effective_form_inputs/inputs/effective_price_input.rb
+- lib/effective_form_inputs/inputs/effective_radio_buttons_input.rb
+- lib/effective_form_inputs/inputs/effective_select_input.rb
+- lib/effective_form_inputs/inputs/effective_static_control_input.rb
+- lib/effective_form_inputs/inputs/effective_tel_input.rb
+- lib/effective_form_inputs/inputs/effective_time_picker_input.rb
+- lib/effective_form_inputs/inputs/effective_url_input.rb
 - lib/effective_form_inputs/version.rb
+- lib/validators/effective_email_validator.rb
+- lib/validators/effective_tel_validator.rb
+- lib/validators/effective_url_validator.rb
 homepage: https://github.com/code-and-effect/effective_form_inputs
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -142,9 +156,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.4.5.1
-signing_key: 
+rubygems_version: 3.1.2
+signing_key:
 specification_version: 4
 summary: Collection of Form Inputs
 test_files: []

data/app/models/effective/form_builder_inputs.rb

@@ -1,50 +0,0 @@
-module Effective
-  module FormBuilderInputs
-    def effective_ckeditor_text_area(method, options_tag = nil, options = {}, html_options = {})
-      Inputs::EffectiveCkeditorTextArea::Input.new(@object, @object_name, @template, method, options, html_options).to_html
-    end
-
-    def effective_date_time_picker(method, options = {})
-      Inputs::EffectiveDateTimePicker::Input.new(@object, @object_name, @template, method, options, options).to_html
-    end
-
-    def effective_date_picker(method, options = {})
-      Inputs::EffectiveDatePicker::Input.new(@object, @object_name, @template, method, options, options).to_html
-    end
-
-    def effective_panel_select(method, options_tag = nil, options = {}, html_options = {})
-      options[:collection] = options_tag
-      Inputs::EffectivePanelSelect::Input.new(@object, @object_name, @template, method, options, html_options).to_html
-    end
-
-    def effective_price(method, options = {})
-      Inputs::EffectivePrice::Input.new(@object, @object_name, @template, method, options, options).to_html
-    end
-
-    def effective_radio_buttons(method, options = {})
-      Inputs::EffectiveRadioButtons::Input.new(@object, @object_name, @template, method, options, options).to_html
-    end
-
-    def effective_static_control(method, options = {})
-      Inputs::EffectiveStaticControl::Input.new(@object, @object_name, @template, method, options, options).to_html
-    end
-
-    def effective_select(method, options_tag = nil, options = {}, html_options = {})
-      options[:collection] = options_tag
-      Inputs::EffectiveSelect::Input.new(@object, @object_name, @template, method, options, html_options).to_html
-    end
-
-    def effective_tel(method, options_tag = nil, options = {}, html_options = {})
-      Inputs::EffectiveTel::Input.new(@object, @object_name, @template, method, options, html_options).to_html
-    end
-
-    def effective_time_picker(method, options = {})
-      Inputs::EffectiveTimePicker::Input.new(@object, @object_name, @template, method, options, options).to_html
-    end
-
-    def effective_url(method, options_tag = nil, options = {}, html_options = {})
-      Inputs::EffectiveUrl::Input.new(@object, @object_name, @template, method, options, html_options).to_html
-    end
-
-  end
-end

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

@@ -1,37 +0,0 @@
-module Inputs
-  module EffectiveCkeditorTextArea
-    class Input < Effective::FormInput
-      delegate :content_tag, :text_area_tag, :asset_path, :to => :@template
-
-      def default_input_js
-        {
-          effective_assets: defined?(EffectiveAssets).present?,
-          effective_ckeditor_js_path: asset_path('effective_ckeditor.js'),
-          effective_ckeditor_css_path: asset_path('effective_ckeditor.css'),
-          contentsCss: (
-            case options[:contentsCss]
-            when :bootstrap
-              'https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/css/bootstrap.min.css'
-            when false
-              nil
-            else
-              options[:contentsCss] || asset_path('application.css')
-            end
-          ),
-          toolbar: options[:toolbar],
-          height: options[:height],
-          width: options[:width]
-        }.compact
-      end
-
-      def default_input_html
-        {class: 'effective_ckeditor_text_area text'}
-      end
-
-      def to_html
-        text_area_tag(field_name, value, tag_options)
-      end
-    end
-  end
-end
-

data/app/models/inputs/effective_select_input.rb

@@ -1,18 +0,0 @@
-# = simple_form_for @thing do |f|
-#   = f.input :category, :as => :effective_select
-
-if defined?(SimpleForm)
-
-  class EffectiveSelectInput < SimpleForm::Inputs::CollectionSelectInput
-    def input(wrapper_options = nil)
-      label_method, value_method = (detect_collection_methods rescue [:to_s, :to_s])
-
-      options[:collection] = collection
-      options[:label_method] = label_method unless options[:polymorphic]
-      options[:value_method] = value_method unless options[:polymorphic]
-
-      Inputs::EffectiveSelect::Input.new(object, object_name, template, attribute_name, input_options, (merge_wrapper_options(input_html_options, wrapper_options) || {})).to_html
-    end
-  end
-
-end