massive code cleanup and attachments working

Author: Torann

README.md

@@ -1,294 +1,33 @@
-# Asana for Laravel 5
+# Asana for Laravel
 
-[![Latest Stable Version](https://poser.pugx.org/torann/laravel-asana/v/stable.png)](https://packagist.org/packages/torann/laravel-asana) [![Total Downloads](https://poser.pugx.org/torann/laravel-asana/downloads.png)](https://packagist.org/packages/torann/laravel-asana)
+[![Latest Stable Version](https://poser.pugx.org/torann/laravel-asana/v/stable.png)](https://packagist.org/packages/torann/laravel-asana)
+[![Total Downloads](https://poser.pugx.org/torann/laravel-asana/downloads.png)](https://packagist.org/packages/torann/laravel-asana)
+[![Patreon donate button](https://img.shields.io/badge/patreon-donate-yellow.svg)](https://www.patreon.com/torann)
+[![Donate weekly to this project using Gratipay](https://img.shields.io/badge/gratipay-donate-yellow.svg)](https://gratipay.com/~torann)
+[![Donate to this project using Flattr](https://img.shields.io/badge/flattr-donate-yellow.svg)](https://flattr.com/profile/torann)
+[![Donate to this project using Paypal](https://img.shields.io/badge/Donate-PayPal-green.svg)](https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=4CJA2A97NPYVU)
 
-----------
-
-## Installation
+Asana API wrapper for Laravel, supporting workspaces, projects, tasks, tags, users and stories.
 
 - [Laravel Asana on Packagist](https://packagist.org/packages/torann/laravel-asana)
 - [Laravel Asana on GitHub](https://github.com/torann/laravel-asana)
-- [Laravel 4 Installation](https://github.com/Torann/laravel-asana/tree/0.1.2)
-
-### Composer
-
-From the command line run:
-
-```
-$ composer require torann/laravel-asana
-```
-
-### Laravel
-
-Once installed you need to register the service provider with the application. Open up `config/app.php` and find the `providers` key.
-
-``` php
-'providers' => [
-
-    \Torann\LaravelAsana\ServiceProvider::class,
-
-]
-```
-
-### Lumen
-
-For Lumen register the service provider in `bootstrap/app.php`.
-
-``` php
-$app->register(\Torann\LaravelAsana\ServiceProvider::class);
-```
-
-### Facade
-
-This package also ships with a facade which provides the static syntax for creating collections. You can register the facade in the aliases key of your `config/app.php` file.
-
-```php
-'aliases' => [
-    'Asana' => 'Torann\LaravelAsana\Facade',
-]
-```
-
-### Publish the configurations
-
-Run this on the command line from the root of your project:
-
-```
-$ php artisan vendor:publish --provider="Torann\LaravelAsana\ServiceProvider"
-```
-
-A configuration file will be publish to `config/asana.php`.
-
-## Quick Examples
-
-#### Get a specific user
-
-```php
-Asana::getUserInfo($user_id);
-```
-
-#### Get current user
-
-Will return the user's info of the owner of the Personal Access Token.
-
-```php
-Asana::getCurrentUser();
-```
-
-#### Get all users in all workspaces
-
-Will return the user's info of the owner of the Personal Access Token.
-
-```php
-Asana::getUsers();
-```
-
-#### Get task
-
-```php
-Asana::getTask($task_id);
-```
-
-#### Get a task's sub-tasks
-
-```php
-Asana::getSubTasks($task_id);
-```
-
-#### Creating a task
-
-```php
-Asana::createTask([
-   'workspace' => '176825', // Workspace ID
-   'name'      => 'Hello World!', // Name of task
-   'assignee'  => '[email protected]', // Assign task to...
-   'followers' => ['3714136', '5900783'] // We add some followers to the task... (this time by ID)
-]);
-```
-
-#### Delete a task
-
-```php
-Asana::deleteTask($task_id);
-```
-
-#### Adding task to project
-
-```php
-Asana::addProjectToTask($task_id, $project_id);
-```
-
-#### Remove task from a project
-
-```php
-Asana::removeProjectToTask($task_id, $project_id);
-```
-
-#### Get task stories
-
-```php
-Asana::getTaskStories($task_id);
-```
-
-#### Commenting on a task
-
-```php
-Asana::commentOnTask($task_id, "Please please! Don't assign me this task!");
-```
-
-#### Add a tag to a task
-
-```php
-Asana::addTagToTask($task_id, $tag_id);
-```
 
-#### Remove a tag from a task
+## Official Documentation
 
-```php
-Asana::removeTagFromTask($task_id, $tag_id);
-```
+Documentation for the package can be found on [Lyften.com](http://lyften.com/projects/laravel-asana/).
 
-#### Create a project
-
-```php
-Asana::createProject([
-    "workspace" => "1768",
-    "name"      => "Foo Project!",
-    "notes"     => "This is a test project"
-]);
-```
-
-#### Getting projects in all workspaces
-
-```php
-Asana::getProjects();
-```
-
-#### Get projects in a workspace
-
-```php
-$archived = false;
-
-Asana::getProjectsInWorkspace($workspace_id, $archived);
-```
-
-#### Updating project info
-
-```php
-Asana::updateProject($project_id, [
-    'name' => 'This is a new cool project!',
-    'notes' => 'At first, it wasn't cool, but after this name change, it is!'
-]);
-```
-
-#### Get project tasks
-
-```php
-Asana::getProjectTasks($project_id);
-```
-
-#### Get project stories
-
-```php
-Asana::getProjectStories($project_id);
-```
-
-#### Get a specific story
-
-```php
-Asana::getSingleStory($story_id);
-```
-
-#### Comment on a project
-
-```php
-$text = "Such fun!";
-
-Asana::commentOnProject($project_id, $text)
-```
-
-#### Get a specific tag
-
-```php
-Asana::getTag($tag_id);
-```
-
-#### Get tags
-
-```php
-Asana::getTags();
-```
-
-#### Update tag
-
-```php
-// $data - array - An array containing fields to update, see Asana API if needed.
-
-Asana::updateTag($tag_id, $data);
-```
-
-#### Get tasks with tag
-
-```php
-Asana::getTasksWithTag($tag_id);
-```
-
-#### Get workspaces
-
-```php
-Asana::getWorkspaces();
-```
-
-#### Update workspace
-
-```php
-$data = ['name' => ''];
-
-Asana::updateWorkspace($workspace_i, $data);
-```
-
-#### Get workspace tasks
-
-```php
-// Assignee can either be 'me' or a user's ID
-
-Asana::getWorkspaceTasks($workspace_id, $assignee);
-```
-
-#### Get workspace tags
-
-```php
-Asana::getWorkspaceTags($workspace_id);
-```
-
-#### Get workspace users
-
-```php
-Asana::getWorkspaceUsers($workspace_id);
-```
-
-#### Filtering
-
-If you specify an assignee, you must also specify a workspace to filter on.
-
-```php
-Asana::getTasksByFilter([
-    'assignee'  => 1121,
-    'project'   => 37373729,
-    'workspace' => 111221
-]);
-```
-
-## Upgrading
+## Change Log
 
-### Upgrade from v0.2 to v0.3
+#### v0.4.0
 
-Asana stopped supporting API keys, so now we must use a Personal Access Token. See Asana's directions for generating a [personal access tokens](https://asana.com/guide/help/api/api#gl-access-tokens). Then update the `config/asana.php` config file with the new token:
+- Added attachment
+- Code cleanup
+- Add helper function
 
-```php
-'accessToken' => env('ASANA_TOKEN'),
-```
+#### v0.3.1
 
-## Change Log
+- Fix big integers parsing
+- Fix `getTasksByFilter` ignoring filters beside the predefined ones
 
 #### v0.3.0
 

composer.json

@@ -1,27 +1,29 @@
 {
   "name": "torann/laravel-asana",
-  "description": "Asna API wrapper for Laravel",
-  "keywords": ["laravel", "asana", "laravel 5", "laravel 4"],
+  "description": "Asana API wrapper for Laravel",
+  "keywords": ["laravel", "asana", "laravel 5"],
   "license": "BSD 2-Clause",
   "authors": [
     {
       "name": "Daniel Stainback",
-      "email": "daniel@lyften.com"
+      "email": "torann@gmail.com"
     }
    ],
   "require": {
     "php": ">=5.5.9",
-    "illuminate/support": "~5.0",
-    "illuminate/database": "~5.0"
+    "illuminate/support": "~5.0"
   },
   "autoload": {
+    "files": [
+      "src/helpers.php"
+    ],
     "psr-4": {
-      "Torann\\LaravelAsana\\": "src/Torann/LaravelAsana"
+      "Torann\\LaravelAsana\\": "src/"
     }
   },
   "extra": {
     "branch-alias": {
-      "dev-master": "0.3-dev"
+      "dev-master": "0.4-dev"
     }
   }
 }

src/config/asana.php renamed to config/asana.php

@@ -96,7 +96,7 @@ public function getUsers()
      *     )
      * )
      *
-     * @return string|null
+     * @return object|null
      */
     public function createTask($data)
     {
@@ -167,11 +167,9 @@ public function deleteTask($taskId)
      */
     public function addTaskAttachment($taskId, $file)
     {
-        $data = [
-            'file' => $this->addPostFile($file)
-        ];
-
-        return $this->curl->post("tasks/{$taskId}/attachments", $data);
+        return $this->curl->post("tasks/{$taskId}/attachments", [
+            'file' => $file,
+        ]);
     }
 
     /**
@@ -243,10 +241,10 @@ public function removeProjectToTask($taskId, $projectId = null)
     public function getTasksByFilter($filter = ["assignee" => "", "project" => "", "workspace" => ""])
     {
         $filter = array_filter(array_merge(["assignee" => "", "project" => "", "workspace" => ""], $filter));
-        $url = '?' . join('&', array_map(function($k, $v){
-            return "{$k}={$v}";
-        }, array_keys($filter), $filter));
-        
+        $url = '?' . join('&', array_map(function ($k, $v) {
+                return "{$k}={$v}";
+            }, array_keys($filter), $filter));
+
         return $this->curl->get("tasks{$url}");
     }