chobble-forms 0.6.0 → 0.7.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 32610a1903913985762082f5865bd24bfcae7327bf887cafa70c09db7efe9e88
-  data.tar.gz: 4d0e15de04ab8ceee7fac1fea871d83582caf5bc96e4cc39760ef7e1297c8915
+  metadata.gz: 771171d582d4bdb09d03fc7ac56a37ca4922d7ce9ee76f392c19c0667e2cd6d3
+  data.tar.gz: e692e2d66579f14eae1099989efddef5a7358620653ac6ab7daaf3ffab151333
 SHA512:
-  metadata.gz: c70cbe6796e0edba08b2c41c5e476401d4579cc86de865710a772c0f4ef570abacd76f4ec08033d1d405ef887cdf44b52aa5f4e82c07085270c28186f5fb7532
-  data.tar.gz: d9b8cc2aff3b86e9de10b189a44f2d2a9f651a236b87da01dd0095bc27fb81b8ea034f14d72655ae580fa4cd26a777674c3a2db78225769eca42af134e176208
+  metadata.gz: c7b53bd70bfa1063f24071b476a9789b43d79c0c539e033857b1331caf0456bb324fea113a93471bc0fef9b114c9b9004f52b10c0c3a82ef52c6a85e54b91e34
+  data.tar.gz: f4b9fd0dedb8a2e0d133cf09f0dc0ab5e9e4b390cfeafe510b16424e9ec1037492fdec506db580447c61d6857597bb164d60c2b211fc019f1df58d1472f27202

data/lib/chobble_forms/field_utils.rb

@@ -7,23 +7,21 @@ module ChobbleForms
   module FieldUtils
     extend T::Sig
 
-    sig { params(field: Symbol).returns(String) }
+    sig { params(field: Symbol).returns(Symbol) }
     def self.strip_field_suffix(field)
-      field.to_s.gsub(/_pass$|_comment$/, "")
+      field.to_s.gsub(/_pass$|_comment$/, "").to_sym
     end
 
-    sig { params(field: Symbol, partial: Symbol).returns(T::Array[String]) }
+    sig { params(field: Symbol, partial: Symbol).returns(T::Array[Symbol]) }
     def self.get_composite_fields(field, partial)
-      fields = T.let([], T::Array[String])
+      fields = T.let([], T::Array[Symbol])
       partial_str = partial.to_s
 
-      if partial_str.include?("pass_fail") && !field.to_s.end_with?("_pass")
-        fields << "#{field}_pass"
-      end
+      fields << :"#{field}_pass" if partial_str.include?("pass_fail") && !field.to_s.end_with?("_pass")
 
       if partial_str.include?("comment")
         base = field.to_s.end_with?("_pass") ? strip_field_suffix(field) : field
-        fields << "#{base}_comment"
+        fields << :"#{base}_comment"
       end
 
       fields
@@ -44,7 +42,7 @@ module ChobbleForms
       is_pass_field?(field) || is_comment_field?(field)
     end
 
-    sig { params(field: Symbol).returns(String) }
+    sig { params(field: Symbol).returns(Symbol) }
     def self.base_field_name(field)
       strip_field_suffix(field)
     end
@@ -53,5 +51,10 @@ module ChobbleForms
     def self.form_field_label(form, field)
       I18n.t("forms.#{form}.fields.#{field}")
     end
+
+    sig { params(assessment_key: Symbol).returns(Symbol) }
+    def self.form_name_from_assessment(assessment_key)
+      assessment_key.to_s.gsub(/_assessment$/, "").to_sym
+    end
   end
 end

data/lib/chobble_forms/helpers.rb

@@ -7,7 +7,35 @@ module ChobbleForms
   module Helpers
     extend T::Sig
 
-    sig { params(field: Symbol, local_assigns: T::Hash[Symbol, T.untyped]).returns(T::Hash[Symbol, T.untyped]) }
+    SelectOption = T.type_alias {
+      [String, T.any(String, Integer)]
+    }
+
+    LocalAssignValue = T.type_alias {
+      T.any(
+        String,
+        Symbol,
+        Integer,
+        Float,
+        T::Boolean,
+        T::Array[SelectOption],
+        T::Hash[Symbol, T.untyped]
+      )
+    }
+
+    FieldSetupResult = T.type_alias {
+      {
+        form_object: T.untyped,
+        i18n_base: String,
+        value: T.untyped,
+        prefilled: T::Boolean,
+        field_label: String,
+        field_hint: T.nilable(String),
+        field_placeholder: T.nilable(String)
+      }
+    }
+
+    sig { params(field: Symbol, local_assigns: T::Hash[Symbol, LocalAssignValue]).returns(FieldSetupResult) }
     def form_field_setup(field, local_assigns)
       validate_local_assigns(local_assigns)
       validate_form_context
@@ -22,6 +50,7 @@ module ChobbleForms
     sig { params(form_object: T.untyped, field: Symbol).returns([T.untyped, T::Boolean]) }
     def get_field_value_and_prefilled_status(form_object, field)
       return [nil, false] unless form_object&.object
+
       model = form_object.object
       resolved = resolve_field_value(model, field)
       [resolved[:value], resolved[:prefilled]]
@@ -30,6 +59,7 @@ module ChobbleForms
     sig { params(form: T.untyped, comment_field: Symbol, base_field_label: String).returns(T::Hash[Symbol, T.untyped]) }
     def comment_field_options(form, comment_field, base_field_label)
       raise ArgumentError, "form_object required" unless form
+
       model = form.object
 
       comment_value, comment_prefilled =
@@ -81,21 +111,16 @@ module ChobbleForms
       rows
       step
       type
-    ], T::Array[Symbol])
+    ].freeze, T::Array[Symbol])
 
-    sig { params(local_assigns: T::Hash[Symbol, T.untyped]).void }
+    sig { params(local_assigns: T::Hash[Symbol, LocalAssignValue]).void }
     def validate_local_assigns(local_assigns)
-      if local_assigns[:field]&.respond_to?(:to_s) &&
-          local_assigns[:field].to_s.match?(/^[A-Z]/)
-        raise ArgumentError, "Field names must be snake_case symbols, not class names. Use :field, not Field."
-      end
-
       locally_assigned_keys = local_assigns.keys
       disallowed_keys = locally_assigned_keys - ALLOWED_LOCAL_ASSIGNS
 
-      if disallowed_keys.any?
-        raise ArgumentError, "local_assigns contains #{disallowed_keys.inspect}"
-      end
+      return unless disallowed_keys.any?
+
+      raise ArgumentError, "local_assigns contains #{disallowed_keys.inspect}"
     end
 
     sig { void }
@@ -109,7 +134,10 @@ module ChobbleForms
     sig { params(field: Symbol).returns(T::Hash[Symbol, T.nilable(String)]) }
     def build_field_translations(field)
       i18n_base = T.unsafe(instance_variable_get(:@_current_i18n_base))
-      fields_key = "#{i18n_base}.fields.#{field}"
+
+      # 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
+      fields_key = "#{i18n_base}.fields.#{lookup_field}"
       field_label = t(fields_key, raise: true)
 
       base_parts = i18n_base.split(".")
@@ -124,34 +152,42 @@ module ChobbleForms
       }
     end
 
-    sig { params(field_translations: T::Hash[Symbol, T.nilable(String)], value: T.untyped, prefilled: T::Boolean).returns(T::Hash[Symbol, T.untyped]) }
+    sig { params(field_translations: T::Hash[Symbol, T.nilable(String)], value: T.untyped, prefilled: T::Boolean).returns(FieldSetupResult) }
     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))
 
-      {
-        form_object: form_obj,
-        i18n_base: i18n_base,
-        value:,
-        prefilled:
-      }.merge(field_translations)
+      T.cast(
+        {
+          form_object: form_obj,
+          i18n_base: i18n_base,
+          value:,
+          prefilled:
+        }.merge(field_translations),
+        FieldSetupResult
+      )
     end
 
-    sig { params(model: T.untyped, field: Symbol).returns(T::Hash[Symbol, T.untyped]) }
+    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
 
-      if field_str.include?("password")
-        return {value: nil, prefilled: false}
-      end
-
-      current_value = model.send(field) if model.respond_to?(field)
+      return {value: nil, prefilled: false} if field_str.include?("password")
 
-      if defined?(InspectionsController::NOT_COPIED_FIELDS) &&
-          InspectionsController::NOT_COPIED_FIELDS.include?(field_str)
-        return {value: current_value, prefilled: false}
+      # 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
 
+      # Check if this field should not be prefilled based on excluded fields list
+      excluded_fields = T.unsafe(instance_variable_get(:@_excluded_prefill_fields))
+      return {value: current_value, prefilled: false} if excluded_fields&.include?(field)
+
       prev_inspection = T.unsafe(instance_variable_get(:@previous_inspection))
       previous_value = extract_previous_value(prev_inspection, model, field)
 

data/lib/chobble_forms/version.rb

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

data/views/chobble_forms/_form_context.html.erb

@@ -8,6 +8,7 @@
   #   url: Form submission URL (defaults to model's update path)
   #   method: HTTP method (defaults to :patch for models, :post for scoped forms)
   #   local: Use standard form submission instead of Turbo (defaults to false)
+  #   excluded_prefill_fields: Array of field symbols that should not be prefilled
 
   if model
     url ||= url_for(model)
@@ -52,6 +53,11 @@ end %>
   <% @_current_form = form %>
   <% @_current_i18n_base = i18n_base %>
 
+  <% # Set excluded prefill fields if provided %>
+  <% if local_assigns[:excluded_prefill_fields] %>
+    <% @_excluded_prefill_fields = excluded_prefill_fields %>
+  <% end %>
+
   <%= yield form %>
 
   <% if model && model.respond_to?(:errors) && model.errors.any? %>

data/views/chobble_forms/_pass_fail_comment.html.erb

@@ -1,13 +1,14 @@
 <%
   # Composite partial for pass/fail + comment fields with grid layout
   # Required parameters:
-  #   field: Base field name (e.g., 'seam_integrity_pass')
+  #   field: Base field name (e.g., 'seam_integrity')
   #
   # This will render:
-  #   - Pass/fail field: field (e.g., 'seam_integrity_pass')
+  #   - Pass/fail field: base field + '_pass' (e.g., 'seam_integrity_pass')
   #   - Comment field: base field + '_comment' (e.g., 'seam_integrity_comment')
 
   base_field = field.to_s.gsub(/_pass$/, "")
+  pass_field = "#{base_field}_pass".to_sym
   comment_field = "#{base_field}_comment".to_sym
 
   form = @_current_form
@@ -30,7 +31,7 @@
   </label>
 
   <%= render 'chobble_forms/radio_pass_fail',
-    field: field,
+    field: pass_field,
     prefilled: field_data[:prefilled],
     checked_value: checked_value %>
 

data/views/chobble_forms/_pass_fail_na_comment.html.erb

@@ -1,15 +1,16 @@
 <%
   # Composite partial for pass/fail + N/A + comment fields with grid layout
   # Required parameters:
-  #   field: Base field name (e.g., 'seam_integrity_pass')
+  #   field: Base field name (e.g., 'seam_integrity')
   #
   # This will render:
-  #   - Pass/fail/N/A field: field (e.g., 'seam_integrity_pass')
+  #   - Pass/fail/N/A field: base field + '_pass' (e.g., 'seam_integrity_pass')
   #     - Enum fields: Pass = "pass", Fail = "fail", N/A = "na" (rendered as radio buttons)
   #     - Boolean fields: Pass = true, Fail = false (rendered as radio buttons)
   #   - Comment field: base field + '_comment' (e.g., 'seam_integrity_comment')
 
   base_field = field.to_s.gsub(/_pass$/, "")
+  pass_field = "#{base_field}_pass".to_sym
   comment_field = "#{base_field}_comment".to_sym
 
   form = @_current_form
@@ -31,7 +32,7 @@
   </label>
 
   <%= render 'chobble_forms/radio_pass_fail',
-    field: field,
+    field: pass_field,
     prefilled: field_data[:prefilled],
     checked_value: checked_value %>
 

metadata

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