Improve cache

README.md

@@ -3,7 +3,7 @@
 [![Latest Version on Packagist](https://img.shields.io/packagist/v/turbo124/collector.svg?style=flat-square)](https://packagist.org/packages/turbo124/collector)
 [![Total Downloads](https://img.shields.io/packagist/dt/turbo124/collector.svg?style=flat-square)](https://packagist.org/packages/turbo124/collector)
 
-Application level offsite metrics collector for laravel.
+Application offsite metrics collector for Laravel.
 
 ## Installation
 

src/Collector.php

@@ -17,38 +17,38 @@ public function __construct()
 
     public function create($metric)
     {
-    	$this->metric = $metric;
-    	$this->metric->datetime = date("Y-m-d H:i:s");
-    	$this->metric->api_key = config('collector.api_key');
+        $this->metric = $metric;
+        $this->metric->datetime = date("Y-m-d H:i:s");
+        $this->metric->api_key = config('collector.api_key');
 
         return $this;
     }
 
     public function increment()
     {
-    	$this->metric->counter++;
+        $this->metric->counter++;
 
-    	return $this;
+        return $this;
     }
 
     public function decrement()
     {
-    	$this->metric->counter--;
+        $this->metric->counter--;
 
-    	return $this;
+        return $this;
     }
 
     public function setCount($count)
     {
-    	$this->metric->counter = $count;
+        $this->metric->counter = $count;
 
-    	return $this;
+        return $this;
     }
 
     public function send()
     {
         $generator = new Generator();
-    	$generator->fire($this->metric);
+        $generator->fire($this->metric);
     }
 
     public function queue()
@@ -60,6 +60,16 @@ public function batch()
     {
         config(['cache.default' => 'array']);
 
-        Cache::tags(['collector'])->put(config('collector.api_key'), $this->metric);
+        $data = Cache::tags(['collector'])->get('collector');
+
+        if(is_array($data)){
+            $data[] = $this->metric;
+        }
+        else {
+            $data = [];
+            $data[] = $this->metric;
+        }
+
+        Cache::tags(['collector'])->put('collector', $data);
     }
 }

src/Jobs/BatchMetrics.php

@@ -31,7 +31,7 @@ public function handle()
 
         config(['cache.default' => 'array']);
 
-        $metrics = Cache::tags(['collector'])->get(config('collector.api_key'));
+        $metrics = Cache::tags(['collector'])->get('collector');
 
         $generator = new Generator();
         $generator->batchFire($metrics);

tests/CacheTest.php

@@ -0,0 +1,38 @@
+<?php
+
+namespace Turbo124\Collector\Tests;
+
+use Illuminate\Support\Facades\Cache;
+use Orchestra\Testbench\TestCase;
+use Turbo124\Collector\Collector;
+use Turbo124\Collector\CollectorServiceProvider;
+use Turbo124\Collector\Collector\Generator;
+
+class CacheTest extends TestCase
+{
+    /** @test */
+	public function testCacheGetAndPut()
+	{
+		$test_array = ['a' => 'b', 'c'=>'d'];
+
+        config(['cache.default' => 'array']);
+
+        $data = Cache::tags(['collector'])->get('collector');
+
+        if(is_array($data)){
+            $data[] = $test_array;
+        }
+        else {
+            $data = [];
+            $data[] = $test_array;
+        }
+
+        Cache::tags(['collector'])->put('collector', $data);
+
+        $test_data = Cache::tags(['collector'])->get('collector');
+
+        $this->assertTrue(is_array($test_data));
+
+        $this->assertEquals($test_data[0]['a'], 'b');
+	}
+}

tests/ConfigTest.php

@@ -13,6 +13,6 @@ class ConfigTest extends TestCase
 	public function testValidInstanceType()
 	{
 		$collector = new Collector;
-		$this->assertTrue($collector->create() instanceof Collector);
+		$this->assertTrue($collector instanceof Collector);
 	}
 }