Handle prepend bug

Author: inxilpro

src/Elements/Concerns/HasOptions.php

@@ -39,7 +39,10 @@ public function setOptionList(array $values) : self
 	 */
 	public function prependEmptyOption($label, $empty_value = '') : self
 	{
-		$this->view_data['options']->prepend($label, $empty_value);
+		$this->view_data['prepend_empty_option'] = (object) [
+			'value' => $empty_value,
+			'label' => $label,
+		];
 
 		return $this;
 	}

src/Elements/Form.php

@@ -149,9 +149,10 @@ public function bind($bound_data) : self
 	 *
 	 * @param \Illuminate\Database\Eloquent\Model $model
 	 * @param string $resource_name
+	 * @param array $prepend_parameters
 	 * @return \Galahad\Aire\Elements\Form
 	 */
-	public function resourceful(Model $model, $resource_name = null) : self
+	public function resourceful(Model $model, $resource_name = null, $prepend_parameters = []) : self
 	{
 		$this->bind($model);
 
@@ -160,10 +161,13 @@ public function resourceful(Model $model, $resource_name = null) : self
 		}
 
 		if ($model->exists) {
-			$this->action($this->url->route("{$resource_name}.update", $model));
+			$parameters = $prepend_parameters;
+			$parameters[] = $model;
+			
+			$this->action($this->url->route("{$resource_name}.update", $parameters));
 			$this->put();
 		} else {
-			$this->action($this->url->route("{$resource_name}.store"));
+			$this->action($this->url->route("{$resource_name}.store", $prepend_parameters));
 			$this->post();
 		}
 

tests/Feature/ResourcefulBindingTest.php

@@ -51,6 +51,17 @@ public function test_provided_name_overrides_inferred_name() : void
 
 		$this->assertSelectorAttribute($html, 'form', 'action', URL::to('/foo/bar'));
 	}
+	
+	public function test_route_parameters_are_prepended_when_loading_route() : void
+	{
+		Route::post('/{foo}/users', function() {})->name('foo.users.store');
+		
+		$model = new XResourcefulModel(['id' => 1]);
+		
+		$html = $this->aire()->form()->resourceful($model, 'foo.users', ['baz'])->render();
+		
+		$this->assertSelectorAttribute($html, 'form', 'action', URL::to('/baz/users'));
+	}
 }
 
 class XResourcefulModel extends Model

tests/Unit/SelectTest.php

@@ -67,4 +67,20 @@ public function test_a_custom_empty_option_can_be_prepended() : void
 		$this->assertSelectorTextEquals($html, 'option[value="roth"]', 'Philip Roth');
 		$this->assertSelectorTextEquals($html, 'option[value="patchett"]', 'Ann Patchett');
 	}
+	
+	public function test_an_empty_option_can_be_prepended_to_a_non_associative_array() : void
+	{
+		$options = [
+			0 => 'Ta-Nehisi Coates',
+			1 => 'Philip Roth',
+			2 => 'Ann Patchett',
+		];
+		
+		$html = $this->aire()->select($options)->prependEmptyOption('Empty')->render();
+		
+		$this->assertSelectorTextEquals($html, 'option[value=""]', 'Empty');
+		$this->assertSelectorTextEquals($html, 'option[value="0"]', 'Ta-Nehisi Coates');
+		$this->assertSelectorTextEquals($html, 'option[value="1"]', 'Philip Roth');
+		$this->assertSelectorTextEquals($html, 'option[value="2"]', 'Ann Patchett');
+	}
 }

views/checkbox-group.blade.php

@@ -3,6 +3,19 @@
 
 <div {{ $attributes->wrapper }}>
 
+	@isset($prepend_empty_option)
+		<label {{ $attributes->label }}>
+			<input
+					{{ $attributes->except('id', 'value', 'checked') }}
+					value="{{ $prepend_empty_option->value }}"
+					{{ $attributes->isValue($prepend_empty_option->value) ? 'checked' : '' }}
+			/>
+			<span {{ $attributes->label_wrappwer }}>
+				{{ $prepend_empty_option->label }}
+			</span>
+		</label>
+	@endisset
+	
 	@foreach($options->getOptions() as $option_value => $option_label)
 
 		<label {{ $attributes->label }}>

views/radio-group.blade.php

@@ -2,6 +2,20 @@
 <?php /** @var \Galahad\Aire\Support\OptionsCollection $options */ ?>
 
 <div {{ $attributes->wrapper }}>
+	
+	@isset($prepend_empty_option)
+		<label {{ $attributes->label }}>
+			<input
+					{{ $attributes->except('id', 'value', 'checked') }}
+					value="{{ $prepend_empty_option->value }}"
+					{{ $attributes->isValue($prepend_empty_option->value) ? 'checked' : '' }}
+			/>
+			<span {{ $attributes->label_wrapper }}>
+				{{ $prepend_empty_option->label }}
+			</span>
+		</label>
+	@endisset
+	
 	@foreach($options->getOptions() as $option_value => $option_label)
 
 		<label {{ $attributes->label }}>

views/select.blade.php

@@ -3,6 +3,12 @@
 
 <select {{ $attributes->except('value') }}>
 
+	@isset($prepend_empty_option)
+		<option value="{{ $prepend_empty_option->value }}" {{ $attributes->isValue($prepend_empty_option->value) ? 'selected' : '' }}>
+			{{ $prepend_empty_option->label }}
+		</option>
+	@endisset
+	
 	@foreach($options->getOptions() as $value => $label)
 
 		<option value="{{ $value }}" {{ $attributes->isValue($value) ? 'selected' : '' }}>