Rename validations (#199)

baonguyenNava · web-flow · commit 301d5b80dc3e · 2025-09-26T12:05:38.000-06:00
## Changes

Rename Flex::Validations to Strata::Validations

- Additionally, did some small cleanup with smaller moves + linting
diff --git a/app/controllers/concerns/.keep b/app/controllers/concerns/.keep
diff --git a/app/jobs/strata/application_job.rb b/app/jobs/strata/application_job.rb
@@ -1,4 +1,4 @@
-module Flex
+module Strata
   class ApplicationJob < ActiveJob::Base
   end
 end
diff --git a/app/lib/strata/attributes/basic_value_object_attribute.rb b/app/lib/strata/attributes/basic_value_object_attribute.rb
@@ -1,8 +1,8 @@
 module Strata
   module Attributes
-    # Internal module used by other Flex attribute modules to implement attributes
+    # Internal module used by other Strata attribute modules to implement attributes
     # whose type is a subclass of Strata::ValueObject. This module is not intended to be
-    # used directly by clients of Flex.
+    # used directly by clients of Strata.
     #
     # The module provides functionality to create attributes that represent complex values
     # as value objects, with nested attributes that are automatically mapped to and from
@@ -13,10 +13,10 @@ module Attributes
     # - A setter method that accepts either a value object or a hash of values
     # - Automatic validation handling for the nested structure
     #
-    # This module is used internally to implement higher-level attribute modules in Flex.
+    # This module is used internally to implement higher-level attribute modules in Strata.
     module BasicValueObjectAttribute
       extend ActiveSupport::Concern
-      include Flex::Validations
+      include Strata::Validations
 
       class_methods do
         # Defines an attribute associated with a subclass of
@@ -56,7 +56,7 @@ def basic_value_object_attribute(name, value_class, nested_attribute_types, opti
             end
           end
 
-          flex_validates_nested(name)
+          strata_validates_nested(name)
         end
       end
     end
diff --git a/app/lib/strata/attributes/range_attribute.rb b/app/lib/strata/attributes/range_attribute.rb
@@ -20,7 +20,7 @@ module Attributes
     #
     module RangeAttribute
       extend ActiveSupport::Concern
-      include Flex::Validations
+      include Strata::Validations
 
       def self.attribute_type
         :multi_column_value_object
@@ -53,7 +53,7 @@ def range_attribute(name, value_type, options = {})
             end
           end
 
-          flex_validates_nested(name)
+          strata_validates_nested(name)
         end
       end
     end
diff --git a/app/lib/strata/attributes/us_date_attribute.rb b/app/lib/strata/attributes/us_date_attribute.rb
@@ -4,7 +4,7 @@ module Attributes
     # It allows dates to be stored in a format that is consistent with US conventions
     module USDateAttribute
       extend ActiveSupport::Concern
-      include Flex::Validations
+      include Strata::Validations
 
       def self.attribute_type
         :single_column_value_object
@@ -28,7 +28,7 @@ def type
       class_methods do
         def us_date_attribute(name, options)
           attribute name, USDateType.new
-          flex_validates_type_casted_attribute(name, :invalid_date)
+          strata_validates_type_casted_attribute(name, :invalid_date)
         end
       end
     end
diff --git a/app/lib/strata/attributes/year_month_attribute.rb b/app/lib/strata/attributes/year_month_attribute.rb
@@ -19,7 +19,7 @@ module Attributes
     #
     module YearMonthAttribute
       extend ActiveSupport::Concern
-      include Flex::Validations
+      include Strata::Validations
 
       def self.attribute_type
         :single_column_value_object
@@ -70,8 +70,8 @@ def deserialize(value)
         # @return [void]
         def year_month_attribute(name, options = {})
           attribute name, YearMonthType.new
-          flex_validates_nested(name)
-          flex_validates_type_casted_attribute(name, :invalid_year_month)
+          strata_validates_nested(name)
+          strata_validates_type_casted_attribute(name, :invalid_year_month)
         end
       end
     end
diff --git a/app/lib/strata/attributes/year_quarter_attribute.rb b/app/lib/strata/attributes/year_quarter_attribute.rb
@@ -19,7 +19,7 @@ module Attributes
     #
     module YearQuarterAttribute
       extend ActiveSupport::Concern
-      include Flex::Validations
+      include Strata::Validations
 
       def self.attribute_type
         :single_column_value_object
@@ -70,8 +70,8 @@ def deserialize(value)
         # @return [void]
         def year_quarter_attribute(name, options = {})
           attribute name, YearQuarterType.new
-          flex_validates_nested(name)
-          flex_validates_type_casted_attribute(name, :invalid_year_quarter)
+          strata_validates_nested(name)
+          strata_validates_type_casted_attribute(name, :invalid_year_quarter)
         end
       end
     end
diff --git a/app/lib/strata/validations.rb b/app/lib/strata/validations.rb
@@ -1,26 +1,26 @@
-module Flex
+module Strata
   # Validations is a module that provides nested validation support for value objects.
   # It extends ActiveModel::Validations to handle validation of nested attributes in a
   # consistent way, propagating errors from nested objects to the parent model with
   # appropriate attribute name prefixing.
   #
   # This module should be included in models that need to validate nested value objects.
-  # It provides the flex_validates_nested class method for defining these validations.
+  # It provides the strata_validates_nested class method for defining these validations.
   # It is automatically included in the Strata::Attributes module.
   #
   # @example Including Validations in a model and validating a nested date range
   #   class MyModel < ApplicationRecord
-  #     include Flex::Validations
+  #     include Strata::Validations
   #
-  #     flex_validates_nested :period
+  #     strata_validates_nested :period
   #   end
   #
   module Validations
     extend ActiveSupport::Concern
     include ActiveModel::Validations
 
     class_methods do
-      def flex_validates_nested(name)
+      def strata_validates_nested(name)
         validate :"validate_nested_#{name}"
 
         # Adds a validator for an attribute that represents a value object.
@@ -49,7 +49,7 @@ def flex_validates_nested(name)
         end
       end
 
-      def flex_validates_type_casted_attribute(name, error_type)
+      def strata_validates_type_casted_attribute(name, error_type)
         validate :"validate_type_casted_attribute_#{name}"
 
         define_method "validate_type_casted_attribute_#{name}" do
diff --git a/app/mailers/strata/application_mailer.rb b/app/mailers/strata/application_mailer.rb
@@ -1,5 +1,5 @@
-module Flex
-  # ApplicationMailer is the base class for all mailers in the Flex SDK.
+module Strata
+  # ApplicationMailer is the base class for all mailers in the Strata SDK.
   # It provides default settings and layouts for email templates.
   #
   # This class inherits from ActionMailer::Base and sets default sender
diff --git a/app/models/strata/value_object.rb b/app/models/strata/value_object.rb
@@ -21,7 +21,7 @@ class ValueObject
     include ActiveModel::Validations
     include ActiveModel::Serializers::JSON
     include Strata::Attributes
-    include Flex::Validations
+    include Strata::Validations
 
     def ==(other)
       return false if self.class != other.class
diff --git a/app/models/strata/value_range.rb b/app/models/strata/value_range.rb
@@ -5,8 +5,8 @@ class ValueRange < Strata::ValueObject
     # start and end attributes are defined dynamically based on the value_class
     # (see ValueRange.[] method)
 
-    flex_validates_nested :start
-    flex_validates_nested :end
+    strata_validates_nested :start
+    strata_validates_nested :end
     validate :start_cannot_be_greater_than_end
 
     def include?(value)
diff --git a/spec/dummy/spec/lib/strata/validations_spec.rb b/spec/dummy/spec/lib/strata/validations_spec.rb
@@ -1,9 +1,9 @@
 require 'rails_helper'
 
-RSpec.describe Flex::Validations do
+RSpec.describe Strata::Validations do
   let(:object) { TestRecord.new }
 
-  describe '#flex_validates_nested' do
+  describe '#strata_validates_nested' do
     let(:valid_base_period) do
       Strata::ValueRange[Strata::YearQuarter].new(
         start: Strata::YearQuarter.new(year: 2025, quarter: 1),
diff --git a/spec/helpers/strata/application_helper_spec.rb b/spec/helpers/strata/application_helper_spec.rb
@@ -2,26 +2,10 @@
 
 RSpec.describe Strata::ApplicationHelper, type: :helper do
   describe '#strata_form_with' do
-    it 'sets the builder, forwards options, includes :model when provided, and yields the block' do
-      dummy_model = double('Model')
+    it 'sets builder, forwards options, includes :model when provided, and returns form_with result' do
+      dummy_model = instance_double(Object)
 
-      expect(helper).to receive(:form_with) do |**args, &blk|
-        expect(args[:builder]).to eq(Strata::FormBuilder)
-        expect(args[:scope]).to eq(:user)
-        expect(args[:url]).to eq('/submit')
-        expect(args[:format]).to eq(:json)
-
-        # forwards arbitrary options
-        expect(args[:local]).to eq(true)
-        expect(args[:method]).to eq(:patch)
-        expect(args[:data]).to eq({ foo: 'bar' })
-
-        # includes model when provided
-        expect(args[:model]).to eq(dummy_model)
-
-        expect(blk).to be_a(Proc)
-        :result
-      end
+      allow(helper).to receive(:form_with).and_return(:result)
 
       result = helper.strata_form_with(
         model: dummy_model,
@@ -33,11 +17,23 @@
         data: { foo: 'bar' }
       ) { :yielded }
 
+      expect(helper).to have_received(:form_with).with(
+        hash_including(
+          builder: Strata::FormBuilder,
+          scope: :user,
+          url: '/submit',
+          format: :json,
+          local: true,
+          method: :patch,
+          data: { foo: 'bar' },
+          model: dummy_model
+        )
+      )
       expect(result).to eq(:result)
     end
 
     it 'omits :model when model is falsey' do
-      expect(helper).to receive(:form_with) do |**args, &blk|
+      allow(helper).to receive(:form_with) do |**args, &blk|
         expect(args).not_to have_key(:model)
         :no_model
       end
@@ -47,5 +43,3 @@
     end
   end
 end
-
-

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`		`-module Flex`
`2`		`- # ApplicationMailer is the base class for all mailers in the Flex SDK.`
	`1`	`+module Strata`
	`2`	`+ # ApplicationMailer is the base class for all mailers in the Strata SDK.`
`3`	`3`	`# It provides default settings and layouts for email templates.`
`4`	`4`	`#`
`5`	`5`	`# This class inherits from ActionMailer::Base and sets default sender`