Sander's fixes

.travis.yml

@@ -20,7 +20,7 @@ before_script:
   - (cd cphalcon/ext; export CFLAGS="-g3 -O1 -fno-delete-null-pointer-checks -Wall"; phpize && ./configure --enable-phalcon && make -j4 && sudo make install && phpenv config-add ../unit-tests/ci/phalcon.ini)
   - curl -s http://getcomposer.org/installer | php
   - php composer.phar install --dev
-  
+
 script:
   - cp tests/config.sample.php tests/config.php
   - mkdir -p tests/fixtures/cache
@@ -29,4 +29,4 @@ script:
   - php vendor/bin/phpunit -c travis/phpunit.xml.dist
 
 after_script:
-  - php vendor/bin/coveralls -v
+  - php vendor/bin/coveralls -v

src/DI/Scaffolding.php

@@ -76,6 +76,13 @@ class Scaffolding implements ScaffoldingInterface
      */
     protected $formName;
 
+    /**
+     * Query
+     *
+     * @var array
+     */
+    protected $query = [];
+
     /**
      * {@inheritdoc}
      */
@@ -135,6 +142,15 @@ public function setModelName($name)
         return $this;
     }
 
+    /**
+     * {@inheritdoc}
+     */
+    public function setQuery($query)
+    {
+        $this->adapter->setQuery($query);
+        return $this;
+    }
+
     /**
      * {@inheritdoc}
      */
@@ -194,7 +210,7 @@ public function doDelete($id)
      */
     private function processForm($values)
     {
-        $form = $this->getForm();
+        $form = $this->getForm($this->record);
         $form->bind($values, $this->record);
 
         if ($form->isValid()) {

src/DI/Scaffolding/Adapter/Mongo.php

@@ -38,6 +38,13 @@ class Mongo implements AdapterInterface, ScaffoldingAdapterInterface
      */
     protected $scaffolding;
 
+    /**
+     * Query for paginator
+     *
+     * @var array
+     */
+    protected $query = [];
+
     /**
      * Constructor
      * Verifies services required by Mongo
@@ -49,6 +56,16 @@ public function __construct()
         $this->setupExtraServices($di);
     }
 
+    /**
+     * {@inheritdoc}
+     */
+    public function setQuery($query)
+    {
+        $this->query = $query;
+
+        return $this;
+    }
+
     /**
      * {@inheritdoc}
      */
@@ -69,6 +86,7 @@ public function retrieveOne($id)
     public function getPaginator($page = 1, $limit = 10)
     {
         return new PaginatorAdapterMongo(array(
+            'query' => $this->query,
             'model' => $this->scaffolding->getRecord(),
             'limit' => $limit,
             'page' => $page

src/DI/Scaffolding/Adapter/Mysql.php

@@ -38,6 +38,13 @@ class Mysql implements AdapterInterface, ScaffoldingAdapterInterface
      */
     protected $scaffolding;
 
+    /**
+     * Query for paginator
+     *
+     * @var array
+     */
+    protected $query = [];
+
     /**
      * Constructor
      */
@@ -47,6 +54,16 @@ public function __construct()
         $this->verifyRequiredServices($di);
     }
 
+    /**
+     * {@inheritdoc}
+     */
+    public function setQuery($query)
+    {
+        $this->query = $query;
+
+        return $this;
+    }
+
     /**
      * {@inheritdoc}
      */
@@ -71,7 +88,7 @@ public function getPaginator($page = 1, $limit = 10)
         $this->ensureScaffolding();
 
         return new PaginatorAdapterModel(array(
-            'data' => (object) call_user_func(array($this->scaffolding->getRecord(), 'find')),
+            'data' => call_user_func(array($this->scaffolding->getRecord(), 'find'), $this->query),
             'limit' => $limit,
             'page' => $page
         ));

src/DI/Scaffolding/AdapterInterface.php

@@ -27,6 +27,14 @@ interface AdapterInterface
      */
     public function retrieveOne($id);
 
+    /**
+     * Sets query for the paginator
+     *
+     * @param $id
+     * @return mixed
+     */
+    public function setQuery($query);
+
     /**
      * Retrieve list of records as paginator object.
      *

src/DI/ScaffoldingInterface.php

@@ -57,6 +57,14 @@ public function getForm($entity = null);
      */
     public function setFormName($name);
 
+    /**
+     * Sets query for paginator
+     *
+     * @param $query
+     * @return mixed
+     */
+    public function setQuery($query);
+
     /**
      * Sets model name
      *

src/Mvc/Controller/CrudAbstract.php

@@ -77,6 +77,13 @@ public function initialize()
      */
     protected $modelName;
 
+    /**
+     * Query that will be used in index action
+     *
+     * @var array
+     */
+    protected $query = [];
+
     /**
      * Array of fields names that will be used in index action
      *
@@ -104,6 +111,7 @@ protected function initializeScaffolding()
 
         $this->scaffolding->setModelName($this->modelName);
         $this->scaffolding->setFormName($this->formName);
+        $this->scaffolding->setQuery($this->query);
     }
 
     /**

src/Mvc/Module/Loader.php

@@ -100,7 +100,7 @@ public function dump($inputDirectory, $outputDirectory, $dumpVendorModules = tru
      * @param $modulesList
      * @return mixed
      */
-    private function dumpModulesFromVendor(array &$modulesList)
+    public function dumpModulesFromVendor(array &$modulesList)
     {
         if (!file_exists(APP_ROOT.'/composer.json')) {
             return $modulesList;

src/Task/AssetsTask.php

@@ -16,6 +16,7 @@
 use Vegas\Cli\Task\Option;
 use Vegas\Cli\Task;
 use Vegas\Cli\TaskAbstract;
+use Vegas\Mvc\Module\Loader;
 
 /**
  * Class AssetsTask
@@ -28,16 +29,20 @@ class AssetsTask extends TaskAbstract
      */
     public function publishAction()
     {
-        $this->putText("Copying assets...");
-        $this->copyAllAssets();
+        $this->putText("Copying Vegas CMF assets...");
+        $this->copyCmfAssets();
+
+        $this->putText("Copying vendor assets:");
+        $this->copyVendorAssets();
+
         $this->putSuccess("Done.");
     }
 
     /**
      * Copies all assets from vegas-cmf libraries
      * @internal
      */
-    private function copyAllAssets()
+    private function copyCmfAssets()
     {
         $vegasCmfPath = APP_ROOT . DIRECTORY_SEPARATOR . 'vendor' . DIRECTORY_SEPARATOR . 'vegas-cmf';
         $publicAssetsDir = $this->getOption('d', APP_ROOT.DIRECTORY_SEPARATOR.'public'.DIRECTORY_SEPARATOR.'assets');
@@ -59,6 +64,32 @@ private function copyAllAssets()
         }
     }
 
+    /**
+     * Copies all assets vendor modules
+     * @internal
+     */
+    private function copyVendorAssets()
+    {
+        $modules = [];
+        $moduleLoader = new Loader($this->di);
+        $moduleLoader->dumpModulesFromVendor($modules);
+
+        $publicAssetsDir = $this->getOption('d', APP_ROOT.DIRECTORY_SEPARATOR.'public'.DIRECTORY_SEPARATOR.'assets');
+
+
+        if ($modules) {
+            foreach ($modules as $moduleName => $module) {
+                $assetsDir = dirname($module['path']) . '/../assets';
+
+                if (file_exists($assetsDir)) {
+                    $this->putText("- " . $moduleName . "...");
+
+                    $this->copyRecursive($assetsDir, $publicAssetsDir);
+                }
+            }
+        }
+    }
+
     /**
      * Copies assets recursively
      *

tests/DI/Scaffolding/Adapter/MysqlTest.php

@@ -92,17 +92,47 @@ public function testShouldReturnValidPagination()
         $mysql = new \Vegas\DI\Scaffolding\Adapter\Mysql();
         $scaffolding = new Scaffolding($mysql);
 
-        $scaffolding->setModelName('\Test\Models\Fake');
+        $scaffolding->setModelName('\Test\Models\FakeSql');
+        $scaffolding->setFormName('\Test\Forms\Fake');
+        $scaffolding->doCreate([
+            'fake_field' => 'fake'
+        ]);
+        $scaffolding->doCreate([
+            'fake_field' => 'fake2'
+        ]);
+
+        $pagination = $mysql->getPaginator();
+        $paginate = $pagination->getPaginate();
+
+        $this->assertInstanceOf('\Phalcon\Paginator\Adapter\Model', $pagination);
+        $this->assertInstanceOf('\stdClass', $paginate);
+        $this->assertNotEquals(0, $paginate->total_items);
+    }
+
+    public function testShouldReturnFilteredPagination()
+    {
+        $mysql = new \Vegas\DI\Scaffolding\Adapter\Mysql();
+        $scaffolding = new Scaffolding($mysql);
+
+        $scaffolding->setModelName('\Test\Models\FakeSql');
         $scaffolding->setFormName('\Test\Forms\Fake');
         $scaffolding->doCreate([
             'fake_field' => 'fake'
         ]);
         $scaffolding->doCreate([
             'fake_field' => 'fake2'
         ]);
+        $scaffolding->doCreate([
+            'fake_field' => 'fake'
+        ]);
+        $scaffolding->setQuery('fake_field = "fake2"');
 
         $pagination = $mysql->getPaginator();
+        $paginate = $pagination->getPaginate();
+
         $this->assertInstanceOf('\Phalcon\Paginator\Adapter\Model', $pagination);
-        $this->assertInstanceOf('\stdClass', $pagination->getPaginate());
+        $this->assertInstanceOf('\stdClass', $paginate);
+        $this->assertNotEquals(0, $paginate->total_items);
+        $this->assertEquals('fake2', $paginate->items[0]->fake_field);
     }
 }

tests/DI/ScaffoldingTest.php

@@ -30,6 +30,10 @@ protected function setUp()
         $record = new \Vegas\Tests\Stub\Models\FakeModel();
         $record->fake_field = 'test';
         $record->save();
+
+        $record = new \Vegas\Tests\Stub\Models\FakeModel();
+        $record->fake_field = 'test_query';
+        $record->save();
 
         $this->record = $record;
     }
@@ -133,4 +137,29 @@ public function testDoDelete()
             $this->assertInstanceOf('\Vegas\DI\Scaffolding\Exception\RecordNotFoundException', $ex);
         }
     }
+
+    public function testShouldReturnValidPagination()
+    {
+        $pagination = $this->scaffolding->doPaginate();
+
+        $this->assertInstanceOf('\Vegas\Paginator\Adapter\Mongo', $pagination);
+
+        $results = $pagination->getResults();
+
+        $this->assertNotCount(0, $results);
+        $this->assertInstanceOf('\Vegas\Tests\Stub\Models\FakeModel', $results[0]);
+    }
+
+    public function testShouldReturnFilteredPagination()
+    {
+        $this->scaffolding->setQuery([
+            'fake_field' => 'test_query'
+        ]);
+
+        $pagination = $this->scaffolding->doPaginate();
+        $results = $pagination->getResults();
+
+        $this->assertNotCount(0, $results);
+        $this->assertEquals('test_query', $results[0]->fake_field);
+    }
 }

tests/fixtures/app/modules/Test/models/FakeSql.php

@@ -0,0 +1,27 @@
+<?php
+/**
+ * This file is part of Vegas package
+ *
+ * @author Slawomir Zytko <slawek@amsterdam-standard.pl>
+ * @copyright Amsterdam Standard Sp. Z o.o.
+ * @homepage http://vegas-cmf.github.io
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Test\Models;
+
+use Vegas\Db\Decorator\ModelAbstract;
+
+class FakeSql extends ModelAbstract
+{
+    public function getSource()
+    {
+        return 'fake';
+    }
+
+    protected $mappings = array(
+        'arraydata' =>  'json'
+    );
+} 

tests/fixtures/public/assets/css/vendor.another.css

@@ -0,0 +1,3 @@
+p {
+    color: #111;
+}

tests/fixtures/public/assets/css/vendor.test.css

@@ -0,0 +1,3 @@
+body {
+    background-color: #FDFDFD;
+}

tests/fixtures/public/assets/js/vendor.example.js

@@ -0,0 +1,3 @@
+/**
+ * Created by arius on 30.05.14.
+ */

tests/fixtures/vendor/vegas-cmf/fake-vendor-module/assets/css/vendor.another.css

@@ -0,0 +1,3 @@
+p {
+    color: #111;
+}