Completed
Pull Request — master (#10)
by Manuel
02:47
created
app/Handlers/Events/NotifyUsersAboutPoke.php 1 patch
Indentation   +48 added lines, -48 removed lines patch added patch discarded remove patch
@@ -8,52 +8,52 @@
 block discarded – undo
8 8
 
9 9
 class NotifyUsersAboutPoke
10 10
 {
11
-    /**
12
-     * The Pusher instance.
13
-     *
14
-     * @var PusherManager
15
-     */
16
-    protected $pusher;
17
-
18
-    /**
19
-     * @var DeviceTransformer
20
-     */
21
-    private $transformer;
22
-
23
-    /**
24
-     * Create the event handler.
25
-     *
26
-     * @param PusherManager $pusher
27
-     * @param DeviceTransformer $transformer
28
-     */
29
-    public function __construct(PusherManager $pusher, DeviceTransformer $transformer)
30
-    {
31
-        $this->pusher = $pusher;
32
-        $this->transformer = $transformer;
33
-    }
34
-
35
-    /**
36
-     * Handle the server was poked event.
37
-     *
38
-     * @param ServerWasPoked $event
39
-     *
40
-     * @return void
41
-     */
42
-    public function handle(ServerWasPoked $event)
43
-    {
44
-        $channel = env('PUSHER_CHANNEL', 'pi-finder');
45
-        $device = $event->getDevice();
46
-
47
-        if ($device->isPublic()) {
48
-            $this->pusher->trigger($channel, 'ServerWasPoked', [
49
-                'device' => $this->transformer->transform($device),
50
-            ]);
51
-        } else {
52
-            $channel = $channel.'-'.$device->group;
53
-
54
-            $this->pusher->trigger($channel, 'ServerWasPoked', [
55
-                'device' => $this->transformer->transform($device),
56
-            ]);
57
-        }
58
-    }
11
+	/**
12
+	 * The Pusher instance.
13
+	 *
14
+	 * @var PusherManager
15
+	 */
16
+	protected $pusher;
17
+
18
+	/**
19
+	 * @var DeviceTransformer
20
+	 */
21
+	private $transformer;
22
+
23
+	/**
24
+	 * Create the event handler.
25
+	 *
26
+	 * @param PusherManager $pusher
27
+	 * @param DeviceTransformer $transformer
28
+	 */
29
+	public function __construct(PusherManager $pusher, DeviceTransformer $transformer)
30
+	{
31
+		$this->pusher = $pusher;
32
+		$this->transformer = $transformer;
33
+	}
34
+
35
+	/**
36
+	 * Handle the server was poked event.
37
+	 *
38
+	 * @param ServerWasPoked $event
39
+	 *
40
+	 * @return void
41
+	 */
42
+	public function handle(ServerWasPoked $event)
43
+	{
44
+		$channel = env('PUSHER_CHANNEL', 'pi-finder');
45
+		$device = $event->getDevice();
46
+
47
+		if ($device->isPublic()) {
48
+			$this->pusher->trigger($channel, 'ServerWasPoked', [
49
+				'device' => $this->transformer->transform($device),
50
+			]);
51
+		} else {
52
+			$channel = $channel.'-'.$device->group;
53
+
54
+			$this->pusher->trigger($channel, 'ServerWasPoked', [
55
+				'device' => $this->transformer->transform($device),
56
+			]);
57
+		}
58
+	}
59 59
 }
Please login to merge, or discard this patch.
app/Http/Controllers/Api/DeviceController.php 1 patch
Indentation   +133 added lines, -133 removed lines patch added patch discarded remove patch
@@ -10,137 +10,137 @@
 block discarded – undo
10 10
 
11 11
 class DeviceController extends ApiController
12 12
 {
13
-    /**
14
-     * @var DeviceTransformer
15
-     */
16
-    private $transformer;
17
-
18
-    public function __construct(DeviceTransformer $transformer)
19
-    {
20
-        $this->middleware('auth.basic', ['except' => ['index', 'poke', 'show']]);
21
-
22
-        $this->transformer = $transformer;
23
-    }
24
-
25
-    /**
26
-     * Display a listing of the resource.
27
-     *
28
-     * @param null $group
29
-     * @return Response
30
-     */
31
-    public function index($group = null)
32
-    {
33
-        $devices = $group ? Device::where('group', $group)->get() : Device::onHomePage()->get();
34
-
35
-        return $this->respond([
36
-            'data'        => $this->transformer->transformCollection($devices->all()),
37
-            'server_time' => Carbon::now()->toIso8601String(),
38
-        ]);
39
-    }
40
-
41
-    /**
42
-     * Store a newly created resource in storage.
43
-     *
44
-     * @param StoreComputerRequest $request
45
-     *
46
-     * @return Response
47
-     */
48
-    public function store(StoreComputerRequest $request)
49
-    {
50
-        $device = Device::create($request->all());
51
-
52
-        $device->public = $request->get('public', 'auto');
53
-
54
-        return $this->respondCreated($this->transformer->transform($device), $device->id);
55
-    }
56
-
57
-    /**
58
-     * Display the specified resource.
59
-     *
60
-     * @param int $id
61
-     *
62
-     * @return Response
63
-     */
64
-    public function show($id)
65
-    {
66
-        $device = Device::find($id);
67
-
68
-        if (!$device) {
69
-            return $this->respondNotFound('Did not find the device you are looking for!');
70
-        }
71
-
72
-        return $this->respond([
73
-            'data' => $this->transformer->transform($device),
74
-        ]);
75
-    }
76
-
77
-    /**
78
-     * Update the specified resource in storage.
79
-     *
80
-     * @param StoreComputerRequest $request
81
-     * @param int                  $id
82
-     *
83
-     * @return Response
84
-     */
85
-    public function update(StoreComputerRequest $request, $id)
86
-    {
87
-        $device = Device::find($id);
88
-
89
-        if (!$device) {
90
-            return $this->respondNotFound('Did not find the device you are looking for!');
91
-        }
92
-
93
-        $device = $device->fill($request->all());
94
-
95
-        $device->save();
96
-
97
-        return $this->respond([
98
-            'data' => $this->transformer->transform($device),
99
-        ]);
100
-    }
101
-
102
-    /**
103
-     * Remove the specified resource from storage.
104
-     *
105
-     * @param int $id
106
-     *
107
-     * @return Response
108
-     */
109
-    public function destroy($id)
110
-    {
111
-        $device = Device::find($id);
112
-
113
-        if (!$device) {
114
-            return $this->respondNotFound('Did not find the device you are looking for!');
115
-        }
116
-
117
-        $device->delete();
118
-
119
-        return $this->respondNoContent();
120
-    }
121
-
122
-    /**
123
-     * Handle device pokes.
124
-     *
125
-     * @param StoreComputerRequest $request
126
-     *
127
-     * @throws \Exception
128
-     *
129
-     * @return Response
130
-     */
131
-    public function poke(StoreComputerRequest $request)
132
-    {
133
-        $device = Device::firstOrNew(['mac' => $request->mac]);
134
-
135
-        $device->fill($request->all());
136
-
137
-        $device->group = $request->get('group', null);
138
-        $device->public = $request->get('public', 'auto');
139
-
140
-        $device->touch();
141
-
142
-        event(new ServerWasPoked(array_add($device, 'server_time', Carbon::now()->toDateTimeString())));
143
-
144
-        return $this->respondPoked($this->transformer->transform($device), $device->id);
145
-    }
13
+	/**
14
+	 * @var DeviceTransformer
15
+	 */
16
+	private $transformer;
17
+
18
+	public function __construct(DeviceTransformer $transformer)
19
+	{
20
+		$this->middleware('auth.basic', ['except' => ['index', 'poke', 'show']]);
21
+
22
+		$this->transformer = $transformer;
23
+	}
24
+
25
+	/**
26
+	 * Display a listing of the resource.
27
+	 *
28
+	 * @param null $group
29
+	 * @return Response
30
+	 */
31
+	public function index($group = null)
32
+	{
33
+		$devices = $group ? Device::where('group', $group)->get() : Device::onHomePage()->get();
34
+
35
+		return $this->respond([
36
+			'data'        => $this->transformer->transformCollection($devices->all()),
37
+			'server_time' => Carbon::now()->toIso8601String(),
38
+		]);
39
+	}
40
+
41
+	/**
42
+	 * Store a newly created resource in storage.
43
+	 *
44
+	 * @param StoreComputerRequest $request
45
+	 *
46
+	 * @return Response
47
+	 */
48
+	public function store(StoreComputerRequest $request)
49
+	{
50
+		$device = Device::create($request->all());
51
+
52
+		$device->public = $request->get('public', 'auto');
53
+
54
+		return $this->respondCreated($this->transformer->transform($device), $device->id);
55
+	}
56
+
57
+	/**
58
+	 * Display the specified resource.
59
+	 *
60
+	 * @param int $id
61
+	 *
62
+	 * @return Response
63
+	 */
64
+	public function show($id)
65
+	{
66
+		$device = Device::find($id);
67
+
68
+		if (!$device) {
69
+			return $this->respondNotFound('Did not find the device you are looking for!');
70
+		}
71
+
72
+		return $this->respond([
73
+			'data' => $this->transformer->transform($device),
74
+		]);
75
+	}
76
+
77
+	/**
78
+	 * Update the specified resource in storage.
79
+	 *
80
+	 * @param StoreComputerRequest $request
81
+	 * @param int                  $id
82
+	 *
83
+	 * @return Response
84
+	 */
85
+	public function update(StoreComputerRequest $request, $id)
86
+	{
87
+		$device = Device::find($id);
88
+
89
+		if (!$device) {
90
+			return $this->respondNotFound('Did not find the device you are looking for!');
91
+		}
92
+
93
+		$device = $device->fill($request->all());
94
+
95
+		$device->save();
96
+
97
+		return $this->respond([
98
+			'data' => $this->transformer->transform($device),
99
+		]);
100
+	}
101
+
102
+	/**
103
+	 * Remove the specified resource from storage.
104
+	 *
105
+	 * @param int $id
106
+	 *
107
+	 * @return Response
108
+	 */
109
+	public function destroy($id)
110
+	{
111
+		$device = Device::find($id);
112
+
113
+		if (!$device) {
114
+			return $this->respondNotFound('Did not find the device you are looking for!');
115
+		}
116
+
117
+		$device->delete();
118
+
119
+		return $this->respondNoContent();
120
+	}
121
+
122
+	/**
123
+	 * Handle device pokes.
124
+	 *
125
+	 * @param StoreComputerRequest $request
126
+	 *
127
+	 * @throws \Exception
128
+	 *
129
+	 * @return Response
130
+	 */
131
+	public function poke(StoreComputerRequest $request)
132
+	{
133
+		$device = Device::firstOrNew(['mac' => $request->mac]);
134
+
135
+		$device->fill($request->all());
136
+
137
+		$device->group = $request->get('group', null);
138
+		$device->public = $request->get('public', 'auto');
139
+
140
+		$device->touch();
141
+
142
+		event(new ServerWasPoked(array_add($device, 'server_time', Carbon::now()->toDateTimeString())));
143
+
144
+		return $this->respondPoked($this->transformer->transform($device), $device->id);
145
+	}
146 146
 }
Please login to merge, or discard this patch.
app/Http/routes.php 1 patch
Indentation   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -8,13 +8,13 @@
 block discarded – undo
8 8
 
9 9
 Route::group(['prefix' => 'api/v1', 'namespace' => 'Api'], function () {
10 10
 
11
-    Route::get('/devices/@{group}', 'DeviceController@index');
12
-    Route::resource('devices', 'DeviceController', ['except' => ['create', 'edit']]);
11
+	Route::get('/devices/@{group}', 'DeviceController@index');
12
+	Route::resource('devices', 'DeviceController', ['except' => ['create', 'edit']]);
13 13
 
14
-    Route::post('devices/poke', [
15
-        'as'   => 'api.v1.devices.poke',
16
-        'uses' => 'DeviceController@poke',
17
-    ]);
14
+	Route::post('devices/poke', [
15
+		'as'   => 'api.v1.devices.poke',
16
+		'uses' => 'DeviceController@poke',
17
+	]);
18 18
 
19 19
 });
20 20
 
Please login to merge, or discard this patch.
app/Observers/DeviceObserver.php 1 patch
Indentation   +24 added lines, -24 removed lines patch added patch discarded remove patch
@@ -7,31 +7,31 @@
 block discarded – undo
7 7
 
8 8
 class DeviceObserver
9 9
 {
10
-    /**
11
-     * @var PusherManager
12
-     */
13
-    protected $pusher;
10
+	/**
11
+	 * @var PusherManager
12
+	 */
13
+	protected $pusher;
14 14
 
15
-    /**
16
-     * @var DeviceTransformer
17
-     */
18
-    private $transformer;
15
+	/**
16
+	 * @var DeviceTransformer
17
+	 */
18
+	private $transformer;
19 19
 
20
-    /**
21
-     * DeviceObserver constructor.
22
-     * @param PusherManager $pusher
23
-     * @param DeviceTransformer $transformer
24
-     */
25
-    public function __construct(PusherManager $pusher, DeviceTransformer $transformer)
26
-    {
27
-        $this->pusher = $pusher;
28
-        $this->transformer = $transformer;
29
-    }
20
+	/**
21
+	 * DeviceObserver constructor.
22
+	 * @param PusherManager $pusher
23
+	 * @param DeviceTransformer $transformer
24
+	 */
25
+	public function __construct(PusherManager $pusher, DeviceTransformer $transformer)
26
+	{
27
+		$this->pusher = $pusher;
28
+		$this->transformer = $transformer;
29
+	}
30 30
 
31
-    public function deleted($device)
32
-    {
33
-        $this->pusher->trigger(env('PUSHER_CHANNEL', 'pi-finder'), 'DeviceWasDeleted', [
34
-            'device' => $this->transformer->transform($device),
35
-        ]);
36
-    }
31
+	public function deleted($device)
32
+	{
33
+		$this->pusher->trigger(env('PUSHER_CHANNEL', 'pi-finder'), 'DeviceWasDeleted', [
34
+			'device' => $this->transformer->transform($device),
35
+		]);
36
+	}
37 37
 }
Please login to merge, or discard this patch.
app/Transformers/DeviceTransformer.php 1 patch
Indentation   +12 added lines, -12 removed lines patch added patch discarded remove patch
@@ -4,16 +4,16 @@
 block discarded – undo
4 4
 
5 5
 class DeviceTransformer extends Transformer
6 6
 {
7
-    public function transform($device)
8
-    {
9
-        return [
10
-            'id'            => $device['id'],
11
-            'ip'            => $device['ip'],
12
-            'name'          => $device['name'],
13
-            'group'         => $device['group'],
14
-            'on_home_page'  => $device['public'],
15
-            'device_added'  => $device['created_at']->toIso8601String(),
16
-            'last_contact'  => $device['updated_at']->toIso8601String(),
17
-        ];
18
-    }
7
+	public function transform($device)
8
+	{
9
+		return [
10
+			'id'            => $device['id'],
11
+			'ip'            => $device['ip'],
12
+			'name'          => $device['name'],
13
+			'group'         => $device['group'],
14
+			'on_home_page'  => $device['public'],
15
+			'device_added'  => $device['created_at']->toIso8601String(),
16
+			'last_contact'  => $device['updated_at']->toIso8601String(),
17
+		];
18
+	}
19 19
 }
Please login to merge, or discard this patch.