Laravel 5.5 (#42)

* Prepare package for unit tests

* WIP - improve code quality

* Move from elixir to mix

* WIP

* WIP - clean up code

* WIP - do not scrutinize public directory

* WIP - cleaning up code

* WIP

* WIP - writing tests

* Update travis config

* WIP

* Fix unit tests

* WIP - bring things to green

Author: mikebronner

.scrutinizer.yml

@@ -2,3 +2,4 @@ filter:
     excluded_paths:
         - "public/"
         - "tests/"
+        - "resources/assets/js/mixpanel.js"

.travis.yml

@@ -23,4 +23,3 @@ notifications:
     on_success: change  # options: [always|never|change] default: always
     on_failure: always  # options: [always|never|change] default: always
     on_start: never     # options: [always|never|change] default: always
-    

CHANGELOG.md

@@ -11,6 +11,13 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 (This is already detected in subscription update.)
 - Filter any incoming web-hook events that are in test mode.
 
+## [WIP] - 5 Nov 2017
+### Added
+- unit and feature tests.
+
+### Changed
+- class structure as part of refactoring.
+
 ## [0.7.2] - 5 Nov 2017
 ### Fixed
 - inclusion of auto-track JS scripts. NPM library is broken and seems to not be maintained anymore, switched to script provided by mixpanel setup instructions.

composer.json

@@ -30,6 +30,7 @@
     "require-dev": {
         "fzaninotto/faker": "~1.4",
         "laravel/laravel": "5.5.*",
+        "laravel/browser-kit-testing": "^2.0",
         "mockery/mockery": "0.9.*",
         "phpmd/phpmd": "^2.6",
         "phpunit/phpunit": "5.7.*",

phpunit.xml

@@ -32,5 +32,6 @@
         <env name="QUEUE_DRIVER" value="sync"/>
         <env name="DB_CONNECTION" value="sqlite"/>
         <env name="DB_DATABASE" value=":memory:"/>
+        <env name="MIXPANEL_TOKEN" value="68dffdba4c272b791a2d4883b43ccfd7"/>
     </php>
 </phpunit>

src/LaravelMixpanel.php

@@ -12,12 +12,6 @@ class LaravelMixpanel extends Mixpanel
     private $defaults;
     private $request;
 
-    /**
-     * @param Request $request
-     * @param array   $options
-     *
-     * @internal param Result $browser
-     */
     public function __construct(Request $request, array $options = [])
     {
         $this->defaults = [
@@ -33,12 +27,6 @@ public function __construct(Request $request, array $options = [])
         );
     }
 
-    /**
-     * @param string $event
-     * @param array  $properties
-     *
-     * @internal param array $data
-     */
     public function track($event, $properties = [])
     {
         $browserInfo = new Browser();

src/Listeners/LaravelMixpanelEventHandler.php

@@ -1,26 +1,26 @@
 <?php namespace GeneaLabs\LaravelMixpanel\Listeners;
 
-use GeneaLabs\LaravelMixpanel\Events\MixpanelEvent;
+use GeneaLabs\LaravelMixpanel\Events\MixpanelEvent as Mixpanel;
 
 class LaravelMixpanelUserObserver
 {
     public function created($user)
     {
-        event(new MixpanelEvent($user, 'User: Registered'));
+        event(new Mixpanel($user, 'User: Registered'));
     }
 
     public function saving($user)
     {
-        event(new MixpanelEvent($user, 'User: Updated'));
+        event(new Mixpanel($user, 'User: Updated'));
     }
 
     public function deleting($user)
     {
-        event(new MixpanelEvent($user, 'User: Deactivated'));
+        event(new Mixpanel($user, 'User: Deactivated'));
     }
 
     public function restored($user)
     {
-        event(new MixpanelEvent($user, 'User: Reactivated'));
+        event(new Mixpanel($user, 'User: Reactivated'));
     }
 }

src/Listeners/LaravelMixpanelUserObserver.php

@@ -0,0 +1,12 @@
+<?php namespace GeneaLabs\LaravelMixpanel\Listeners;
+
+use GeneaLabs\LaravelMixpanel\Events\MixpanelEvent as Mixpanel;
+use Illuminate\Auth\Events\Login as LoginEvent;
+
+class Login
+{
+    public function handle(LoginEvent $login)
+    {
+        event(new Mixpanel($login->user, 'User Logged In'));
+    }
+}

src/Listeners/Login.php

@@ -0,0 +1,20 @@
+<?php namespace GeneaLabs\LaravelMixpanel\Listeners;
+
+use GeneaLabs\LaravelMixpanel\Events\MixpanelEvent as Mixpanel;
+use Illuminate\Auth\Events\Attempting;
+
+class LoginAttempt
+{
+    public function handle(Attempting $event)
+    {
+        $email = $event->credentials['email'] ?? $event['email'] ?? '';
+
+        $authModel = config('auth.providers.users.model', config('auth.model'));
+        $user = app($authModel)
+            ->where('email', $email)
+            ->first();
+        $eventName = 'Login Attempted';
+
+        event(new Mixpanel($user, $eventName));
+    }
+}