merge crawler module #972

envs/dev/composer.json

@@ -25,14 +25,13 @@
             "luya\\admin\\" : "../../modules/admin/src",
             "luya\\cms\\" : "../../modules/cms/",
             "luya\\account\\" : "../../modules/account",
+            "luya\\crawler\\" : "../../modules/crawler",
 
             "newsadmin\\" : "../../modules/newsadmin",
             "news\\" : "../../modules/news/src",
             "errorapi\\" : "../../modules/errorapi/src",
             "gallery\\" : "../../modules/gallery",
             "galleryadmin\\" : "../../modules/galleryadmin",
-            "crawler\\" : "../../modules/crawler",
-            "crawleradmin\\" : "../../modules/crawleradmin",
             "contactform\\" : "../../modules/contactform",
             "moduletest\\" : "modules/moduletest",
             "styleguide\\" : "../../modules/styleguide",

modules/crawler/README.md

@@ -17,14 +17,14 @@ or add it directly to your composer.json file:
 "luyadev/luya-module-crawler" : "^1.0@dev"
 ```
 
-Add the module to your configuration (config):
+Add the modules to your configuration (config) in the modules section:
 
 ```php
 'crawler' => [
-    'class' => 'crawler\Module',
+    'class' => 'luya\crawler\frontend\Module',
     'baseUrl' => 'http://luya.io',
 ],
-'crawleradmin' => 'crawleradmin\Module',
+'crawleradmin' => 'luya\crawler\admin\Module',
 ```
 
 Where `baseUrl` is the domain you want to crawler all informations.

modules/crawleradmin/Module.php → modules/crawler/admin/Module.php

@@ -1,15 +1,15 @@
 <?php
 
-namespace crawleradmin;
+namespace luya\crawler\admin;
 
 use Yii;
 
 class Module extends \luya\admin\base\Module
 {
     public $apis = [
-        'api-crawler-builderindex' => 'crawleradmin\apis\BuilderindexController',
-        'api-crawler-index' => 'crawleradmin\apis\IndexController',
-        'api-crawler-searchdata' => 'crawleradmin\apis\SearchdataController',
+        'api-crawler-builderindex' => 'luya\crawler\admin\apis\BuilderindexController',
+        'api-crawler-index' => 'luya\crawler\admin\apis\IndexController',
+        'api-crawler-searchdata' => 'luya\crawler\admin\apis\SearchdataController',
     ];
 
     public function getMenu()

modules/crawler/admin/apis/BuilderindexController.php

@@ -0,0 +1,8 @@
+<?php
+
+namespace luya\crawler\admin\apis;
+
+class BuilderindexController extends \luya\admin\ngrest\base\Api
+{
+    public $modelClass = '\luya\crawler\models\Builderindex';
+}

modules/crawler/admin/apis/IndexController.php

@@ -0,0 +1,8 @@
+<?php
+
+namespace luya\crawler\admin\apis;
+
+class IndexController extends \luya\admin\ngrest\base\Api
+{
+    public $modelClass = '\luya\crawler\models\Index';
+}

modules/crawleradmin/apis/SearchdataController.php → modules/crawler/admin/apis/SearchdataController.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace crawleradmin\apis;
+namespace luya\crawler\admin\apis;
 
 /**
  * NgRest API created at 24.05.2016 15:56 on LUYA Version 1.0.0-beta7-dev.
@@ -10,5 +10,5 @@ class SearchdataController extends \luya\admin\ngrest\base\Api
     /**
      * @var string $modelClass The path to the model which is the provider for the rules and fields.
      */
-    public $modelClass = '\crawleradmin\models\Searchdata';
+    public $modelClass = '\luya\crawler\models\Searchdata';
 }

modules/crawler/admin/controllers/BuilderindexController.php

@@ -0,0 +1,8 @@
+<?php
+
+namespace luya\crawler\admin\controllers;
+
+class BuilderindexController extends \luya\admin\ngrest\base\Controller
+{
+    public $modelClass = '\luya\crawler\models\Builderindex';
+}

modules/crawler/admin/controllers/IndexController.php

@@ -0,0 +1,8 @@
+<?php
+
+namespace luya\crawler\admin\controllers;
+
+class IndexController extends \luya\admin\ngrest\base\Controller
+{
+    public $modelClass = '\luya\crawler\models\Index';
+}

modules/crawleradmin/controllers/SearchdataController.php → modules/crawler/admin/controllers/SearchdataController.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace crawleradmin\controllers;
+namespace luya\crawler\admin\controllers;
 
 /**
  * NgRest API created at 24.05.2016 15:56 on LUYA Version 1.0.0-beta7-dev.
@@ -10,5 +10,5 @@ class SearchdataController extends \luya\admin\ngrest\base\Controller
     /**
      * @var string $modelClass The path to the model which is the provider for the rules and fields.
      */
-    public $modelClass = '\crawleradmin\models\Searchdata';
+    public $modelClass = '\luya\crawler\models\Searchdata';
 }

modules/crawler/composer.json

@@ -21,7 +21,7 @@
 	},
 	"autoload" : {
 		"psr-4" : {
-			"crawler\\" : ""
+			"luya\\crawler\\" : ""
 		}
 	},
 	"extra": {

modules/crawler/Module.php → modules/crawler/frontend/Module.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace crawler;
+namespace luya\crawler\frontend;
 
 /**
  * LUYA Crawler

modules/crawler/classes/CrawlContainer.php → modules/crawler/frontend/classes/CrawlContainer.php

@@ -1,14 +1,14 @@
 <?php
 
-namespace crawler\classes;
+namespace luya\crawler\frontend\classes;
 
 use Yii;
 use Exception;
 use yii\base\InvalidConfigException;
 use crawleradmin\models\Builderindex;
 use crawleradmin\models\Index;
 use luya\helpers\Url;
-use crawler\classes\CrawlPage;
+use luya\crawler\frontend\classes\CrawlPage;
 
 class CrawlContainer extends \yii\base\Object
 {

modules/crawler/classes/CrawlPage.php → modules/crawler/frontend/classes/CrawlPage.php

@@ -1,12 +1,12 @@
 <?php
 
-namespace crawler\classes;
+namespace luya\crawler\frontend\classes;
 
 use Goutte\Client;
 use yii\base\InvalidConfigException;
 use yii\base\yii\base;
 use luya\helpers\Url;
-use Symfony\Component\DomCrawler\Crawler;
+use Symfony\Component\Domluya\crawler\frontend\Crawler;
 
 class CrawlPage extends \yii\base\Object
 {

modules/crawler/commands/CrawlController.php → modules/crawler/frontend/commands/CrawlController.php

@@ -1,8 +1,8 @@
 <?php
 
-namespace crawler\commands;
+namespace luya\crawler\frontend\commands;
 
-use crawler\classes\CrawlContainer;
+use luya\crawler\frontend\classes\CrawlContainer;
 use luya\helpers\FileHelper;
 
 /**

modules/crawler/commands/StatisticController.php → modules/crawler/frontend/commands/StatisticController.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace crawler\commands;
+namespace luya\crawler\frontend\commands;
 
 use Yii;
 use luya\console\Command;

modules/crawler/controllers/DefaultController.php → modules/crawler/frontend/controllers/DefaultController.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace crawler\controllers;
+namespace luya\crawler\frontend\controllers;
 
 use Yii;
 use crawleradmin\models\Index;

modules/crawler/controllers/RestController.php → modules/crawler/frontend/controllers/RestController.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace crawler\controllers;
+namespace luya\crawler\frontend\controllers;
 
 use Yii;
 use crawleradmin\models\Index;

modules/crawleradmin/models/Builderindex.php → modules/crawler/models/Builderindex.php

@@ -1,8 +1,8 @@
 <?php
 
-namespace crawleradmin\models;
+namespace luya\crawler\models;
 
-use crawleradmin\Module;
+use luya\crawler\admin\Module;
 
 class Builderindex extends \luya\admin\ngrest\base\NgRestModel
 {

modules/crawleradmin/models/Index.php → modules/crawler/models/Index.php

@@ -1,10 +1,10 @@
 <?php
 
-namespace crawleradmin\models;
+namespace luya\crawler\models;
 
 use Yii;
-use crawleradmin\Module;
-use crawleradmin\models\Searchdata;
+use luya\crawler\admin\Module;
+use luya\crawler\models\Searchdata;
 
 class Index extends \luya\admin\ngrest\base\NgRestModel
 {

modules/crawleradmin/models/Searchdata.php → modules/crawler/models/Searchdata.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace crawleradmin\models;
+namespace luya\crawler\models;
 
 use Yii;
 

modules/crawleradmin/composer.json

@@ -17,7 +17,7 @@
 	},
 	"autoload" : {
 		"psr-4" : {
-			"crawleradmin\\" : ""
+			"luya\crawler\admin\\" : ""
 		}
 	},
 	"extra": {