express_templates 0.3.5 → 0.3.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d742a1eb7b837967378382a6d1d389a272a6bf8c
-  data.tar.gz: b6b8a96819bb587a242093ca991af100f5e62853
+  metadata.gz: 1e11659af9b175019fa94c33686d4f4f197fcc07
+  data.tar.gz: 3bd1729777599d3ba3772c72d8b403098aa66b07
 SHA512:
-  metadata.gz: 931e15f70ec9d4a1a060c4f6f09c4ae2821e7cc571c91aee3f1580cf26d83e99475ac956d06b1d6282492a2302124e507bae218d1a692d7636623ecb202af428
-  data.tar.gz: 062fe5cef79a19962a304ca6e53c539ba685af8a5845926a12f3a911201c6b4f7f57d9f533ff4b8df99368e590fb409d800062cad9c2419d1182a487b6b5a101
+  metadata.gz: 34b7fedf65a87724dadb3d8c77ecdc78dbef4598d0bf2da4cecbc89bfbbba865bdbf9a9fbf3518d197f93597c0091a18153df7919a988f31bf786b3ef1b257dd
+  data.tar.gz: b55b2a3cb61868d5df45738d8c1cfbf423a0bbc60996aca66c65d7cfc72d75dad0bd4831ae352c24c372dbd08fbba6e3fc775c1a5aba08eb295a0960096d0c14

data/lib/express_templates/components/form_for.rb

@@ -209,19 +209,27 @@ module ExpressTemplates
       #   #   <label class="radio" for="user_age_2"><input type="radio" value="2" name="user[age]" id="user_age_2">Two</label>
       #   # </div>
       #
-      def radio(name, collection, value_method, text_method, options = {})
+      #   f.radio :enable_something, :boolean
+      #   # <div>
+      #   #   <label class="radio"><input type="radio" value="1" name="user[age]" id="user_age_1">One</label>
+      #   #   <label class="radio"><input type="radio" value="2" name="user[age]" id="user_age_2">Two</label>
+      #   # </div>
+      def radio(name, collection, value_method = :first, text_method = :last, options = {})
         @fields ||= []
+        if collection == :boolean
+          collection = [[true, 'True'], [false, 'False']]
+        end
         @fields << Radio.new(name, options.merge!(collection: collection, value_method: value_method, text_method: text_method))
       end
 
       # ==== Examples
       #   f.checkbox :age, [[1, 'One'], [2, 'Two']], :first, :last
       #   # <div>
-      #   #   <label class="checkbox" for="user_age_1">
+      #   #   <label class="checkbox">
       #   #     <input type="checkbox" value="1" name="user[age][]" id="user_age_1">
       #   #     "One"
       #   #   </label>
-      #   #   <label>
+      #   #   <label class="checkbox">
       #   #     <input type="checkbox" value="2" name="user[age][]" id="user_age_2">
       #   #     "Two"
       #   #   </label>
@@ -305,11 +313,13 @@ module ExpressTemplates
                 label_tag(label_name, field_label)
                 select_tag(resource_field_name, field.options_html, field.options)
               elsif field_type == 'radio'
+                label_tag(label_name, field_label)
                 collection_radio_buttons(my[:id], field_name, field.collection,
                                          field.value_method, field.text_method, field.options) do |b|
                   b.label(class: 'radio') { b.radio_button + b.text }
                 end
               elsif field_type == 'checkbox'
+                label_tag(label_name, field_label)
                 collection_check_boxes(my[:id], field_name, field.collection,
                                        field.value_method, field.text_method, field.options) do |b|
                   b.label(class: 'checkbox') { b.check_box + b.text }

data/lib/express_templates/version.rb

@@ -1,3 +1,3 @@
 module ExpressTemplates
-  VERSION = "0.3.5"
+  VERSION = "0.3.6"
 end

data/test/components/form_for_test.rb

@@ -99,6 +99,7 @@ class FormForTest < ActiveSupport::TestCase
     fragment = -> {
       form_for(:resource) do |f|
         f.radio :age, [[1, 'One'],[2, 'Two']], :first, :last
+        f.radio :enable_something, :boolean
       end
     }
     return ctx, fragment
@@ -197,7 +198,13 @@ class FormForTest < ActiveSupport::TestCase
   </div>
 
   <div class=\"\">
-"+%Q(#{collection_radio_buttons(:resource, :age, [[1, "One"], [2, "Two"]], :first, :last, {}) do |b|
+"+%Q(#{label_tag("resource_age", "Age")})+%Q(#{collection_radio_buttons(:resource, :age, [[1, "One"], [2, "Two"]], :first, :last, {}) do |b|
+                  b.label(class: 'radio') { b.radio_button + b.text }
+                end})+"
+  </div>
+
+  <div class=\"\">
+"+%Q(#{label_tag("resource_enable_something", "Enable Something")})+%Q(#{collection_radio_buttons(:resource, :enable_something, [[true, "True"], [false, "False"]], :first, :last, {}) do |b|
                   b.label(class: 'radio') { b.radio_button + b.text }
                 end})+"
   </div>
@@ -221,7 +228,7 @@ class FormForTest < ActiveSupport::TestCase
   </div>
 
   <div class=\"\">
-"+%Q(#{collection_check_boxes(:resource, :age, [[1, "One"], [2, "Two"]], :first, :last, {}) do |b|
+"+%Q(#{label_tag("resource_age", "Age")})+%Q(#{collection_check_boxes(:resource, :age, [[1, "One"], [2, "Two"]], :first, :last, {}) do |b|
                   b.label(class: 'checkbox') { b.check_box + b.text }
                 end})+"
   </div>