Skip to content

Commit ee351de

Browse files
committed
refactor
1 parent e75a1c7 commit ee351de

File tree

4 files changed

+18
-18
lines changed

4 files changed

+18
-18
lines changed

src/Avatar.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ public function create($name)
110110

111111
$this->initialGenerator->setName($name);
112112
$this->initialGenerator->setLength($this->chars);
113-
$this->initials = $this->initialGenerator->getInitial();
113+
$this->initials = $this->initialGenerator->make();
114114

115115
$this->setForeground($this->getRandomForeground());
116116
$this->setBackground($this->getRandomBackground());

src/InitialGenerator.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ public function setUppercase($uppercase)
7272
$this->uppercase = $uppercase;
7373
}
7474

75-
public function getInitial()
75+
public function make()
7676
{
7777
$words = new Collection(explode(' ', $this->name));
7878

tests/AvatarLaravelTest.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ public function it_can_override_attributes_when_instantiated()
2323
$cache = Mockery::mock('Illuminate\Contracts\Cache\Repository');
2424

2525
$generator = Mockery::mock('Laravolt\Avatar\InitialGenerator');
26-
$generator->shouldReceive('getInitial')->andReturn('AB');
26+
$generator->shouldReceive('make')->andReturn('AB');
2727
$generator->shouldReceive('setUppercase');
2828
$generator->shouldReceive('setAscii');
2929

@@ -51,7 +51,7 @@ public function it_can_override_attributes_after_set_name()
5151
$generator = Mockery::mock('Laravolt\Avatar\InitialGenerator');
5252
$generator->shouldReceive('setName')->andReturnSelf();
5353
$generator->shouldReceive('setLength');
54-
$generator->shouldReceive('getInitial')->andReturn('A');
54+
$generator->shouldReceive('make')->andReturn('A');
5555
$generator->shouldReceive('setUppercase');
5656
$generator->shouldReceive('setAscii');
5757
$generator->shouldReceive('base_path');
@@ -86,7 +86,7 @@ public function it_has_correct_random_background()
8686
$generator->shouldReceive('setLength')->andReturn(1);
8787
$generator->shouldReceive('setName')->andReturn($name);
8888
$generator->shouldReceive('setUppercase')->andReturnSelf();
89-
$generator->shouldReceive('getInitial')->andReturn('A');
89+
$generator->shouldReceive('make')->andReturn('A');
9090
$avatar->create($name);
9191

9292
$this->assertAttributeEquals('#000000', 'background', $avatar);
@@ -113,7 +113,7 @@ public function it_has_different_random_background()
113113

114114
$generator->shouldReceive('setLength')->andReturn(2);
115115
$generator->shouldReceive('setName')->andReturn($name1);
116-
$generator->shouldReceive('getInitial')->andReturn('AA');
116+
$generator->shouldReceive('make')->andReturn('AA');
117117

118118
$avatar1 = new \Laravolt\Avatar\Avatar($config, $cache, $generator);
119119
$avatar1->create($name1);

tests/InitialsGeneratorTest.php

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ public function it_accept_string()
1010
{
1111
$generator = new \Laravolt\Avatar\InitialGenerator('Bayu Hendra');
1212

13-
$this->assertEquals('BH', $generator->getInitial());
13+
$this->assertEquals('BH', $generator->make());
1414
}
1515

1616
/**
@@ -20,7 +20,7 @@ public function it_accept_stringy()
2020
{
2121
$generator = new \Laravolt\Avatar\InitialGenerator(new \Stringy\Stringy('Bayu Hendra'));
2222

23-
$this->assertEquals('BH', $generator->getInitial());
23+
$this->assertEquals('BH', $generator->make());
2424
}
2525

2626
/**
@@ -48,7 +48,7 @@ public function it_can_generate_initials_from_single_word_name()
4848
{
4949
$generator = new \Laravolt\Avatar\InitialGenerator('Fulan');
5050

51-
$this->assertEquals('Fu', (string) $generator->getInitial());
51+
$this->assertEquals('Fu', (string) $generator->make());
5252
}
5353

5454
/**
@@ -58,7 +58,7 @@ public function it_can_generate_initials_from_multi_word_name()
5858
{
5959
$generator = new \Laravolt\Avatar\InitialGenerator('Fulan Doe');
6060

61-
$this->assertEquals('FD', (string) $generator->getInitial());
61+
$this->assertEquals('FD', (string) $generator->make());
6262
}
6363

6464
/**
@@ -69,7 +69,7 @@ public function it_can_generate_initials_if_name_shorter_than_expected_length()
6969
$generator = new \Laravolt\Avatar\InitialGenerator('Joe');
7070
$generator->setLength(4);
7171

72-
$this->assertEquals('Joe', (string) $generator->getInitial());
72+
$this->assertEquals('Joe', (string) $generator->make());
7373
}
7474

7575
/**
@@ -80,7 +80,7 @@ public function it_can_generate_initials_if_name_longer_than_expected_length()
8080
$generator = new \Laravolt\Avatar\InitialGenerator('Fulan John Doe');
8181
$generator->setLength(2);
8282

83-
$this->assertEquals('FJ', (string) $generator->getInitial());
83+
$this->assertEquals('FJ', (string) $generator->make());
8484
}
8585

8686
/**
@@ -90,7 +90,7 @@ public function it_can_handle_empty_name()
9090
{
9191
$generator = new \Laravolt\Avatar\InitialGenerator('');
9292

93-
$this->assertEquals('', (string) $generator->getInitial());
93+
$this->assertEquals('', (string) $generator->make());
9494
}
9595

9696
/**
@@ -100,7 +100,7 @@ public function it_allow_non_ascii()
100100
{
101101
$generator = new \Laravolt\Avatar\InitialGenerator('Bāyu');
102102

103-
$this->assertEquals('', (string) $generator->getInitial());
103+
$this->assertEquals('', (string) $generator->make());
104104
}
105105

106106
/**
@@ -111,7 +111,7 @@ public function it_can_convert_to_ascii()
111111
$generator = new \Laravolt\Avatar\InitialGenerator('Bāyu');
112112
$generator->setAscii(true);
113113

114-
$this->assertEquals('Ba', (string) $generator->getInitial());
114+
$this->assertEquals('Ba', (string) $generator->make());
115115
}
116116

117117
/**
@@ -120,12 +120,12 @@ public function it_can_convert_to_ascii()
120120
public function it_can_generate_initials_from_email()
121121
{
122122
$generator = new \Laravolt\Avatar\InitialGenerator('[email protected]');
123-
$this->assertEquals('ab', $generator->getInitial());
123+
$this->assertEquals('ab', $generator->make());
124124

125125
$generator = new \Laravolt\Avatar\InitialGenerator('[email protected]');
126-
$this->assertEquals('ci', $generator->getInitial());
126+
$this->assertEquals('ci', $generator->make());
127127

128128
$generator = new \Laravolt\Avatar\InitialGenerator('[email protected]');
129-
$this->assertEquals('DA', $generator->getInitial());
129+
$this->assertEquals('DA', $generator->make());
130130
}
131131
}

0 commit comments

Comments
 (0)