webring-rails 1.8.0 → 1.8.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7231dcbc5a185d6c345c5d13b387d09aa80dd5acd7962f8c006a9ca7f313a585
-  data.tar.gz: 6f377e0a118b9037fcd65f6b015000ff247ca3616e670abc3154dea86389be53
+  metadata.gz: '09962a10d4698514d1fff56c342a2f7a352860dfec190a5b39c2916ce882c868'
+  data.tar.gz: 494cf6cae44530b3015d4aa03bf951a86562a98bf6fce5b66f5d2779f41cf3d0
 SHA512:
-  metadata.gz: 3ea2a0284502cca42c7f1c9faa6cc7500158fc995e5d7d9f0481ffcc0c674794eff4f58197fa3bc9e24af0732e9fcdaf5bdc9f6c1fc94166ce8d8faa6c34dfa1
-  data.tar.gz: 7dbd23f1404bb811c4380fdd37e195fadde5c1212e1261baab4fc94df327350627453d537fa99a1bf452f69598854b3f93f08ff3d4198f9b283ff63d25ab27b3
+  metadata.gz: b6c6caa1496cae03db8c3c78fa5cd9ead1e4757d35e4107811b6482e902416988c7acddcad4c15437315e5b8bd47fb71bce1caedac6cee9c3a53781c0eeef719
+  data.tar.gz: 275ca9a8962b43fa39c8f31c71db8efd0cac38ed31c44466f3b0af9e7acda293663bef12135759108bb6fcc03afc3bb91f41da8c09387de337dbefe523120490

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,6 +1,7 @@
 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]
@@ -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/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/custom_widget_controller/templates/custom_widget_controller.rb

@@ -20,5 +20,11 @@ module Webring
         widgetTitle: { default: 'Webring', enforced: false }
       }
     end
+
+    # Override with actual path to enable widget usage metrics tracking
+    # Remove the method or return `nil` to disable metrics tracking
+    def widget_fetch_metrics_path
+      nil
+    end
   end
 end

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

@@ -1,6 +1,7 @@
 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]
@@ -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.0'.freeze
+  VERSION = '1.8.2'.freeze
 end

metadata

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