avo 1.17.0 → 1.17.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: afbc7118164b7104453b9440a65ee4ff84a9b2dc6a42f30cf39aaeaca93fc4e3
-  data.tar.gz: a37f8c6890e565c80f668d630795cfa15422c1d69f443e97542409afc7d6a9ef
+  metadata.gz: f979b13adfa02e58a8d2b3b4f6463d0fcef9200cdc4a4dee76b268ebc5a5e8b0
+  data.tar.gz: acdddcbb5516ffd36f1538877472f4f8a4ec5f2423a4ddea69b7eed5b156c308
 SHA512:
-  metadata.gz: 86bc59793edb35cc7af577d2145d20ae83fc964d7163fa647c53e6d3e560dfadbd5ef79650b45f15d621ee7aab89d2164302ec34e9547381cceacdf8e1613922
-  data.tar.gz: 1d012fb769f7f297f8eead60bbc296b01666e5d8852f3943c2706ad76bce0ae3ed3b8ac55a1509a84475436ca3cc70b6941070161467e51627561d98045bbff4
+  metadata.gz: '050786326a44c661a9c3467cf9f5b3ed5df27a8b713040a9126be15f96b3fcf553b8cd7c7f23fe01339665eac1f41d2a203fca4c3c671676c28b9c6efaf18cb9'
+  data.tar.gz: 417a94817cdad9255904bbff41dc5aa911b2dfa02c31ac2f1d2deb46c6038e7a563d802ad0d2b4533e6001e06d455b2fd9cf48a47c2556539e143f48b95ff6ee

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    avo (1.17.0)
+    avo (1.17.1)
       active_link_to
       addressable
       breadcrumbs_on_rails

data/app/packs/js/controllers/filter_controller.js

@@ -21,6 +21,23 @@ export default class extends Controller {
     return param
   }
 
+  b64EncodeUnicode(str) {
+    // first we use encodeURIComponent to get percent-encoded UTF-8,
+    // then we convert the percent encodings into raw bytes which
+    // can be fed into btoa.
+    return btoa(encodeURIComponent(str).replace(/%([0-9A-F]{2})/g,
+      function toSolidBytes(match, p1) {
+        return String.fromCharCode('0x' + p1);
+      }));
+  }
+
+  b64DecodeUnicode(str) {
+    // Going backwards: from bytestream, to percent-encoding, to original string.
+    return decodeURIComponent(atob(str).split('').map(function(c) {
+      return '%' + ('00' + c.charCodeAt(0).toString(16)).slice(-2);
+    }).join(''));
+  }
+
   changeFilter() {
     const value = this.getFilterValue()
     const filterClass = this.getFilterClass()
@@ -28,7 +45,7 @@ export default class extends Controller {
     let filters = this.uriParams()[this.uriParam('filters')]
 
     if (filters) {
-      filters = JSON.parse(atob(filters))
+      filters = JSON.parse(this.b64DecodeUnicode(filters))
     } else {
       filters = {}
     }
@@ -46,7 +63,7 @@ export default class extends Controller {
     let encodedFilters
 
     if (filtered && Object.keys(filtered).length > 0) {
-      encodedFilters = btoa(JSON.stringify(filtered))
+      encodedFilters = this.b64EncodeUnicode(JSON.stringify(filtered))
     }
 
     const url = new URI(this.urlRedirectTarget.href)

data/lib/avo/version.rb

@@ -1,3 +1,3 @@
 module Avo
-  VERSION = "1.17.0"
+  VERSION = "1.17.1"
 end