Added new resource for heartbeats. Optimized code and upgraded guzzle.

Author: Mario Basic

.env.example

@@ -0,0 +1,2 @@
+WAKATIME_API_KEY=YourWakatimeApiKey
+WAKATIME_PROJECT=ProjectName

.gitignore

@@ -1,3 +1,2 @@
-.idea/
-
+.env
 vendor/

.travis.yml

@@ -1,11 +1,11 @@
 language: php
-sudo: false
 
 php:
   - 5.4
   - 5.5
   - 5.6
+  - 7.0
   - hhvm
 
 install:
-  - composer install --prefer-source --no-interaction --no-dev
+  - composer install --prefer-source --no-interaction

LICENSE.md

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2014 Mario Basic
+Copyright (c) 2014-2016 Mario Basic
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

README.md

@@ -4,26 +4,18 @@
 
 **WakaTime API for PHP**
 
-This is a PHP package for WakaTime API. It offers all the methods from [WakaTime API](https://wakatime.com/developers) with additional methods for total hours logged.
+This is a PHP package for WakaTime API. It supports resource endpoints from [WakaTime API](https://wakatime.com/developers) with additional helper methods for hours logged.
 
-If you are using [Laravel](http://laravel.com/) check out [WakaTime Reports and Laravel](http://mariobasic.com/wakatime-reports-and-laravel/) on my blog.
+If you are using [Laravel](http://laravel.com/) check out [WakaTime Reports and Laravel](http://laravelista.com/wakatime-reports-and-laravel/).
 
-## Planned Features
-
-- [ ] OAuth 2.0 authentication
+If you find that some resource endpoints are missing feel free to send me a PR. *(Be sure to include tests for your code)*
 
 ## Installation
 
-Add to your `composer.json`:
-
-```php
-"mabasic/wakatime-php-api": "~1.0"
-```
-
-and run `composer update` or type this from command line:
+Type this from command line:
 
 ```php
-composer require "mabasic/wakatime-php-api=~1.0"
+composer require mabasic/wakatime-php-api
 ```
 
 ## Usage
@@ -34,43 +26,52 @@ composer require "mabasic/wakatime-php-api=~1.0"
 use GuzzleHttp\Client as Guzzle;
 use Mabasic\WakaTime\WakaTime;
 
-$wakatime = new WakaTime(new Guzzle);
-$wakaTime->setApiKey($your_api_key_for_wakatime);
+$wakatime = new WakaTime(new Guzzle, $your_api_key_for_wakatime);
 ```
 
 You can get your Api Key from your [settings page](https://wakatime.com/settings).
 
-> Be sure to set your Api Key before using any of the methods because you will get an Exception.
-
-## Methods
+## Resource Endpoints
 
-### Official methods
-
-#### currentUser
+#### Users
 
 ```php
 $wakatime->currentUser()
+
+// or
+
+$wakatime->users('username');
 ```
 
 See: https://wakatime.com/developers/#users for details.
 
-#### dailySummary
+#### Summaries
 
 ```php
-$wakatime->dailySummary($startDate, $endDate, $project = null)
+$wakatime->summaries($startDate, $endDate, $project = null)
 ```
 
 See: https://wakatime.com/developers/#summaries for details.
 
-#### stats
+#### Stats
 
 ```php
 $wakatime->stats($range, $project = null)
 ```
 
 See: https://wakatime.com/developers/#stats for details.
 
-### Additional methods
+#### Heartbeats
+
+```php
+$date = '01/22/2016';
+
+$wakatime->heartbeats($date);
+```
+
+See: https://wakatime.com/developers#heartbeats for details.
+
+## Helper methods aka Reports aka Shortcuts
 
 #### getHoursLoggedFor
 
@@ -163,22 +164,10 @@ _You can optionally specify a project._
 
 ---
 
-## Testing instructions
-
-For testing purposes set these environment variables before running tests:
+## For developers only
 
-On windows use:
+Copy `.env.example` file to `.env` and set your api key and project name before running tests with:
 
 ```
-setx WAKATIME_API_KEY xyz
-setx WAKATIME_PROJECT xyz
-```
-
-On Linux use:
-
-```
-export WAKATIME_API_KEY=xyz
-export WAKATIME_PROJECT=xyz
-```
-
-_Of course replace `xyz` with correct values._
+vendor/bin/phpunit
+```

composer.json

@@ -4,11 +4,11 @@
   "keywords": ["wakatime", "time tracking", "api"],
   "require": {
     "php": ">=5.4",
-    "guzzlehttp/guzzle": "4.*"
+    "guzzlehttp/guzzle": "~6.0"
   },
   "require-dev": {
-    "phpunit/phpunit": "4.4.*",
-    "mockery/mockery": "dev-master"
+    "phpunit/phpunit": "^5.1",
+    "vlucas/phpdotenv": "^2.2"
   },
   "license": "MIT",
   "authors": [
@@ -21,7 +21,5 @@
     "psr-4": {
       "Mabasic\\WakaTime\\": "src/"
     }
-  },
-  "minimum-stability": "dev",
-  "prefer-stable": true
-}
+  }
+}