spamtrap 0.3.3 → 0.3.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d3ff3c236a80418a4048beacd5cb3ff88c555a45d4736a8ea743a97a924d1283
-  data.tar.gz: 882c96f34aa70bfe8fab481704d96b97b8a9424c1d5b637140d7d60cb56abb30
+  metadata.gz: 7fe29ab4e860e6ec50177f3726bee89e12d1e04ad26f1690937134e2fd3bb3ec
+  data.tar.gz: ccb09fadb403aa131c826422d774f9ec0d72929ca9d3f8f737a9ddb84795ecfd
 SHA512:
-  metadata.gz: 2316d8928764a5071ff756e37717f3d52924f85f8e7fb34a6de9109bec0d103716e2cfe428456557d9664e0c117fb2c9c8b735d231c16440610ec391d77afb00
-  data.tar.gz: db528095a79dc96011fad7ee831f7164650c3d3cfb92004ea6edced38fec1aa39df5ce87d4cef793631c713ccc668dd040f61b9e56d70c6b8b174338732ed9ec
+  metadata.gz: '09de714c88709d90859cb25c8f129bb88efeba1a2c697519bca1aaa8df816894e3c442e37598c423fa8740832123af86c85b204ae5eec6eeb3115566a7fe74d4'
+  data.tar.gz: 65bda092b52a6bc5b0a58c61c5b08ad3e2f7723c1daf6418071582691eabfa0897998bf33bd7b473aae91708621cc9f0e368d1bf8e780bf14feb761c2a8f6f23

data/lib/spamtrap/helper.rb

@@ -43,7 +43,26 @@ module Spamtrap
 
             super(encrypted_field, *args, opts, &blk)
           when :label
-            # label renders a <label> element and does not read a value from the model object
+            # Preserve the human-readable label text using the real field name
+            # before substituting the encrypted form. Mirrors Rails' own
+            # resolution order:
+            #   1. explicit text argument — kept as-is
+            #   2. activerecord.attributes.Model.field (ActiveRecord models)
+            #   3. helpers.label.object_name.field (plain objects / form_with)
+            #   4. humanize fallback
+            # Discard any explicit nil that a subclass may have passed through
+            # (e.g. `super(method, nil, options)`) so it does not survive as a
+            # spurious positional argument in the final super call.
+            args.compact!
+            unless args.first.is_a?(String)
+              human_text =
+                if object.respond_to?(:to_model)
+                  object.class.human_attribute_name(field.to_s, default: field.to_s.humanize)
+                else
+                  I18n.t(field, scope: [:helpers, :label, object_name], default: field.to_s.humanize)
+                end
+              args.unshift(human_text)
+            end
             super(encrypted_field, *args, opts, &blk)
           else
             opts[:value] = model_value unless opts.key?(:value)

data/lib/spamtrap/version.rb

@@ -1,5 +1,5 @@
 module Spamtrap
 
-  VERSION = '0.3.3'
+  VERSION = '0.3.5'
 
 end

data/test/form_builder_mutation_test.rb

@@ -133,6 +133,38 @@ class FormBuilderMutationTest < ActionView::TestCase
     assert_match(/selected.*CA|CA.*selected/, html)
   end
 
+  # --- label ---
+
+  def test_label_does_not_raise_when_mutate_is_true
+    msg = Message.new('Alice', 'alice@example.com', 'Hello')
+    f   = build_form_builder(msg)
+    f.spamtrap(:trap, mutate: true)
+
+    assert_nothing_raised { f.label(:name) }
+  end
+
+  def test_label_with_explicit_nil_text_does_not_raise
+    # Regression: a subclass that calls super(method, nil, options) used to
+    # produce "wrong number of arguments (given 4, expected 1..3)" because the
+    # nil survived as a positional argument alongside the auto-generated text.
+    msg  = Message.new('Alice', 'alice@example.com', 'Hello')
+    base = build_form_builder(msg)
+    base.spamtrap(:trap, mutate: true)
+
+    # Simulate what a subclass does: call label with nil text explicitly.
+    assert_nothing_raised { base.label(:name, nil, class: 'my-label') }
+  end
+
+  def test_label_with_explicit_nil_text_uses_humanized_fallback
+    msg  = Message.new('Alice', 'alice@example.com', 'Hello')
+    base = build_form_builder(msg)
+    base.spamtrap(:trap, mutate: true)
+
+    html = base.label(:name, nil, class: 'my-label')
+
+    assert_includes html, 'Name'
+  end
+
   private
 
   # ActionView::TestCase helpers expect a #request method; provide a stub.

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: spamtrap
 version: !ruby/object:Gem::Version
-  version: 0.3.3
+  version: 0.3.5
 platform: ruby
 authors:
 - Cedric Howe