Merge pull request #1 from LightMediaNL/first-revision

First revision

src/Builders/QueryBuilder.php → src/Builders/ConnectionBuilder.php

@@ -6,7 +6,7 @@
 use Lightmedia\Googleprint\Cache\GooglePrintCache;
 use Lightmedia\Googleprint\Exceptions\GooglePrintException;
 
-class QueryBuilder {
+class ConnectionBuilder {
 
     protected $accessToken;
     protected $values;
@@ -75,6 +75,15 @@ public function submit(array $array) {
         return $result;
     }
 
+    public function printer(array $array) {
+
+        $this->values = $array;
+
+        $result = $this->request(self::BASE_URL . '/printer');
+
+        return $result;
+    }
+
     protected function removeEmptyValues() {
 
         foreach($this->values as $key => $value) {
@@ -115,7 +124,7 @@ protected function request($url) {
 
         if(true !== $response['success']){
 
-            throw new GooglePrintException('Error in Google API request: ' . $response['message']);
+            throw new GooglePrintException('Error in Google API request: ' . $response['message'] . ' in ' . $url);
         }
 
         return $response;

src/Builders/PrinterBuilder.php

@@ -119,7 +119,7 @@ public function all() {
 
     public function get() {
 
-        $search = new QueryBuilder($this->accessToken);
+        $search   = new ConnectionBuilder($this->accessToken);
         $response = $search->search($this->values);
 
 
@@ -134,20 +134,40 @@ protected function arrayToHash(array $array) {
 
     protected function buildObjects(Array $array) {
 
-        $return = [];
+        $return = [ ];
 
-        $hide = config('print.printers.hide') ?: [];
+        $hide = config('print.printers.hide') ?: [ ];
 
         foreach($array as $item) {
 
-            if(false === in_array($item['id'], $hide)){
+            if(false === in_array($item['id'], $hide)) {
 
-                $object = new Printer($this->accessToken, $item['id']);
+                $object   = new Printer($item['id']);
                 $return[] = $object->assign($item);
             }
 
         }
 
         return collect($return);
     }
+
+    public function find($id) {
+
+        $params = [
+            'printerid'    => $id,
+            'extra_fields' => 'connectionStatus,semanticState,uiState',
+        ];
+
+        $search   = new ConnectionBuilder;
+        $response = $search->printer($params);
+
+        if(count($response['printers']) !== 1){
+            throw new GooglePrintException('Unable to find printer');
+        }
+
+        $object = new Printer;
+        $object->assign($response['printers'][0]);
+
+        return $object;
+    }
 }

src/Cache/GooglePrintCache.php

@@ -2,7 +2,6 @@
 namespace Lightmedia\Googleprint\Cache;
 
 use Cache;
-use Lightmedia\Googleprint\Builders\QueryBuilder;
 
 class GooglePrintCache extends Cache {
 
@@ -20,8 +19,6 @@ public static function __callStatic($name, $arguments) {
 
     protected static function cache() {
 
-        $request = new QueryBuilder;
-
         return Cache::store(config('print.cache.driver'));
     }
 }

src/Facades/GooglePrint.php

@@ -0,0 +1,14 @@
+<?php
+namespace Lightmedia\Googleprint\Facades;
+
+use Illuminate\Support\Facades\Facade;
+
+class GooglePrint extends Facade
+{
+    /**
+     * Get the registered name of the component.
+     *
+     * @return string
+     */
+    protected static function getFacadeAccessor() { return 'Googleprint'; }
+}

src/Googleprint.php

@@ -2,11 +2,22 @@
 namespace Lightmedia\Googleprint;
 
 use Lightmedia\Googleprint\Builders\PrinterBuilder;
+use Lightmedia\Googleprint\Models\PrintJob;
 
 class Googleprint {
 
     public static function printer() {
 
         return new PrinterBuilder();
     }
+
+    public static function defaultPrinter() {
+
+        return (new PrinterBuilder)->find(config('print.printers.default'));
+    }
+
+    public static function newPrintJob() {
+
+        return new PrintJob;
+    }
 }

src/GoogleprintServiceProvider.php

@@ -23,6 +23,6 @@ public function boot()
      */
     public function register()
     {
-        //
+        $this->app->bind('Googleprint', 'LightMedia\Googleprint\Googleprint' );
     }
 }

src/Models/PrintJob.php

@@ -1,9 +1,9 @@
 <?php
-namespace Lightmedianl\Googleprint\Models;
+namespace Lightmedia\Googleprint\Models;
 
 use View;
-use Lightmedianl\Googleprint\Builders\QueryBuilder;
-use Lightmedianl\Googleprint\Exceptions\GooglePrintException;
+use Lightmedia\Googleprint\Builders\ConnectionBuilder;
+use Lightmedia\Googleprint\Exceptions\GooglePrintException;
 
 class PrintJob {
 
@@ -31,7 +31,7 @@ public function save() {
             'contentType' => $this->getContentType(),
         ];
 
-        $request = new QueryBuilder();
+        $request = new ConnectionBuilder;
         $response = $request->submit($params);
 
         $this->assign($response['job']);
@@ -104,6 +104,8 @@ protected function getTicket() {
     public function printer(Printer &$printer) {
 
         $this->printer = &$printer;
+
+        return $this;
     }
 
     public function view($view, $variables = [ ]) {

src/Models/Printer.php

@@ -2,6 +2,7 @@
 namespace Lightmedia\Googleprint\Models;
 
 use Lightmedia\Googleprint\Exceptions\GooglePrintException;
+use Lightmedia\Googleprint\Models\PrintJob;
 
 class Printer extends BaseObject{
 
@@ -22,12 +23,11 @@ protected function getFullObject() {
 
     }
 
-    public function submit() {
+    public function submit(PrintJob $job) {
 
         $this->canPrint();
 
-
-
+        return $job->printer($this)->save();
     }
 
     protected function getStatusAttribute() {
@@ -74,13 +74,7 @@ protected function getNameAttribute() {
             return null;
         }
     }
-
-    protected function getIdAttribute() {
-
-        return strtolower($this->id);
-    }
-
-
+
     protected function canPrint() {
 
         if(true === $this->values['isTosAccepted']) {