glib-web 0.5.24 → 0.5.29

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: dc406a3897c823c3c4c9d9470811460a5c08a469178fcb965459b91cbef9b37a
-  data.tar.gz: 3e38269b7c876f08e084aaa83a12bbe7476cc8724775e8f09ce429d927a133a9
+  metadata.gz: 7fbacc0893e8f36261c10fcfc5a1dd488d1170c10c4b901f14285a0c64212383
+  data.tar.gz: 00ac950fdf253428ec4b3b1eac29d709c817949df290fb97b065b0adb24e0156
 SHA512:
-  metadata.gz: b048d67cd2cf79dc3b7e4f72d0da7ecfb8001a6d504cf933bacc46875f9ad044c1d704621794fea22439eb17bbabd3ca90e5c0ae8cd7b77e5b8e14c0fde86469
-  data.tar.gz: b58a6fcacead2d9a23e37220fa39a108e1fb147d6e8109d1fabeabb17020647dba8968052015e083824d013c6decd3d3bb9df6ebae9389e2e7d532e35c890ed6
+  metadata.gz: 01feace7ab2d3333382d4aed1ef15091fd827c9346270c9393d498330350f32f9559ebbdc577f8c1088eac659cec3c910b99de2b27b64f19810bcbc745049c8a
+  data.tar.gz: c83f4a4d8414006746c70e8d692e788d0822ac19cc09964af687dfab1b07992205d69f5c82712fa8ff88c6adbf0b04ad815b40780bf4f0089bb32cc950a34e30

data/app/controllers/concerns/glib/json/new_dynamic_text.rb

@@ -112,7 +112,7 @@ module Glib::Json::NewDynamicText
     def substitute_image_with(images)
       view[prop] = view[prop].gsub(/\{\{image(\d)\}\}/) {
         if image = images[$1.to_i - 1]
-          ApplicationController.helpers.dynamic_image_url(image.blob.key)
+          ApplicationController.helpers.glib_dynamic_image_url(image.blob.key)
         else
           "{{image#{$1}}}"
         end

data/app/helpers/glib/dynamic_images_helper.rb

@@ -1,7 +1,7 @@
 module Glib
   module DynamicImagesHelper
     # NOTE: The bucket should probably be set as a parameter for json_libs
-    def dynamic_image_url(blob_key, width: 100, height: 100, fit: 'clip', bucket: Rails.application.config.try(:aws_s3_bucket))
+    def glib_dynamic_image_url(blob_key, width: 100, height: 100, fit: 'clip', bucket: Rails.application.config.try(:aws_s3_bucket), signature_key: nil)
       return unless blob_key.present?
 
       full_params_hash = {
@@ -10,17 +10,20 @@ module Glib
         w: width,
         h: height,
         fit: fit,
-        expires: 1.hours.from_now.to_i
+        # expires: 1.hours.from_now.to_i
+        expires: 1.month.from_now.end_of_month.to_i
       }
+
       request_params_hash = full_params_hash.except(:bucket_name, :blob_key)
 
-      if (private_key = ENV['PRIVATE_API_KEY'])
+      if (private_key = signature_key)
         encryption_service = EncryptionService.new(bucket, private_key)
+        # This produces different signature every time.
+        # TODO: Use digest instead, because we really only need to verify. We don't need to be able to decrypt.
         signature = encryption_service.encrypt(full_params_hash)
         request_params_hash = request_params_hash.merge(signature: signature)
       end
 
-      # TODO: This should probably be set as a parameter for json_libs
       uri = URI::HTTPS.build(
         host: 'imageserver-demo.herokuapp.com',
         path: "/image/#{bucket}/#{blob_key}",

data/app/helpers/glib/dynamic_texts_helper.rb

@@ -17,7 +17,7 @@ module Glib
       if text_object.images.attached?
         content = content.gsub(/\{\{image(\d)\}\}/) {
           if image = text_object.images[$1.to_i - 1]
-            dynamic_image_url(image.blob.key)
+            glib_dynamic_image_url(image.blob.key)
           else
             "{{image#{$1}}}"
           end

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

@@ -10,7 +10,7 @@ module Glib
 
       private
         def capitalize_first_letter_and_leave_others_alone(str)
-          str.slice(0,1).capitalize + str.slice(1..-1)
+          str.slice(0, 1).capitalize + str.slice(1..-1)
         end
 
         def add_singleton_element(type, name, *args)
@@ -19,7 +19,7 @@ module Glib
           args = [yield] if block_given?
 
           # TODO: consider caching these instances
-          "#{self.class.name}::#{name_components.map{ |str| capitalize_first_letter_and_leave_others_alone(str) }.join('::')}".constantize.new(json, @page).props(*args)
+          "#{self.class.name}::#{name_components.map { |str| capitalize_first_letter_and_leave_others_alone(str) }.join('::')}".constantize.new(json, @page).props(*args)
         end
 
         def add_element_to_array(type, name, *args)
@@ -29,15 +29,15 @@ module Glib
         end
 
         # TODO: Consider removing this in favour of non 'v1' suffix
-        def add_singleton_element_v1 type, name, *args
+        def add_singleton_element_v1(type, name, *args)
           name_components = name.to_s.split('_')
           json.set! type, "#{name_components.join('/')}-v1" if type
           args = [yield] if block_given?
-          "#{self.class.name}::#{name_components.map{ |str| capitalize_first_letter_and_leave_others_alone(str) }.join('::')}".constantize.new(json, @page).props(*args)
+          "#{self.class.name}::#{name_components.map { |str| capitalize_first_letter_and_leave_others_alone(str) }.join('::')}".constantize.new(json, @page).props(*args)
         end
 
         # TODO: Consider removing this in favour of non 'v1' suffix
-        def add_element_to_array_v1 type, name, *args
+        def add_element_to_array_v1(type, name, *args)
           json.child! do
             add_singleton_element_v1 type, name, *args
           end
@@ -68,219 +68,218 @@ module Glib
       end
 
       private
-
-      def self.any(propName)
-        define_method(propName) do |value|
-          json.set! propName, value
+        def self.any(propName)
+          define_method(propName) do |value|
+            json.set! propName, value
+          end
         end
-      end
 
-      def self.date(propName)
-        define_method(propName) do |value|
-          json.set! propName, value&.to_date
+        def self.date(propName)
+          define_method(propName) do |value|
+            json.set! propName, value&.to_date
 
-          # if (value = value&.to_s)
-          #   if !Rails.env.production?
-          #     raise "Invalid date for #{propName}: #{value}" unless value =~ /^\d{4}-\d{2}-\d{2}$/
-          #   end
+            # if (value = value&.to_s)
+            #   if !Rails.env.production?
+            #     raise "Invalid date for #{propName}: #{value}" unless value =~ /^\d{4}-\d{2}-\d{2}$/
+            #   end
 
-          #   json.set! propName, value
-          # end
+            #   json.set! propName, value
+            # end
+          end
         end
-      end
 
-      def self.date_time(propName)
-        define_method(propName) do |value|
-          json.set! propName, value&.to_datetime
+        def self.date_time(propName)
+          define_method(propName) do |value|
+            json.set! propName, value&.to_datetime
 
-          # if (value = value&.to_s)
-          #   if !Rails.env.production?
-          #     try Date.parse(value) rescue raise "Invalid date: #{value}"
-          #   end
+            # if (value = value&.to_s)
+            #   if !Rails.env.production?
+            #     try Date.parse(value) rescue raise "Invalid date: #{value}"
+            #   end
 
-          #   json.set! propName, value
-          # end
+            #   json.set! propName, value
+            # end
+          end
         end
-      end
 
-      def self.color propName
-        define_method(propName) do |value|
-          if (value = value&.to_s)
-            if !Rails.env.production?
-              if !value.match /^#([A-Fa-f0-9]{6}|[A-Fa-f0-9]{3})$/i
-                raise "Invalid color: #{value}"
+        def self.color(propName)
+          define_method(propName) do |value|
+            if (value = value&.to_s)
+              if !Rails.env.production?
+                if !value.match /^#([A-Fa-f0-9]{6}|[A-Fa-f0-9]{3})$/i
+                  raise "Invalid color: #{value}"
+                end
               end
-            end
 
-            json.set! propName, value
+              json.set! propName, value
+            end
           end
         end
-      end
 
-      def self.length propName
-        define_method(propName) do |value|
-          if value
-            if !Rails.env.production?
-              case value
-              when 'matchParent'
-              when 'wrapContent'
-              else
-                if !value.is_a? Integer
-                  raise "Invalid length: #{value}"
+        def self.length(propName)
+          define_method(propName) do |value|
+            if value
+              if !Rails.env.production?
+                case value
+                when 'matchParent'
+                when 'wrapContent'
+                else
+                  if !value.is_a? Integer
+                    raise "Invalid length: #{value}"
+                  end
                 end
               end
-            end
 
-            json.set! propName, value
+              json.set! propName, value
+            end
           end
         end
-      end
 
-      def self.string propName, options = {}
-        define_method(propName) do |value|
-          str = value&.to_s
-          instance_variable_set("@#{propName}", str) if options[:cache]
-          json.set! propName, str
+        def self.string(propName, options = {})
+          define_method(propName) do |value|
+            str = value&.to_s
+            instance_variable_set("@#{propName}", str) if options[:cache]
+            json.set! propName, str
+          end
         end
-      end
 
-      # Support either string or dynamic_text hash
-      def self.text propName, options = {}
-        define_method(propName) do |value|
-          if value.is_a?(Hash)
-            json.set! propName, value
-          else
-            json.set! propName, value&.to_s
+        # Support either string or dynamic_text hash
+        def self.text(propName, options = {})
+          define_method(propName) do |value|
+            if value.is_a?(Hash)
+              json.set! propName, value
+            else
+              json.set! propName, value&.to_s
+            end
           end
         end
-      end
 
-      def self.int propName
-        define_method(propName) do |value|
-          json.set! propName, value&.to_i
+        def self.int(propName)
+          define_method(propName) do |value|
+            json.set! propName, value&.to_i
+          end
         end
-      end
 
-      def self.float propName
-        define_method(propName) do |value|
-          json.set! propName, value&.to_f
+        def self.float(propName)
+          define_method(propName) do |value|
+            json.set! propName, value&.to_f
+          end
         end
-      end
 
-      def self.bool propName, options = {}
-        define_method(propName) do |value|
-          bool = value == true
-          instance_variable_set("@#{propName}", bool) if options[:cache]
-          json.set! propName, bool
+        def self.bool(propName, options = {})
+          define_method(propName) do |value|
+            bool = value == true
+            instance_variable_set("@#{propName}", bool) if options[:cache]
+            json.set! propName, bool
+          end
         end
-      end
 
-      def self.icon propName, options = {}
-        define_method(propName) do |value|
+        def self.icon(propName, options = {})
+          define_method(propName) do |value|
 
-          if value.is_a?(Hash)
-            data = value
-            name = data[:name]
-          else
-            data = {}
-            name = value
-            # data = { material: { name: value } }
+            if value.is_a?(Hash)
+              data = value
+              name = data[:name]
+            else
+              data = {}
+              name = value
+              # data = { material: { name: value } }
 
-            # name = value
+              # name = value
 
-            # TODO: deprecated
-            # json.set!(propName) do
-            #   json.name name
-            # end
-          end
-
-          json.set!(propName) do
-            if name
-              data[:material] ||= {}
-              data[:material][:name] = name
+              # TODO: deprecated
+              # json.set!(propName) do
+              #   json.name name
+              # end
             end
 
-            if (material = data[:material])
-              json.material do
-                json.name material[:name]
-                json.size material[:size] if material[:size]
+            json.set!(propName) do
+              if name
+                data[:material] ||= {}
+                data[:material][:name] = name
               end
-            end
 
-            if (fa = data[:fa])
-              json.fa do
-                json.name fa[:name]
-                json.size fa[:size] if fa[:size]
+              if (material = data[:material])
+                json.material do
+                  json.name material[:name]
+                  json.size material[:size] if material[:size]
+                end
               end
-            end
 
-            if (custom = data[:custom])
-              json.custom do
-                json.name custom[:name]
-                json.size custom[:size] if custom[:size]
+              if (fa = data[:fa])
+                json.fa do
+                  json.name fa[:name]
+                  json.size fa[:size] if fa[:size]
+                end
               end
-            end
 
-            if (badge = data[:badge])
-              if badge.is_a?(Hash)
-                json.badge badge
-              else
-                json.badge do
-                  json.text badge
+              if (custom = data[:custom])
+                json.custom do
+                  json.name custom[:name]
+                  json.size custom[:size] if custom[:size]
                 end
               end
-            end
 
-          end
+              if (badge = data[:badge])
+                if badge.is_a?(Hash)
+                  json.badge badge
+                else
+                  json.badge do
+                    json.text badge
+                  end
+                end
+              end
 
-          # raise "Invalid properties: #{options.keys}" if options.size > 0
+            end
 
-          # instance_variable_set("@#{propName}", name) if options[:cache]
+            # raise "Invalid properties: #{options.keys}" if options.size > 0
 
+            # instance_variable_set("@#{propName}", name) if options[:cache]
+
+          end
         end
-      end
 
-      def self.action propName
-        define_method(propName) do |value|
-          json.set!(propName) { value.call(page.action_builder) }
+        def self.action(propName)
+          define_method(propName) do |value|
+            json.set!(propName) { value.call(page.action_builder) }
+          end
         end
-      end
 
-      def self.views propName
-        define_method(propName) do |value|
-          json.set!(propName) { value.call(page.view_builder) }
+        def self.views(propName)
+          define_method(propName) do |value|
+            json.set!(propName) { value.call(page.view_builder) }
+          end
         end
-      end
 
-      def self.array propName
-        define_method(propName) do |value|
-          json.set! propName, value&.to_a
+        def self.array(propName)
+          define_method(propName) do |value|
+            json.set! propName, value&.to_a
+          end
         end
-      end
 
-      def self.hash propName
-        define_method(propName) do |value|
-          json.set! propName, value
+        def self.hash(propName)
+          define_method(propName) do |value|
+            json.set! propName, value
+          end
         end
-      end
 
-      def self.singleton_array singletonName, arrayName
-        array arrayName
+        def self.singleton_array(singletonName, arrayName)
+          array arrayName
 
-        define_method(singletonName) do |value|
-          json.set! arrayName, [value]
+          define_method(singletonName) do |value|
+            json.set! arrayName, [value]
+          end
         end
-      end
 
-      def self.panels_builder(propName, *panelNames)
-        define_method(propName) do |value|
-          value.call(page.content_builder(panelNames))
+        def self.panels_builder(propName, *panelNames)
+          define_method(propName) do |value|
+            value.call(page.content_builder(panelNames))
+          end
         end
-      end
 
-      def created
-        # To be overridden
-      end
+        def created
+          # To be overridden
+        end
 
     end
   end

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

@@ -68,6 +68,13 @@ module Glib
 
         class Restart < Action
         end
+
+        class CreditCard < Action
+          string :publicKey
+          string :clientSecret
+          action :onSuccess
+          action :onFailure
+        end
       end
 
       module Devices

data/app/helpers/glib/json_ui/action_builder/http.rb

@@ -1,18 +1,38 @@
 class Glib::JsonUi::ActionBuilder
   module Http
-    class Post < Action
+    class AbstractHttp < Action
       string :url, cache: true
-      hash :formData
+
+      def formData(hash)
+        form_data = {}
+        hash.each do |key, value|
+          flatten_nested_params(form_data, key, value)
+        end
+        json.formData form_data
+      end
+
+      def flatten_nested_params(form_data, key, value)
+        if value.is_a?(Hash)
+          value.each do |nested_key, nested_value|
+            flatten_nested_params(form_data, "#{key}[#{nested_key}]", nested_value)
+          end
+        else
+          form_data[key] = value
+        end
+      end
     end
 
-    class Patch < Action
-      string :url, cache: true
-      hash :formData
+    class Post < AbstractHttp
     end
 
-    class Delete < Action
-      string :url, cache: true
-      hash :formData
+    class Patch < AbstractHttp
+      # string :url, cache: true
+      # hash :formData
+    end
+
+    class Delete < AbstractHttp
+    #   string :url, cache: true
+    #   hash :formData
     end
 
   end

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

@@ -1,9 +1,9 @@
 module Glib
   module JsonUi
     module DynamicFieldBuilders
-      
+
       class Group < AbstractBuilder
-        def initialize json, page, template
+        def initialize(json, page, template)
           super json, page
           @template = template
         end
@@ -15,11 +15,11 @@ module Glib
 
         def template(options = {})
           # json.template do
-            page.vertical_content(options)
+          page.vertical_content(options)
           # end
         end
       end
-      
+
     end
   end
 end

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

@@ -1,7 +1,7 @@
 module Glib
   module JsonUi
     class MenuBuilder < AbstractBuilder
-      def method_missing m, *args
+      def method_missing(m, *args)
         add_element_to_array_v1 nil, m, *args
       end
 

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

@@ -3,10 +3,10 @@ module Glib
     module PageHelper
       def json_ui_garage_url(options = {})
         Glib::Web::Engine.routes.url_helpers.json_ui_garage_url(options.merge(
-          protocol: request.protocol,
-          host: request.host,
-          port: request.port,
-          _render: params[:_render], format: params[:format])
+                                                                  protocol: request.protocol,
+                                                                  host: request.host,
+                                                                  port: request.port,
+                                                                  _render: params[:_render], format: params[:format])
         )
       end
 

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

@@ -3,7 +3,7 @@ module Glib
     module SplitBuilders
 
       class Content < AbstractBuilder
-        def initialize json, page, template
+        def initialize(json, page, template)
           super json, page
           @template = template
         end

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

@@ -2,10 +2,10 @@ module Glib
   module JsonUi
     module TableBuilders
       class Template < AbstractBuilder
-        def method_missing m, *args
+        def method_missing(m, *args)
           add_element_to_array 'template', m, *args
         end
-      
+
         class AbstractTemplate < JsonUiElement
 
           def editButtons(block)
@@ -13,9 +13,9 @@ module Glib
               block.call page.menu_builder
             end
           end
-        
+
         end
-        
+
         class Default < AbstractTemplate
           views :cellViews
           action :onClick
@@ -23,9 +23,9 @@ module Glib
           array :colStyles
         end
       end
-      
+
       class Section < AbstractBuilder
-        def initialize json, page, template
+        def initialize(json, page, template)
           super json, page
           @template = template
         end
@@ -68,7 +68,7 @@ module Glib
         # end
 
       end
-      
+
     end
   end
 end

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

@@ -104,6 +104,9 @@ module Glib
         bool :previewVideo
       end
 
+      class Html < AbstractText
+      end
+
       class Label < AbstractText
         # string :format
         action :onClick
@@ -199,4 +202,4 @@ module Glib
 
     end
   end
-end
+end

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

@@ -207,14 +207,18 @@ class Glib::JsonUi::ViewBuilder
       date_time :max
     end
 
-    class LatLong < AbstractField
+    class Location < AbstractField
       hash :latitudeField
       hash :longitudeField
+      hash :zoomField
     end
 
     class StripeToken < AbstractField
       string :publicKey
     end
 
+    class CreditCard < AbstractField
+      string :publicKey
+    end
   end
 end

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

@@ -97,7 +97,9 @@ class Glib::JsonUi::ViewBuilder
     end
 
     class List < View
-      hash :ws
+      hash :phoenixSocket
+      hash :actionCable
+
       hash :nextPage
       action :onScrollToTop
       action :onScrollToBottom
@@ -156,6 +158,7 @@ class Glib::JsonUi::ViewBuilder
     class Responsive < View
       views :childViews
       string :align
+      action :onClick
     end
 
     class Column < View

data/app/views/json_ui/garage/actions/_http.json.jbuilder

@@ -6,7 +6,7 @@ end
 section.rows builder: ->(template) do
   template.thumbnail title: 'http/post', onClick: ->(action) do
     action.auth_saveCsrfToken token: form_authenticity_token, onSave: ->(subaction) do
-      subaction.http_post url: json_ui_garage_url(path: 'forms/basic_post'), formData: { 'user[name]' => 'New Joe' }
+      subaction.http_post url: json_ui_garage_url(path: 'forms/basic_post'), formData: { user: { name: { first: 'New', last: 'Joe' } } }
     end
   end
 

data/app/views/json_ui/garage/forms/index.json.jbuilder

@@ -76,6 +76,12 @@ json_ui_page json do |page|
         template.thumbnail title: 'Rich Text Editor', onClick: ->(action) do
           action.windows_open url: json_ui_garage_url(path: 'forms/rich_text')
         end
+      end
+
+      section.rows builder: ->(template) do
+        template.thumbnail title: 'New Rich Text Editor', onClick: ->(action) do
+          action.windows_open url: json_ui_garage_url(path: 'forms/new_rich_text')
+        end
 
       end
     end, ->(section) do

data/app/views/json_ui/garage/forms/new_rich_text.json.jbuilder

@@ -0,0 +1,40 @@
+json.title 'Forms'
+
+json_ui_page json do |page|
+  render "#{@path_prefix}/nav_menu", json: json, page: page
+
+  page.form url: json_ui_garage_url(path: 'forms/basic_post'), method: 'post', padding: { top: 12, left: 20, right: 20, bottom: 12 }, childViews: ->(form) do
+    form.fields_text name: 'user[name]', width: 'matchParent', label: 'Name'
+
+    # images = [
+    #   {
+    #     value: "eyJfcmFpbHMiOnsibWVzc2FnZSI6IkJBaHBFQT09IiwiZXhwIjpudWxsLCJwdXIiOiJibG9iX2lkIn19--193dc0d939b9558fc4973fafbba91d989cbb04d4",
+    #     fileUrl: "https://imageserver-demo.herokuapp.com/image/itinerarybuilder-demo/o6CKzNt67PWnkPdUEnWMt7pr?h=100&w=100"
+    #   }
+    # ]
+    # form.fields_richText name: 'user[bio]', width: 'matchParent', label: 'Content', images: images, value: '<p>Test {{image1}}</p>'
+
+    json.child! do
+      json.view 'fields/newRichText-v1'
+      json.width 'matchParent'
+      json.label 'Content'
+      json.name 'user[bio]'
+      json.value '<p>Test {{image1}}</p>'
+
+      json.images do
+        json.child! do
+          json.value "eyJfcmFpbHMiOnsibWVzc2FnZSI6IkJBaHBFQT09IiwiZXhwIjpudWxsLCJwdXIiOiJibG9iX2lkIn19--193dc0d939b9558fc4973fafbba91d989cbb04d4"
+          # json.fileTitle "hita i hanom hg.jpg"
+          json.fileUrl "https://imageserver-demo.herokuapp.com/image/itinerarybuilder-demo/o6CKzNt67PWnkPdUEnWMt7pr?h=100&w=100"
+        end
+      end
+
+      json.imageUploader do
+        json.accepts(fileType: "image/*", maxFileSize: 5000)
+        json.directUploadUrl rails_direct_uploads_url
+      end
+    end
+
+    form.button text: 'Submit', onClick: ->(action) { action.forms_submit }
+  end
+end

data/app/views/json_ui/garage/forms/pickers.json.jbuilder

@@ -2,7 +2,7 @@ json.title 'Forms'
 
 json_ui_page json do |page|
   render "#{@path_prefix}/nav_menu", json: json, page: page
-  
+
   page.form url: json_ui_garage_url(path: 'forms/generic_post'), method: 'post', padding: glib_json_padding_body, childViews: ->(form) do
     form.h2 text: 'Radio Group'
     form.spacer height: 6
@@ -12,7 +12,7 @@ json_ui_page json do |page|
       group.fields_radio value: 'M', label: 'Male'
       group.fields_radio value: 'F', label: 'Female'
     end
-  
+
     form.spacer height: 20
     form.h2 text: 'Single Checkbox'
     form.fields_check name: 'user[age_range]', value: '16+', checkValue: '16+', uncheckValue: '0-16', label: 'I am over 16 (has default value)'
@@ -34,9 +34,10 @@ json_ui_page json do |page|
     form.spacer height: 20
     form.h2 text: 'Map'
     form.spacer height: 6
-    form.fields_latLong name: 'user[address]', width: 'matchParent', label: 'Type an address', value: 'Sydney Harbour Bridge',
-      latitudeField: { name: 'user[latitude]', label: 'Lat', value: -33.8523063, readOnly: true },
-      longitudeField: { name: 'user[longitude]', label: 'Long', value: 151.21078710000006, readOnly: true }
+    form.fields_location name: 'user[address]', width: 'matchParent', label: 'Type an address', value: 'Sydney Harbour Bridge',
+      latitudeField: { view: 'fields/text', name: 'user[latitude]', label: 'Lat', value: -33.8523063, readOnly: true },
+      longitudeField: { view: 'fields/text', name: 'user[longitude]', label: 'Long', value: 151.21078710000006, readOnly: true },
+      zoomField: { view: 'fields/text', name: 'user[zoom]', label: 'Zoom' }
 
     form.spacer height: 20
     form.fields_submit text: 'Submit'

data/app/views/json_ui/garage/forms/rich_text.json.jbuilder

@@ -2,12 +2,12 @@ json.title 'Forms'
 
 json_ui_page json do |page|
   render "#{@path_prefix}/nav_menu", json: json, page: page
-  
+
   page.form url: json_ui_garage_url(path: 'forms/basic_post'), method: 'post', padding: { top: 12, left: 20, right: 20, bottom: 12 }, childViews: ->(form) do
     form.fields_text name: 'user[name]', width: 'matchParent', label: 'Name'
 
     # images = [
-    #   { 
+    #   {
     #     value: "eyJfcmFpbHMiOnsibWVzc2FnZSI6IkJBaHBFQT09IiwiZXhwIjpudWxsLCJwdXIiOiJibG9iX2lkIn19--193dc0d939b9558fc4973fafbba91d989cbb04d4",
     #     fileUrl: "https://imageserver-demo.herokuapp.com/image/itinerarybuilder-demo/o6CKzNt67PWnkPdUEnWMt7pr?h=100&w=100"
     #   }
@@ -28,7 +28,7 @@ json_ui_page json do |page|
           json.fileUrl "https://imageserver-demo.herokuapp.com/image/itinerarybuilder-demo/o6CKzNt67PWnkPdUEnWMt7pr?h=100&w=100"
         end
       end
-      
+
       json.imageUploader do
         json.accepts(fileType: "image/*", maxFileSize: 5000)
         json.directUploadUrl rails_direct_uploads_url

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

@@ -19,7 +19,7 @@ section.rows builder: ->(row) do
     index = page_index * batch_count + i
     if local_assigns[:reorder]
       row.thumbnail title: "Item #{index}", onReorder: ->(action) do
-        action.dialogs_alert
+        action.dialogs_notification title: "Item #{index}"
       end, paramNameForFormData: 'message', paramNameForNewIndex: 'new_index'
     else
       row.thumbnail title: "Item #{index}"

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

@@ -5,7 +5,7 @@ liked = params[:liked] == 'true'
 page = json_ui_page json
 render "#{@path_prefix}/nav_menu", json: json, page: page
 
-json.ws({
+json.phoenixSocket({
   "socket" => {
     "endpoint" => "/socket/websocket",
     "params" => {
@@ -71,25 +71,6 @@ page.list ws: list_ws, firstSection: ->(section) do
 end
 
 page.footer padding: { top: 12, left: 16, right: 16, bottom: 12 }, childViews: ->(footer) do
-  # json.ws({
-  #   "socket" => {
-  #     "endpoint" => "/socket/websocket",
-  #     "params" => {
-  #       vsn: '2.0.0',
-  #       token: 'TOKEN'
-  #     }
-  #   },
-  #   # "topic" => "room:30",
-  #   # "event" => "comments_updated",
-  #   "topic" => "links",
-  #   "events" => ["new_link_added"],
-  #   "header" => {
-  #     "user_id" => 2,
-  #     "prev_item_id" => nil,
-  #     "last_item_id" => nil
-  #   }
-  # })
-
   footer.panels_form width: 'matchParent', url: json_ui_garage_url(path: 'forms/basic_post'), method: 'post', padding: glib_json_padding_body, paramNameForFormData: 'formData', onSubmit: ->(action) do
     json.action "ws/push"
     json.topic "rooms"

data/app/views/json_ui/garage/notifications/web_socket.json.jbuilder

@@ -3,7 +3,7 @@ json.title 'Forms'
 page = json_ui_page json
 render "#{@path_prefix}/nav_menu", json: json, page: page
 
-json.ws({
+json.phoenixSocket({
   "socket" => {
     "endpoint" => "/socket/websocket",
     "params" => {
@@ -43,7 +43,7 @@ end, childViews: ->(form) do
 
   # TODO: Change this to radio for selecting alert vs reload response
   form.fields_password name: 'user[password]', width: 'matchParent', label: 'Password'
-  
+
   form.fields_hidden name: 'baseUrl', width: 'matchParent', value: json_ui_garage_url(path: 'notifications/web_socket')
 
   form.panels_split width: 'matchParent', content: ->(split) do
@@ -56,5 +56,5 @@ end, childViews: ->(form) do
       right.button text: 'Submit', onClick: ->(action) { action.forms_submit }
     end
   end
-  
+
 end

data/app/views/json_ui/garage/panels/custom.json.jbuilder

@@ -2,13 +2,13 @@ json.title 'Panels'
 
 json_ui_page json do |page|
   render "#{@path_prefix}/nav_menu", json: json, page: page
-  
+
   page.scroll padding: glib_json_padding_body, childViews: ->(scroll) do
     scroll.h2 text: 'Thumbnail Template'
     scroll.spacer height: 6
     scroll.panels_custom template: 'thumbnail', width: 'matchParent', backgroundColor: '#fafafa',
       data: { imageUrl: glib_json_image_standard_url, title: 'Title', subtitle: 'Use the same template from list templates' }
-    
+
     scroll.spacer height: 20
     scroll.h2 text: 'Non-existent Template'
     scroll.spacer height: 6

data/app/views/json_ui/garage/panels/responsive.json.jbuilder

@@ -71,7 +71,7 @@ page.scroll padding: glib_json_padding_body, childViews: ->(scroll) do
     # responsive.panels_column lg: { cols: 4 }, childViews: ->(column) do
     #   column.button width: 'matchParent', text: '2'
     # end
-    
+
     responsive.panels_column lg: { cols: 8 }, backgroundColor: '#c3cad2', childViews: ->(column) do
       column.button text: '1'
     end
@@ -84,5 +84,15 @@ page.scroll padding: glib_json_padding_body, childViews: ->(scroll) do
   end
 
   scroll.spacer height: 20
+  scroll.h2 text: 'With onClick'
+  scroll.spacer height: 6
+  scroll.panels_responsive backgroundColor: '#c3cad2', padding: { left: 20, right: 20, top: 10, bottom: 10 }, childViews: ->(responsive) do
+    responsive.h4 text: 'Heading'
+    responsive.label text: 'Label'
+  end, onClick: ->(action) do
+    action.windows_open url: json_ui_garage_url(path: 'home/blank')
+  end
+
+  scroll.spacer height: 20
 
 end

data/app/views/json_ui/garage/panels/split.json.jbuilder

@@ -180,4 +180,3 @@ json_ui_page json do |page|
     end
   end
 end
-

data/app/views/json_ui/garage/panels/vertical.json.jbuilder

@@ -2,7 +2,7 @@ json.title 'Panels'
 
 json_ui_page json do |page|
   render "#{@path_prefix}/nav_menu", json: json, page: page
-  
+
   page.scroll padding: glib_json_padding_body, childViews: ->(scroll) do
     scroll.h1 text: 'Basic'
     scroll.panels_vertical backgroundColor: '#b3bac2', childViews: ->(panel) do

data/lib/glib-web.rb

@@ -6,3 +6,4 @@ require 'glib/json_crawler'
 require 'glib/dynamic_text'
 require 'glib/crypt'
 require 'glib/test_helpers'
+require 'glib/mailer_tester'

data/lib/glib/json_crawler/router.rb

@@ -81,6 +81,9 @@ module Glib
       end
 
       def tear_down
+        # NOTE: Experimental, to address issue where sometimes changes don't get saved.
+        @logger.flush
+
         @logger.close
       end
 

data/lib/glib/mailer_tester.rb

@@ -0,0 +1,36 @@
+module Glib
+  module MailerTester
+    extend ActiveSupport::Concern
+
+    included do
+      project_root = Rails.root
+      paths = Dir.glob(project_root + 'test/mailers/previews/*')
+      paths.each do |file|
+        require file
+      end
+
+      ActionMailer::Preview.subclasses.each do |preview_class|
+        preview = preview_class.new
+
+        preview_class.instance_methods(false).each do |mailer_method|
+          test "mailer for #{preview_class}##{mailer_method}" do
+            preview.send(mailer_method).deliver_now
+
+            logfile = File.join(log_dir, "#{preview_class.name.underscore}##{mailer_method}.txt")
+
+            # Use rstrip to avoid trailing space issues
+            expected = File.exist?(logfile) ? File.read(logfile).rstrip : ''
+            last_delivery = ActionMailer::Base.deliveries.last
+            result = last_delivery.html_part.body.raw_source.rstrip
+
+            logger = File.open(logfile, 'w')
+            logger.puts result
+            logger.close
+
+            assert_equal expected, result, "Result mismatch! #{logfile.sub(/\.txt$/, '')}"
+          end
+        end
+      end
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: glib-web
 version: !ruby/object:Gem::Version
-  version: 0.5.24
+  version: 0.5.29
 platform: ruby
 authors:
 - ''
@@ -131,6 +131,7 @@ files:
 - app/views/json_ui/garage/forms/generic_post.json.jbuilder
 - app/views/json_ui/garage/forms/get_request.json.jbuilder
 - app/views/json_ui/garage/forms/index.json.jbuilder
+- app/views/json_ui/garage/forms/new_rich_text.json.jbuilder
 - app/views/json_ui/garage/forms/pickers.json.jbuilder
 - app/views/json_ui/garage/forms/rich_text.json.jbuilder
 - app/views/json_ui/garage/forms/selects.json.jbuilder
@@ -224,6 +225,7 @@ files:
 - lib/glib/json_crawler/coverage.rb
 - lib/glib/json_crawler/http.rb
 - lib/glib/json_crawler/router.rb
+- lib/glib/mailer_tester.rb
 - lib/glib/test_helpers.rb
 - lib/glib/value.rb
 - lib/glib/version.rb