Merge 8c6f53a into b534567

Rakefile

@@ -15,4 +15,3 @@ namespace :test do
 end
 
 task default: :test
-

lib/hanami/helpers/form_helper/form_builder.rb

@@ -767,16 +767,30 @@ def password_field(name, attributes = {})
         #   #    <option value="it">Italy</option>
         #   #    <option value="us">United States</option>
         #   #  </select>
+        #
+        # @example Selected option
+        #   <%=
+        #     # ...
+        #     values = Hash['it' => 'Italy', 'us' => 'United States']
+        #     select :stores, values, options: {selected: book.store}
+        #   %>
+        #
+        #   # Output:
+        #   #  <select name="book[store]" id="book-store">
+        #   #    <option value="it" selected="selected">Italy</option>
+        #   #    <option value="us">United States</option>
+        #   #  </select>
         def select(name, values, attributes = {})
           options    = attributes.delete(:options) { {} }
           attributes = { name: _input_name(name), id: _input_id(name) }.merge(attributes)
           prompt     = options.delete(:prompt)
+          selected   = options.delete(:selected)
 
           super(attributes) do
             option(prompt) unless prompt.nil?
 
             values.each do |content, value|
-              if _value(name) == value
+              if selected == value || _value(name) == value
                 option(content, {value: value, selected: SELECTED}.merge(options))
               else
                 option(content, {value: value}.merge(options))

test/form_helper_test.rb

@@ -1268,6 +1268,19 @@
         end
       end
     end
+
+    describe "with selected attribute" do
+      let(:params) { Hash[book: { store: val }] }
+      let(:val)    { 'it' }
+
+      it "sets the selected attribute" do
+        actual = view.form_for(:book, action) do
+          select :store, values, options: { selected: val }
+        end.to_s
+
+        actual.must_include %(<select name="book[store]" id="book-store">\n<option value="it" selected="selected">Italy</option>\n<option value="us">United States</option>\n</select>)
+      end
+    end
   end
 
   describe "#datalist" do