Skip to content

Commit

Permalink
Improved extract to be able to extract data from deep arrays (#2)
Browse files Browse the repository at this point in the history
  • Loading branch information
@joskfg
joskfg authored Sep 30, 2019
1 parent d24b850 commit 70615e7
Show file tree
Hide file tree
Showing 2 changed files with 104 additions and 1 deletion.
3 changes: 2 additions & 1 deletion src/ServiceProvider.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
* @author Jose Manuel Cardona <[email protected]>
*/

use Illuminate\Support\Arr;
use Illuminate\Support\Collection;
use Illuminate\Support\ServiceProvider as LaravelServiceProvider;

Expand Down Expand Up @@ -115,7 +116,7 @@ private function registerMultipleOnly()
? [key($keyToMap), current($keyToMap)]
: [$keyToMap, $keyToMap];

return [$keyMapped => $item[$keyToMap]];
return [$keyMapped => Arr::get($item, $keyToMap)];
});
});
});
Expand Down
102 changes: 102 additions & 0 deletions tests/ServiceProviderTest.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -250,4 +250,106 @@ public function it_throws_a_runtime_exception_if_the_field_does_not_exist()

$collection->groupByHierarchy('field_1');
}

public function collectionExtractProvider()
{
return [
'Single column' => [
'collection' => collect([
[
'field_1' => 'key_1',
'field_2' => 'item_1',
],
]),
'fields' => 'field_2',
'expectedResult' => collect([
collect([
'field_2' => 'item_1',
]),
]),
],
'Multi column' => [
'collection' => collect([
[
'field_1' => 'key_1',
'field_2' => 'item_1',
'field_3' => 'item_3',
],
]),
'fields' => ['field_1', 'field_3'],
'expectedResult' => collect([
collect([
'field_1' => 'key_1',
'field_3' => 'item_3',
]),
]),
],
'Multi column deeper' => [
'collection' => collect([
[
'field_1' => [ 'value' => 'key_1'],
'field_2' => [ 'value' => 'item_1'],
'field_3' => [ 'value' => 'item_3'],
],
]),
'fields' => ['field_1.value', 'field_3.value'],
'expectedResult' => collect([
collect([
'field_1.value' => 'key_1',
'field_3.value' => 'item_3',
]),
]),
],

'Multi column deeper with alias' => [
'collection' => collect([
[
'field_1' => [ 'value' => 'key_1'],
'field_2' => [ 'value' => 'item_1'],
'field_3' => [ 'value' => 'item_3'],
],
]),
'fields' => [['field_1' => 'field_1.value'], ['field_3' => 'field_3.value']],
'expectedResult' => collect([
collect([
'field_1' => 'key_1',
'field_3' => 'item_3',
]),
]),
],

'Multi column deeper with conflicts' => [
'collection' => collect([
[
'field_1' => [ 'value' => 'key_1'],
'field_1.value' => 'item_1',
'field_3' => [ 'value' => 'item_3'],
],
]),
'fields' => 'field_1.value',
'expectedResult' => collect([
collect([
'field_1.value' => 'item_1',
]),
]),
],
];
}

/**
* @test
* @dataProvider collectionExtractProvider
*
* @param Collection $collection
* @param mixed $fields
* @param Collection $expectedResult
*/
public function it_extracts_the_corresponding_fields(
Collection $collection,
$fields,
Collection $expectedResult
) {
$extractedCollection = $collection->extract($fields);
$this->assertEquals($expectedResult, $extractedCollection);
}
}

0 comments on commit 70615e7

Please sign in to comment.