remove include_blank, update README

Author: nimmolo

README.md

@@ -362,10 +362,10 @@ class SignupForm < Components::Form
       end
     end
 
-    # Select with include_blank: true adds a blank option at the start
+    # Pass nil as first argument to add a blank option at the start
     div do
       field(:country).label { "Select your country" }
-      field(:country).select([[1, "USA"], [2, "Canada"], [3, "Mexico"]], include_blank: true)
+      field(:country).select(nil, [1, "USA"], [2, "Canada"], [3, "Mexico"])
     end
 
     # Multiple select with multiple: true
@@ -380,13 +380,12 @@ class SignupForm < Components::Form
       )
     end
 
-    # Combine multiple: true with include_blank: true
+    # Combine multiple: true with nil for blank option
     div do
       field(:tag_ids).label { "Select tags (optional)" }
       field(:tag_ids).select(
-        [[1, "Ruby"], [2, "Rails"], [3, "Phlex"]],
-        multiple: true,
-        include_blank: true
+        nil, [1, "Ruby"], [2, "Rails"], [3, "Phlex"],
+        multiple: true
       )
     end
 

lib/superform/rails/components/select.rb

@@ -4,26 +4,24 @@ module Components
       class Select < Field
         def initialize(
           *,
-          options: nil,
+          options: [],
           collection: nil,
           multiple: false,
-          include_blank: false,
           **,
           &
         )
           super(*, **, &)
 
           # Handle deprecated collection parameter
-          if collection && !options
+          if collection && options.empty?
             warn "[DEPRECATION] Superform::Rails::Components::Select: " \
-                 "`collection:` parameter is deprecated. " \
-                 "Use `options:` instead."
+                 "`collection:` keyword is deprecated and will be removed. " \
+                 "Use positional arguments instead: field.select([1, 'A'], [2, 'B'])"
             options = collection
           end
 
-          @options = options || []
+          @options = options
           @multiple = multiple
-          @include_blank = include_blank
         end
 
         def view_template(&block)
@@ -38,8 +36,12 @@ def view_template(&block)
             select(**attributes, &block)
           else
             select(**attributes) do
-              blank_option if @include_blank
-              options(*@options)
+              # If first option is nil, render a blank option
+              include_blank = @options.first.nil?
+              filtered_options = include_blank ? @options[1..] : @options
+
+              blank_option if include_blank
+              options(*filtered_options)
             end
           end
         end

lib/superform/rails/field.rb

@@ -46,26 +46,14 @@ def textarea(**attributes)
       end
 
       def select(*options, **attributes, &)
-        # Extract select-specific parameters from attributes if passed as keyword arguments
-        # Note: positional args are the preferred API - keyword form is for internal use
-
-        # Handle deprecated collection parameter
-        if attributes.key?(:collection) && !attributes.key?(:options)
-          warn "[DEPRECATION] Superform::Rails::Field#select: " \
-               "`collection:` parameter is deprecated. " \
-               "Use `options:` instead."
-          attributes[:options] = attributes.delete(:collection)
-        end
-
-        options = attributes.delete(:options) if options.empty? && attributes.key?(:options)
+        # Extract select-specific parameters from attributes
         multiple = attributes.delete(:multiple) || false
-        include_blank = attributes.delete(:include_blank) || false
+
         Components::Select.new(
           field,
           attributes:,
           options:,
           multiple:,
-          include_blank:,
           &
         )
       end

spec/superform/rails/components/select_collection_integration_spec.rb

@@ -44,7 +44,7 @@ class Order < ActiveRecord::Base
       html = render(form) do |f|
         orders_collection = f.collection(:orders)
         orders_collection.each do |order_namespace|
-          f.render order_namespace.field(:item_id).select(options: item_options)
+          f.render order_namespace.field(:item_id).select(*item_options)
         end
       end
 
@@ -57,7 +57,7 @@ class Order < ActiveRecord::Base
       html = render(form) do |f|
         orders_collection = f.collection(:orders)
         orders_collection.each do |order_namespace|
-          f.render order_namespace.field(:item_id).select(options: item_options)
+          f.render order_namespace.field(:item_id).select(*item_options)
         end
       end
 
@@ -85,7 +85,7 @@ class Order < ActiveRecord::Base
       html = render(submitted_form) do |f|
         orders_collection = f.collection(:orders)
         orders_collection.each do |order_namespace|
-          f.render order_namespace.field(:item_id).select(options: item_options)
+          f.render order_namespace.field(:item_id).select(*item_options)
         end
       end
 
@@ -121,7 +121,7 @@ class Order < ActiveRecord::Base
         orders_collection = f.collection(:orders)
         orders_collection.each do |order_namespace|
           f.render order_namespace.field(:tag_ids).select(
-            options: tag_options,
+            *tag_options,
             multiple: true
           )
         end
@@ -139,7 +139,7 @@ class Order < ActiveRecord::Base
         orders_collection = f.collection(:orders)
         orders_collection.each do |order_namespace|
           f.render order_namespace.field(:tag_ids).select(
-            options: tag_options,
+            *tag_options,
             multiple: true
           )
         end
@@ -155,7 +155,7 @@ class Order < ActiveRecord::Base
         orders_collection = f.collection(:orders)
         orders_collection.each do |order_namespace|
           f.render order_namespace.field(:tag_ids).select(
-            options: tag_options,
+            *tag_options,
             multiple: true
           )
         end
@@ -191,7 +191,7 @@ class Order < ActiveRecord::Base
         orders_collection = f.collection(:orders)
         orders_collection.each do |order_namespace|
           f.render order_namespace.field(:tag_ids).select(
-            options: tag_options,
+            *tag_options,
             multiple: true
           )
         end

spec/superform/rails/components/select_spec.rb

@@ -9,7 +9,7 @@
   end
   let(:options) { [[1, 'Admin'], [2, 'Editor'], [3, 'Viewer']] }
   let(:component) do
-    described_class.new(field, attributes: attributes, options: options)
+    described_class.new(field, attributes: attributes, options:)
   end
   let(:attributes) { {} }
 
@@ -81,7 +81,7 @@
       described_class.new(
         field,
         attributes: attributes,
-        options: options,
+        options:,
         multiple: true
       )
     end
@@ -124,7 +124,7 @@
       described_class.new(
         field,
         attributes: attributes,
-        options: options,
+        options:,
         multiple: true
       )
     end
@@ -158,13 +158,13 @@
     end
   end
 
-  describe 'with include_blank: true' do
+  describe 'with nil as first option (blank option)' do
+    let(:options_with_blank) { [nil, *options] }
     let(:component) do
       described_class.new(
         field,
         attributes: attributes,
-        options: options,
-        include_blank: true
+        options: options_with_blank
       )
     end
 
@@ -212,7 +212,7 @@
       described_class.new(
         role_ids_field,
         attributes: attributes,
-        options: options,
+        options:,
         multiple: true
       )
     end
@@ -246,14 +246,14 @@
     end
   end
 
-  describe 'with both multiple and include_blank' do
+  describe 'with both multiple and nil first option (blank)' do
+    let(:options_with_blank) { [nil, *options] }
     let(:component) do
       described_class.new(
         field,
         attributes: attributes,
-        options: options,
-        multiple: true,
-        include_blank: true
+        options: options_with_blank,
+        multiple: true
       )
     end
 
@@ -283,16 +283,16 @@
       end
     end
 
-    context 'with options keyword argument' do
+    context 'with positional arguments' do
       subject do
         render(
           form_field.select(
-            options: [[1, 'Admin'], [2, 'Editor'], [3, 'Viewer']]
+            [1, 'Admin'], [2, 'Editor'], [3, 'Viewer']
           )
         )
       end
 
-      it 'renders select with options from options kwarg' do
+      it 'renders select with options from positional args' do
         expect(subject).to include('>Admin</option>')
         expect(subject).to include('>Editor</option>')
         expect(subject).to include('>Viewer</option>')
@@ -303,13 +303,13 @@
       subject do
         render(
           form_field.select(
-            options: [[1, 'Admin'], [2, 'Editor']],
+            [1, 'Admin'], [2, 'Editor'],
             multiple: true
           )
         )
       end
 
-      it 'renders multiple select with options kwarg' do
+      it 'renders multiple select with positional args' do
         expect(subject).to include('multiple')
         expect(subject).to include('name="role_ids[]"')
         expect(subject).to include('>Admin</option>')
@@ -365,78 +365,5 @@
       expect(subject).to match(/<option value="\d+">Bob<\/option>/)
     end
   end
-
-  describe 'backwards compatibility with collection parameter' do
-    context 'using deprecated collection keyword in component' do
-      let(:component) do
-        described_class.new(field, attributes: attributes, collection: options)
-      end
-
-      it 'shows deprecation warning' do
-        expect_any_instance_of(described_class).to receive(:warn).with(
-          "[DEPRECATION] Superform::Rails::Components::Select: " \
-          "`collection:` parameter is deprecated. " \
-          "Use `options:` instead."
-        )
-        component
-      end
-
-      it 'still renders select correctly' do
-        # Suppress deprecation warning for this test
-        allow_any_instance_of(described_class).to receive(:warn)
-        result = render(component)
-        expect(result).to include('>Admin</option>')
-        expect(result).to include('>Editor</option>')
-        expect(result).to include('>Viewer</option>')
-      end
-    end
-
-    context 'using deprecated collection keyword in field helper' do
-      let(:form_field) do
-        Superform::Rails::Field.new(:role_ids, parent: nil, object: object)
-      end
-
-      it 'shows deprecation warning' do
-        expect(form_field).to receive(:warn).with(
-          "[DEPRECATION] Superform::Rails::Field#select: " \
-          "`collection:` parameter is deprecated. " \
-          "Use `options:` instead."
-        )
-        form_field.select(collection: [[1, 'Admin'], [2, 'Editor']])
-      end
-
-      it 'still renders select correctly' do
-        # Suppress deprecation warning for this test
-        allow(form_field).to receive(:warn)
-        result = render(
-          form_field.select(collection: [[1, 'Admin'], [2, 'Editor']])
-        )
-        expect(result).to include('>Admin</option>')
-        expect(result).to include('>Editor</option>')
-      end
-    end
-
-    context 'when both options and collection are provided' do
-      let(:component) do
-        described_class.new(
-          field,
-          attributes: attributes,
-          options: [[1, 'Admin']],
-          collection: [[2, 'Editor']]
-        )
-      end
-
-      it 'does not show deprecation warning' do
-        expect_any_instance_of(described_class).not_to receive(:warn)
-        component
-      end
-
-      it 'uses options parameter (takes precedence)' do
-        result = render(component)
-        expect(result).to include('>Admin</option>')
-        expect(result).not_to include('>Editor</option>')
-      end
-    end
-  end
 end
 # rubocop:enable Metrics/BlockLength