Fix host reference, implemented getAttribute()

Author: mikebronner

CHANGELOG.md

@@ -12,6 +12,9 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 - Filter any incoming webhook events that are in test mode.
 
 ## [0.4.7 - 0.4.8] - 25 Oct 2015
+### Changed
+- referenced to user model properties to use `getAttribute()` instead of referencing them directly.
+
 ### Added
 - tracking of `name` in addition to `first name` and `last name`.
 - tracking of `referrer` and `referring domain` to help get additional information for Live View (may not yet work

src/Listeners/LaravelMixpanelEventHandler.php

@@ -47,11 +47,11 @@ public function onUserLoginAttempt(array $event)
      */
     public function onUserLogin(Model $user)
     {
-        $firstName = $user->first_name ?: '';
-        $lastName = $user->last_name ?: '';
+        $firstName = $user->getAttribute('first_name');
+        $lastName = $user->getAttribute('last_name');
 
-        if ($user->name) {
-            $nameParts = explode(' ', $user->name);
+        if ($user->getAttribute('name')) {
+            $nameParts = explode(' ', $user->getAttribute('name'));
             array_filter($nameParts);
             $lastName = array_pop($nameParts);
             $firstName = implode(' ', $nameParts);
@@ -60,14 +60,13 @@ public function onUserLogin(Model $user)
         $data = [
             '$first_name' => $firstName,
             '$last_name' => $lastName,
-            '$name' => $user->name,
-            '$email' => $user->email,
+            '$name' => $user->getAttribute('name'),
+            '$email' => $user->getAttribute('email'),
+            '$created' => ($user->getAttribute('created_at')
+                ? $user->getAttribute('created_at')->format('Y-m-d\Th:i:s')
+                : null),
         ];
 
-        if ($user->created_at) {
-            $data['$created'] = $user->created_at->format('Y-m-d\Th:i:s');
-        }
-
         array_filter($data);
 
         $this->mixPanel->identify($user->getKey());
@@ -106,7 +105,9 @@ public function onViewLoad($route)
         $data['Url'] = $request->getUri();
         $data['Referrer'] = $request->header('referer');
         $data['$initial_referrer'] = $request->header('referer');
-        $data['$initial_referring_domain'] = parse_url($request->header('referer'))['host'];
+        $data['$initial_referring_domain'] = ($request->header('referer')
+            ? parse_url($request->header('referer'))['host']
+            : null);
         array_filter($data);
         $this->mixPanel->track('Page View', $data);
     }

src/Listeners/LaravelMixpanelUserObserver.php

@@ -23,11 +23,11 @@ public function __construct(LaravelMixpanel $mixPanel)
      */
     public function created(Model $user)
     {
-        $firstName = $user->first_name ?: '';
-        $lastName = $user->last_name ?: '';
+        $firstName = $user->getAttribute('first_name');
+        $lastName = $user->getAttribute('last_name');
 
-        if ($user->name) {
-            $nameParts = explode(' ', $user->name);
+        if ($user->getAttribute('name')) {
+            $nameParts = explode(' ', $user->getAttribute('name'));
             array_filter($nameParts);
             $lastName = array_pop($nameParts);
             $firstName = implode(' ', $nameParts);
@@ -36,14 +36,13 @@ public function created(Model $user)
         $data = [
             '$first_name' => $firstName,
             '$last_name' => $lastName,
-            '$name' => $user->name,
-            '$email' => $user->email,
+            '$name' => $user->getAttribute('name'),
+            '$email' => $user->getAttribute('email'),
+            '$created' => ($user->getAttribute('created_at')
+                ? $user->getAttribute('created_at')->format('Y-m-d\Th:i:s')
+                : null),
         ];
 
-        if ($user->created_at) {
-            $data['$created'] = $user->created_at->format('Y-m-d\Th:i:s');
-        }
-
         array_filter($data);
 
         $request = App::make(Request::class);
@@ -57,11 +56,11 @@ public function created(Model $user)
     public function saving(Model $user)
     {
         $this->mixPanel->identify($user->getKey());
-        $firstName = $user->first_name ?: '';
-        $lastName = $user->last_name ?: '';
+        $firstName = $user->getAttribute('first_name');
+        $lastName = $user->getAttribute('last_name');
 
-        if ($user->name) {
-            $nameParts = explode(' ', $user->name);
+        if ($user->getAttribute('name')) {
+            $nameParts = explode(' ', $user->getAttribute('name'));
             array_filter($nameParts);
             $lastName = array_pop($nameParts);
             $firstName = implode(' ', $nameParts);
@@ -70,14 +69,13 @@ public function saving(Model $user)
         $data = [
             '$first_name' => $firstName,
             '$last_name' => $lastName,
-            '$name' => $user->name,
-            '$email' => $user->email,
+            '$name' => $user->getAttribute('name'),
+            '$email' => $user->getAttribute('email'),
+            '$created' => ($user->getAttribute('created_at')
+                ? $user->getAttribute('created_at')->format('Y-m-d\Th:i:s')
+                : null),
         ];
 
-        if ($user->created_at) {
-            $data['$created'] = $user->created_at->format('Y-m-d\Th:i:s');
-        }
-
         array_filter($data);
 
         if (count($data)) {