Merge pull request #5 from me-shaon/master

Some code refactored

Author: nahid

example/index.php

@@ -36,5 +36,4 @@
 $data = $json->collect([1, 2, 3, 4, 5])->nth(-2);
 
 echo '<pre>';
-dump($data);
-*/
+dump($data);

src/JsonQueriable.php

@@ -161,6 +161,27 @@ public function isJson($value, $return_map = false)
 
         return (json_last_error() == JSON_ERROR_NONE) ? ($return_map ? $data : true) : json_last_error_msg();
     }
+    protected function prepareResult($data, $object)
+    {
+        $output = [];
+        if (is_array($data)) {
+            foreach ($data as $key => $val) {
+                if ($object) {
+                    $output[$key] = (object) $val;
+                } else {
+                    $output[$key] = $val;
+                }
+            }
+        } else {
+            if ($object) {
+                $output = json_decode(json_encode($data));
+            } else {
+                $output = json_decode(json_encode($data), true);
+            }
+        }
+
+        return $output;
+    }
 
     /**
      * read JSON data from file

src/Jsonq.php

@@ -91,16 +91,8 @@ public function get($object = true)
         if (!$this->isMultiArray($this->_map)) {
             return (object) $this->_map;
         }
-        $resultingData = [];
-        foreach ($this->_map as $key=>$data) {
-            if ($object) {
-                $resultingData[$key] = (object) $data;
-            } else {
-                $resultingData[$key] = $data;
-            }
-        }
 
-        return $resultingData;
+        return $this->prepareResult($this->_map, $object);
     }
 
 
@@ -125,7 +117,11 @@ public function fetch($object = true)
      */
     public function exists()
     {
-        return count($this->_map) > 0;
+        if (!empty($this->_map) && !is_null($this->_map)) {
+            return true;
+        }
+
+        return false;
     }
 
 
@@ -282,11 +278,7 @@ public function first($object = true)
 
         $data = $this->_map;
         if (count($data) > 0) {
-            if ($object) {
-                return json_decode(json_encode(reset($data)));
-            }
-
-            return json_decode(json_encode(reset($data)), true);
+            return $this->prepareResult(reset($data), $object);
         }
 
         return null;
@@ -305,11 +297,7 @@ public function last($object = true)
 
         $data = $this->_map;
         if (count($data) > 0) {
-            if ($object) {
-                return json_decode(json_encode(end($data)));
-            }
-
-            return json_decode(json_encode(end($data)), true);
+            return $this->prepareResult(end($data), $object);
         }
 
         return null;
@@ -341,11 +329,7 @@ public function nth($index, $object = true)
             $result = $data[$this->count() + $index];
         }
 
-        if ($object) {
-            return json_decode(json_encode($result));
-        }
-
-        return json_decode(json_encode($result), true);
+        return $this->prepareResult($result, $object);
     }
 
     /**