glib-web 0.6.13 → 0.6.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e20093312ead5735f1515024fb1d3f3ed9489a5b779b6bebed5389ee5d467387
-  data.tar.gz: 59d7bf932016ba5d9cbec3b9496a4684dcb1d9152315a04be64e76d3771b9e34
+  metadata.gz: 0c56cc5b0cb3eac25758cb566dcf2b69f10470a65df7fa00d25325db8958961d
+  data.tar.gz: 5d2d0bdef7274ec75442b5c8f6a2336463c51f73b07a40905ff5916168eaa349
 SHA512:
-  metadata.gz: e309034217ac808d8833d2790f247269bb61034d649b23bfdabda48bbb382aeeaa2aa4411a3a6307516df5ed7711ee5c894a12e5a3fc54f392f4690b64312331
-  data.tar.gz: 9d10545b5a48359871342d59919f058876f980ee970587a3638d8f89f07d6ff04557de3437ca42a8b93afa4c299b6b8463fb4497618be7956cad79b2d52b653a
+  metadata.gz: fa471dad31b61bd7f6562627ece6574b56e68260d456c3f0b4a5f5b3e2ed344cccb6b682654ec286b1b4761a5bcdc51524cb96729dd8896fbc92adff0f141149
+  data.tar.gz: 281c3ceba5a2a22320ff553420d4c0a962e41123a35ebcf868127af880742c6e04cc6b2314413191d62b3cc9f0b71f08a9fd727ef2421f709f7209ea839f77ac

data/app/controllers/concerns/glib/analytics/funnel.rb

@@ -35,14 +35,20 @@ module Glib::Analytics
       action = request.headers['GApp-Analytics-Referer-Action']
       segment = request.headers['GApp-Analytics-Referer-Segment']
       placement = request.headers['GApp-Analytics-Referer-Placement']
-
-      if group.nil? && action.nil? && !request.headers['referer'].nil?
-        host = URI.parse(request.headers['referer']).host
-        if host == request.host || !/^(.*).#{request.host.sub('www', '')}/.match(host).nil?
-          referer_url = request.headers['referer'].delete_suffix('/')
+      referrer_url = request.headers['referer'] # Notice that the HTTP header uses one "r"
+      if group.nil? && action.nil? && !referrer_url.nil?
+        current_host = request.host
+        referrer_host = URI.parse(referrer_url).host
+
+        # Replace the subdomain portion with regex so it will only match the non-subdomain part.
+        # This will allow cross-subdomain referral, but it will not work if the host is a bare domain,
+        # which is something that we should avoid doing anyway.
+        regex = '^([^\.]*)\.'
+        if current_host == referrer_host || !/#{current_host.sub(/#{regex}/, regex)}/.match(referrer_host).nil?
+          referrer_url = referrer_url.delete_suffix('/')
 
           begin
-            route = Rails.application.routes.recognize_path(referer_url)
+            route = Rails.application.routes.recognize_path(referrer_url)
             group = route[:controller]
             action = route[:action]
           rescue ActionController::RoutingError

data/app/helpers/glib/json_ui/view_builder/fields.rb

@@ -225,6 +225,8 @@ class Glib::JsonUi::ViewBuilder
       string :directUploadUrl
       string :fileUrl
       string :fileTitle
+      string :uploadText
+      string :uploadIcon
       hash :placeholderView
     end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: glib-web
 version: !ruby/object:Gem::Version
-  version: 0.6.13
+  version: 0.6.14
 platform: ruby
 authors:
 - ''