chobble-forms 0.7.1 → 0.7.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 771171d582d4bdb09d03fc7ac56a37ca4922d7ce9ee76f392c19c0667e2cd6d3
-  data.tar.gz: e692e2d66579f14eae1099989efddef5a7358620653ac6ab7daaf3ffab151333
+  metadata.gz: 6541e97cfb901cd5437021bc314615f055125057456dfad79475be9497c55092
+  data.tar.gz: 21a7944f64c0974e144cfbc0b39fcb4d0f7dcff980358b08454c899ef181d8a3
 SHA512:
-  metadata.gz: c7b53bd70bfa1063f24071b476a9789b43d79c0c539e033857b1331caf0456bb324fea113a93471bc0fef9b114c9b9004f52b10c0c3a82ef52c6a85e54b91e34
-  data.tar.gz: f4b9fd0dedb8a2e0d133cf09f0dc0ab5e9e4b390cfeafe510b16424e9ec1037492fdec506db580447c61d6857597bb164d60c2b211fc019f1df58d1472f27202
+  metadata.gz: 47ddc8c257e2e6b228205fbe2f6ac215b5d43d51e1df0f4348f912b94f1d153f2b0d810db04ef6531c71c30b0f69ad12b29a4d9ab74b4a5be7af60bf56237f2a
+  data.tar.gz: f30b8deb1d9ad611671be7a3fc92d41e37e36613b6a6d294cef1c28e46ef402bd495820b5a7b1bd0e989e987729defb196292c17dc20a258a3b88b3c437e2a92

data/lib/chobble_forms/helpers.rb

@@ -7,11 +7,11 @@ module ChobbleForms
   module Helpers
     extend T::Sig
 
-    SelectOption = T.type_alias {
+    SelectOption = T.type_alias do
       [String, T.any(String, Integer)]
-    }
+    end
 
-    LocalAssignValue = T.type_alias {
+    LocalAssignValue = T.type_alias do
       T.any(
         String,
         Symbol,
@@ -21,9 +21,9 @@ module ChobbleForms
         T::Array[SelectOption],
         T::Hash[Symbol, T.untyped]
       )
-    }
+    end
 
-    FieldSetupResult = T.type_alias {
+    FieldSetupResult = T.type_alias do
       {
         form_object: T.untyped,
         i18n_base: String,
@@ -33,7 +33,7 @@ module ChobbleForms
         field_hint: T.nilable(String),
         field_placeholder: T.nilable(String)
       }
-    }
+    end
 
     sig { params(field: Symbol, local_assigns: T::Hash[Symbol, LocalAssignValue]).returns(FieldSetupResult) }
     def form_field_setup(field, local_assigns)
@@ -91,7 +91,10 @@ module ChobbleForms
       }
     end
 
-    sig { params(prefilled: T::Boolean, checked_value: T.untyped, expected_value: T.untyped).returns(T::Hash[Symbol, T::Boolean]) }
+    sig do
+      params(prefilled: T::Boolean, checked_value: T.untyped,
+        expected_value: T.untyped).returns(T::Hash[Symbol, T::Boolean])
+    end
     def radio_button_options(prefilled, checked_value, expected_value)
       (prefilled && checked_value == expected_value) ? {checked: true} : {}
     end
@@ -136,7 +139,11 @@ module ChobbleForms
       i18n_base = T.unsafe(instance_variable_get(:@_current_i18n_base))
 
       # Only strip _pass suffix for pass/fail fields, not _comment fields
-      lookup_field = field.to_s.end_with?("_pass") ? FieldUtils.strip_field_suffix(field) : field
+      lookup_field = if field.to_s.end_with?("_pass")
+        FieldUtils.strip_field_suffix(field)
+      else
+        field
+      end
       fields_key = "#{i18n_base}.fields.#{lookup_field}"
       field_label = t(fields_key, raise: true)
 
@@ -152,7 +159,10 @@ module ChobbleForms
       }
     end
 
-    sig { params(field_translations: T::Hash[Symbol, T.nilable(String)], value: T.untyped, prefilled: T::Boolean).returns(FieldSetupResult) }
+    sig do
+      params(field_translations: T::Hash[Symbol, T.nilable(String)], value: T.untyped,
+        prefilled: T::Boolean).returns(FieldSetupResult)
+    end
     def build_field_setup_result(field_translations, value, prefilled)
       form_obj = T.unsafe(instance_variable_get(:@_current_form))
       i18n_base = T.unsafe(instance_variable_get(:@_current_i18n_base))
@@ -168,21 +178,28 @@ module ChobbleForms
       )
     end
 
+    sig { params(model: T.untyped, field: Symbol, raise_if_missing: T::Boolean).returns(T.untyped) }
+    def get_field_value_from_model(model, field, raise_if_missing: false)
+      return nil unless model
+
+      # Check for base field first (for fields like step_ramp_size that have a base value)
+      # Only check for _pass suffix if base field doesn't exist (for pass_fail_comment partials)
+      if model.respond_to?(field)
+        model.send(field)
+      elsif model.respond_to?("#{field}_pass")
+        model.send("#{field}_pass")
+      elsif raise_if_missing
+        available = model.attributes.keys.sort.join(", ")
+        raise "Field '#{field}' or '#{field}_pass' not found on " \
+              "#{model.class.name}. Available fields: #{available}"
+      end
+    end
+
     sig { params(model: T.untyped, field: Symbol).returns({value: T.untyped, prefilled: T::Boolean}) }
     def resolve_field_value(model, field)
-      field_str = field.to_s
+      return {value: nil, prefilled: false} if field.to_s.include?("password")
 
-      return {value: nil, prefilled: false} if field_str.include?("password")
-
-      # For composite partials, we receive the base field but need to check for suffixed fields
-      # Check for _pass field first (in case both base and _pass exist)
-      if model.respond_to?("#{field}_pass")
-        current_value = model.send("#{field}_pass")
-      elsif model.respond_to?(field)
-        current_value = model.send(field)
-      else
-        raise "Field '#{field}' or '#{field}_pass' not found on #{model.class.name}. Available fields: #{model.attributes.keys.sort.join(", ")}"
-      end
+      current_value = get_field_value_from_model(model, field, raise_if_missing: true)
 
       # Check if this field should not be prefilled based on excluded fields list
       excluded_fields = T.unsafe(instance_variable_get(:@_excluded_prefill_fields))
@@ -198,11 +215,7 @@ module ChobbleForms
         }
       end
 
-      if field_str.end_with?("_id") && field_str != "id"
-        resolve_association_value(model, field_str)
-      else
-        {value: current_value, prefilled: false}
-      end
+      {value: current_value, prefilled: false}
     end
 
     sig { params(previous_inspection: T.untyped, current_model: T.untyped, field: Symbol).returns(T.untyped) }
@@ -212,7 +225,7 @@ module ChobbleForms
       elsif current_model.class.name.include?("Assessment")
         assessment_type = current_model.class.name.demodulize.underscore
         previous_model = previous_inspection.send(assessment_type)
-        previous_model&.send(field)
+        get_field_value_from_model(previous_model, field, raise_if_missing: false)
       else
         previous_inspection.send(field)
       end

data/lib/chobble_forms/version.rb

@@ -2,5 +2,5 @@
 # frozen_string_literal: true
 
 module ChobbleForms
-  VERSION = "0.7.1"
+  VERSION = "0.7.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: chobble-forms
 version: !ruby/object:Gem::Version
-  version: 0.7.1
+  version: 0.7.2
 platform: ruby
 authors:
 - Chobble.com
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-08-16 00:00:00.000000000 Z
+date: 2025-08-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails