express_templates 0.11.8 → 0.11.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4832cfc78c6baa394a408ea32aa18c66b4cb7ed7
-  data.tar.gz: 912d50b9d688c7a24a57f719abf36d33d63eb286
+  metadata.gz: b662a57e856dd89321c96091431adb2331ce4c0d
+  data.tar.gz: 5f3847dda42dec6989c7e85e86d6afd6f64100f1
 SHA512:
-  metadata.gz: cd44543aab5ff5b20c9dabd5543e50f683c567e7b756fa5884dde1f40980329d1ccd3ccf70dc70132f2371708d91a30c47ec2df139624be471177c03f6bf9f32
-  data.tar.gz: 7d836dd3ce6851b16efc2f300a38686cf42963d01532b78b3fa118f4353d2e84972283c2bd00ebc31f088cd0a632aae07f7fc4d3d7791814019ef74e72edeb8f
+  metadata.gz: 5461e2ef314e4a4bf8e3d4a291fce3f261ac539baac42ae20b8b36b093355ddb4f4effe60ab61c9d8c5dae9ebb1477c5eed0d401e416612fb9a32bdbdedb30c3
+  data.tar.gz: 23fbaaf48a9ed88fd36d53311a8fd46d0c510110b220fd9d21b39f6df717dc95cea5088029146b50ab01420f6a40d508b6319ca6c3e5cbbda22e5546142dcb9f

data/lib/express_templates/components/forms/radio.rb

@@ -6,6 +6,11 @@ module ExpressTemplates
 
         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.'
+        has_option(
+          :label_after,
+          "Specify (true of false) if the label should appear after the input (they will be siblings)",
+          default: false
+        )
 
         contains -> {
           label_tag(label_name, label_text)
@@ -35,23 +40,36 @@ module ExpressTemplates
         end
 
         def generate_options_from_specified_values
-          case
-          when option_collection.kind_of?(Array)
-            option_collection.each_with_index do |option, index|
-              label(class: config[:label_wrapper_class]) {
-                radio_button(resource_name, field_name.to_sym, option, class: 'radio')
-                current_arbre_element.add_child option
-              }
+          if !option_collection.kind_of?(Array) &&
+              !option_collection.kind_of?(Hash)
+            raise ArgumentError, "Radio collection should be Array or Hash: #{option_collection.inspect}"
+          end
+
+          option_collection_hash = option_collection
+          if option_collection.kind_of?(Array)
+            option_collection_hash = option_collection.inject({}) do |hash, val|
+              hash[val] = val
+              hash
             end
-          when option_collection.kind_of?(Hash)
-            option_collection.each_pair do |key, value|
+          end
+
+          option_collection_hash.each_pair do |key, value|
+            if label_after?
+              div(class: "radio-input-container") {
+                radio_button(resource_name, field_name.to_sym, key, class: 'radio')
+                label({
+                  class: config[:label_wrapper_class],
+                  for: "#{resource_name}_#{field_name}_#{key}",
+                }) {
+                  current_arbre_element.add_child value
+                }
+              }
+            else
               label(class: config[:label_wrapper_class]) {
                 radio_button(resource_name, field_name.to_sym, key, class: 'radio')
                 current_arbre_element.add_child  value
               }
             end
-          else
-            raise "Radio collection should be Array or Hash: #{option_collection.inspect}"
           end
         end
 
@@ -59,6 +77,12 @@ module ExpressTemplates
           related_collection or raise "No association collection for: #{resource_name}.#{field_name}"
         end
 
+        protected
+
+        def label_after?
+          !!config[:label_after]
+        end
+
       end
     end
   end

data/lib/express_templates/version.rb

@@ -1,3 +1,3 @@
 module ExpressTemplates
-  VERSION = "0.11.8"
+  VERSION = "0.11.9"
 end

data/test/components/forms/radio_test.rb

@@ -100,6 +100,44 @@ class RadioTest < ActiveSupport::TestCase
                   radio_with_options_omitted
   end
 
+  test "label_after is true, options specified is an array - label appears after the input" do
+    html = arbre {
+      express_form(:person) {
+        radio :subscribed, options: ['Yes', 'No'], label_after: true
+      }
+    }
+
+    document = Nokogiri::HTML.parse(html)
+    radio_input_containers = document.css(".radio-input-container")
+
+    container_1 = radio_input_containers[0]
+    assert_equal "input", container_1.element_children[0].name
+    assert_equal "label", container_1.element_children[1].name
+
+    container_2 = radio_input_containers[1]
+    assert_equal "input", container_2.element_children[0].name
+    assert_equal "label", container_2.element_children[1].name
+  end
+
+  test "label_after is true, options specified is a hash - label appears after the input" do
+    html = arbre {
+      express_form(:person) {
+        radio :subscribed, options: {0 => 'Yes', 1 => 'No'}, label_after: true
+      }
+    }
+
+    document = Nokogiri::HTML.parse(html)
+    radio_input_containers = document.css(".radio-input-container")
+
+    container_1 = radio_input_containers[0]
+    assert_equal "input", container_1.element_children[0].name
+    assert_equal "label", container_1.element_children[1].name
+
+    container_2 = radio_input_containers[1]
+    assert_equal "input", container_2.element_children[0].name
+    assert_equal "label", container_2.element_children[1].name
+  end
+
   # test "radio supports html options"
 
   # test "html_options passed correctly when collection is omitted"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: express_templates
 version: !ruby/object:Gem::Version
-  version: 0.11.8
+  version: 0.11.9
 platform: ruby
 authors:
 - Steven Talcott Smith
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-27 00:00:00.000000000 Z
+date: 2016-01-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport