spamtrap 0.3.2 → 0.3.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f0cec3797da20a8ab16dd95113f15c271acb6764478291372e14fc8d3556e0a3
-  data.tar.gz: 960f481d33667095c861f91665786ab6e5a60c5a162e9f90fea709b99821b91e
+  metadata.gz: f1f9fa53d08c869e9952416e63376c31ed74f74584e9cf1e59f7439364c370d5
+  data.tar.gz: 4ecae5a00af343aa3c8856a3f2bcf04999bd37a0112d067d3d907e5b85b75e2a
 SHA512:
-  metadata.gz: 846a83081e7139d5c6ba56674d3f5506abebc583c9f2fc62501fa8dc30d230f391f3a61a63a8a231456368a09c8ba20635d8af1176356d7574c97d1c4c0a9f9c
-  data.tar.gz: fab5e0b02f702ee3f71bb2914d766a6a3ba1fedc90232189844497e5c818927b7cd31ff17eeb0fbf3583494b4e3e54c14e00511055df6a604608a5d850e3c0ad
+  metadata.gz: 825936fb38cb3095ecf504c42aff353081a8352539a535beff67d85ef2423fc4e7bac328c107d48d5d0ed092ea1b508be6bb06e7490c33cceb2f230a0c89e45a
+  data.tar.gz: c35648761da54aab75b8b8d587f24d4ccfbfb03210d23ed930fbdbea2743876de9a795d19980acac9bac45b92e7bbe94621f8419440031d2e15412b6876e041a

data/lib/spamtrap/helper.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Spamtrap
   module FormBuilderMutation
     include Spamtrap::Crypto
@@ -11,8 +13,60 @@ module Spamtrap
 
     MUTABLE_FIELDS.each do |m|
       define_method(m) do |field, *args, &blk|
-        field = spamtrap_encrypt_field(field.to_s, @spamtrap_salt) if @spamtrap_salt
-        super(field, *args, &blk)
+        if @spamtrap_salt
+          encrypted_field = spamtrap_encrypt_field(field.to_s, @spamtrap_salt)
+
+          opts =
+            if m == :check_box
+              args.first.is_a?(Hash) ? args.shift.dup : {}
+            else
+              args.last.is_a?(Hash) ? args.pop.dup : {}
+            end
+
+          model_value = object.respond_to?(field) ? object.public_send(field) : nil
+
+          case m
+          when :check_box
+            # :checked controls the checked state; :value is the submitted value ("1" by default)
+            opts[:checked] = !!model_value unless opts.key?(:checked)
+            super(encrypted_field, opts, *args, &blk)
+          when :select, :collection_select, :grouped_collection_select
+            # :selected belongs in the inner options hash, not html_options (the last hash).
+            # After popping html_options into opts, args.last is the options hash (if present).
+            if args.last.is_a?(Hash)
+              sel_opts = args.pop.dup
+              sel_opts[:selected] = model_value unless sel_opts.key?(:selected)
+              args.push(sel_opts)
+            else
+              opts[:selected] = model_value unless opts.key?(:selected)
+            end
+
+            super(encrypted_field, *args, opts, &blk)
+          when :label
+            # 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
+            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)
+            super(encrypted_field, *args, opts, &blk)
+          end
+        else
+          super(field, *args, &blk)
+        end
       end
     end
 

data/lib/spamtrap/version.rb

@@ -1,5 +1,5 @@
 module Spamtrap
 
-  VERSION = '0.3.2'
+  VERSION = '0.3.4'
 
 end

data/test/form_builder_mutation_test.rb

@@ -0,0 +1,142 @@
+# frozen_string_literal: true
+
+require File.join(File.dirname(__FILE__), 'test_helper')
+require 'action_view'
+require 'action_view/test_case'
+
+# A simple model-like struct to back the form builder, mimicking an AR model.
+Message = Struct.new(:name, :email, :body, :active, :country)
+
+class FormBuilderMutationTest < ActionView::TestCase
+  include Spamtrap::Crypto
+
+  # Build a minimal form builder instance backed by a Message object.
+  def build_form_builder(object)
+    ActionView::Helpers::FormBuilder.new(:message, object, self, {})
+  end
+
+  # --- text-like inputs ---
+
+  def test_text_field_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.text_field(:name) }
+    assert_nothing_raised { f.email_field(:email) }
+    assert_nothing_raised { f.text_area(:body) }
+  end
+
+  def test_model_value_is_preserved_in_encrypted_field
+    msg = Message.new('Alice', 'alice@example.com', 'Hello')
+    f   = build_form_builder(msg)
+    f.spamtrap(:trap, mutate: true)
+
+    assert_includes f.text_field(:name), 'Alice'
+    assert_includes f.email_field(:email), 'alice@example.com'
+    assert_includes f.text_area(:body), 'Hello'
+  end
+
+  def test_encrypted_field_name_is_used_in_html
+    msg = Message.new('Alice', 'alice@example.com', 'Hello')
+    f   = build_form_builder(msg)
+    f.spamtrap(:trap, mutate: true)
+
+    html = f.text_field(:name)
+
+    # The original unencrypted name must NOT appear as the input name attribute
+    refute_match(/name="message\[name\]"/, html)
+  end
+
+  def test_nil_model_value_does_not_raise
+    msg = Message.new(nil, nil, nil)
+    f   = build_form_builder(msg)
+    f.spamtrap(:trap, mutate: true)
+
+    assert_nothing_raised { f.text_field(:name) }
+  end
+
+  def test_virtual_field_without_model_method_does_not_raise
+    msg = Message.new('Alice', 'alice@example.com', 'Hello')
+    f   = build_form_builder(msg)
+    f.spamtrap(:trap, mutate: true)
+
+    # :nonexistent is not a method on Message; should render with empty value, not crash
+    assert_nothing_raised { f.text_field(:nonexistent) }
+  end
+
+  def test_explicit_value_option_is_preserved
+    msg = Message.new('Alice', 'alice@example.com', 'Hello')
+    f   = build_form_builder(msg)
+    f.spamtrap(:trap, mutate: true)
+
+    html = f.text_field(:name, value: 'Overridden')
+
+    assert_includes html, 'Overridden'
+    refute_includes html, 'Alice'
+  end
+
+  # --- no mutation ---
+
+  def test_no_salt_leaves_field_names_unencrypted
+    msg = Message.new('Alice', 'alice@example.com', 'Hello')
+    f   = build_form_builder(msg)
+
+    html = f.text_field(:name)
+
+    assert_match(/name="message\[name\]"/, html)
+  end
+
+  # --- check_box ---
+
+  def test_check_box_does_not_raise_when_mutate_is_true
+    msg = Message.new(nil, nil, nil, true)
+    f   = build_form_builder(msg)
+    f.spamtrap(:trap, mutate: true)
+
+    assert_nothing_raised { f.check_box(:active) }
+  end
+
+  def test_check_box_checked_when_model_value_is_true
+    msg = Message.new(nil, nil, nil, true)
+    f   = build_form_builder(msg)
+    f.spamtrap(:trap, mutate: true)
+
+    assert_includes f.check_box(:active), 'checked'
+  end
+
+  def test_check_box_unchecked_when_model_value_is_false
+    msg = Message.new(nil, nil, nil, false)
+    f   = build_form_builder(msg)
+    f.spamtrap(:trap, mutate: true)
+
+    refute_includes f.check_box(:active), 'checked'
+  end
+
+  # --- select ---
+
+  def test_select_does_not_raise_when_mutate_is_true
+    msg = Message.new(nil, nil, nil, nil, 'US')
+    f   = build_form_builder(msg)
+    f.spamtrap(:trap, mutate: true)
+
+    assert_nothing_raised { f.select(:country, %w[US CA GB]) }
+  end
+
+  def test_select_preselects_model_value
+    msg = Message.new(nil, nil, nil, nil, 'CA')
+    f   = build_form_builder(msg)
+    f.spamtrap(:trap, mutate: true)
+
+    html = f.select(:country, %w[US CA GB])
+
+    assert_match(/selected.*CA|CA.*selected/, html)
+  end
+
+  private
+
+  # ActionView::TestCase helpers expect a #request method; provide a stub.
+  def request
+    @request ||= ActionDispatch::TestRequest.create
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: spamtrap
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.3.4
 platform: ruby
 authors:
 - Cedric Howe
@@ -36,6 +36,7 @@ files:
 - lib/spamtrap/helper.rb
 - lib/spamtrap/version.rb
 - test/controller_test.rb
+- test/form_builder_mutation_test.rb
 - test/test_helper.rb
 homepage: http://github.com/cedric/spamtrap/
 licenses:
@@ -60,4 +61,5 @@ specification_version: 4
 summary: Simple spamtrap for spambots.
 test_files:
 - test/controller_test.rb
+- test/form_builder_mutation_test.rb
 - test/test_helper.rb