overlastic 0.10.1 → 0.11.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bdf65721b705fb8f823c14f57f128323ea19cf09809928483247d57b05f0e276
-  data.tar.gz: a9929402976455d1a1cd6f50accb1300d4e6bc511be565b0efa84ce476e4f775
+  metadata.gz: 43db3c1020ad55f7f3e3583c87619fb3cd108ae75c24aee4d00047981faa6fa5
+  data.tar.gz: cda4c45a9ba38585749bfdd34f1d457628e6f4efeb4af30ea257a501fcf653a2
 SHA512:
-  metadata.gz: 264f8ad45eed1df4147792806f6c8ffaf342d4d1b170e16d235ea822a82bce4409e23211d2dfa535236f3c4c1f1b37fa2095054a5eef9ddd0f1a02f3b15cacad
-  data.tar.gz: e00ccdc033b896334d055d6f94dff5a3fc4082e89a38fe53fc0c94028546b8dc205912b4375930c768ed0eed4ee9002d17f66e65f0d344800902c8928cc935f8
+  metadata.gz: 6991e4bf107dcb88b60623d8dc6ba7b7cbabc42b26a33d834196bb6d85f276fe2df13ce61c7f2bfe8f02537ab2bb9e1b1bc87d0ba3f05fea06890d9ee862ab62
+  data.tar.gz: 75195d9d488ddba1253fa5406f0b89d50836070cb68327f3c046a4bb5828eafe40af165b8b1e2741de5eb3659bb0f751f761ada2d39f250596e3ade4d1cf32d1

data/README.md

@@ -9,7 +9,7 @@
 <h3 align="center">Fantastically easy overlays using <a href="https://hotwired.dev/" target="_blank">Hotwire</a>.</h3>
 
 <p align="center">
-  <img alt="Build" src="https://img.shields.io/github/workflow/status/martinzamuner/overlastic/CI">
+  <img alt="Build" src="https://img.shields.io/github/actions/workflow/status/martinzamuner/overlastic/ci.yml?branch=main">
   <img alt="Gem" src="https://img.shields.io/gem/v/overlastic">
   <img alt="rails version" src="https://img.shields.io/badge/rails-%3E%3D%206.1.0-informational">
   <img alt="turbo-rails version" src="https://img.shields.io/badge/turbo--rails-%3E%3D%201.3.0-informational">

data/app/controllers/overlastic/concerns/overlay_handling.rb

@@ -4,33 +4,11 @@ module Overlastic::Concerns::OverlayHandling
   included do
     before_action :add_overlay_variant
 
-    private
-
-    def add_overlay_variant
-      request.variant = :overlay if helpers.current_overlay_name.present?
-    end
-
-    def close_overlay(key = :last, **options)
-      overlay_name = helpers.overlay_name_from(key) || :overlay1
-
-      # In case a Turbo Stream is appended which renders new overlay links, they should be generated
-      # relative to the foremost overlay still open after closing the requested overlays.
-      request.headers["Overlay-Name"] = :"overlay#{helpers.overlay_number_from(overlay_name) - 1}"
-
-      options.filter { |key, _| key.in? self.class._flash_types }.each { |key, value| flash.now[key] = value }
-
-      if block_given?
-        render overlay: overlay_name, html: helpers.overlastic_tag(id: overlay_name), append_turbo_stream: yield
-      else
-        render overlay: overlay_name, html: helpers.overlastic_tag(id: overlay_name)
-      end
-    end
-
     def render(*args, **options, &block)
       # Force render of overlays without an initiator
       request.headers["Overlay-Target"] ||= options.delete(:overlay_target)
       request.headers["Overlay-Type"] ||= options.delete(:overlay_type)
-      request.headers["Overlay-Args"] ||= Base64.encode64(options.delete(:overlay_args).to_json) if options.key?(:overlay_args)
+      request.headers["Overlay-Args"] ||= Base64.urlsafe_encode64(options.delete(:overlay_args).to_json) if options.key?(:overlay_args)
 
       # If renderable content other than HTML is passed we should avoid returning a stream
       avoid_stream = _renderers.excluding(:html).intersection(options.keys).present?
@@ -113,5 +91,27 @@ module Overlastic::Concerns::OverlayHandling
         super
       end
     end
+
+    private
+
+    def add_overlay_variant
+      request.variant = :overlay if helpers.current_overlay_name.present?
+    end
+
+    def close_overlay(key = :last, **options)
+      overlay_name = helpers.overlay_name_from(key) || :overlay1
+
+      # In case a Turbo Stream is appended which renders new overlay links, they should be generated
+      # relative to the foremost overlay still open after closing the requested overlays.
+      request.headers["Overlay-Name"] = :"overlay#{helpers.overlay_number_from(overlay_name) - 1}"
+
+      options.filter { |key, _| key.in? self.class._flash_types }.each { |key, value| flash.now[key] = value }
+
+      if block_given?
+        render overlay: overlay_name, html: helpers.overlastic_tag(id: overlay_name), append_turbo_stream: yield
+      else
+        render overlay: overlay_name, html: helpers.overlastic_tag(id: overlay_name)
+      end
+    end
   end
 end

data/app/helpers/overlastic/navigation_helper.rb

@@ -20,7 +20,7 @@ module Overlastic::NavigationHelper
       options["data"][:overlay_target] = target if target.present?
 
       args = options.delete("overlay_args")
-      options["data"][:overlay_args] = Base64.encode64(args.to_json) if args.present?
+      options["data"][:overlay_args] = Base64.urlsafe_encode64(args.to_json) if args.present?
 
       options["target"] = :_blank
 
@@ -42,7 +42,7 @@ module Overlastic::NavigationHelper
       html_options["data"][:overlay_target] = target if target.present?
 
       args = html_options.delete("overlay_args")
-      html_options["data"][:overlay_args] = Base64.encode64(args.to_json) if args.present?
+      html_options["data"][:overlay_args] = Base64.urlsafe_encode64(args.to_json) if args.present?
 
       html_options["target"] = :_blank
 

data/app/helpers/overlastic/overlays_helper.rb

@@ -48,7 +48,7 @@ module Overlastic::OverlaysHelper
     string = capture(&block)
     type = request.headers["Overlay-Type"] || Overlastic.configuration.default_overlay
     args_header = request.headers["Overlay-Args"]
-    overlay_args = JSON.parse(Base64.decode64(request.headers["Overlay-Args"])) if args_header.present?
+    overlay_args = JSON.parse(Base64.urlsafe_decode64(request.headers["Overlay-Args"])) if args_header.present?
     locals.merge! overlay_args.to_h.symbolize_keys
 
     overlastic_tag do

data/lib/overlastic/version.rb

@@ -1,3 +1,3 @@
 module Overlastic
-  VERSION = "0.10.1"
+  VERSION = "0.11.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: overlastic
 version: !ruby/object:Gem::Version
-  version: 0.10.1
+  version: 0.11.0
 platform: ruby
 authors:
 - Martin Zamuner
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-11-04 00:00:00.000000000 Z
+date: 2023-10-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionpack
@@ -104,7 +104,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.22
+rubygems_version: 3.4.10
 signing_key:
 specification_version: 4
 summary: Fantastically easy overlays using Hotwire. Bring your dialog modals and slide-out