radio.rb in express_templates-0.7.0

- old
+ new

@@ -14,12 +14,11 @@
             end
           }
         }
 
         def use_options_from_collection_radio_buttons_helper
-          # Note {{ }} will get stripped.  This prevents the collection finder string being passed as string.
-          collection_radio_buttons(resource_var, field_name.to_sym, "{{#{collection_from_association}}}",
+          collection_radio_buttons(resource_var, field_name.to_sym, collection_from_association,
                                    option_value_method, option_name_method,
                                    field_options, html_options) do |b|
             b.label(class: "radio") {
               b.radio_button + b.text
             }
@@ -29,31 +28,31 @@
         def option_values_specified?
           [Array, Hash].include?(option_collection.class)
         end
 
         def option_collection
-          @args.second
+          @args.first
         end
 
         def wrapper_class
-          @config[:wrapper_class] || '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) {
                 radio_button(resource_var, field_name.to_sym, option, class: 'radio')
-                null_wrap { option }
+                current_arbre_element.add_child option
               }
             end
           when option_collection.kind_of?(Hash)
             option_collection.each_pair do |key, value|
               label(class: wrapper_class) {
                 radio_button(resource_var, field_name.to_sym, key, class: 'radio')
-                null_wrap { value }
+                current_arbre_element.add_child  value
               }
             end
           else
             raise "Radio collection should be Array or Hash: #{option_collection.inspect}"
           end
@@ -64,11 +63,11 @@
         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.size > 3 && @args[2].is_a?(Hash)
-            @args[2]
+          if @args[1] && @args[1].is_a?(Hash)
+            @args[1]
           else
             {}
           end
         end
 