Update cache key to work with non-roman alphabets

mikebronner · mikebronner · commit 9f9df7fd941e · 2017-06-22T07:44:26.000-07:00
diff --git a/src/ProviderAndDumperAggregator.php b/src/ProviderAndDumperAggregator.php
@@ -74,9 +74,9 @@ public function dump($dumper)
      */
     public function geocode($value)
     {
-        $cacheId = str_slug($value);
+        $cacheKey = str_slug(strtolower(urlencode($value)));
         $this->results = cache()->remember(
-            "geocoder-{$cacheId}",
+            "geocoder-{$cacheKey}",
             config('geocoder.cache-duraction', 0),
             function () use ($value) {
                 return parent::geocode($value);
@@ -101,9 +101,9 @@ public function get()
      */
     public function reverse($latitude, $longitude)
     {
-        $cacheId = str_slug("{$latitude}-{$longitude}");
+        $cacheKey = str_slug(strtolower(urlencode("{$latitude}-{$longitude}")));
         $this->results = cache()->remember(
-            "geocoder-{$cacheId}",
+            "geocoder-{$cacheKey}",
             config('geocoder.cache-duraction', 0),
             function () use ($latitude, $longitude) {
                 return parent::reverse($latitude, $longitude);
diff --git a/tests/Laravel5_3/Providers/GeocoderServiceTest.php b/tests/Laravel5_3/Providers/GeocoderServiceTest.php
@@ -178,9 +178,20 @@ public function testCacheIsUsed()
     {
         $result = app('geocoder')->geocode('1600 Pennsylvania Ave., Washington, DC USA')
             ->get();
-        $cacheKey = 'geocoder-' . str_slug('1600 Pennsylvania Ave., Washington, DC USA');
+        $cacheKey = str_slug(strtolower(urlencode('1600 Pennsylvania Ave., Washington, DC USA')));
 
-        $this->assertTrue(cache()->has($cacheKey));
-        $this->assertEquals($result, cache($cacheKey));
+        $this->assertEquals($result, cache("geocoder-{$cacheKey}"));
+        $this->assertTrue(cache()->has("geocoder-{$cacheKey}"));
+    }
+
+    public function testJapaneseCharacterGeocoding()
+    {
+        $cacheKey = str_slug(strtolower(urlencode('108-0075 東京都港区港南２丁目１６－３')));
+
+        app('geocoder')->geocode('108-0075 東京都港区港南２丁目１６－３')
+            ->get();
+
+        $this->assertEquals($cacheKey, '108-0075e69db1e4baace983bde6b8afe58cbae6b8afe58d97efbc92e4b881e79baeefbc91efbc96efbc8defbc93');
+        $this->assertTrue(cache()->has("geocoder-{$cacheKey}"));
     }
 }
