update export/import

Author: aVadim483

README.md

@@ -28,45 +28,61 @@ $excel->saveTo('path/file.xlsx');
 // or save file to specified disk
 $excel->store('disk', 'path/file.xlsx');
 ```
-Export a Model
+
+## Export Data
+
+### Export a Model
+Easy and fast export of a model. This way you export only model data without any styling 
 ```php
 
 // Create workbook with sheet named 'Users'
 $excel = \Excel::create('Users');
 
-// Write all users to Excel file
-$sheet->writeModel(Users::class);
+// Export all users to Excel file
+$sheet->exportModel(Users::class);
+
+$excel->saveTo('path/file.xlsx');
+```
+The following code will write the field names and styles (font and borders) to the first row, and then export all the data of the User model
+```php
+
+// Create workbook with sheet named 'Users'
+$excel = \Excel::create('Users');
 
 // Write users with field names in the first row
 $sheet->withHeaders()
     ->applyFontStyleBold()
     ->applyBorder('thin')
-    ->writeModel(Users::class);
+    ->exportModel(Users::class);
 
 $excel->saveTo('path/file.xlsx');
 ```
 
-Export any collections and arrays
+### Export Any Collections and Arrays
 ```php
 // Create workbook with sheet named 'Users'
 $excel = \Excel::create('Users');
 
 $sheet = $excel->getSheet();
-$users = User::all();
+// Get users as collection
+$users = User::where('age', '>', 35)->get();
 $sheet->writeData($users);
 
 $sheet = $excel->makeSheet('Records');
+// Get collection of records using Query Builder
 $records = \DB::table('users')->where('age', '>=', 21)->get(['id', 'name', 'birthday']);
 $sheet->writeData($records);
 
 $sheet = $excel->makeSheet('Collection');
+// Make custom collection of arrays
 $collection = collect([
     [ 'id' => 1, 'site' => 'google.com' ],
     [ 'id' => 2, 'site.com' => 'youtube.com' ],
 ]);
 $sheet->writeData($collection);
 
 $sheet = $excel->makeSheet('Array');
+// Make array and write to sheet
 $array = [
     [ 'id' => 1, 'name' => 'Helen' ],
     [ 'id' => 2, 'name' => 'Peter' ],
@@ -82,7 +98,7 @@ $sheet->writeData(function () {
 
 ```
 
-## Advanced usage for data export
+### Advanced Usage for Data Export
 
 See detailed documentation for avadim/fast-excel-laravel here: https://github.com/aVadim483/fast-excel-writer/tree/master#readme
 
@@ -95,13 +111,14 @@ $sheet->setColOptions('c', ['width' => 12, 'text-align' => 'center']);
 $sheet->setColWidth('d', 'auto');
 
 $title = 'This is demo of avadim/fast-excel-laravel';
-// begin area for direct access to cells
+// Begin area for direct access to cells
 $area = $sheet->beginArea();
 $area->setValue('A2:D2', $title)
       ->applyFontSize(14)
       ->applyFontStyleBold()
       ->applyTextCenter();
-
+      
+// Write headers to area
 $area
     ->setValue('a4:a5', '#')
     ->setValue('b4:b5', 'Number')
@@ -110,20 +127,33 @@ $area
     ->setValue('d5', 'Name')
 ;
 
+// Apply styles to headers
 $area->withRange('a4:d5')
     ->applyBgColor('#ccc')
     ->applyFontStyleBold()
     ->applyOuterBorder('thin')
     ->applyInnerBorder('thick')
     ->applyTextCenter();
-
+    
+// Write area to sheet
 $sheet->writeAreas();
 
+// Write data to sheet
 $sheet->writeData($data);
+
+// Save XLSX-file
 $excel->saveTo($testFileName);
 
 ```
 
+## Import Data
+
+### Import a Model
+To import models, you can use method ```importModel()```. By default, the first row is considered to contain the names of the fields
+```txt
+importModel(string $modelClass, $address = null, $columns = null)
+```
+
 ## Do you want to support FastExcelLaravel?
 
 if you find this package useful you can support and donate to me for a cup of coffee:

src/FastExcelLaravel/ExcelReader.php

@@ -28,9 +28,9 @@ public static function open(string $file): ExcelReader
      *
      * @return $this
      */
-    public function loadModels(string $modelClass, $address = null, $columns = null): ExcelReader
+    public function importModel(string $modelClass, $address = null, $columns = null): ExcelReader
     {
-        $this->sheet()->loadModels($modelClass, $address, $columns);
+        $this->sheet()->importModel($modelClass, $address, $columns);
 
         return $this;
     }

src/FastExcelLaravel/SheetReader.php

@@ -20,7 +20,7 @@ class SheetReader extends \avadim\FastExcelReader\Sheet
      *
      * @return $this
      */
-    public function loadModels($modelClass, $address = null, $columns = null): SheetReader
+    public function importModel($modelClass, $address = null, $columns = null): SheetReader
     {
         $resultMode = 0;
         if ($columns === true) {

src/FastExcelLaravel/SheetWriter.php

@@ -99,7 +99,7 @@ public function writeData($data, array $rowStyle = null, array $cellStyles = nul
      *
      * @return $this
      */
-    public function writeModel($model, array $rowStyle = null, array $cellStyles = null): SheetWriter
+    public function exportModel($model, array $rowStyle = null, array $cellStyles = null): SheetWriter
     {
         $this->writeData(static function() use ($model) {
             foreach ($model::cursor() as $user) {

tests/FastExcelLaravelTest.php

@@ -315,32 +315,32 @@ public function testLoadModel()
         $this->assertEquals('Sheet1', $excel->sheet()->name());
 
         FakeModel::$storage = [];
-        $excel->loadModels(FakeModel::class);
+        $excel->importModel(FakeModel::class);
         $this->assertCount(4, FakeModel::$storage);
         $this->assertNull(FakeModel::$storage[0]->name);
 
         FakeModel::$storage = [];
-        $excel->loadModels(FakeModel::class, true);
+        $excel->importModel(FakeModel::class, true);
         $this->assertCount(3, FakeModel::$storage);
         $this->assertEquals('James Bond', FakeModel::$storage[0]->name);
 
         FakeModel::$storage = [];
-        $excel->loadModels(FakeModel::class, 'b2');
+        $excel->importModel(FakeModel::class, 'b2');
         $this->assertCount(3, FakeModel::$storage);
         $this->assertNull(FakeModel::$storage[0]->name);
 
         FakeModel::$storage = [];
-        $excel->loadModels(FakeModel::class, 'b1', true);
+        $excel->importModel(FakeModel::class, 'b1', true);
         $this->assertCount(3, FakeModel::$storage);
         $this->assertEquals('James Bond', FakeModel::$storage[0]->name);
 
         FakeModel::$storage = [];
         $excel->setDateFormat('Y-m-d');
-        $excel->loadModels(FakeModel::class, 'c4', ['B' => 'foo', 'C' => 'bar', 'D' => 'int']);
+        $excel->importModel(FakeModel::class, 'c4', ['B' => 'foo', 'C' => 'bar', 'D' => 'int']);
         $this->assertEquals('1753-01-31', FakeModel::$storage[0]->bar);
 
         FakeModel::$storage = [];
-        $excel->loadModels(FakeModel::class, 'b2', ['B' => 'foo', 'C' => 'bar', 'D' => 'int']);
+        $excel->importModel(FakeModel::class, 'b2', ['B' => 'foo', 'C' => 'bar', 'D' => 'int']);
         $this->assertCount(3, FakeModel::$storage);
         $this->assertEquals('Captain Jack Sparrow', FakeModel::$storage[2]->foo);
         $this->assertEquals('1753-01-31', FakeModel::$storage[2]->bar);