gov_uk_date_fields 1.0.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8f339e206ab6ddf10b3905aecd2e6bea7e7bbada
-  data.tar.gz: 9736e32d381faf7360d57eb488673ccb2f289dbf
+  metadata.gz: 019c47dec540df18ad926d8f63d2cd303500a529
+  data.tar.gz: 1fe179381218745ceb752a68b78cebbc07ec2abf
 SHA512:
-  metadata.gz: ebd14090f8f6418ea1fc1505a49fc5bcc416550b6a3da4df120503668fb76b0cd18676594f38a5d2020a969f1da5982f98293d8356a96a3ce79d4958f50bbf3b
-  data.tar.gz: 15e120b2cfa3269fd93e84b3c6b5e30b9ff2261bef3e7e322e6f8d003ffc7c0e4043fd7a505e94bec47f830538db0126c0a53e30b7849d59a305c8348b3db75d
+  metadata.gz: 7ed038d2457e55ddabf3989e99ec490ed818dfe67f11e8de564a17afeca394541d45311c7e42bfe914d7992245adb7f1a3d718e57cc5e5f5c3946c4d01576220
+  data.tar.gz: 2c646bb53b4b2c762da3040cd83051878140655e58f7bd36e26d8ce48de7a2230d9c7f5caa4f49b3a0b99d2570ea75f50facdba41ef0fda06683f2444020d6b2

data/lib/gov_uk_date_fields/form_fields.rb

@@ -1,7 +1,7 @@
 module GovUkDateFields
 
   class FormFields
-    VALID_OPTIONS = [:legend_text, :legend_class, :form_hint_text, :placeholders]
+    VALID_OPTIONS = [:legend_text, :legend_class, :form_hint_text, :id, :placeholders]
 
     DATE_SEGMENTS = {
       day:    '_dd',
@@ -26,6 +26,7 @@ module GovUkDateFields
       @year_value         = @object.send("#{@attribute}_yyyy")
       @form_hint_text     = @options[:form_hint_text] || "For example, 31 3 1980"
       @fieldset_required  = false
+      @fieldset_id        = @options[:id]
       parse_options
     end
 
@@ -57,13 +58,21 @@ module GovUkDateFields
 
     def generate_start_fieldset
       %Q|
-        <fieldset>
+        #{generate_fieldset_tag}
           #{generate_legend_tag}#{@options[:legend_text]}</legend>
           <div class="form-date">
             <p class="form-hint" id="#{@attribute}-hint">#{@form_hint_text}</p>
       |
     end
 
+    def generate_fieldset_tag
+      if @fieldset_id.nil?
+        "<fieldset>"
+      else
+        %Q|<fieldset id="#{@fieldset_id}">|
+      end
+    end
+
     def generate_end_fieldset
       "</div></fieldset>"
     end
@@ -124,7 +133,7 @@ module GovUkDateFields
 
     def parse_options
       validate_option_keys
-      if @options.key?(:legend_text)
+      if @options.key?(:legend_text) || @options.key?(:id)
         @fieldset_required = true
       else
         if @options.key?(:legend_class) || @options.key?(:form_hint_text)

data/lib/gov_uk_date_fields/version.rb

@@ -1,3 +1,3 @@
 module GovUkDateFields
-  VERSION = "1.0.0"
+  VERSION = "1.0.1"
 end

data/test/dummy/log/test.log

@@ -4933,3 +4933,111 @@ GovUkDateFieldsTest: test_placeholder_output_without_fieldset
 GovUkDateFieldsTest: test_basic_output_without_fieldset
 -------------------------------------------------------
    (0.1ms)  ROLLBACK
+  ActiveRecord::SchemaMigration Load (0.4ms)  SELECT "schema_migrations".* FROM "schema_migrations"
+   (0.1ms)  BEGIN
+-------------------------------------------------------
+GovUkDateFieldsTest: test_basic_output_without_fieldset
+-------------------------------------------------------
+   (0.2ms)  ROLLBACK
+   (0.1ms)  BEGIN
+-------------------------------------------------------------
+GovUkDateFieldsTest: test_placeholder_output_without_fieldset
+-------------------------------------------------------------
+   (0.1ms)  ROLLBACK
+   (0.1ms)  BEGIN
+--------------------------------------------------------
+GovUkDateFieldsTest: test_fieldset_output_with_form_hint
+--------------------------------------------------------
+   (0.1ms)  ROLLBACK
+   (0.3ms)  BEGIN
+-------------------------------------
+GovUkDateFieldsTest: test_squash_html
+-------------------------------------
+   (0.1ms)  ROLLBACK
+   (0.1ms)  BEGIN
+------------------------------------------
+GovUkDateFieldsTest: test_fieldset_with_id
+------------------------------------------
+   (0.1ms)  ROLLBACK
+   (0.1ms)  BEGIN
+-----------------------------------------------------------
+GovUkDateFieldsTest: test_fieldset_output_with_legend_class
+-----------------------------------------------------------
+   (0.1ms)  ROLLBACK
+   (0.1ms)  BEGIN
+---------------------------------------------------------------
+GovUkDateFieldsTest: test_error_raised_if_invalid_options_given
+---------------------------------------------------------------
+   (0.1ms)  ROLLBACK
+  ActiveRecord::SchemaMigration Load (0.3ms)  SELECT "schema_migrations".* FROM "schema_migrations"
+   (0.2ms)  BEGIN
+-----------------------------------------------------------
+GovUkDateFieldsTest: test_fieldset_output_with_legend_class
+-----------------------------------------------------------
+   (0.2ms)  ROLLBACK
+   (0.1ms)  BEGIN
+------------------------------------------
+GovUkDateFieldsTest: test_fieldset_with_id
+------------------------------------------
+   (0.2ms)  ROLLBACK
+   (0.1ms)  BEGIN
+-------------------------------------
+GovUkDateFieldsTest: test_squash_html
+-------------------------------------
+   (0.1ms)  ROLLBACK
+   (0.1ms)  BEGIN
+-------------------------------------------------------------
+GovUkDateFieldsTest: test_placeholder_output_without_fieldset
+-------------------------------------------------------------
+   (0.1ms)  ROLLBACK
+   (0.1ms)  BEGIN
+---------------------------------------------------------------
+GovUkDateFieldsTest: test_error_raised_if_invalid_options_given
+---------------------------------------------------------------
+   (0.1ms)  ROLLBACK
+   (0.1ms)  BEGIN
+-------------------------------------------------------
+GovUkDateFieldsTest: test_basic_output_without_fieldset
+-------------------------------------------------------
+   (0.1ms)  ROLLBACK
+   (0.1ms)  BEGIN
+--------------------------------------------------------
+GovUkDateFieldsTest: test_fieldset_output_with_form_hint
+--------------------------------------------------------
+   (0.1ms)  ROLLBACK
+  ActiveRecord::SchemaMigration Load (0.3ms)  SELECT "schema_migrations".* FROM "schema_migrations"
+   (0.2ms)  BEGIN
+-------------------------------------------------------------
+GovUkDateFieldsTest: test_placeholder_output_without_fieldset
+-------------------------------------------------------------
+   (0.2ms)  ROLLBACK
+   (0.1ms)  BEGIN
+---------------------------------------------------------------
+GovUkDateFieldsTest: test_error_raised_if_invalid_options_given
+---------------------------------------------------------------
+   (0.1ms)  ROLLBACK
+   (0.0ms)  BEGIN
+------------------------------------------
+GovUkDateFieldsTest: test_fieldset_with_id
+------------------------------------------
+   (0.1ms)  ROLLBACK
+   (0.1ms)  BEGIN
+--------------------------------------------------------
+GovUkDateFieldsTest: test_fieldset_output_with_form_hint
+--------------------------------------------------------
+   (0.1ms)  ROLLBACK
+   (0.1ms)  BEGIN
+-------------------------------------
+GovUkDateFieldsTest: test_squash_html
+-------------------------------------
+   (0.1ms)  ROLLBACK
+   (0.1ms)  BEGIN
+-----------------------------------------------------------
+GovUkDateFieldsTest: test_fieldset_output_with_legend_class
+-----------------------------------------------------------
+   (0.1ms)  ROLLBACK
+   (0.1ms)  BEGIN
+-------------------------------------------------------
+GovUkDateFieldsTest: test_basic_output_without_fieldset
+-------------------------------------------------------
+   (0.1ms)  ROLLBACK

data/test/form_fields_test.rb

@@ -40,13 +40,17 @@ class GovUkDateFieldsTest < ActiveSupport::TestCase
     date_fields = GovUkDateFields::FormFields.new(@form_builder, :employee, :dob, {legend_text: 'Date of birth', legend_class: 'govuk_legend_class', form_hint_text: 'In the form: dd mm yyyy'})
     assert_html_equal(date_fields.raw_output, expected_fieldset_output_with_form_hint)
   end
-
   
   test 'fieldset output with legend class' do
     date_fields = GovUkDateFields::FormFields.new(@form_builder, :employee, :joined, {legend_text: 'Joining date', legend_class: 'date-legend-class', form_hint_text: 'For example, 31 3 1980'})
     assert_html_equal(date_fields.raw_output, expected_fieldset_output_with_legend_class)
   end
 
+  test 'fieldset with id' do
+    date_fields = GovUkDateFields::FormFields.new(@form_builder, :employee, :joined, {legend_text: 'Joining date', id: 'employee_date_joined'})
+    assert_html_equal(date_fields.raw_output, expected_fieldset_output_with_id)
+  end
+
   test "squash_html" do
     html = "   <html>  This is some   text \n  <tr>  \n    <td>  <%=   dfkhdfh   %>  </td>  </tr>\n</html> "
     expected_result = "<html>This is some   text<tr><td><%=   dfkhdfh   %></td></tr></html>"
@@ -71,6 +75,29 @@ class GovUkDateFieldsTest < ActiveSupport::TestCase
     }
   end
 
+  def expected_fieldset_output_with_id
+    %Q{
+      <fieldset id="employee_date_joined">
+        <legend>Joining date</legend>
+        <div class="form-date">
+          <p class="form-hint" id="joined-hint">For example, 31 3 1980</p>
+          <div class="form-group form-group-day">
+            <label for="joined-day">Day</label>
+            <input class="form-control" id="joined-day" name="joined-day" type="number" pattern="[0-9]*" min="0" max="31" aria-describedby="joined-hint" value="1">
+          </div>
+          <div class="form-group form-group-month">
+            <label for="joined-month">Month</label>
+            <input class="form-control" id="joined-month" name="joined-month" type="number" pattern="[0-9]*" min="0" max="12" value="4">
+          </div>
+          <div class="form-group form-group-year">
+            <label for="joined-year">Year</label>
+            <input class="form-control" id="joined-year" name="joined-year" type="number" pattern="[0-9]*" min="0" max="2016" value="2015">
+          </div>
+        </div>
+      </fieldset>
+    }
+  end
+
   def expected_fieldset_output_with_form_hint
     %Q{
       <fieldset>

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gov_uk_date_fields
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors:
 - Stephen Richards