glib-web 0.6.10 → 0.6.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: caea1800c7d255e83399effe4e38a4231fb7642c43a42112c788c54e5f7d5f6e
-  data.tar.gz: f9c676108ecdfcbf638c9a3714610514665a8cda37e8b22da87431b681b40769
+  metadata.gz: 0c56cc5b0cb3eac25758cb566dcf2b69f10470a65df7fa00d25325db8958961d
+  data.tar.gz: 5d2d0bdef7274ec75442b5c8f6a2336463c51f73b07a40905ff5916168eaa349
 SHA512:
-  metadata.gz: cb8f985c5765648db0631ed057ce22b6a7b040176e3a2d98dbe6f08d31ad5d62c4eb7bd5ec473ee3c15599bab15f6b4d520e66259d851473cf2cd0585aa13862
-  data.tar.gz: 61bb69710386e0aa798654efa5714fa87bff71e2206dd852849cc581abbfbf0d14e9bfbc3f607450c9695b0b4571de81d8d29d9abc5e6a8802e59e51b8861fdc
+  metadata.gz: fa471dad31b61bd7f6562627ece6574b56e68260d456c3f0b4a5f5b3e2ed344cccb6b682654ec286b1b4761a5bcdc51524cb96729dd8896fbc92adff0f141149
+  data.tar.gz: 281c3ceba5a2a22320ff553420d4c0a962e41123a35ebcf868127af880742c6e04cc6b2314413191d62b3cc9f0b71f08a9fd727ef2421f709f7209ea839f77ac

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

@@ -35,14 +35,26 @@ 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?
-
-          route = Rails.application.routes.recognize_path(request.headers['referer'].delete_suffix('/'))
-          group = route[:controller]
-          action = route[:action]
+      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(referrer_url)
+            group = route[:controller]
+            action = route[:action]
+          rescue ActionController::RoutingError
+            # Do nothing. This may happen when the referrer is from the same domain,
+            # but not from the same Rails app.
+          end
         end
       end
 

data/app/helpers/glib/json_ui/list_builders.rb

@@ -54,6 +54,8 @@ module Glib
         end
 
         class Thumbnail < Standard
+          menu :leftOuterButtons
+          int :imageSize
         end
 
         class CommentOutgoing < Standard

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
 

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

@@ -35,6 +35,8 @@ module Glib
         hash :analytics
         hash :tooltip
         hash :tour
+        array :extensions
+
 
         # def initialize(json, page)
         #   super(json, page)

data/app/views/json_ui/garage/lists/templating.json.jbuilder

@@ -12,7 +12,7 @@ json_ui_page json do |page|
       template.thumbnail title: 'Click me', onClick: ->(action) do
         action.windows_open url: json_ui_garage_url(path: 'home/blank')
       end
-      template.thumbnail title: 'Item with subtitle', subtitle: 'Item subtitle'
+      template.thumbnail title: 'Item with icon and subtitle', subtitle: 'Item subtitle', icon: 'facebook'
       template.thumbnail title: 'Item with chips', chips: ->(menu) do
         menu.button text: 'Finished', styleClass: 'info'
         menu.button props: { text: 'Succeeded', styleClass: 'success' }

data/app/views/json_ui/garage/tables/layout.json.jbuilder

@@ -24,6 +24,8 @@ page.table sections: [
           action.windows_reload url: json_ui_garage_url(path: 'tables/layout', orders: reversed_order_params(order_key))
         end
       end
+
+      header.label text: "Markdown"
     end
 
     items = [1, 2, 3]
@@ -32,8 +34,11 @@ page.table sections: [
         column_indexes.each do |i|
           cell.label text: "Data #{item}"
         end
-      end, onClick: ->(action) do
-        action.windows_open url: json_ui_garage_url(path: 'home/blank')
+
+        markdown = "* [Item 1](#{json_ui_garage_url(path: 'home/blank')})\n"\
+          "* Item 2\n"\
+          '* Item 3'
+        cell.markdown text: markdown
       end
     end
   end

metadata

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