Move to just Laravel cache

Author: Torann

config/geoip.php

@@ -79,40 +79,41 @@
     | Default Cache Driver
     |--------------------------------------------------------------------------
     |
-    | Here you may specify the default cache storage that should be used
-    | by the GeoIP package.
+    | Here you may specify the type of caching that should be used
+    | by the package.
     |
-    | Supported: "sync", "session", "laravel"
+    | Options:
+    |
+    |  all  - All location are cached
+    |  some - Cache only the requesting user
+    |  none - Disable cached
     |
     */
 
-    'cache' => 'sync',
+    'cache' => 'all',
 
     /*
     |--------------------------------------------------------------------------
-    | Cache Driver Specific Configuration
+    | Cache Tags
     |--------------------------------------------------------------------------
     |
-    | Here you may configure as many cache stores as you wish. The base class
-    | name of the driver is used as the driver key.
+    | Cache tags are not supported when using the file or database cache
+    | drivers in Laravel. This is done so that only locations can be cleared.
     |
     */
 
-    'cache_drivers' => [
-
-        'sync' => [
-            'class' => \Torann\GeoIP\Cache\Sync::class,
-        ],
+    'cache_tags' => ['torann-geoip-location'],
 
-        'session' => [
-            'class' => \Torann\GeoIP\Cache\Session::class,
-        ],
+    /*
+    |--------------------------------------------------------------------------
+    | Cache Expiration
+    |--------------------------------------------------------------------------
+    |
+    | Define how long cached location are valid.
+    |
+    */
 
-        'laravel' => [
-            'class' => \Torann\GeoIP\Cache\Laravel::class,
-            'expires' => 60,
-        ],
-    ],
+    'cache_expires' => 30,
 
     /*
     |--------------------------------------------------------------------------
@@ -136,7 +137,7 @@
         'timezone' => 'America/New_York',
         'continent' => 'NA',
         'default' => true,
-        'currency' => null,
+        'currency' => 'USD',
     ],
 
 ];

src/Cache.php

@@ -0,0 +1,74 @@
+<?php
+
+namespace Torann\GeoIP;
+
+use Illuminate\Cache\CacheManager;
+
+class Cache
+{
+    /**
+     * Instance of cache manager.
+     *
+     * @var \Illuminate\Cache\CacheManager
+     */
+    protected $cache;
+
+    /**
+     * Lifetime of the cache.
+     *
+     * @var int
+     */
+    protected $expires;
+
+    /**
+     * Create a new cache instance.
+     *
+     * @param CacheManager $cache
+     * @param array        $tags
+     * @param int          $expires
+     */
+    public function __construct(CacheManager $cache, $tags, $expires = 30)
+    {
+        $this->cache = $tags ? $cache->tags($tags) : $cache;
+        $this->expires = $expires;
+    }
+
+    /**
+     * Get an item from the cache.
+     *
+     * @param string $name
+     *
+     * @return array
+     */
+    public function get($name)
+    {
+        $value = $this->cache->get($name);
+
+        return is_array($value)
+            ? new Location($value)
+            : null;
+    }
+
+    /**
+     * Store an item in cache.
+     *
+     * @param string   $name
+     * @param Location $location
+     *
+     * @return bool
+     */
+    public function set($name, Location $location)
+    {
+        return $this->cache->put($name, $location->toArray(), $this->expires);
+    }
+
+    /**
+     * Flush cache for tags.
+     *
+     * @return bool
+     */
+    public function flush()
+    {
+        return $this->cache->flush();
+    }
+}