Merge pull request #722 from LearningLocker/develop

v1.10.0

Author: ryasmi

VERSION

@@ -1 +1 @@
-1.9.0
+1.10.0

app/controllers/ReportingController.php

@@ -110,7 +110,7 @@ public function statements($lrs_id, $report_id) {
   public function typeahead($lrs, $segment, $query){
     $options = self::$segments[$segment];
     return Response::json($this->report->setQuery(
-      $lrs,
+      new \MongoId($lrs),
       $query,
       self::statementKey.$options['return'],
       self::statementKey.$options['query']

app/locker/repository/File/AzureFlyRepository.php

@@ -0,0 +1,18 @@
+<?php namespace Locker\Repository\File;
+use WindowsAzure\Common\ServicesBuilder;
+use League\Flysystem\Azure\AzureAdapter;
+
+class AzureFlyRepository extends FlyRepository {
+
+  public function __construct(Callable $conf) {
+    $endpoint = sprintf(
+        $conf('FS_AZURE_PROTOCOL'),
+        $conf('FS_AZURE_USERNAME'),
+        conf('FS_AZURE_API_KEY')
+    );
+    $blobRestProxy = ServicesBuilder::getInstance()->createBlobService($endpoint);
+    $adapter = new AzureAdapter($blobRestProxy, conf('FS_AZURE_CONTAINER'));
+    $this->constructFileSystem($adapter);
+  }
+
+}

app/locker/repository/File/CopyFlyRepository.php

@@ -0,0 +1,18 @@
+<?php namespace Locker\Repository\File;
+use Barracuda\Copy\API as CopyAPI;
+use League\Flysystem\Copy\CopyAdapter as CopyAdapter;
+
+class CopyFlyRepository extends FlyRepository {
+
+  public function __construct(Callable $conf) {
+    $client = new API(
+      $conf('FS_COPY_CONSUMER_KEY'),
+      $conf('FS_COPY_CONSUMER_SECRET'),
+      $conf('FS_COPY_ACCESS_TOKEN'),
+      $conf('FS_COPY_TOKEN_SECRET')
+    );
+    $adapter = new CopyAdapter($client, $conf('FS_COPY_PREFIX'));
+    $this->constructFileSystem($adapter);
+  }
+
+}

app/locker/repository/File/DropboxFlyRepository.php

@@ -0,0 +1,13 @@
+<?php namespace Locker\Repository\File;
+use Dropbox\Client as DropboxClient;
+use League\Flysystem\Dropbox\DropboxAdapter as DropboxAdapter;
+
+class DropboxFlyRepository extends FlyRepository {
+
+  public function __construct(Callable $conf) {
+    $client = new DropboxClient($conf('FS_DROPBOX_ACCESS_TOKEN'), $conf('FS_DROPBOX_APP_SECRET'));
+    $adapter = new DropboxAdapter($client, [$conf('FS_DROPBOX_PREFIX')]);
+    $this->constructFileSystem($adapter);
+  }
+
+}

app/locker/repository/File/Factory.php

@@ -12,6 +12,10 @@ public static function createRepo($repo) {
     $repos = [
       'Local' => 'LocalFlyRepository',
       'Rackspace' => 'RackspaceFlyRepository',
+      'Copy' => 'CopyFlyRepository',
+      'Dropbox' => 'DropboxFlyRepository',
+      'Azure' => 'AzureFlyRepository',
+      'S3V3' => 'S3V3FlyRepository',
     ];
     $repo = ucfirst(strtolower($repo));
     $conf = function ($var) {

app/locker/repository/File/S3V3FlyRepository.php

@@ -0,0 +1,21 @@
+<?php namespace Locker\Repository\File;
+use Aws\S3\S3Client as S3Client;
+use League\Flysystem\AwsS3v3\AwsS3Adapter as AwsS3Adapter;
+
+class S3V3FlyRepository extends FlyRepository {
+
+  public function __construct(Callable $conf) {
+    $client = S3Client::factory([
+      'credentials' => [
+        'key' => $conf('FS_S3V3_KEY'),
+        'secret' => $conf('FS_S3V3_SECRET'),
+      ],
+      'region' => $conf('FS_S3V3_REGION'),
+      'version' => $conf('FS_S3V3_VERSION'),
+    ]);
+
+    $adapter = new AwsS3Adapter($client, $conf('FS_S3V3_BUCKET'), $conf('FS_S3V3_PREFIX'));
+    $this->constructFileSystem($adapter);
+  }
+
+}

app/locker/repository/File/readme.md

@@ -3,6 +3,10 @@ This page documents how to use different storage adapters in Learning Locker. Th
 
 - [Local](#local)
 - [Rackspace](#rackspace)
+- [Copy.com](#copycom)
+- [Dropbox](#dropbox)
+- [Azure](#azure)
+- [AWS S3 V3](#aws-s3-v3)
 
 ### Local
 Your .env.local.php file should look something like this.
@@ -39,8 +43,72 @@ If you're migrating from another file repository (i.e. "Local"), you'll need to
 php artisan ll:file-repo Rackspace -f Local
 ```
 
+### Copy.com
+Your .env.local.php file should look something like this.
+```php
+  'FS_REPO' => 'Copy',
+  'FS_COPY_CONSUMER_KEY' => 'YOUR CONSUMER KEY',
+  'FS_COPY_CONSUMER_SECRET' => 'YOUR CONSUMER SECRET',
+  'FS_COPY_ACCESS_TOKEN' => 'YOUR ACCESS TOKEN',
+  'FS_COPY_TOKEN_SECRET' => 'YOUR TOKEN SECRET',
+  'FS_COPY_PREFIX' => 'YOUR PREFIX',
+```
+
+If you're migrating from another file repository (i.e. "Local"), you'll need to run the command below.
+
+```shell
+php artisan ll:file-repo Copy -f Local
+```
+
+### Dropbox
+Your .env.local.php file should look something like this.
+```php
+  'FS_REPO' => 'Dropbox',
+  'FS_DROPBOX_ACCESS_TOKEN' => 'YOUR ACCESS TOKEN',
+  'FS_DROPBOX_APP_SECRET' => 'YOUR APP SECRET',
+  'FS_DROPBOX_PREFIX' => 'YOUR PREFIX',
+```
+
+If you're migrating from another file repository (i.e. "Local"), you'll need to run the command below.
+
+```shell
+php artisan ll:file-repo Dropbox -f Local
+```
+
+### Azure
+Your .env.local.php file should look something like this.
+```php
+  'FS_REPO' => 'Azure',
+  'FS_AZURE_PROTOCOL' => 'DefaultEndpointsProtocol=https;AccountName=%s;AccountKey=%s',
+  'FS_AZURE_USERNAME' => 'YOUR USERNAME',
+  'FS_AZURE_API_KEY' => 'YOUR API KEY',
+  'FS_AZURE_CONTAINER' => 'YOUR CONTAINER',
+```
+
+If you're migrating from another file repository (i.e. "Local"), you'll need to run the command below.
+```shell
+php artisan ll:file-repo Azure -f Local
+```
+
+### AWS S3 V3
+Your .env.local.php file should look something like this.
+```php
+  'FS_REPO' => 'S3V3',
+  'FS_S3V3_KEY' => 'YOUR KEY',
+  'FS_S3V3_SECRET' => 'YOUR SECRET',
+  'FS_S3V3_REGION' => 'YOUR REGION',
+  'FS_S3V3_VERSION' => 'YOUR VERSION',
+  'FS_S3V3_BUCKET' => 'YOUR BUCKET',
+  'FS_S3V3_PREFIX' => 'YOUR PREFIX',
+```
+
+If you're migrating from another file repository (i.e. "Local"), you'll need to run the command below.
+```shell
+php artisan ll:file-repo S3V3 -f Local
+```
+
 ### Useful Development Links
 - http://docs.rackspace.com/sdks/api/php/class-OpenCloud.Rackspace.html
 - http://flysystem.thephpleague.com/api/
 - https://github.com/thephpleague/flysystem-aws-s3-v2/issues/3
-- https://github.com/thephpleague/flysystem-rackspace/issues/7
+- https://github.com/thephpleague/flysystem-rackspace/issues/7

app/views/partials/reporting/statements.blade.php

@@ -30,7 +30,7 @@
 
 @section('buttons')
   <a id="edit" href="{{ route('reporting.index', [$report->lrs_id]) }}#{{$report->_id}}/edit" class="btn btn-info"><i class="icon icon-pencil"></i> {{ Lang::get('site.edit') }}</a>
-  <a id="graph" data-toggle="tooltip" data-placement="top" title="View a graph of statements that match this report" href="{{ route('reporting.index', [$report->lrs]) }}#{{$report->_id}}/graph" class="btn btn-success"><i class="icon icon-signal"></i> {{ Lang::get('reporting.graph') }}</a>
+  <a id="graph" data-toggle="tooltip" data-placement="top" title="View a graph of statements that match this report" href="{{ route('reporting.index', [$report->lrs_id]) }}#{{$report->_id}}/graph" class="btn btn-success"><i class="icon icon-signal"></i> {{ Lang::get('reporting.graph') }}</a>
 @stop
 
 @section('footer')

composer.json

@@ -29,6 +29,10 @@
     {
       "type": "vcs",
       "url": "[email protected]:LearningLocker/oauth2-server-laravel"
+    },
+    {
+      "type": "pear",
+      "url": "http://pear.php.net"
     }
   ],
   "require": {
@@ -45,7 +49,11 @@
     "bshaffer/oauth2-server-httpfoundation-bridge": "1.1.x",
     "jenssegers/mongodb-session": "~1.0",
     "league/flysystem": "~1.0",
-    "league/flysystem-rackspace": "^1.0"
+    "league/flysystem-rackspace": "^1.0",
+    "league/flysystem-copy": "^1.0",
+    "league/flysystem-dropbox": "^1.0",
+    "league/flysystem-azure": "^1.0",
+    "league/flysystem-aws-s3-v3": "^1.0"
   },
   "require-dev": {
     "phpunit/phpunit": "4.1.*"