fix bug: expiration time reset every incerments

composer.json

@@ -15,6 +15,7 @@
     ],
     "require": {
         "illuminate/support": "~5.1",
+        "predis/predis": "^1.1",
         "php" : "~5.6|~7.0"
     },
     "require-dev": {

src/BareqServiceProvider.php

@@ -15,7 +15,7 @@ public function boot()
     {
         $this->publishes([
             __DIR__ . '/config/bareq.php' => config_path('bareq.php'),
-        ]);
+        ], 'config');
     }
 
     /**

src/Reset.php

@@ -45,7 +45,13 @@ public function factory()
     public function visits()
     {
         if ($this->keys->id) {
-            $this->forceDecrement($this->count());
+            Redis::zrem($this->keys->visits, $this->keys->id);
+
+            foreach ($this->periods as $period) {
+                Redis::zrem($this->keys->period($period), $this->keys->id);
+            }
+
+            $this->ips();
         } else {
             Redis::del($this->keys->visits);
             Redis::del($this->keys->visits . '_total');

src/Visits.php

@@ -162,8 +162,14 @@ public function increment($inc = 1, $force = false, $periods = true)
             if($periods) {
                 foreach ($this->periods as $period => $days) {
                     $periodKey = $this->keys->period($period);
-                    Redis::zincrby($periodKey, $inc, $this->keys->id);
-                    Redis::expire($periodKey, $days * 24 * 60 * 60);
+
+                    if ( ! Redis::exists($periodKey)) {
+                        Redis::zincrby($periodKey, $inc, $this->keys->id);
+                        Redis::expire($periodKey, $days * 24 * 60 * 60);
+                    } else {
+                        Redis::zincrby($periodKey, $inc, $this->keys->id);
+                    }
+
                     Redis::incrby($periodKey . '_total', $inc);
                 }
             }

src/config/bareq.php

@@ -18,6 +18,13 @@
         'year'  => 365,
     ],
 
+    /*
+    |--------------------------------------------------------------------------
+    | Redis prefix
+    |--------------------------------------------------------------------------
+    */
+    'redis_keys_prefix' =>  'bareq',
+
     /*
     |--------------------------------------------------------------------------
     | Remember ip for x seconds of time
@@ -36,6 +43,5 @@
     */
     'always_fresh' => false,
 
-    'redis_keys_prefix' =>  'bareq',
 ];
 

tests/VisitsTest.php

@@ -66,6 +66,22 @@ function make($class, $times = null, $attributes = [])
         return factory($class, $times)->make($attributes);
     }
 
+    /** @test */
+    public function dont_reset_time_expiration_every_increment()
+    {
+        $post = $this->create('App\Post');
+
+        visits($post)->forceIncrement();
+
+        $timenow = visits($post)->timeLeft('day')->diffInSeconds();
+
+        visits($post)->forceIncrement();
+
+        $timethen = visits($post)->timeLeft('day')->diffInSeconds();
+
+        $this->assertNotEquals($timenow, $timethen);
+    }
+
     /**
      * @test
      */