lib/express_templates/components/forms/radio.rb in express_templates-0.7.1 vs lib/express_templates/components/forms/radio.rb in express_templates-0.8.0

@@ -2,25 +2,26 @@
   module Components
     module Forms
       class Radio < FormComponent
         include OptionSupport
 
-        emits -> {
-          div(class: field_wrapper_class) {
-            label_tag(label_name, label_text)
-            if option_values_specified?
-              generate_options_from_specified_values
-            else
-              use_options_from_collection_radio_buttons_helper
-            end
-          }
+        has_option :options, 'Supplies a list of options for the radio tag'
+        has_option :label_wrapper_class, 'Specify a class for labels which wrap each radio option.'
+
+        contains -> {
+          label_tag(label_name, label_text)
+          if option_values_specified?
+            generate_options_from_specified_values
+          else
+            use_options_from_collection_radio_buttons_helper
+          end
         }
 
         def use_options_from_collection_radio_buttons_helper
           collection_radio_buttons(resource_var, field_name.to_sym, collection_from_association,
                                    option_value_method, option_name_method,
-                                   field_options, html_options) do |b|
+                                   input_attributes) do |b|
             b.label(class: "radio") {
               b.radio_button + b.text
             }
           end
         end
@@ -28,29 +29,25 @@
         def option_values_specified?
           [Array, Hash].include?(option_collection.class)
         end
 
         def option_collection
-          @args.first
+          config[:options]
         end
 
-        def wrapper_class
-          config[:wrapper_class] || 'wrapper-class'
-        end
-
         def generate_options_from_specified_values
           case
           when option_collection.kind_of?(Array)
             option_collection.each_with_index do |option, index|
-              label(class: wrapper_class) {
+              label(class: config[:label_wrapper_class]) {
                 radio_button(resource_var, field_name.to_sym, option, class: 'radio')
                 current_arbre_element.add_child option
               }
             end
           when option_collection.kind_of?(Hash)
             option_collection.each_pair do |key, value|
-              label(class: wrapper_class) {
+              label(class: config[:label_wrapper_class]) {
                 radio_button(resource_var, field_name.to_sym, key, class: 'radio')
                 current_arbre_element.add_child  value
               }
             end
           else
@@ -58,24 +55,9 @@
           end
         end
 
         def collection_from_association
           related_collection or raise "No association collection for: #{resource_name}.#{field_name}"
-        end
-
-        def field_options
-          # If field_otions is omitted the Expander will be
-          # in last or 3rd position and we don't want that
-          if @args[1] && @args[1].is_a?(Hash)
-            @args[1]
-          else
-            {}
-          end
-        end
-
-        # TODO: implement
-        def html_options
-          {}
         end
 
       end
     end
   end