webring-rails 1.8.1 → 1.8.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ea41f8c9f6234ce3bea568e5fbaa6c54989aed946433a131cabb2e7aab611eb1
-  data.tar.gz: 0e943bd6e8ed643efc4ea65702836a70e164f681a29dc7ef549849ef7f9348c1
+  metadata.gz: bf919b253e2c49eecdcc9383f67e090014c0e1ba91946025b87420d7f629fdcb
+  data.tar.gz: e17daaf411ede72c0815a86877dbba76b7f3f796da14583fb7592be630e2b133
 SHA512:
-  metadata.gz: 35b0e2ec336cbfa1ba5d07cb63c41e3d81e02041ded017012b4a3ec597ccff78b8a32660db9ac63886048d5a0ece447fe0280f499576fb264b2cffa396a1e6f0
-  data.tar.gz: 4c9e634dcca78c9f84f8d27a218609f860520b746683fbbe48b4143b294e957b61a5f8c6a3829d8f7607c9b2bda11a6c708b4b79836d0d33067aac567bf47c40
+  metadata.gz: 1587582f91f859772718b03de676b4509eb55a0478ccc8fbfb2a62d384dd165072f6599ee4ed77ba508c1171bc014c735ffd8133ab55cc29d7feb2094f0aca44
+  data.tar.gz: 4fd3c70354de200081242011231b62d80cc081e40dc450381b64bea795eac69cbac7511afdd21c04a857d79f1e6f307fd444daa433073636083868f719641895

data/app/assets/javascripts/webring/widget.js

@@ -475,7 +475,7 @@
 
       const widgetFetchMetricsPath = "<<REPLACE_ME_WIDGET_FETCH_METRICS_PATH>>";
 
-      if (widgetFetchMetricsPath && widgetFetchMetricsPath.trim() !== '' && widgetFetchMetricsPath.trim() !== '<<REPLACE_ME_WIDGET_FETCH_METRICS_PATH>>') { // if not empty and not the default value
+      if (widgetFetchMetricsPath && widgetFetchMetricsPath.trim() !== '' && widgetFetchMetricsPath.trim() !== "<<REPLACE_ME_WIDGET_FETCH_METRICS_PATH>>") { // if not empty and not the default value
         // Track widget fetch for metrics
         try {
           fetch(`${baseUrl}${widgetFetchMetricsPath}`, {

data/app/controllers/webring/navigation_controller.rb

@@ -1,9 +1,10 @@
 module Webring
   class NavigationController < ApplicationController
     before_action :set_cors_headers
+    before_action :handle_placeholder_uid
 
-    before_action :find_member, only: %i[next previous]
-    before_action :ensure_members_exist, :check_member_exists, only: [:random]
+    before_action :check_member_exists, only: %i[next previous]
+    before_action :ensure_members_exist, only: [:random]
 
     # GET /webring/next
     def next
@@ -32,20 +33,21 @@ module Webring
       params.permit(:source_member_uid)
     end
 
+    def handle_placeholder_uid
+      head :ok if permitted_params[:source_member_uid] == Webring::Member::UID_PLACEHOLDER
+    end
+
     def redirect_to_member(member)
       redirect_to member.url, allow_other_host: true
     end
 
-    def find_member
-      @member = Webring::Member.active.find_by(uid: permitted_params[:source_member_uid])
-      return @member if @member
-
-      render_member_not_found
+    def member
+      @member ||= Webring::Member.active.find_by(uid: permitted_params[:source_member_uid])
     end
 
     def check_member_exists
       member_uid = permitted_params[:source_member_uid]
-      return unless member_uid.present? && !Webring::Member.active.exists?(uid: member_uid)
+      return unless member_uid.present? && !member.present?
 
       render_member_not_found
     end

data/app/controllers/webring/widget_controller.rb

@@ -15,11 +15,11 @@ module Webring
           # Take the minified JavaScript file from the engine's assets and replace the customizable Logo SVG
           widget_js =
             Webring::Engine
-            .root.join('app/assets/javascripts/webring/widget.min.js')
+            .root.join('app/assets/javascripts/webring/widget.js')
             .read
             .gsub('"<<REPLACE_ME_LOGO_SVG_FUNCTION>>"', logo_svg_function)
             .gsub('"<<REPLACE_ME_TEXT_DEFAULTS>>"', JSON.generate(text_defaults))
-            .gsub('"<<REPLACE_ME_WIDGET_FETCH_METRICS_PATH>>"', widget_fetch_metrics_path)
+            .sub('<<REPLACE_ME_WIDGET_FETCH_METRICS_PATH>>', widget_fetch_metrics_path)
 
           render js: widget_js
         end

data/app/models/webring/member.rb

@@ -3,6 +3,7 @@ module Webring
     extend Webring::Navigation
 
     UID_LENGTH = 16 # 32-character hex string
+    UID_PLACEHOLDER = 'YOUR_MEMBER_UID'.freeze
 
     # :active?, :disabled? -- :active!, :disabled!
     enum :status, { active: 0, disabled: 1 }

data/lib/generators/webring/navigation_controller/templates/navigation_controller.rb

@@ -1,9 +1,10 @@
 module Webring
   class NavigationController < ApplicationController
     before_action :set_cors_headers
+    before_action :handle_placeholder_uid
 
     before_action :find_member, only: %i[next previous]
-    before_action :ensure_members_exist, :check_member_exists, only: [:random]
+    before_action :ensure_members_exist, only: [:random]
 
     # GET /webring/next
     def next
@@ -32,6 +33,10 @@ module Webring
       params.permit(:source_member_uid)
     end
 
+    def handle_placeholder_uid
+      head :ok if permitted_params[:source_member_uid] == Webring::Member::UID_PLACEHOLDER
+    end
+
     def redirect_to_member(member)
       redirect_to member.url, allow_other_host: true
     end

data/lib/webring/version.rb

@@ -1,3 +1,3 @@
 module Webring
-  VERSION = '1.8.1'.freeze
+  VERSION = '1.8.3'.freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: webring-rails
 version: !ruby/object:Gem::Version
-  version: 1.8.1
+  version: 1.8.3
 platform: ruby
 authors:
 - Nikita Shkoda