Skip to content

Commit bcff9ae

Browse files
simensensimensen
committed
Finished implementation, finished testing.
1 parent 645f4a7 commit bcff9ae

File tree

2 files changed

+142
-8
lines changed

2 files changed

+142
-8
lines changed

‎src/Dflydev/DotAccessData/Data.php‎

Lines changed: 83 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,23 +35,103 @@ public function __construct(array $data = null)
3535
*/
3636
public function append($key, $value = null)
3737
{
38-
//
38+
if (0 == strlen($key)) {
39+
throw new \RuntimeException("Key cannot be an empty string");
40+
}
41+
42+
$currentValue =& $this->data;
43+
$keyPath = explode('.', $key);
44+
45+
if (1 == count($keyPath)) {
46+
if (!isset($currentValue[$key])) {
47+
$currentValue[$key] = array();
48+
}
49+
if (!is_array($currentValue[$key])) {
50+
// Promote this key to an array.
51+
// TODO: Is this really what we want to do?
52+
$currentValue[$key] = array($currentValue[$key]);
53+
}
54+
$currentValue[$key][] = $value;
55+
56+
return;
57+
}
58+
59+
$endKey = array_pop($keyPath);
60+
for ( $i = 0; $i < count($keyPath); $i++ ) {
61+
$currentKey =& $keyPath[$i];
62+
if ( ! isset($currentValue[$currentKey]) ) {
63+
$currentValue[$currentKey] = array();
64+
}
65+
$currentValue =& $currentValue[$currentKey];
66+
}
67+
68+
if(!isset($currentValue[$endKey])) {
69+
$currentValue[$endKey] = array();
70+
}
71+
if (!is_array($currentValue[$endKey])) {
72+
$currentValue[$endKey] = array($currentValue[$endKey]);
73+
}
74+
// Promote this key to an array.
75+
// TODO: Is this really what we want to do?
76+
$currentValue[$endKey][] = $value;
3977
}
4078

4179
/**
4280
* {@inheritdoc}
4381
*/
4482
public function set($key, $value = null)
4583
{
46-
//
84+
if (0 == strlen($key)) {
85+
throw new \RuntimeException("Key cannot be an empty string");
86+
}
87+
88+
$currentValue =& $this->data;
89+
$keyPath = explode('.', $key);
90+
91+
if (1 == count($keyPath)) {
92+
$currentValue[$key] = $value;
93+
94+
return;
95+
}
96+
97+
$endKey = array_pop($keyPath);
98+
for ( $i = 0; $i < count($keyPath); $i++ ) {
99+
$currentKey =& $keyPath[$i];
100+
if (!isset($currentValue[$currentKey])) {
101+
$currentValue[$currentKey] = array();
102+
}
103+
$currentValue =& $currentValue[$currentKey];
104+
}
105+
$currentValue[$endKey] = $value;
47106
}
48107

49108
/**
50109
* {@inheritdoc}
51110
*/
52111
public function remove($key)
53112
{
54-
//
113+
if (0 == strlen($key)) {
114+
throw new \RuntimeException("Key cannot be an empty string");
115+
}
116+
117+
$currentValue =& $this->data;
118+
$keyPath = explode('.', $key);
119+
120+
if (1 == count($keyPath)) {
121+
unset($currentValue[$key]);
122+
123+
return;
124+
}
125+
126+
$endKey = array_pop($keyPath);
127+
for ( $i = 0; $i < count($keyPath); $i++ ) {
128+
$currentKey =& $keyPath[$i];
129+
if (!isset($currentValue[$currentKey])) {
130+
return;
131+
}
132+
$currentValue =& $currentValue[$currentKey];
133+
}
134+
unset($currentValue[$endKey]);
55135
}
56136

57137
/**

‎tests/Dflydev/Tests/DotAccessData/DataTest.php‎

Lines changed: 59 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -40,22 +40,76 @@ protected function runSampleDataTests(DataInterface $data)
4040
$this->assertEquals(array('C1', 'C2', 'C3'), $data->get('b.c'));
4141
$this->assertEquals('D3', $data->get('b.d.d3'));
4242
$this->assertEquals(array('c1', 'c2', 'c3'), $data->get('c'));
43-
$this->assertEquals(null, $data->get('foo'), 'Foo should not exist');
43+
$this->assertNull($data->get('foo'), 'Foo should not exist');
4444
}
4545

4646
public function testAppend()
4747
{
48-
$this->markTestSkipped();
48+
$data = new Data($this->getSampleData());
49+
50+
$data->append('a', 'B');
51+
$data->append('c', 'c4');
52+
$data->append('b.c', 'C4');
53+
$data->append('b.d.d3', 'D3b');
54+
$data->append('b.d.d4', 'D');
55+
$data->append('e', 'E');
56+
$data->append('f.a', 'b');
57+
58+
$this->assertEquals(array('A', 'B'), $data->get('a'));
59+
$this->assertEquals(array('c1', 'c2', 'c3', 'c4'), $data->get('c'));
60+
$this->assertEquals(array('C1', 'C2', 'C3', 'C4'), $data->get('b.c'));
61+
$this->assertEquals(array('D3', 'D3b'), $data->get('b.d.d3'));
62+
$this->assertEquals(array('D'), $data->get('b.d.d4'));
63+
$this->assertEquals(array('E'), $data->get('e'));
64+
$this->assertEquals(array('b'), $data->get('f.a'));
65+
66+
$this->setExpectedException('RuntimeException');
67+
68+
$data->append('', 'broken');
4969
}
5070

5171
public function testSet()
5272
{
53-
$this->markTestSkipped();
73+
$data = new Data;
74+
75+
$this->assertNull($data->get('a'));
76+
$this->assertNull($data->get('b.c'));
77+
$this->assertNull($data->get('d.e'));
78+
79+
$data->set('a', 'A');
80+
$data->set('b.c', 'C');
81+
$data->set('d.e', array('f' => 'F', 'g' => 'G',));
82+
83+
$this->assertEquals('A', $data->get('a'));
84+
$this->assertEquals(array('c' => 'C'), $data->get('b'));
85+
$this->assertEquals('C', $data->get('b.c'));
86+
$this->assertEquals('F', $data->get('d.e.f'));
87+
$this->assertEquals(array('e' => array('f' => 'F', 'g' => 'G',)), $data->get('d'));
88+
89+
$this->setExpectedException('RuntimeException');
90+
91+
$data->set('', 'broken');
5492
}
5593

56-
public function testRemote()
94+
public function testRemove()
5795
{
58-
$this->markTestSkipped();
96+
$data = new Data($this->getSampleData());
97+
98+
$data->remove('a');
99+
$data->remove('b.c');
100+
$data->remove('b.d.d3');
101+
$data->remove('d');
102+
$data->remove('d.e.f');
103+
104+
$this->assertNull($data->get('a'));
105+
$this->assertNull($data->get('b.c'));
106+
$this->assertNull($data->get('b.d.d3'));
107+
$this->assertNull(null);
108+
$this->assertEquals('D2', $data->get('b.d.d2'));
109+
110+
$this->setExpectedException('RuntimeException');
111+
112+
$data->remove('', 'broken');
59113
}
60114

61115
public function testGet()

0 commit comments

Comments
 (0)