formular 0.2.1 → 0.2.2

data/lib/formular/element/bootstrap3/horizontal.rb

@@ -7,7 +7,7 @@ module Formular
   class Element
     module Bootstrap3
       module Horizontal
-        module WrappedControl
+        module Wrapped
           include Formular::Element::Module
 
           html(:label_column) do |input|
@@ -35,11 +35,11 @@ module Formular
               has_label? ? [] : builder.class.column_classes[:left_offset]
             end
           end
-        end # module WrappedControl
+        end # module Wrapped
 
         module WrappedCheckableControl
           include Formular::Element::Module
-          include WrappedControl
+          include Wrapped
 
           html(:label_column) do |input|
             input.group_label
@@ -80,19 +80,19 @@ module Formular
         end # class Form
 
         class Select < Formular::Element::Bootstrap3::Select
-          include WrappedControl
+          include Wrapped
         end # class Select
 
         class Textarea < Formular::Element::Bootstrap3::Textarea
-          include WrappedControl
+          include Wrapped
         end # class Textarea
 
         class Input < Formular::Element::Bootstrap3::Input
-          include WrappedControl
+          include Wrapped
         end # class Input
 
         class InputGroup < Formular::Element::Bootstrap3::InputGroup
-          include WrappedControl
+          include Wrapped
 
           html(:start) do |input|
             wrapper = input.wrapper

data/lib/formular/element/bootstrap3/input_group.rb

@@ -1,12 +1,12 @@
 require 'formular/elements'
 require 'formular/element/modules/container'
-require 'formular/element/modules/wrapped_control'
+require 'formular/element/modules/wrapped'
 
 module Formular
   class Element
     module Bootstrap3
       class InputGroup < Formular::Element::Input
-        include Formular::Element::Modules::WrappedControl
+        include Formular::Element::Modules::Wrapped
         include Formular::Element::Modules::Container
         include Formular::Element::Bootstrap3::ColumnControl
 

data/lib/formular/element/bootstrap4.rb

@@ -1,9 +1,10 @@
 require 'formular/element'
 require 'formular/elements'
-require 'formular/element/modules/wrapped_control'
+require 'formular/element/modules/wrapped'
 require 'formular/element/module'
 require 'formular/element/bootstrap4/checkable_control'
 require 'formular/element/bootstrap4/custom_control'
+require 'formular/element/bootstrap3'
 require 'formular/element/bootstrap3/column_control'
 
 module Formular
@@ -18,22 +19,30 @@ module Formular
       end # class Submit
 
       class Error < Formular::Element::Error
-        tag :span
+        tag :div
         set_default :class, ['form-control-feedback']
       end # class Error
 
       class Hint < Formular::Element::Small
-        set_default :class, ['text-muted']
+        set_default :class, ['form-text', 'text-muted']
       end # class Hint
 
-      class Input < Formular::Element::Input
-        include Formular::Element::Modules::WrappedControl
-        include Formular::Element::Bootstrap3::ColumnControl
+      class Select < Formular::Element::Bootstrap3::Select
+        set_default :label_options, { class: ['form-control-label'] }
+      end # class Textarea
 
-        set_default :class, :input_class
+
+      class Textarea < Formular::Element::Bootstrap3::Textarea
+        set_default :label_options, { class: ['form-control-label'] }
+      end # class Textarea
+
+      class Input < Formular::Element::Bootstrap3::Input
+        set_default :label_options, { class: ['form-control-label'] }
 
         def input_class
-          attributes[:type].to_s == 'file' ? %(form-control-file) : %(form-control)
+          return %(form-control-file) if options[:type].to_s == 'file'
+
+          has_errors? ? ['form-control', 'form-control-danger'] : ['form-control']
         end
       end # class Input
 

data/lib/formular/element/bootstrap4/checkable_control.rb

@@ -1,5 +1,5 @@
 require 'formular/elements'
-require 'formular/element/modules/wrapped_control'
+require 'formular/element/modules/wrapped'
 require 'formular/element/module'
 
 module Formular
@@ -7,15 +7,14 @@ module Formular
     module Bootstrap4
       module CheckableControl
         class Checkbox < Formular::Element::Checkbox
-          include Formular::Element::Modules::WrappedControl
+          include Formular::Element::Modules::Wrapped
           set_default :class, ['form-check-input']
-          set_default :value, '1' # instead of reader value
 
           html { closed_start_tag }
         end # class Checkbox
 
         class Radio < Formular::Element::Radio
-          include Formular::Element::Modules::WrappedControl
+          include Formular::Element::Modules::Wrapped
           set_default :class, ['form-check-input']
 
           def hidden_tag
@@ -26,6 +25,7 @@ module Formular
         module InlineCheckable
           include Formular::Element::Module
 
+          set_default :label_options, { class: ['form-control-label'] }
           set_default :control_label_options, { class: ['form-check-inline'] }
 
           html(:wrapped) do |input|
@@ -72,6 +72,7 @@ module Formular
             }.join('')
           end
 
+          set_default :label_options, { class: ['form-control-label'] }
           set_default :control_label_options, { class: ['form-check-label'] }
 
           module InstanceMethods

data/lib/formular/element/bootstrap4/custom_control.rb

@@ -1,5 +1,5 @@
 require 'formular/elements'
-require 'formular/element/modules/wrapped_control'
+require 'formular/element/modules/wrapped'
 require 'formular/element/bootstrap4'
 require 'formular/element/bootstrap3'
 require 'formular/element/module'
@@ -10,8 +10,9 @@ module Formular
       module CustomControl
         module CustomCheckable
           include Formular::Element::Module
-          include Formular::Element::Modules::WrappedControl
+          include Formular::Element::Modules::Wrapped
           set_default :class, ['custom-control-input']
+          set_default :label_options, { class: ['form-control-label'] }
 
           html(:checkable_label) do |input|
             Formular::Element::Label.(input.label_options) do
@@ -57,7 +58,6 @@ module Formular
             html { closed_start_tag }
 
             set_default :control_label_options, { class: ['custom-control custom-checkbox'] }
-            set_default :value, '1' # instead of reader value
           end # class Checkbox
 
           class CustomRadio < Formular::Element::Radio
@@ -71,13 +71,15 @@ module Formular
 
           class CustomSelect < Formular::Element::Bootstrap3::Select
             set_default :class, ['custom-select']
+            set_default :label_options, { class: ['form-control-label'] }
           end # class CustomSelect
 
           class CustomFile < Formular::Element::Input
-            include Formular::Element::Modules::WrappedControl
+            include Formular::Element::Modules::Wrapped
             include Formular::Element::Bootstrap3::ColumnControl
 
             set_default :class, ['custom-file-input']
+            set_default :label_options, { class: ['form-control-label'] }
             set_default :type, 'file'
 
             rename_html_context(:default, :control)
@@ -93,6 +95,7 @@ module Formular
 
         class CustomSelect < Inline::CustomSelect
           rename_html_context(:default, :input)
+          set_default :label_options, { class: ['form-control-label'] }
 
           html do |input|
             Formular::Element::Div.(content: input.to_html(context: :input))
@@ -101,6 +104,7 @@ module Formular
 
         class CustomFile < Inline::CustomFile
           rename_html_context(:default, :input)
+          set_default :label_options, { class: ['form-control-label'] }
 
           html do |input|
             Formular::Element::Div.(content: input.to_html(context: :input))

data/lib/formular/element/bootstrap4/horizontal.rb

@@ -26,15 +26,15 @@ module Formular
         end # class Legend
 
         class Input < Formular::Element::Bootstrap4::Input
-          include Formular::Element::Bootstrap3::Horizontal::WrappedControl
+          include Formular::Element::Bootstrap3::Horizontal::Wrapped
         end # class Input
 
         class CustomFile < Formular::Element::Bootstrap4::CustomFile
-          include Formular::Element::Bootstrap3::Horizontal::WrappedControl
+          include Formular::Element::Bootstrap3::Horizontal::Wrapped
         end # class CustomFile
 
         class CustomSelect < Formular::Element::Bootstrap4::CustomSelect
-          include Formular::Element::Bootstrap3::Horizontal::WrappedControl
+          include Formular::Element::Bootstrap3::Horizontal::Wrapped
         end # class CustomFile
 
         class Submit < Formular::Element::Bootstrap4::Submit

data/lib/formular/element/bootstrap4/input_group.rb

@@ -0,0 +1,12 @@
+require 'formular/elements'
+require 'formular/element/bootstrap3/input_group'
+
+module Formular
+  class Element
+    module Bootstrap4
+      class InputGroup < Formular::Element::Bootstrap3::InputGroup
+        set_default :label_options, { class: ['form-control-label'] }
+      end # class InputGroup
+    end # module Bootstrap4
+  end # class Element
+end # module Formular

data/lib/formular/element/foundation6.rb

@@ -1,8 +1,8 @@
 require 'formular/elements'
-require 'formular/element/modules/wrapped_control'
+require 'formular/element/modules/wrapped'
 require 'formular/element/module'
 require 'formular/element/foundation6/checkable_control'
-require 'formular/element/foundation6/wrapped_control'
+require 'formular/element/foundation6/wrapped'
 module Formular
   class Element
     module Foundation6
@@ -36,7 +36,7 @@ module Formular
       end # class Hint
 
       class Input < Formular::Element::Input
-        include WrappedControl
+        include Wrapped
         include InputWithErrors
       end # class Input
 
@@ -56,12 +56,12 @@ module Formular
       end # class File
 
       class Select < Formular::Element::Select
-        include WrappedControl
+        include Wrapped
         include InputWithErrors
       end # class Select
 
       class Textarea < Formular::Element::Textarea
-        include WrappedControl
+        include Wrapped
         include InputWithErrors
       end # class Textarea
     end # module Foundation6

data/lib/formular/element/foundation6/checkable_control.rb

@@ -1,13 +1,13 @@
 require 'formular/elements'
 require 'formular/element/module'
-require 'formular/element/foundation6/wrapped_control'
+require 'formular/element/foundation6/wrapped'
 module Formular
   class Element
     module Foundation6
       module CheckableControl
         module Checkable
           include Formular::Element::Module
-          include Formular::Element::Foundation6::WrappedControl
+          include Formular::Element::Foundation6::Wrapped
 
           set_default :label_options, { class: ['is-invalid-label'] }, if: :has_errors?
           set_default :control_label_options, { class: ['is-invalid-label'] }, if: :has_errors?
@@ -43,8 +43,6 @@ module Formular
 
         class Checkbox < Formular::Element::Checkbox
           include Checkable
-
-          set_default :value, '1' # instead of reader value
           set_default :label_options, { class: ['is-invalid-label'] }, if: :has_errors?
           set_default :control_label_options, { class: ['is-invalid-label'] }, if: :has_errors?
 

data/lib/formular/element/foundation6/input_group.rb

@@ -1,13 +1,13 @@
 require 'formular/elements'
 require 'formular/element/modules/container'
-require 'formular/element/modules/wrapped_control'
+require 'formular/element/modules/wrapped'
 module Formular
   class Element
     module Foundation6
       class InputGroup < Formular::Element::Input
         module WrappedGroup
           include Formular::Element::Module
-          include Formular::Element::Modules::WrappedControl
+          include Formular::Element::Modules::Wrapped
 
           def wrapper(&block)
             builder.fieldset(Attributes[options[:wrapper_options]], &block)

data/lib/formular/element/foundation6/{wrapped_control.rb → wrapped.rb}

@@ -1,11 +1,11 @@
 require 'formular/element/module'
-require 'formular/element/modules/wrapped_control'
+require 'formular/element/modules/wrapped'
 module Formular
   class Element
     module Foundation6
-      module WrappedControl
+      module Wrapped
         include Formular::Element::Module
-        include Formular::Element::Modules::WrappedControl
+        include Formular::Element::Modules::Wrapped
 
         html(:wrapped) do |input|
           input.wrapper do
@@ -15,7 +15,7 @@ module Formular
             concat input.error
           end.to_s
         end
-      end # module WrappedControl
+      end # module Wrapped
     end # module Foundation6
   end # class Element
 end # module Formular

data/lib/formular/element/modules/checkable.rb

@@ -15,7 +15,6 @@ module Formular
         include Label
 
         add_option_keys :control_label_options
-
         set_default :checked, 'checked', if: :is_checked?
 
         html(:checkable_label) do |input|
@@ -38,8 +37,9 @@ module Formular
         module InstanceMethods
           def group_label
             return '' unless has_group_label?
-            label_options[:content] = label_text
-            builder.checkable_group_label(label_options).to_s
+            label_opts = label_options.dup
+            label_opts[:content] = label_text
+            builder.checkable_group_label(label_opts).to_s
           end
 
           def has_group_label?
@@ -59,10 +59,10 @@ module Formular
               opts[:value] = item.send(options[:value_method])
               opts[:label] = item.send(options[:label_method])
 
-              opts[:id] = if attributes[:id]
-                            "#{attributes[:id]}_#{opts[:value]}"
+              opts[:id] = if options[:id]
+                            "#{options[:id]}_#{opts[:value]}"
                           else
-                            "#{attribute_name || attributes[:name].gsub('[]', '')}_#{opts[:value]}"
+                            "#{attribute_name || options[:name].gsub('[]', '')}_#{opts[:value]}"
                           end
 
               self.class.(opts)
@@ -74,18 +74,17 @@ module Formular
           end
 
           private
-
-          # we can't access other defaults
           def is_checked?
-            !options[:checked].nil? || reader_value == attributes[:value]
+            !options[:checked].nil? || reader_value == options[:value]
           end
 
           def collection_base_options
-            opts = attributes.select { |k, v| ![:name, :id, :checked, :class].include?(k) } #FIXME due to class merging, we'll end up with duplicate classes...
+            opts = attributes.select { |k, v| ![:name, :id, :checked, :class].include?(k) }
+            # FIXME due to class merging, we'll end up with duplicate classes...
             opts[:attribute_name] = attribute_name if attribute_name
             opts[:builder]        = builder if builder
             opts[:label_options]  = options[:control_label_options] if options[:control_label_options]
-            opts[:name]           = attributes[:name] if attributes[:name]
+            opts[:name]           = options[:name] if options[:name] # do we need this??
 
             opts
           end

data/lib/formular/element/modules/control.rb

@@ -1,4 +1,5 @@
 require 'formular/element/module'
+require 'formular/element/modules/escape_value'
 module Formular
   class Element
     module Modules
@@ -6,6 +7,7 @@ module Formular
       # name & value based on the attribute name
       module Control
         include Formular::Element::Module
+        include Formular::Element::Modules::EscapeValue
 
         add_option_keys :attribute_name
 
@@ -20,20 +22,26 @@ module Formular
 
           private
 
+          # FIXME... we should probably find a better way of returning nil to all of these if
+          # no attribute_name or builder
+          def builder_attribute?
+            attribute_name && builder
+          end
+
           def path
-            @path ||= builder.path(attribute_name) if attribute_name && builder
+            @path ||= builder.path(attribute_name) if builder_attribute?
           end
 
           def form_encoded_name
-            path.to_encoded_name if path
+            path.to_encoded_name if builder_attribute?
           end
 
           def form_encoded_id
-            path.to_encoded_id if path
+            path.to_encoded_id if builder_attribute?
           end
 
           def reader_value
-            builder.reader_value(attribute_name) if attribute_name && builder
+            builder.reader_value(attribute_name) if builder_attribute?
           end
         end # model InstanceMethods
       end # module Control

data/lib/formular/element/modules/error.rb

@@ -1,10 +1,12 @@
 require 'formular/element/module'
+require 'formular/html_escape'
 module Formular
   class Element
     module Modules
       # this module provides error methods and options to a control when included
       module Error
         include Formular::Element::Module
+        include HtmlEscape
         add_option_keys :error
 
         # options functionality (same as SimpleForm):
@@ -12,7 +14,10 @@ module Formular
         # options[:error] == String return the string, regardless of model errors
         module InstanceMethods
           def error_text
-            has_custom_error? ? options[:error] : errors_on_attribute.send(error_method) if has_errors?
+            return unless has_errors?
+
+            text = has_custom_error? ? options[:error] : errors_on_attribute.send(error_method)
+            html_escape(text)
           end
 
           def has_errors?