make code developer friendly, and refactor

Author: nahid

.gitattributes

@@ -2,4 +2,5 @@
 
 /.gitattributes export-ignore
 /.gitignore export-ignore
-/README.md export-ignore
+/README.md export-ignore
+/example export-ignore

example/index.php

@@ -10,25 +10,22 @@
 $result = '';
 $json=new Jsonq($rootDir . 'data.json');
 $json1 = $json->copy();
-$result = $json->from('users')
-    ->prepare()
-    ->groupBy('locations');
-
-
+$result = $json->from('products');
 echo '<pre>';
-dump($json->get());
+dump($json->sum('price'));
+dump($json->copy()->collect([1,2,6])->avg());
 
 
 /* ----------- avg method example ------------ */
-
+/*
 $json=new Jsonq($rootDir . 'data.json');
-$avg = $json->from('products')->prepare()->avg('price');
+$avg = $json->from('products')->avg('price');
 
 echo '<pre>';
 dump($avg);
 
 $json=new Jsonq();
-$avg = $json->collect([1, 3, 2])->prepare()->avg();
+$avg = $json->collect([1, 3, 2])->avg();
 
 echo '<pre>';
-dump($avg);
+dump($avg);*/

src/JsonQueriable.php

@@ -33,6 +33,9 @@ trait JsonQueriable
      */
     protected $_conditions = [];
 
+
+    protected $_isProcessed = false;
+
     /**
      * map all conditions with methods
      * @var array
@@ -78,6 +81,56 @@ public function import($json_file = null)
         throw new FileNotFoundException();
     }
 
+    /**
+     * Prepare data from desire conditions
+     *
+     * @return $this
+     * @throws ConditionNotAllowedException
+     */
+    protected function prepare()
+    {
+        if ($this->_isProcessed) {
+            return $this;
+        }
+        if (count($this->_conditions) > 0) {
+            $calculatedData = $this->processConditions();
+            $this->_map = $this->objectToArray($calculatedData);
+
+            $this->_conditions = [];
+            $this->_node = '';
+            $this->_isProcessed = true;
+            return $this;
+        }
+
+        $this->_isProcessed = true;
+        $this->_map = $this->objectToArray($this->getData());
+        return $this;
+    }
+
+    /**
+     * parse object to array
+     *
+     * @param $obj object
+     * @return array|mixed
+     */
+    protected function objectToArray($obj)
+    {
+        if (!is_array($obj) && !is_object($obj)) {
+            return $obj;
+        }
+
+        if (is_array($obj)) {
+            return $obj;
+        }
+
+        if (is_object($obj)) {
+            $obj = get_object_vars($obj);
+        }
+
+        return array_map([$this, 'objectToArray'], $obj);
+    }
+
+
 
     /**
      * check given value is multidimensional array
@@ -214,6 +267,11 @@ protected function processConditions()
      */
     public function where($key, $condition = null, $value = null)
     {
+        if (!is_null($condition) && is_null($value)) {
+            $value = $condition;
+            $condition = '=';
+        }
+
         if (count($this->_conditions) < 1) {
             array_push($this->_conditions, []);
         }
@@ -230,6 +288,11 @@ public function where($key, $condition = null, $value = null)
      */
     public function orWhere($key = null, $condition = null, $value = null)
     {
+        if (!is_null($condition) && is_null($value)) {
+            $value = $condition;
+            $condition = '=';
+        }
+
         array_push($this->_conditions, []);
 
         return $this->makeWhere($key, $condition, $value);