formtastic 2.1.0 → 4.0.0

data/lib/formtastic/inputs/base/options.rb

@@ -2,15 +2,14 @@ module Formtastic
   module Inputs
     module Base
       module Options
-        
+
         def input_options
           options.except(*formtastic_options)
         end
-        
+
         def formtastic_options
-          [:priority_countries, :priority_zones, :member_label, :member_value, :collection, :required, :label, :as, :hint, :input_html, :label_html, :value_as_class, :find_options, :class]
+          [:priority_countries, :priority_zones, :member_label, :member_value, :collection, :required, :label, :as, :hint, :input_html, :value_as_class, :class]
         end
-      
       end
     end
   end

data/lib/formtastic/inputs/base/stringish.rb

@@ -14,11 +14,19 @@ module Formtastic
         # Overrides standard `input_html_options` to provide a `maxlength` and `size` attribute.
         def input_html_options
           {
-            :maxlength => options[:input_html].try(:[], :maxlength) || limit,
-            :size => builder.default_text_field_size
+            :maxlength => maxlength,
+            :size => size
           }.merge(super)
         end
         
+        def size
+          builder.default_text_field_size
+        end
+        
+        def maxlength
+          options[:input_html].try(:[], :maxlength) || limit
+        end
+        
         def wrapper_html_options
           new_class = [super[:class], "stringish"].compact.join(" ")
           super.merge(:class => new_class)

data/lib/formtastic/inputs/base/timeish.rb

@@ -1,7 +1,7 @@
 module Formtastic
   module Inputs
     module Base
-      # Timeish inputs (`:date`, `:datetime`, `:time`) are similar to the Rails date and time 
+      # Timeish inputs (`:date_select`, `:datetime_select`, `:time_select`) are similar to the Rails date and time 
       # helpers (`date_select`, `datetime_select`, `time_select`), rendering a series of `<select>`
       # tags for each fragment (year, month, day, hour, minute, seconds). The fragments are then 
       # re-combined to a date by ActiveRecord through multi-parameter assignment.
@@ -21,12 +21,12 @@ module Formtastic
       # * floating the `<li>` fragments against each other as a single line
       # * hiding the `<label>` of each fragment with `display:none`
       #
-      # @example `:date` input with full form context and sample HTMl output
+      # @example `:date_select` input with full form context and sample HTMl output
       #
       #   <%= semantic_form_for(@post) do |f| %>
       #     <%= f.inputs do %>
       #       ...
-      #       <%= f.input :publish_at, :as => :date %>
+      #       <%= f.input :publish_at, :as => :date_select %>
       #     <% end %>
       #   <% end %>
       #
@@ -56,31 +56,37 @@ module Formtastic
       #   </form>
       #       
       #
-      # @example `:time` input
-      #   <%= f.input :publish_at, :as => :time %>
+      # @example `:time_select` input
+      #   <%= f.input :publish_at, :as => :time_select %>
       #
-      # @example `:datetime` input
-      #   <%= f.input :publish_at, :as => :datetime %>
+      # @example `:datetime_select` input
+      #   <%= f.input :publish_at, :as => :datetime_select %>
       #
       # @example Change the labels for each fragment
-      #   <%= f.input :publish_at, :as => :date, :labels => { :year => "Y", :month => "M", :day => "D" }  %>
+      #   <%= f.input :publish_at, :as => :date_select, :labels => { :year => "Y", :month => "M", :day => "D" }  %>
+      #
+      # @example Suppress the labels for all fragments
+      #   <%= f.input :publish_at, :as => :date_select, :labels => false  %>
       #
       # @example Skip a fragment (defaults to 1, skips all following fragments)
-      #   <%= f.input :publish_at, :as => :datetime, :discard_minute => true  %>
-      #   <%= f.input :publish_at, :as => :datetime, :discard_hour => true  %>
-      #   <%= f.input :publish_at, :as => :datetime, :discard_day => true  %>
-      #   <%= f.input :publish_at, :as => :datetime, :discard_month => true  %>
-      #   <%= f.input :publish_at, :as => :datetime, :discard_year => true  %>
+      #   <%= f.input :publish_at, :as => :datetime_select, :discard_minute => true  %>
+      #   <%= f.input :publish_at, :as => :datetime_select, :discard_hour => true  %>
+      #   <%= f.input :publish_at, :as => :datetime_select, :discard_day => true  %>
+      #   <%= f.input :publish_at, :as => :datetime_select, :discard_month => true  %>
+      #   <%= f.input :publish_at, :as => :datetime_select, :discard_year => true  %>
       #
       # @example Change the order
-      #   <%= f.input :publish_at, :as => :date, :order => [:month, :day, :year]  %>
+      #   <%= f.input :publish_at, :as => :date_select, :order => [:month, :day, :year]  %>
       #
       # @example Include seconds with times (excluded by default)
-      #   <%= f.input :publish_at, :as => :time, :include_seconds => true %>
+      #   <%= f.input :publish_at, :as => :time_select, :include_seconds => true %>
       #
       # @example Specify if there should be a blank option at the start of each select or not. Note that, unlike select inputs, :include_blank does not accept a string value.
-      #   <%= f.input :publish_at, :as => :time, :include_blank => true %>
-      #   <%= f.input :publish_at, :as => :time, :include_blank => false %>
+      #   <%= f.input :publish_at, :as => :time_select, :include_blank => true %>
+      #   <%= f.input :publish_at, :as => :time_select, :include_blank => false %>
+      #
+      # @example Provide a value for the field via selected
+      #   <%= f.input :publish_at, :as => :datetime_select, :selected => DateTime.new(2018, 10, 4, 12, 00)
       #
       # @todo Document i18n
       # @todo Check what other Rails options are supported (`start_year`, `end_year`, `use_month_numbers`, `use_short_month`, `add_month_numbers`, `prompt`), write tests for them, and otherwise support them
@@ -130,8 +136,10 @@ module Formtastic
         end
         
         def fragment_label(fragment)
-          labels_from_options = options[:labels] || {}
-          if labels_from_options.key?(fragment)
+          labels_from_options = options.key?(:labels) ? options[:labels] : {}
+          if !labels_from_options
+            ''
+          elsif labels_from_options.key?(fragment)
             labels_from_options[fragment]
           else
             ::I18n.t(fragment.to_s, :default => fragment.to_s.humanize, :scope => [:datetime, :prompts])
@@ -152,6 +160,7 @@ module Formtastic
         end
         
         def value
+          return input_options[:selected] if options.key?(:selected)
           object.send(method) if object && object.respond_to?(method)
         end
         
@@ -183,8 +192,11 @@ module Formtastic
         
         def i18n_date_fragments
           order = ::I18n.t(:order, :scope => [:date])
-          order = nil unless order.is_a?(Array)
-          order
+          if order.is_a?(Array)
+            order.map &:to_sym
+          else
+            nil
+          end
         end
         
         def fragments_wrapping(&block)
@@ -230,4 +242,4 @@ module Formtastic
       end
     end
   end
-end
+end

data/lib/formtastic/inputs/base/validations.rb

@@ -35,8 +35,10 @@ module Formtastic
           return true unless validator.options.key?(:if) || validator.options.key?(:unless)
           conditional = validator.options.key?(:if) ? validator.options[:if] : validator.options[:unless]
 
-          result = if conditional.respond_to?(:call)
+          result = if conditional.respond_to?(:call) && conditional.arity > 0
             conditional.call(object)
+          elsif conditional.respond_to?(:call) && conditional.arity == 0
+            object.instance_exec(&conditional)
           elsif conditional.is_a?(::Symbol) && object.respond_to?(conditional)
             object.send(conditional)
           else
@@ -71,13 +73,11 @@ module Formtastic
             raise IndeterminableMinimumAttributeError if validation.options[:greater_than] && column? && [:float, :decimal].include?(column.type)
 
             if validation.options[:greater_than_or_equal_to]
-              return (validation.options[:greater_than_or_equal_to].call(object)) if validation.options[:greater_than_or_equal_to].kind_of?(Proc)
-              return (validation.options[:greater_than_or_equal_to])
+              return option_value(validation.options[:greater_than_or_equal_to], object)
             end
 
             if validation.options[:greater_than]
-              return (validation.options[:greater_than].call(object) + 1) if validation.options[:greater_than].kind_of?(Proc)
-              return (validation.options[:greater_than] + 1)
+              return option_value(validation.options[:greater_than], object) + 1
             end
           end
         end
@@ -92,13 +92,11 @@ module Formtastic
             raise IndeterminableMaximumAttributeError if validation.options[:less_than] && column? && [:float, :decimal].include?(column.type)
 
             if validation.options[:less_than_or_equal_to]
-              return (validation.options[:less_than_or_equal_to].call(object)) if validation.options[:less_than_or_equal_to].kind_of?(Proc)
-              return (validation.options[:less_than_or_equal_to])
+              return option_value(validation.options[:less_than_or_equal_to], object)
             end
 
             if validation.options[:less_than]
-              return ((validation.options[:less_than].call(object)) - 1) if validation.options[:less_than].kind_of?(Proc)
-              return (validation.options[:less_than] - 1)
+              return option_value(validation.options[:less_than], object) - 1
             end
           end
         end
@@ -134,9 +132,10 @@ module Formtastic
           return true if options[:required] == true
           return false if not_required_through_negated_validation?
           if validations?
-            validations.select { |validator|
+            validations.any? { |validator|
               if validator.options.key?(:on)
-                return false if (validator.options[:on] != :save) && ((object.new_record? && validator.options[:on] != :create) || (!object.new_record? && validator.options[:on] != :update))
+                validator_on = Array(validator.options[:on])
+                next false if (validator_on.exclude?(:save)) && ((object.new_record? && validator_on.exclude?(:create)) || (!object.new_record? && validator_on.exclude?(:update)))
               end
               case validator.kind
               when :presence
@@ -150,7 +149,7 @@ module Formtastic
               else
                 false
               end
-            }.any?
+            }
           else
             return responds_to_global_required? && !!builder.all_fields_required_by_default
           end
@@ -190,8 +189,37 @@ module Formtastic
           validation_limit || column_limit
         end
 
+        def readonly?
+          readonly_from_options? || readonly_attribute?
+        end
+
+        def readonly_attribute?
+          object_class = self.object.class
+          object_class.respond_to?(:readonly_attributes) &&
+            self.object.persisted? &&
+            column.respond_to?(:name) &&
+            object_class.readonly_attributes.include?(column.name.to_s)
+        end
+
+        def readonly_from_options?
+          options[:input_html] && options[:input_html][:readonly]
+        end
+
+        private
+
+        # Loosely based on
+        # https://github.com/rails/rails/blob/5-2-stable/activemodel/lib/active_model/validations/numericality.rb#L54-L59
+        def option_value(option, object)
+          case option
+          when Symbol
+            object.send(option)
+          when Proc
+            option.call(object)
+          else
+            option
+          end
+        end
       end
     end
   end
 end
-

data/lib/formtastic/inputs/base/wrapping.rb

@@ -3,44 +3,47 @@ module Formtastic
     module Base
       # @todo relies on `dom_id`, `required?`, `optional`, `errors?`, `association_primary_key` & `sanitized_method_name` methods from another module
       module Wrapping
-        
+
         # Override this method if you want to change the display order (for example, rendering the
         # errors before the body of the input).
         def input_wrapping(&block)
-          template.content_tag(:li, 
-            [template.capture(&block), error_html, hint_html].join("\n").html_safe, 
+          template.content_tag(:li,
+            [template.capture(&block), error_html, hint_html].join("\n").html_safe,
             wrapper_html_options
           )
         end
-        
+
         def wrapper_html_options
-          opts = (options[:wrapper_html] || {}).dup
-          opts[:class] =
-            case opts[:class]
-            when Array
-              opts[:class].dup
-            when nil
-              []
-            else
-              [opts[:class].to_s]
-            end
-          opts[:class] << as
-          opts[:class] << "input"
-          opts[:class] << "error" if errors?
-          opts[:class] << "optional" if optional?
-          opts[:class] << "required" if required?
-          opts[:class] << "autofocus" if autofocus?
-          opts[:class] = opts[:class].join(' ')
-          
-          opts[:id] ||= wrapper_dom_id
-        
+          opts = wrapper_html_options_raw
+          opts[:class] = wrapper_classes
+          opts[:id] = wrapper_dom_id unless opts.has_key? :id
           opts
         end
-        
+
+        def wrapper_html_options_raw
+          (options[:wrapper_html] || {}).dup
+        end
+
+        def wrapper_classes_raw
+          [*wrapper_html_options_raw[:class]]
+        end
+
+        def wrapper_classes
+          classes = wrapper_classes_raw
+          classes << as
+          classes << "input"
+          classes << "error" if errors?
+          classes << "optional" if optional?
+          classes << "required" if required?
+          classes << "autofocus" if autofocus?
+
+          classes.join(' ')
+        end
+
         def wrapper_dom_id
           @wrapper_dom_id ||= "#{dom_id.to_s.gsub((association_primary_key || method).to_s, sanitized_method_name.to_s)}_input"
         end
-                
+
       end
     end
   end

data/lib/formtastic/inputs/base.rb

@@ -1,9 +1,9 @@
 module Formtastic
   module Inputs
     module Base
-      
+
       attr_accessor :builder, :template, :object, :object_name, :method, :options
-      
+
       def initialize(builder, template, object, object_name, method, options)
         @builder = builder
         @template = template
@@ -11,34 +11,42 @@ module Formtastic
         @object_name = object_name
         @method = method
         @options = options.dup
-        
-        removed_option!(:label_method)
-        removed_option!(:value_method)
-        removed_option!(:group_label_method)
+
+        # Deprecate :member_label and :member_value, remove v4.0
+        member_deprecation_message = "passing an Array of label/value pairs like [['Justin', 2], ['Kate', 3]] into :collection directly (consider building the array in your model using Model.pluck)"
+        warn_deprecated_option!(:member_label, member_deprecation_message)
+        warn_deprecated_option!(:member_value, member_deprecation_message)
       end
-      
+
       # Usefull for deprecating options.
       def warn_and_correct_option!(old_option_name, new_option_name)
         if options.key?(old_option_name)
-          ::ActiveSupport::Deprecation.warn("The :#{old_option_name} option is deprecated in favour of :#{new_option_name} and will be removed from Formtastic after 2.0")
+          ::ActiveSupport::Deprecation.warn("The :#{old_option_name} option is deprecated in favour of :#{new_option_name} and will be removed from Formtastic in the next version", caller(6))
           options[new_option_name] = options.delete(old_option_name)
         end
       end
-      
+
+      # Usefull for deprecating options.
+      def warn_deprecated_option!(old_option_name, instructions)
+        if options.key?(old_option_name)
+          ::ActiveSupport::Deprecation.warn("The :#{old_option_name} option is deprecated in favour of `#{instructions}`. :#{old_option_name} will be removed in the next version", caller(6))
+        end
+      end
+
       # Usefull for raising an error on previously supported option.
       def removed_option!(old_option_name)
         raise ArgumentError, ":#{old_option_name} is no longer available" if options.key?(old_option_name)
       end
-      
+
       extend ActiveSupport::Autoload
-      
+
+      autoload :DatetimePickerish
       autoload :Associations
       autoload :Collections
       autoload :Choices
       autoload :Database
       autoload :Errors
       autoload :Fileish
-      autoload :GroupedCollections
       autoload :Hints
       autoload :Html
       autoload :Labelling
@@ -50,7 +58,7 @@ module Formtastic
       autoload :Timeish
       autoload :Validations
       autoload :Wrapping
-      
+
       include Html
       include Options
       include Database
@@ -62,8 +70,7 @@ module Formtastic
       include Associations
       include Labelling
       include Wrapping
-      
+
     end
   end
 end
-  

data/lib/formtastic/inputs/boolean_input.rb

@@ -50,17 +50,12 @@ module Formtastic
           label_html_options
         )
       end
-
+      
       def label_html_options
-        prev = super
-        prev[:class] = prev[:class] - ['label']
-        
-        input_html_options.merge(
-          prev.merge(
-            :id => nil,
-            :for => input_html_options[:id]
-          )
-        )
+        {
+          :for => input_html_options[:id],
+          :class => super[:class] - ['label'] # remove 'label' class
+        }
       end
 
       def label_text_with_embedded_checkbox
@@ -96,9 +91,28 @@ module Formtastic
       end
 
       def checked?
-        object && ActionView::Helpers::InstanceTag.check_box_checked?(object.send(method), checked_value)
+        object && boolean_checked?(object.send(method), checked_value) 
       end
+      
+      private 
 
+      def boolean_checked?(value, checked_value)
+        case value
+        when TrueClass, FalseClass
+          value
+        when NilClass
+          false
+        when Integer
+          value == checked_value.to_i
+        when String
+          value == checked_value
+        when Array
+          value.include?(checked_value)
+        else
+          value.to_i != 0
+        end
+      end
+      
     end
   end
-end
+end

data/lib/formtastic/inputs/check_boxes_input.rb

@@ -39,12 +39,17 @@ module Formtastic
     #   <%= f.input :categories, :as => :check_boxes, :collection => @categories %>
     #   <%= f.input :categories, :as => :check_boxes, :collection => Category.all %>
     #   <%= f.input :categories, :as => :check_boxes, :collection => Category.some_named_scope %>
+    #   <%= f.input :categories, :as => :check_boxes, :collection => Category.pluck(:label, :id) %>
     #   <%= f.input :categories, :as => :check_boxes, :collection => [Category.find_by_name("Ruby"), Category.find_by_name("Rails")] %>
     #   <%= f.input :categories, :as => :check_boxes, :collection => ["Ruby", "Rails"] %>
     #   <%= f.input :categories, :as => :check_boxes, :collection => [["Ruby", "ruby"], ["Rails", "rails"]] %>
     #   <%= f.input :categories, :as => :check_boxes, :collection => [["Ruby", "1"], ["Rails", "2"]] %>
     #   <%= f.input :categories, :as => :check_boxes, :collection => [["Ruby", 1], ["Rails", 2]] %>
+    #   <%= f.input :categories, :as => :check_boxes, :collection => [["Ruby", 1, {'data-attr' => 'attr-value'}]] %>
     #   <%= f.input :categories, :as => :check_boxes, :collection => 1..5 %>
+    #   <%= f.input :categories, :as => :check_boxes, :collection => [:ruby, :rails] %>
+    #   <%= f.input :categories, :as => :check_boxes, :collection => [["Ruby", :ruby], ["Rails", :rails]] %>
+    #   <%= f.input :categories, :as => :check_boxes, :collection => Set.new([:ruby, :rails]) %>
     #
     # @example `:hidden_fields` can be used to skip Rails' rendering of a hidden field before every checkbox
     #   <%= f.input :categories, :as => :check_boxes, :hidden_fields => false %>
@@ -52,24 +57,6 @@ module Formtastic
     # @example `:disabled` can be used to disable any checkboxes with a value found in the given Array
     #   <%= f.input :categories, :as => :check_boxes, :collection => ["a", "b"], :disabled => ["a"] %>
     #
-    # @example `:member_label` can be used to call a different method (or a Proc) on each object in the collection for rendering the label text (it'll try the methods like `to_s` in `collection_label_methods` config by default)
-    #   <%= f.input :categories, :as => :check_boxes, :member_label => :name %>
-    #   <%= f.input :categories, :as => :check_boxes, :member_label => :name_with_post_count
-    #   <%= f.input :categories, :as => :check_boxes, :member_label => { |c| "#{c.name} (#{pluralize("post", c.posts.count)})" }
-    #
-    # @example `:member_label` can be used with a helper method (both examples have the same result)
-    #   <%= f.input :categories, :as => :check_boxes, :member_label => method(:fancy_label)
-    #   <%= f.input :categories, :as => :check_boxes, :member_label => Proc.new { |category| fancy_label(category) }
-    #
-    # @example `:member_value` can be used to call a different method (or a Proc) on each object in the collection for rendering the value for each checkbox (it'll try the methods like `id` in `collection_value_methods` config by default)
-    #   <%= f.input :categories, :as => :check_boxes, :member_value => :code %>
-    #   <%= f.input :categories, :as => :check_boxes, :member_value => :isbn
-    #   <%= f.input :categories, :as => :check_boxes, :member_value => Proc.new { |c| c.name.downcase.underscore }
-    #
-    # @example `:member_value` can be used with a helper method (both examples have the same result)
-    #   <%= f.input :categories, :as => :check_boxes, :member_value => method(:some_helper)
-    #   <%= f.input :categories, :as => :check_boxes, :member_value => Proc.new { |category| some_helper(category) }
-    #
     # @example `:value_as_class` can be used to add a class to the `<li>` wrapped around each choice using the checkbox value for custom styling of each choice
     #   <%= f.input :categories, :as => :check_boxes, :value_as_class => true %>
     #
@@ -82,6 +69,11 @@ module Formtastic
       include Base::Collections
       include Base::Choices
 
+      def initialize(*args)
+        super
+        raise Formtastic::UnsupportedEnumCollection if collection_from_enum?
+      end
+
       def to_html
         input_wrapping do
           choices_wrapping do
@@ -99,18 +91,16 @@ module Formtastic
       end
 
       def choice_html(choice)
-        template.content_tag(:label,
-          hidden_fields? ?
-            check_box_with_hidden_input(choice) :
-            check_box_without_hidden_input(choice) <<
-          choice_label(choice),
+        template.content_tag(
+          :label,
+          checkbox_input(choice) + choice_label(choice),
           label_html_options.merge(:for => choice_input_dom_id(choice), :class => nil)
         )
       end
 
       def hidden_field_for_all
-        if hidden_fields?
-          ""
+        if hidden_fields_for_every?
+          ''
         else
           options = {}
           options[:class] = [method.to_s.singularize, 'default'].join('_') if value_as_class?
@@ -119,7 +109,7 @@ module Formtastic
         end
       end
 
-      def hidden_fields?
+      def hidden_fields_for_every?
         options[:hidden_fields]
       end
 
@@ -127,7 +117,7 @@ module Formtastic
         value = choice_value(choice)
         builder.check_box(
           association_primary_key || method,
-          input_html_options.merge(:id => choice_input_dom_id(choice), :name => input_name, :disabled => disabled?(value), :required => false),
+          extra_html_options(choice).merge(:id => choice_input_dom_id(choice), :name => input_name, :disabled => disabled?(value), :required => false),
           value,
           unchecked_value
         )
@@ -139,10 +129,14 @@ module Formtastic
           input_name,
           value,
           checked?(value),
-          input_html_options.merge(:id => choice_input_dom_id(choice), :disabled => disabled?(value), :required => false)
+          extra_html_options(choice).merge(:id => choice_input_dom_id(choice), :disabled => disabled?(value), :required => false)
         )
       end
 
+      def extra_html_options(choice)
+        input_html_options.merge(custom_choice_html_options(choice))
+      end
+
       def checked?(value)
         selected_values.include?(value)
       end
@@ -175,11 +169,25 @@ module Formtastic
 
       protected
 
+      def checkbox_input(choice)
+        if hidden_fields_for_every?
+          check_box_with_hidden_input(choice)
+        else
+          check_box_without_hidden_input(choice)
+        end
+      end
+
       def make_selected_values
         if object.respond_to?(method)
-          selected_items = [object.send(method)].compact.flatten
-
-          [*selected_items.map { |o| send_or_call_or_object(value_method, o) }].compact
+          selected_items = object.send(method)
+          # Construct an array from the return value, regardless of the return type
+          selected_items = [*selected_items].compact.flatten
+
+          selected = []
+          selected_items.map do |selected_item|
+            selected_item_id = selected_item.id if selected_item.respond_to? :id
+            item = send_or_call_or_object(value_method, selected_item) || selected_item_id
+          end.compact
         else
           []
         end

data/lib/formtastic/inputs/color_input.rb

@@ -0,0 +1,41 @@
+module Formtastic
+  module Inputs
+
+    # Outputs a simple `<label>` with a HTML5 `<input type="color">` wrapped in the standard
+    # `<li>` wrapper. This is the default input choice for attributes with a name matching
+    # `/color/`, but can be applied to any text-like input with `:as => :color`.
+    #
+    # @example Full form context and output
+    #
+    #   <%= semantic_form_for(@user) do |f| %>
+    #     <%= f.inputs do %>
+    #       <%= f.input :color, :as => :color %>
+    #     <% end %>
+    #   <% end %>
+    #
+    #   <form...>
+    #     <fieldset>
+    #       <ol>
+    #         <li class="color">
+    #           <label for="user_color">Color</label>
+    #           <input type="color" id="user_color" name="user[color]">
+    #         </li>
+    #       </ol>
+    #     </fieldset>
+    #   </form>
+    #
+    # @see Formtastic::Helpers::InputsHelper#input InputsHelper#input for full documentation of all possible options.
+    class ColorInput 
+      include Base
+      include Base::Stringish
+      include Base::Placeholder
+      
+      def to_html
+        input_wrapping do
+          label_html <<
+          builder.color_field(method, input_html_options)
+        end
+      end
+    end
+  end
+end