odon
/
SimpleCrudGenerator
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Support for two-words model name

tags/0.1.0
Nafies Luthfi 8 years ago
parent
f686ac7006
commit
e3d0ae0b19
10 changed files with 56 additions and 56 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      src/CrudMake.php
  2. 24
      src/stubs/controller.model.stub
  3. 26
      src/stubs/test-feature.stub
  4. 4
      src/stubs/test-unit.stub
  5. 20
      src/stubs/view-index.stub
  6. 6
      tests/CrudMakeCommandTest.php
  7. 6
      tests/Generators/ControllerGeneratorTest.php
  8. 14
      tests/Generators/FeatureTestGeneratorTest.php
  9. 6
      tests/Generators/ViewsGeneratorTest.php
  10. 4
      tests/TestCase.php

2
src/CrudMake.php
View File

@ -27,7 +27,7 @@ class CrudMake extends Command
*
* @var array
*/
public $stubModelNames = ['Masters', 'Master', 'masters', 'master'];
public $stubModelNames = ['Masters', 'Master', 'masters', 'master', 'mstrCollections', 'singleMstr'];
/**
* Construct CrudMake class

24
src/stubs/controller.model.stub
View File

@ -8,14 +8,14 @@ use Illuminate\Http\Request;
class MastersController extends Controller
{
/**
* Display a listing of the master.
* Display a listing of the singleMstr.
*
* @return \Illuminate\Http\Response
*/
public function index()
{
$editableMaster = null;
$masters = Master::where(function ($query) {
$mstrCollections = Master::where(function ($query) {
$query->where('name', 'like', '%'.request('q').'%');
})->paginate(25);
@ -23,11 +23,11 @@ class MastersController extends Controller
$editableMaster = Master::find(request('id'));
}
return view('masters.index', compact('masters', 'editableMaster'));
return view('masters.index', compact('mstrCollections', 'editableMaster'));
}
/**
* Store a newly created master in storage.
* Store a newly created singleMstr in storage.
*
* @param \Illuminate\Http\Request $request
* @return \Illuminate\Http\Response
@ -45,13 +45,13 @@ class MastersController extends Controller
}
/**
* Update the specified master in storage.
* Update the specified singleMstr in storage.
*
* @param \Illuminate\Http\Request $request
* @param \App\Master $master
* @param \App\Master $singleMstr
* @return \Illuminate\Http\Response
*/
public function update(Request $request, Master $master)
public function update(Request $request, Master $singleMstr)
{
$this->validate($request, [
'name' => 'required|max:60',
@ -60,18 +60,18 @@ class MastersController extends Controller
$routeParam = request()->only('page', 'q');
$master = $master->update($request->only('name', 'description'));
$singleMstr = $singleMstr->update($request->only('name', 'description'));
return redirect()->route('masters.index', $routeParam);
}
/**
* Remove the specified master from storage.
* Remove the specified singleMstr from storage.
*
* @param \App\Master $master
* @param \App\Master $singleMstr
* @return \Illuminate\Http\Response
*/
public function destroy(Master $master)
public function destroy(Master $singleMstr)
{
$this->validate(request(), [
'master_id' => 'required',
@ -79,7 +79,7 @@ class MastersController extends Controller
$routeParam = request()->only('page', 'q');
if (request('master_id') == $master->id && $master->delete()) {
if (request('master_id') == $singleMstr->id && $singleMstr->delete()) {
return redirect()->route('masters.index', $routeParam);
}

26
src/stubs/test-feature.stub
View File

@ -13,13 +13,13 @@ class ManageMastersTest extends TestCase
/** @test */
public function user_can_see_master_list_in_master_index_page()
{
$master1 = factory(Master::class)->create(['name' => 'Testing name', 'description' => 'Testing 123']);
$master2 = factory(Master::class)->create(['name' => 'Testing name', 'description' => 'Testing 456']);
$singleMstr1 = factory(Master::class)->create(['name' => 'Testing name', 'description' => 'Testing 123']);
$singleMstr2 = factory(Master::class)->create(['name' => 'Testing name', 'description' => 'Testing 456']);
$this->loginAsUser();
$this->visit(route('masters.index'));
$this->see($master1->name);
$this->see($master2->name);
$this->see($singleMstr1->name);
$this->see($singleMstr2->name);
}
/** @test */
@ -47,11 +47,11 @@ class ManageMastersTest extends TestCase
public function user_can_edit_a_master_within_search_query()
{
$this->loginAsUser();
$master = factory(Master::class)->create(['name' => 'Testing 123']);
$singleMstr = factory(Master::class)->create(['name' => 'Testing 123']);
$this->visit(route('masters.index', ['q' => '123']));
$this->click('edit-master-'.$master->id);
$this->seePageIs(route('masters.index', ['action' => 'edit', 'id' => $master->id, 'q' => '123']));
$this->click('edit-singleMstr-'.$singleMstr->id);
$this->seePageIs(route('masters.index', ['action' => 'edit', 'id' => $singleMstr->id, 'q' => '123']));
$this->type('Master 1 name', 'name');
$this->type('Master 1 description', 'description');
@ -69,20 +69,20 @@ class ManageMastersTest extends TestCase
public function user_can_delete_a_master()
{
$this->loginAsUser();
$master = factory(Master::class)->create();
$singleMstr = factory(Master::class)->create();
$this->visit(route('masters.index', [$master->id]));
$this->click('del-master-'.$master->id);
$this->seePageIs(route('masters.index', ['action' => 'delete', 'id' => $master->id]));
$this->visit(route('masters.index', [$singleMstr->id]));
$this->click('del-singleMstr-'.$singleMstr->id);
$this->seePageIs(route('masters.index', ['action' => 'delete', 'id' => $singleMstr->id]));
$this->seeInDatabase('masters', [
'id' => $master->id,
'id' => $singleMstr->id,
]);
$this->press(trans('app.delete_confirm_button'));
$this->dontSeeInDatabase('masters', [
'id' => $master->id,
'id' => $singleMstr->id,
]);
}
}

4
src/stubs/test-unit.stub
View File

@ -13,7 +13,7 @@ class MasterTest extends TestCase
/** @test */
public function it_has_name_attribute()
{
$master = factory(Master::class)->create(['name' => 'Master 1 name']);
$this->assertEquals('Master 1 name', $master->name);
$singleMstr = factory(Master::class)->create(['name' => 'Master 1 name']);
$this->assertEquals('Master 1 name', $singleMstr->name);
}
}

20
src/stubs/view-index.stub
View File

@ -8,7 +8,7 @@
</div>
<h3 class="page-header">
{{ trans('master.list') }}
<small>{{ trans('app.total') }} : {{ $masters->total() }} {{ trans('master.master') }}</small>
<small>{{ trans('app.total') }} : {{ $mstrCollections->total() }} {{ trans('master.master') }}</small>
</h3>
<div class="row">
<div class="col-md-8">
@ -30,30 +30,30 @@
</tr>
</thead>
<tbody>
@foreach($masters as $key => $master)
@foreach($mstrCollections as $key => $singleMstr)
<tr>
<td class="text-center">{{ $masters->firstItem() + $key }}</td>
<td>{{ $master->name }}</td>
<td>{{ $master->description }}</td>
<td class="text-center">{{ $mstrCollections->firstItem() + $key }}</td>
<td>{{ $singleMstr->name }}</td>
<td>{{ $singleMstr->description }}</td>
<td class="text-center">
{!! link_to_route(
'masters.index',
trans('app.edit'),
['action' => 'edit', 'id' => $master->id] + Request::only('page', 'q'),
['id' => 'edit-master-' . $master->id]
['action' => 'edit', 'id' => $singleMstr->id] + Request::only('page', 'q'),
['id' => 'edit-singleMstr-' . $singleMstr->id]
) !!} |
{!! link_to_route(
'masters.index',
trans('app.delete'),
['action' => 'delete', 'id' => $master->id] + Request::only('page', 'q'),
['id' => 'del-master-' . $master->id]
['action' => 'delete', 'id' => $singleMstr->id] + Request::only('page', 'q'),
['id' => 'del-singleMstr-' . $singleMstr->id]
) !!}
</td>
</tr>
@endforeach
</tbody>
</table>
<div class="panel-body">{{ $masters->appends(Request::except('page'))->render() }}</div>
<div class="panel-body">{{ $mstrCollections->appends(Request::except('page'))->render() }}</div>
</div>
</div>
<div class="col-md-4">

6
tests/CrudMakeCommandTest.php
View File

@ -13,7 +13,7 @@ class CrudMakeCommandTest extends TestCase
$crudMaker = app(CrudMake::class);
$this->assertEquals([
'Masters', 'Master', 'masters', 'master',
'Masters', 'Master', 'masters', 'master', 'mstrCollections', 'singleMstr',
], $crudMaker->stubModelNames);
}
@ -45,7 +45,7 @@ class CrudMakeCommandTest extends TestCase
$this->assertFileExists(resource_path("views/{$this->table_name}/index.blade.php"));
$this->assertFileExists(resource_path("views/{$this->table_name}/forms.blade.php"));
$this->assertFileExists(resource_path("lang/en/{$this->single_model_var_name}.php"));
$this->assertFileExists(resource_path("lang/en/{$this->lang_name}.php"));
$this->assertFileExists(database_path("factories/{$this->model_name}Factory.php"));
$this->assertFileExists(base_path("routes/web.php"));
$this->assertFileExists(base_path("tests/Feature/Manage{$this->plural_model_name}Test.php"));
@ -68,7 +68,7 @@ class CrudMakeCommandTest extends TestCase
$this->assertFileNotExists(resource_path("views/{$this->table_name}/index.blade.php"));
$this->assertFileNotExists(resource_path("views/{$this->table_name}/forms.blade.php"));
$this->assertFileNotExists(resource_path("lang/en/{$this->single_model_var_name}.php"));
$this->assertFileNotExists(resource_path("lang/en/{$this->lang_name}.php"));
$this->assertFileNotExists(database_path("factories/{$this->model_name}Factory.php"));
$this->assertFileNotExists(base_path("routes/web.php"));
$this->assertFileNotExists(base_path("tests/Feature/Manage{$this->plural_model_name}Test.php"));

6
tests/Generators/ControllerGeneratorTest.php
View File

@ -37,7 +37,7 @@ class {$this->plural_model_name}Controller extends Controller
\$editable{$this->model_name} = {$this->model_name}::find(request('id'));
}
return view('{$this->table_name}.index', compact('{$this->table_name}', 'editable{$this->model_name}'));
return view('{$this->table_name}.index', compact('{$this->collection_model_var_name}', 'editable{$this->model_name}'));
}
/**
@ -88,12 +88,12 @@ class {$this->plural_model_name}Controller extends Controller
public function destroy({$this->model_name} \${$this->single_model_var_name})
{
\$this->validate(request(), [
'{$this->single_model_var_name}_id' => 'required',
'{$this->lang_name}_id' => 'required',
]);
\$routeParam = request()->only('page', 'q');
if (request('{$this->single_model_var_name}_id') == \${$this->single_model_var_name}->id && \${$this->single_model_var_name}->delete()) {
if (request('{$this->lang_name}_id') == \${$this->single_model_var_name}->id && \${$this->single_model_var_name}->delete()) {
return redirect()->route('{$this->table_name}.index', \$routeParam);
}

14
tests/Generators/FeatureTestGeneratorTest.php
View File

@ -62,7 +62,7 @@ class Manage{$this->plural_model_name}Test extends TestCase
use DatabaseMigrations;
/** @test */
public function user_can_see_{$this->single_model_var_name}_list_in_{$this->single_model_var_name}_index_page()
public function user_can_see_{$this->lang_name}_list_in_{$this->lang_name}_index_page()
{
\${$this->single_model_var_name}1 = factory({$this->model_name}::class)->create(['name' => 'Testing name', 'description' => 'Testing 123']);
\${$this->single_model_var_name}2 = factory({$this->model_name}::class)->create(['name' => 'Testing name', 'description' => 'Testing 456']);
@ -74,17 +74,17 @@ class Manage{$this->plural_model_name}Test extends TestCase
}
/** @test */
public function user_can_create_a_{$this->single_model_var_name}()
public function user_can_create_a_{$this->lang_name}()
{
\$this->loginAsUser();
\$this->visit(route('{$this->table_name}.index'));
\$this->click(trans('{$this->single_model_var_name}.create'));
\$this->click(trans('{$this->lang_name}.create'));
\$this->seePageIs(route('{$this->table_name}.index', ['action' => 'create']));
\$this->type('{$this->model_name} 1 name', 'name');
\$this->type('{$this->model_name} 1 description', 'description');
\$this->press(trans('{$this->single_model_var_name}.create'));
\$this->press(trans('{$this->lang_name}.create'));
\$this->seePageIs(route('{$this->table_name}.index'));
@ -95,7 +95,7 @@ class Manage{$this->plural_model_name}Test extends TestCase
}
/** @test */
public function user_can_edit_a_{$this->single_model_var_name}_within_search_query()
public function user_can_edit_a_{$this->lang_name}_within_search_query()
{
\$this->loginAsUser();
\${$this->single_model_var_name} = factory({$this->model_name}::class)->create(['name' => 'Testing 123']);
@ -106,7 +106,7 @@ class Manage{$this->plural_model_name}Test extends TestCase
\$this->type('{$this->model_name} 1 name', 'name');
\$this->type('{$this->model_name} 1 description', 'description');
\$this->press(trans('{$this->single_model_var_name}.update'));
\$this->press(trans('{$this->lang_name}.update'));
\$this->seePageIs(route('{$this->table_name}.index', ['q' => '123']));
@ -117,7 +117,7 @@ class Manage{$this->plural_model_name}Test extends TestCase
}
/** @test */
public function user_can_delete_a_{$this->single_model_var_name}()
public function user_can_delete_a_{$this->lang_name}()
{
\$this->loginAsUser();
\${$this->single_model_var_name} = factory({$this->model_name}::class)->create();

6
tests/Generators/ViewsGeneratorTest.php
View File

@ -23,7 +23,7 @@ class ViewsGeneratorTest extends TestCase
</div>
<h3 class=\"page-header\">
{{ trans('{$this->lang_name}.list') }}
<small>{{ trans('app.total') }} : {{ \${$this->collection_model_var_name}->total() }} {{ trans('{$this->lang_name}.{$this->single_model_var_name}') }}</small>
<small>{{ trans('app.total') }} : {{ \${$this->collection_model_var_name}->total() }} {{ trans('{$this->lang_name}.{$this->lang_name}') }}</small>
</h3>
<div class=\"row\">
<div class=\"col-md-8\">
@ -115,7 +115,7 @@ class ViewsGeneratorTest extends TestCase
<div class=\"panel-body\">
<label class=\"control-label\">{{ trans('{$this->lang_name}.name') }}</label>
<p>{{ \$editable{$this->model_name}->name }}</p>
{!! \$errors->first('{$this->single_model_var_name}_id', '<span class=\"form-error small\">:message</span>') !!}
{!! \$errors->first('{$this->lang_name}_id', '<span class=\"form-error small\">:message</span>') !!}
</div>
<hr style=\"margin:0\">
<div class=\"panel-body\">{{ trans('app.delete_confirm') }}</div>
@ -125,7 +125,7 @@ class ViewsGeneratorTest extends TestCase
trans('app.delete_confirm_button'),
['class'=>'btn btn-danger'],
[
'{$this->single_model_var_name}_id' => \$editable{$this->model_name}->id,
'{$this->lang_name}_id' => \$editable{$this->model_name}->id,
'page' => request('page'),
'q' => request('q'),
]

4
tests/TestCase.php
View File

@ -16,7 +16,7 @@ abstract class TestCase extends BaseTestCase
public function setUp()
{
parent::setUp();
$this->model_name = 'Category';
$this->model_name = 'PaymentMethod';
$this->plural_model_name = str_plural($this->model_name);
$this->table_name = snake_case($this->plural_model_name);
@ -39,7 +39,7 @@ abstract class TestCase extends BaseTestCase
$this->removeFileOrDir(database_path('migrations'));
$this->removeFileOrDir(database_path('factories'));
$this->removeFileOrDir(resource_path('views/'.$this->table_name));
$this->removeFileOrDir(resource_path("lang/en/{$this->single_model_var_name}.php"));
$this->removeFileOrDir(resource_path("lang/en/{$this->lang_name}.php"));
$this->removeFileOrDir(base_path('routes'));
$this->removeFileOrDir(base_path('tests/BrowserKitTest.php'));
$this->removeFileOrDir(base_path('tests/Feature'));

Write Preview
Loading…
Cancel
Save