dummy: rename numericality validation fields

Author: jasl

test/dummy/app/models/concerns/fields/validations/numericality.rb

@@ -19,55 +19,36 @@ def interpret_to(model, field_name, accessibility, options = {})
     end
 
     class NumericalityOptions < FieldOptions
-      attribute :lower_value, :float, default: 0.0
-      attribute :upper_value, :float, default: 0.0
+      attribute :lower_bound_check, :string, default: "disabled"
+      attribute :upper_bound_check, :string, default: "disabled"
 
-      enum lower_bound: {
+      attribute :lower_bound_value, :float, default: 0.0
+      attribute :upper_bound_value, :float, default: 0.0
+
+      enum lower_bound_check: {
         disabled: "disabled",
         greater_than: "greater_than",
         greater_than_or_equal_to: "greater_than_or_equal_to"
-      }, _prefix: :lower_bound
-      enum upper_bound: {
+      }, _prefix: :lower_bound_check
+      enum upper_bound_check: {
         disabled: "disabled",
         less_than: "less_than",
         less_than_or_equal_to: "less_than_or_equal_to"
-      }, _prefix: :upper_bound
-
-      attribute :lower_bound, :string, default: "disabled"
-      attribute :upper_bound, :string, default: "disabled"
-
-      def greater_than=(value)
-        self.lower_bound = "greater_than"
-        self.lower_value = value
-      end
-
-      def greater_than_or_equal_to=(value)
-        self.lower_bound = "greater_than_or_equal_to"
-        self.lower_value = value
-      end
-
-      def less_than=(value)
-        self.upper_bound = "less_than"
-        self.upper_value = value
-      end
-
-      def less_than_or_equal_to=(value)
-        self.upper_bound = "less_than_or_equal_to"
-        self.upper_value = value
-      end
+      }, _prefix: :upper_bound_check
 
-      validates :upper_value,
+      validates :upper_bound_value,
                 numericality: {
-                  greater_than: :lower_value
+                  greater_than: :lower_bound_value
                 },
-                if: proc { upper_bound != "disabled" && lower_bound != "disabled" }
+                if: proc { upper_bound_check != "disabled" && lower_bound_check != "disabled" }
 
       def interpret_to(model, field_name, _accessibility, _options = {})
         options = {}
-        options[lower_bound] = lower_value unless lower_bound_disabled?
-        options[upper_bound] = upper_value unless upper_bound_disabled?
+        options[lower_bound_check] = lower_bound_value unless lower_bound_check_disabled?
+        options[upper_bound_check] = upper_bound_value unless upper_bound_check_disabled?
         return if options.empty?
 
+        options.symbolize_keys!
         model.validates field_name, numericality: options, allow_blank: true
       end
     end

test/dummy/app/presenters/concerns/fields/presenter_for_number_field.rb

@@ -5,16 +5,16 @@ module PresenterForNumberField
     extend ActiveSupport::Concern
 
     def min
-      return if @model.validations.numericality.lower_bound_disabled?
+      return if @model.validations.numericality.lower_bound_check_disabled?
 
-      min = @model.validations.numericality.lower_value
+      min = @model.validations.numericality.lower_bound_value
       integer_only? ? min.to_i : min
     end
 
     def max
-      return if @model.validations.numericality.upper_bound_disabled?
+      return if @model.validations.numericality.upper_bound_check_disabled?
 
-      max = @model.validations.numericality.upper_value
+      max = @model.validations.numericality.upper_bound_value
       integer_only? ? max.to_i : max
     end
 

test/dummy/app/views/_form_core/validations/_numericality.html.erb

@@ -22,22 +22,22 @@
   <div class="field has-addons">
     <div class="control">
       <span class="select">
-        <%= ff.select :lower_bound, options_for_enum_select(numericality.class, :lower_bound, numericality.lower_bound), {}, class: "select" %>
+        <%= ff.select :lower_bound_check, options_for_enum_select(numericality.class, :lower_bound_check, numericality.lower_bound_check), {}, class: "select" %>
       </span>
     </div>
     <div class="control">
-      <%= ff.number_field :lower_value, step: 0.01, class: "input" %>
+      <%= ff.number_field :lower_bound_value, step: 0.01, class: "input" %>
     </div>
   </div>
 
   <div class="field has-addons">
     <div class="control">
       <span class="select">
-        <%= ff.select :upper_bound, options_for_enum_select(numericality.class, :upper_bound, numericality.upper_bound), {}, class: "select" %>
+        <%= ff.select :upper_bound_check, options_for_enum_select(numericality.class, :upper_bound_check, numericality.upper_bound_check), {}, class: "select" %>
       </span>
     </div>
     <div class="control">
-      <%= ff.number_field :upper_value, step: 0.01, class: "input" %>
+      <%= ff.number_field :upper_bound_value, step: 0.01, class: "input" %>
     </div>
   </div>
 <% end %>

test/dummy/config/locales/form_core.en.yml

@@ -50,12 +50,11 @@ en:
         minimum: Minimum
         maximum: Maximum
         is: Equal
-        lower_bounds:
+        lower_bound_checks:
           disabled: 'Off'
           greater_than: '>'
           greater_than_or_equal_to: '>='
-        upper_bounds:
+        upper_bound_checks:
           disabled: 'Off'
           less_than: '<'
           less_than_or_equal_to: '<='
-