glib-web 0.5.5 → 0.5.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3a631905663a326cc5d4da2aa0be179812d12aae
-  data.tar.gz: a167fd02e4db101e5067832225762ba410bc401b
+  metadata.gz: 811686b2291bc31023b9d5980a6cb54cc2a97a26
+  data.tar.gz: 8f6ed8e3d277ca3c29190bcfe07d99c687c9e90c
 SHA512:
-  metadata.gz: 0a5094637dbe44532c384bd7e30a49bb3dd5377ef87cee6ea13da3528620aae8f2a43eba21f3077df4530a3356087851dcbd8be150d72a3ff1af70b4b3493afb
-  data.tar.gz: 03b85596d99b043700a6818feef54b6e45017e905800358502052a68bdf0d6cb472c64bc9bb352849a9628b587479bfbab41314da1543cb1f92317371639ac07
+  metadata.gz: 79af3fc3c2d8bb48ce3913735bcaac0722a515a588cba5373c80dd41f9cdef0963fcf64f58c28c84ccd81c0fe0e158d83c4476dec7b9b9bc7703952770b8cb26
+  data.tar.gz: 9738ce65f40301d15622da0617cb94795fdf90ceacb1e32066cfaa372ba7f7b1b45eb1e7b1494c6a25d2d68b43637f28cc96e46c2621aab80cbea827930e889e

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

@@ -31,6 +31,13 @@ module Glib::Json::Ui
     @__json_ui_activated
   end
 
+  def json_ui_page_lifecycle_prop(name)
+    if (hash = json_transformation_start).is_a?(Hash) && hash['body']  # A valid page
+      hash[name] ||= { 'action' => 'runMultiple', 'childActions' => [] }
+      hash[name]['childActions']
+    end
+  end
+
   def __json_ui_start(options)
     @__json_ui_activated = false
     @__json_ui_rendering = nil

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

@@ -13,7 +13,7 @@ module Glib
           str.slice(0,1).capitalize + str.slice(1..-1)
         end
 
-        def add_singleton_element type, name, *args
+        def add_singleton_element(type, name, *args)
           name_components = name.to_s.split('_')
           json.set! type, "#{name_components.join('/')}" if type
           args = [yield] if block_given?
@@ -22,7 +22,7 @@ module Glib
           "#{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
+        def add_element_to_array(type, name, *args)
           json.child! do
             add_singleton_element type, name, *args
           end
@@ -69,6 +69,12 @@ module Glib
 
       private
 
+      def self.any(propName)
+        define_method(propName) do |value|
+          json.set! propName, value
+        end
+      end
+
       def self.date(propName)
         define_method(propName) do |value|
           json.set! propName, value&.to_date
@@ -191,7 +197,7 @@ module Glib
           json.set!(propName) do
             if name
               data[:material] ||= {}
-              data[:material][:name] = name 
+              data[:material][:name] = name
             end
 
             if (material = data[:material])

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

@@ -1,8 +1,18 @@
 module Glib
   module JsonUi
     class ActionBuilder < AbstractBuilder
-      def method_missing m, *args
-        add_singleton_element_v1 'action', m, *args
+      def initialize(json, page, multiple)
+        super(json, page)
+
+        @multiple = multiple
+      end
+
+      def method_missing(m, *args)
+        if @multiple
+          add_element_to_array_v1 'action', m, *args
+        else
+          add_singleton_element_v1 'action', m, *args
+        end
       end
 
       class Action < JsonUiElement
@@ -38,19 +48,31 @@ module Glib
 
       ### Action definitions
 
+      class RunMultiple < Action
+        def childActions(block)
+          json.childActions do
+            block.call ActionBuilder.new(json, page, true)
+          end
+        end
+      end
+
       module Forms
         class Submit < Action
         end
-
       end
 
-      # Consider deprecating this. See Data
       module Auth
         class SaveCsrfToken < Action
           string :token
           action :onSave
         end
+      end
 
+      module Analytics
+        class LogEvent < Action
+          string :name
+          hash :params
+        end
       end
 
       module Timeouts
@@ -59,6 +81,10 @@ module Glib
           action :onTimeout
         end
 
+        # FUTURE
+        class Remove < Action
+        end
+
         # FUTURE
         class Clear < Action
         end
@@ -66,11 +92,15 @@ module Glib
 
       # FUTURE
       module Data
-        class SaveCsrfToken < Action
-          string :token
+        class Save < Action
+          string :key
+          string :value
           action :onSave
         end
 
+        class Remove < Action
+        end
+
         class Clear < Action
         end
       end

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

@@ -2,6 +2,7 @@ class Glib::JsonUi::ActionBuilder
   module Windows
     class Close < Action
       action :onClose
+      # action :onAfterClose
     end
 
     class CloseAll < Action

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

@@ -35,11 +35,16 @@ module Glib
       #   json.attributes!
       # end
 
-      def json_ui_section(json, &block)
+      def json_ui_section(json)
         @__json_ui_section ||= Page.new(json, self)
         @__json_ui_section.list_section_builder
       end
 
+      def json_ui_action(json)
+        @__json_ui_section ||= Page.new(json, self)
+        @__json_ui_section.action_builder
+      end
+
       class Page
         attr_reader :json, :context, :view_builder, :action_builder, :menu_builder
         attr_reader :list_section_builder, :table_section_builder, :drawer_content_builder, :split_content_builder
@@ -52,7 +57,7 @@ module Glib
           @context = context
 
           @view_builder = ViewBuilder.new(json, self, true)
-          @action_builder = ActionBuilder.new(json, self)
+          @action_builder = ActionBuilder.new(json, self, false)
           @menu_builder = MenuBuilder.new(json, self)
 
           @list_section_builder = ListBuilders::Section.new(json, self, ListBuilders::Template.new(json, self))
@@ -99,9 +104,12 @@ module Glib
             #   options[:leftItems]&.call @menu_builder
             # end
             # json.logoUrl "http://localhost:3000/assets/logo_dark-02d9b6a91fdbf22515da7b921d31367b70696214415f6789d2f90232e4a287b7.svg"
-            json.rightItems do
-              options[:rightItems]&.call @menu_builder
-            end
+
+            # json.rightItems do
+            #   options[:rightItems]&.call @menu_builder
+            # end
+
+            @view_builder.add_singleton_view('appBar', options)
           end
         end
 

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

@@ -15,7 +15,7 @@ module Glib
           @json = json
           @context = context
 
-          @action_builder = ActionBuilder.new(json, self)
+          @action_builder = ActionBuilder.new(json, self, false)
         end
       end
     end

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

@@ -1,6 +1,9 @@
 module Glib
   module JsonUi
     module StylingHelper
+
+      ### Padding
+
       def glib_json_padding_body
         { top: 12, left: 20, right: 20, bottom: 12 }
       end
@@ -9,6 +12,12 @@ module Glib
         { top: 12, bottom: 12, left: 16, right: 16 }
       end
 
+      ###
+
+
+
+      ### Image
+
       def glib_json_image_standard_url
         'https://cdn-images-1.medium.com/max/1200/1*Qc0XxYm-qAZL-7tjjlNfrg.png'
       end
@@ -20,6 +29,19 @@ module Glib
       def glib_json_image_blob_key
         'o6CKzNt67PWnkPdUEnWMt7pr'
       end
+
+      ###
+
+
+
+      ### Color
+
+      def glib_color_panel_background
+        '#b3bac2'
+      end
+
+      ###
+
     end
   end
 end

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

@@ -15,6 +15,10 @@ module Glib
         end
       end
 
+      def add_singleton_view(name, *args)
+        add_singleton_element 'view', name, *args
+      end
+
       def method_missing(m, *args)
         add_view m, *args
       end
@@ -152,26 +156,22 @@ module Glib
             block.call page.menu_builder
           end
         end
+      end
 
-        # Should be deprecated
-        # def tabButtons(block)
-        #   json.tabButtons do
-        #     block.call page.menu_builder
-        #   end
-        # end
-
-        # def options(options)
-        #   current_url = page.context.request.base_url + page.context.request.fullpath
+      class AppBar < View
+        color :color
 
-        #   buttons ->(menu) do
-        #     options.each do |tab|
-        #       menu.button text: tab[:text], disabled: tab[:url] == current_url, onClick: ->(action) do
-        #         action.windows_reload url: tab[:url]
-        #       end
-        #     end
+        # def leftButtons(block)
+        #   json.leftButtons do
+        #     block.call page.menu_builder
         #   end
         # end
 
+        def rightButtons(block)
+          json.rightButtons do
+            block.call page.menu_builder
+          end
+        end
       end
 
       class Datetime < View
@@ -182,4 +182,4 @@ module Glib
 
     end
   end
-end
+end

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

@@ -103,8 +103,13 @@ class Glib::JsonUi::ViewBuilder
     end
 
     class Check < Text
-      string :uncheckValue
-      string :checkValue
+      any :uncheckValue
+      any :checkValue
+
+
+      def value(value)
+        @value = value if value != Glib::Value::DEFAULT
+      end
 
       # Where possible, use value instead of this
       bool :checked

data/app/helpers/glib/urls_helper.rb

@@ -0,0 +1,7 @@
+module Glib
+  module UrlsHelper
+    def glib_url_current(new_params)
+      url_for(params.to_unsafe_h.merge(new_params.merge(only_path: false)))
+    end
+  end
+end

data/app/policies/glib/application_policy.rb

@@ -113,41 +113,17 @@ module Glib
       controller.policy_scope(record.class, policy_scope_class: policy_scope_class)
     end
 
-    # TODO: Remove. Deprecated
-    private  # Used by child
-    def public?
-      true
-    end
-
-    private  # Used by child
-    def everyone
-      true
-    end
-
-    # TODO: Deprecate `user()`
-    private  # Used by child
-    def current_user
-      user
-    end
-
-    # # TODO: Revise because it seems there is no justification for allowing owner to see any of the deleted entities, which include User, Guild, and Post
-    # private  # Used by child
-    # def not_deleted_unless_owner_or_moderator?(&block)
-    #   block ||= lambda { |unused_arg| @user.moderator? }
-    #   !@record.deleted? || (@user && (@user.id == @record.user_owner_id || block.call(@record)))
-    # end
-
-    # private  # Used by child
-    # def not_deleted_unless_moderator?(&block)
-    #   block ||= lambda { |unused_arg| @user.moderator? }
-    #   !@record.deleted? || (@user && block.call(@record))
-    # end
-
     public
     def self.args_builder
       Proc.new { |controller| [] }
     end
 
+    # TODO: Remove. Deprecated
+    # private  # Used by child
+    # def public?
+    #   true
+    # end
+
     class Scope
       attr_reader :user, :scope
 
@@ -156,9 +132,30 @@ module Glib
         @scope = scope
       end
 
+      # def current_user
+      #   user
+      # end
+
+      # To be overridden
       def resolve
         scope.none
       end
     end
+
+    private  # Used by child
+      def everyone
+        true
+      end
+
+      # def current_user
+      #   user
+      # end
+
+      # TODO: Bad pattern. Implement explicit policy parameter instead.
+      # - E.g. can? :destroy, :service_subscription_auto_renewal, { service_subscription: @service_subscription }
+      # - E.g. super class: :service_subscription_auto_renewal, { service_subscription: @service_subscription }
+      def controller_var(name)
+        controller.instance_variable_get(:"@#{name}")
+      end
   end
 end

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

@@ -5,6 +5,8 @@ json_ui_page json do |page|
 
   page.list sections: [
     ->(section) do
+      render "#{@path_prefix}/actions/reload", section: section
+    end, ->(section) do
       render "#{@path_prefix}/actions/dialogs", section: section
     end, ->(section) do
       render "#{@path_prefix}/actions/snackbars", section: section
@@ -16,8 +18,6 @@ json_ui_page json do |page|
       render "#{@path_prefix}/actions/timeouts", section: section
     end, ->(section) do
       render "#{@path_prefix}/actions/http", section: section
-    end, ->(section) do
-      render "#{@path_prefix}/actions/reload", section: section
     end
   ]
 end

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

@@ -3,7 +3,7 @@ json.title 'Forms'
 page = json_ui_page json
 render "#{@path_prefix}/nav_menu", json: json, page: page
 
-page.form url: json_ui_garage_url(path: 'forms/basic_post'), method: 'post', padding: glib_json_padding_body, childViews: ->(form) do
+page.form url: json_ui_garage_url(path: 'forms/generic_post'), method: 'post', padding: glib_json_padding_body, childViews: ->(form) do
   form.h1 text: 'Text'
   form.fields_password name: 'user[text1]', width: 'matchParent', label: 'Type "show"'
   form.label text: 'Typed', showIf: {
@@ -29,7 +29,7 @@ page.form url: json_ui_garage_url(path: 'forms/basic_post'), method: 'post', pad
 
   form.spacer height: 20
   form.h1 text: 'Check'
-  form.fields_check name: 'user[check1]', value: 'on', label: 'Show text'
+  form.fields_check name: 'user[check1]', checkValue: 'on', label: 'Show text'
   form.spacer height: 10
   form.label text: 'Checked', showIf: {
     "==": [
@@ -70,7 +70,7 @@ page.form url: json_ui_garage_url(path: 'forms/basic_post'), method: 'post', pad
   }
 
   form.spacer height: 20
-  form.h1 text: 'Combo1'
+  form.h1 text: 'Combined conditions'
   form.label text: 'Select the same option on both the radio and select fields above'
   form.spacer height: 10
   form.h3 text: 'Same!', showIf: {
@@ -84,5 +84,22 @@ page.form url: json_ui_garage_url(path: 'forms/basic_post'), method: 'post', pad
     ]
   }
 
+  form.spacer height: 20
+  form.h1 text: 'Show/hide another field'
+  form.label text: ''
+  form.spacer height: 10
+  form.fields_check name: 'user[check2]', checkValue: 'on', label: 'Show field'
+  form.spacer height: 10
+  form.fields_text width: 'matchParent', label: 'Comment (optional)', name: 'user[comment]', value: 'This field can be submitted when it is hidden, but it is not necessary (i.e. up to the app)', showIf: {
+    "==": [
+      {
+        "var": 'user[check2]'
+      },
+      'on'
+    ]
+  }
+
+  form.spacer height: 20
+  form.fields_submit text: 'Submit'
   form.spacer height: 40
 end

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

@@ -4,11 +4,14 @@ 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: glib_json_padding_body, childViews: ->(form) do
-    form.fields_text name: 'user[name]', width: 'matchParent', label: 'Search', styleClasses: ['outlined', 'rounded']
+    form.fields_text name: 'user[name]', width: 'matchParent', label: 'Search', placeholder: 'Enter a keyword', styleClasses: ['outlined', 'rounded']
 
     form.spacer height: 14
     form.fields_password name: 'user[password]', width: 'matchParent', label: 'Password', placeholder: 'Type your password', styleClass: 'outlined'
 
+    form.spacer height: 14
+    form.fields_textarea name: 'user[bio]', width: 'matchParent', label: 'Bio', placeholder: 'Enter your bio', styleClasses: ['outlined']
+
     form.spacer height: 14
     form.fields_stripeToken name: 'user[stripe_token_outlined]', width: 'matchParent', publicKey: 'pk_test_TYooMQauvdEDq54NiTphI7jx', styleClass: 'outlined'
 

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

@@ -7,7 +7,7 @@ json_ui_page json do |page|
     form.fields_email name: 'user[email]', width: 'matchParent', label: 'Email'
     form.fields_url name: 'user[url]', width: 'matchParent', label: 'URL'
     form.fields_number name: 'user[number]', width: 'matchParent', label: 'Number', validation: { required: { message: 'Required' } }
-    form.fields_password name: 'user[password]', width: 'matchParent', label: 'Password'
+    form.fields_password name: 'user[password]', width: 'matchParent', label: 'Password', hint: 'Should contain at least 6 characters'
     form.fields_textarea name: 'user[textarea]', width: 'matchParent', label: 'Textarea with maxLength', maxLength: 50, validation: { required: { message: 'Required' } }
 
     options = ['male', 'female'].map { |i| { text: i.humanize, value: i } }

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

@@ -41,6 +41,17 @@ json_ui_page json do |page|
           action.windows_open url: json_ui_garage_url(path: 'pages/full_width')
         end
       end
+    end,
+    ->(section) do
+      section.header padding: glib_json_padding_list, childViews: ->(header) do
+        header.h2 text: 'Misc (Web Only)'
+      end
+
+      section.rows builder: ->(template) do
+        template.thumbnail title: 'Nested Scroll', onClick: ->(action) do
+          action.windows_open url: json_ui_garage_url(path: 'pages/nested_scroll')
+        end
+      end
     end
   ]
 

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

@@ -1,19 +1,18 @@
 json.title 'Pages'
 
-json_ui_page json do |page|
-  render "#{@path_prefix}/nav_menu", json: json, page: page
-  
-  page.header padding: glib_json_padding_body, backgroundColor: '#b3bac2', childViews: ->(header) do
-    header.h1 text: 'Header'
-  end
+page = json_ui_page json
+render "#{@path_prefix}/nav_menu", json: json, page: page
 
-  page.footer padding: glib_json_padding_body, backgroundColor: '#b3bac2', childViews: ->(footer) do
-    footer.h1 text: 'Footer'
-  end
+page.header padding: glib_json_padding_body, backgroundColor: '#b3bac2', childViews: ->(header) do
+  header.h1 text: 'Header'
+end
+
+page.footer padding: glib_json_padding_body, backgroundColor: '#b3bac2', childViews: ->(footer) do
+  footer.h1 text: 'Footer'
+end
 
-  page.scroll padding: glib_json_padding_body, childViews: ->(scroll) do
-    (1..100).each do |index|
-      scroll.label text: 'Content'
-    end
+page.scroll padding: glib_json_padding_body, childViews: ->(scroll) do
+  (1..100).each do |index|
+    scroll.label text: 'Content'
   end
 end

data/app/views/json_ui/garage/pages/nav_buttons.json.jbuilder

@@ -1,21 +1,33 @@
 json.title 'Pages'
 
-json_ui_page json do |page|
-  render "#{@path_prefix}/nav_menu", json: json, page: page
-  
-  page.rightNavButtons do |menu|
-    menu.button icon: 'search', onClick: ->(action) do 
-      action.dialogs_alert message: 'Perform some action'
-    end
-    menu.button icon: { name: 'star', badge: { text: '1', backgroundColor: '#ff0000' } }, onClick: ->(action) do 
-      action.dialogs_alert message: 'Perform some action'
-    end
-    menu.button icon: { name: 'map', badge: '2' }, onClick: ->(action) do 
-      action.dialogs_alert message: 'Perform some action'
-    end
-  end
+page = json_ui_page json
+
+render "#{@path_prefix}/nav_menu", json: json, page: page
 
-  page.scroll padding: glib_json_padding_body, childViews: ->(scroll) do
-    scroll.label text: 'See the right menu buttons on the nav bar'
+page.navBar backgroundColor: '#a8c4e3', rightButtons: ->(menu) do
+  menu.button icon: 'search', onClick: ->(action) do 
+    action.dialogs_alert message: 'Perform some action'
+  end
+  menu.button icon: { name: 'star', badge: { text: '1', backgroundColor: '#ff0000' } }, onClick: ->(action) do 
+    action.dialogs_alert message: 'Perform some action'
+  end
+  menu.button icon: { name: 'map', badge: '2' }, onClick: ->(action) do 
+    action.dialogs_alert message: 'Perform some action'
   end
 end
+
+# page.rightNavButtons do |menu|
+#   menu.button icon: 'search', onClick: ->(action) do 
+#     action.dialogs_alert message: 'Perform some action'
+#   end
+#   menu.button icon: { name: 'star', badge: { text: '1', backgroundColor: '#ff0000' } }, onClick: ->(action) do 
+#     action.dialogs_alert message: 'Perform some action'
+#   end
+#   menu.button icon: { name: 'map', badge: '2' }, onClick: ->(action) do 
+#     action.dialogs_alert message: 'Perform some action'
+#   end
+# end
+
+page.scroll padding: glib_json_padding_body, childViews: ->(scroll) do
+  scroll.label text: 'See the right menu buttons on the nav bar'
+end

data/app/views/json_ui/garage/pages/nested_scroll.json.jbuilder

@@ -0,0 +1,40 @@
+json.title 'Pages'
+
+page = json_ui_page json
+render "#{@path_prefix}/nav_menu", json: json, page: page
+
+# page.template 'fullWidth'
+
+page.header childViews: ->(header) do
+  header.panels_vertical width: 'matchParent', styleClass: 'card', padding: glib_json_padding_body, childViews: ->(vertical) do
+    vertical.h1 text: 'Header'
+  end
+  header.spacer height: 10
+end
+
+page.footer childViews: ->(footer) do
+  footer.spacer height: 10
+  footer.panels_vertical width: 'matchParent', styleClass: 'card', padding: glib_json_padding_body, childViews: ->(vertical) do
+    vertical.h1 text: 'Footer'
+  end
+end
+
+page.scroll padding: glib_json_padding_body, childViews: ->(scroll) do
+  scroll.label text: 'Inner Header'
+  scroll.label text: 'Inner Header'
+  scroll.label text: 'Inner Header'
+  scroll.spacer height: 20
+
+  scroll.panels_vertical width: 'matchParent', styleClass: 'card', backgroundColor: glib_color_panel_background, padding: glib_json_padding_body.merge(right: nil), childViews: ->(padder) do
+    padder.panels_scroll width: 'matchParent', height: 300, childViews: ->(inner_scroll) do
+      (1..100).each do |index|
+        inner_scroll.label text: 'Content'
+      end
+    end
+  end
+
+  scroll.spacer height: 20
+  scroll.label text: 'Inner Footer'
+  scroll.label text: 'Inner Footer'
+  scroll.label text: 'Inner Footer'
+end

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

@@ -1,16 +1,37 @@
 json.title 'Panels'
 
-image_url1 = 'http://ichef.bbci.co.uk/news/976/cpsprodpb/18106/production/_97266589_gettyimages-474547165.jpg'
+image_url1 = 'https://ichef.bbci.co.uk/news/976/cpsprodpb/18106/production/_97266589_gettyimages-474547165.jpg'
 image_url2 = 'https://s.abcnews.com/images/International/Guam03-gty-jrl-170809_16x9_992.jpg'
 
 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: 'Carousel panel'
+    scroll.label text: "\n"
+    scroll.h1 text: 'Carousel with labels'
+    scroll.panels_carousel width: 'matchParent', childViews: ->(carousel) do
+      carousel.label text: 'Item 1'
+      carousel.label text: 'Item 2'
+    end
+
+    scroll.label text: "\n"
+    scroll.h1 text: 'Carousel with images'
     scroll.panels_carousel width: 'matchParent', childViews: ->(carousel) do
       carousel.image url: image_url1, width: 'matchParent'
       carousel.image url: image_url2, width: 'matchParent'
     end
+
+    scroll.label text: "\n"
+    scroll.h1 text: 'Carousel with complex layout'
+    scroll.panels_carousel width: 'matchParent', childViews: ->(carousel) do
+      carousel.panels_vertical childViews: ->(panel) do
+        panel.h3 text: 'Item 1'
+        panel.image url: image_url1, width: 'matchParent'
+      end
+      carousel.panels_vertical childViews: ->(panel) do
+        panel.h3 text: 'Item 2'
+        panel.image url: image_url2, width: 'matchParent'
+      end
+    end
   end
 end

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

@@ -1,4 +1,3 @@
-
 batch_count = 30
 items = (1..batch_count)
 section = page.table_section_builder
@@ -10,4 +9,4 @@ section.rows objects: items, builder: ->(row, item, index) do
   end, onClick: ->(action) do
     action.windows_open url: json_ui_garage_url(path: 'home/blank')
   end
-end
+end

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

@@ -1,39 +1,39 @@
 
 page_index = params[:page].to_i
 next_page = {
-  url: json_ui_garage_url(path: 'tables/autoload_all', page: page_index + 1, section_only: 'v1'),
+  url: json_ui_garage_url(path: 'tables/autoload_as_needed', page: page_index + 1, section_only: 'v1'),
   autoload: 'asNeeded'
 }
 
+page = json_ui_page json
 column_indexes = (1..3)
+
 if params[:section_only].present?
+  sleep 1
+
   json.nextPage next_page if page_index < 3
-  json_ui_page json do |page|
-    json.sections do
-      json.child! do
-        render 'json_ui/garage/tables/autoload_section', page: page, page_index: page_index, column_indexes: column_indexes
-      end
+  json.sections do
+    json.child! do
+      render 'json_ui/garage/tables/autoload_section', page: page, page_index: page_index, column_indexes: column_indexes
     end
   end
 else
   json.title 'Tables'
 
-  json_ui_page json do |page|
-    render "#{@path_prefix}/nav_menu", json: json, page: page
+  render "#{@path_prefix}/nav_menu", json: json, page: page
 
-    page.table nextPage: next_page, firstSection: ->(section) do
-      section.header cellViews: ->(header) do
-        column_indexes.each do |i|
-          header.label text: "Heading#{i}"
-        end
+  page.table nextPage: next_page, firstSection: ->(section) do
+    section.header cellViews: ->(header) do
+      column_indexes.each do |i|
+        header.label text: "Heading#{i}"
       end
-
-      render "#{@path_prefix}/tables/autoload_section", page: page, page_index: page_index, column_indexes: column_indexes
-    end, onScrollToBottom: ->(action) do
-      action.snackbars_alert message: 'Scrolled to Bottom'
-    end, onScrollToTop: ->(action) do
-      action.snackbars_alert message: 'Scrolled to Top'
     end
+
+    render "#{@path_prefix}/tables/autoload_section", page: page, page_index: page_index, column_indexes: column_indexes
+  end, onScrollToBottom: ->(action) do
+    action.snackbars_alert message: 'Scrolled to Bottom'
+  end, onScrollToTop: ->(action) do
+    action.snackbars_alert message: 'Scrolled to Top'
   end
 
 end

data/app/views/json_ui/garage/views/icons.json.jbuilder

@@ -0,0 +1,22 @@
+json.title 'Views'
+
+page = json_ui_page json
+render "#{@path_prefix}/nav_menu", json: json, page: page
+
+page.scroll padding: glib_json_padding_body, childViews: ->(scroll) do
+  # TODO: Scrape all names from https://material.io/resources/icons
+  icon_names = [
+    'info', 'info', 'info', 'info', 'info', 'info', 'info', 'info',
+    'info', 'info', 'info', 'info', 'info', 'info', 'info', 'info',
+    'info', 'info', 'info', 'info', 'info', 'info', 'info', 'info',
+  ]
+  icon_names.each do |icon_name|
+    scroll.panels_column lg: { cols: 2 }, childViews: ->(column) do
+      column.panels_horizontal align: 'middle', childViews: ->(horizontal) do
+        horizontal.icon spec: icon_name
+        horizontal.spacer width: 6
+        horizontal.label text: icon_name
+      end
+    end
+  end
+end

data/app/views/json_ui/garage/views/images.json.jbuilder

@@ -11,10 +11,10 @@ page.scroll padding: glib_json_padding_body, childViews: ->(scroll) do
   scroll.spacer height: 6
   scroll.avatar url: glib_json_image_avatar_url
 
-  scroll.spacer height: 20
-  scroll.h2 text: 'Icon'
-  scroll.spacer height: 6
-  scroll.icon spec: 'info'
+  # scroll.spacer height: 20
+  # scroll.h2 text: 'Icon'
+  # scroll.spacer height: 6
+  # scroll.icon spec: 'info'
 
   scroll.spacer height: 20
   scroll.h2 text: 'Image with base64 data'

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

@@ -16,15 +16,15 @@ json_ui_page json do |page|
         template.thumbnail title: 'Images', onClick: ->(action) do
           action.windows_open url: json_ui_garage_url(path: 'views/images')
         end
-        template.thumbnail title: 'Carousels', onClick: ->(action) do
-          action.windows_open url: json_ui_garage_url(path: 'views/carousels')
-        end
         template.thumbnail title: 'Charts', onClick: ->(action) do
           action.windows_open url: json_ui_garage_url(path: 'views/charts')
         end
         template.thumbnail title: 'Banners', onClick: ->(action) do
           action.windows_open url: json_ui_garage_url(path: 'views/banners')
         end
+        template.thumbnail title: 'Icons', onClick: ->(action) do
+          action.windows_open url: json_ui_garage_url(path: 'views/icons')
+        end
         template.thumbnail title: 'Misc', onClick: ->(action) do
           action.windows_open url: json_ui_garage_url(path: 'views/misc')
         end

data/lib/glib/json_crawler.rb

@@ -8,3 +8,4 @@ require_relative './json_crawler/action_crawlers/windows_open'
 require_relative './json_crawler/action_crawlers/action_http'
 require_relative './json_crawler/action_crawlers/forms_submit'
 require_relative './json_crawler/action_crawlers/menu'
+require_relative './json_crawler/action_crawlers/run_multiple'

data/lib/glib/json_crawler/action_crawler.rb

@@ -14,7 +14,10 @@ module Glib
           click view
         end
       end
-    end
 
+      def perform(action)
+        @http.router.process_action(@http, action)
+      end
+    end
   end
 end

data/lib/glib/json_crawler/action_crawlers/action_http.rb

@@ -4,11 +4,8 @@ module Glib
       def initialize(method, http, args, controller)
         @http = http
         json = @http.send(method, args['url'], controller, args.fetch('formData', {}))
-
-        unless json.nil?
-          click(json)
-        end
+        perform(json['onResponse'])
       end
     end
   end
-end
+end

data/lib/glib/json_crawler/action_crawlers/forms_submit.rb

@@ -31,7 +31,7 @@ module Glib
 
             include_params = case name
             when 'fields/check', 'fields/check-v1'
-              child['checked']
+              child['checkValue'] == child['value']
             else
               true
             end
@@ -41,7 +41,7 @@ module Glib
         end
 
         json = @http.patch url, action, params
-        click(json)
+        perform(json['onResponse'])
       end
     end
   end

data/lib/glib/json_crawler/action_crawlers/nav_initiate.rb

@@ -9,6 +9,8 @@ module Glib
           crawl left_drawer['header']&.[]('childViews')
           crawl left_drawer['rows']
         end
+
+        perform(json['onLoad'])
       end
     end
   end

data/lib/glib/json_crawler/action_crawlers/run_multiple.rb

@@ -0,0 +1,13 @@
+module Glib
+  module JsonCrawler
+    class RunMultiple < ActionCrawler
+      def initialize(http, args, action)
+        @http = http
+
+        args['childActions']&.each do |button|
+          perform(button)
+        end
+      end
+    end
+  end
+end

data/lib/glib/json_crawler/action_crawlers/windows_open.rb

@@ -3,6 +3,7 @@ module Glib
     class WindowsOpen < ActionCrawler
       def initialize(http, args, action)
         @http = http
+
         if (url = args['url'])
           json = @http.get(url, action, args.except('url'))
 
@@ -20,6 +21,8 @@ module Glib
                 click button
               end
             end
+
+            perform(json['onLoad'])
           end
         end
       end

data/lib/glib/json_crawler/router.rb

@@ -19,6 +19,7 @@ module Glib
       end
 
       def step(http, args)
+        # TODO: Refactor
         case args['view']
         when 'fields/submit-v1', 'fields/submit'
           @depth += 1
@@ -29,40 +30,45 @@ module Glib
         end
 
         if args.is_a?(Hash) && args['rel'] != 'nofollow'
-          if (onClick = (args.fetch('onClick', nil) || args.fetch('onResponse', nil)))
-            action = onClick['action']
-            params = onClick
+          if (onClick = (args.fetch('onClick', nil)))
+            process_action(http, onClick)
           end
+        end
+      end
 
-          if action.present?
-            @depth += 1
-            case action
-            when 'initiate_navigation'
-              @read_only_actions.add([action, params['url']])
-              JsonCrawler::NavInitiate.new(http, params, action)
-            when 'windows/open-v1', 'dialogs/open-v1', 'windows/reload-v1', 'windows/open', 'dialogs/open', 'windows/reload'
+      def process_action(http, spec)
+        action = spec['action']
+        params = spec
+
+        if action.present?
+          @depth += 1
+          case action
+          when 'initiate_navigation'
+            @read_only_actions.add([action, params['url']])
+            JsonCrawler::NavInitiate.new(http, params, action)
+          when 'runMultiple-v1', 'runMultiple'
+            JsonCrawler::RunMultiple.new(http, params, action)
+          when 'windows/open-v1', 'dialogs/open-v1', 'windows/reload-v1', 'windows/open', 'dialogs/open', 'windows/reload'
+            @read_only_actions.add([action, params['url']])
+            JsonCrawler::WindowsOpen.new(http, params, action)
+          when 'sheets/select-v1', 'sheets/select'
+            JsonCrawler::Menu.new(http, params, action)
+          when 'http/post-v1', 'http/post'
+            JsonCrawler::ActionHttp.new(:post, http, params, action)
+          when 'forms/submit-v1', 'forms/submit'
+            forms = @visitor.forms
+            # raise 'Submit action needs to be inside a form' if forms.size < 1
+            JsonCrawler::FormsSubmit.new(http, forms.last)
+          else
+            unless [
+              'http/delete-v1', 'dialogs/oauth-v1', 'windows/openWeb-v1',
+              'http/delete', 'dialogs/oauth', 'windows/openWeb'
+            ].include?(action)
               @read_only_actions.add([action, params['url']])
-              JsonCrawler::WindowsOpen.new(http, params, action)
-            when 'sheets/select-v1', 'sheets/select'
-              JsonCrawler::Menu.new(http, params, action)
-            when 'http/post-v1', 'http/post'
-              JsonCrawler::ActionHttp.new(:post, http, params, action)
-            when 'forms/submit-v1', 'forms/submit'
-              forms = @visitor.forms
-              # raise 'Submit action needs to be inside a form' if forms.size < 1
-              JsonCrawler::FormsSubmit.new(http, forms.last)
-            else
-              unless [
-                'http/delete-v1', 'dialogs/oauth-v1', 'windows/openWeb-v1',
-                'http/delete', 'dialogs/oauth', 'windows/openWeb'
-              ].include?(action)
-                @read_only_actions.add([action, params['url']])
-              end
-              self.log action, params['url']
             end
-            @depth -= 1
-            # child
+            self.log action, params['url']
           end
+          @depth -= 1
         end
       end
 

data/lib/glib/test_helpers.rb

@@ -20,21 +20,21 @@ module Glib
         end
         @__log_dir
       end
-      
+
       def __log_file
         @__log_file ||= "#{self.method_name}.json"
       end
-      
+
       def __log json
         File.open("#{File.join(__log_dir, __log_file)}", "w") do |f|
           f << JSON.pretty_generate( JSON.parse(json) )
         end
         json
       end
-      
+
       def __get_previous_result_from_git
         `git checkout -- "#{File.join(__log_dir, __log_file)}" > /dev/null 2>&1` if __git_is_available?
-        File.exists?(File.join(__log_dir, __log_file)) ? File.open(File.join(__log_dir, __log_file)).read : "\{\}"
+        File.exist?(File.join(__log_dir, __log_file)) ? File.open(File.join(__log_dir, __log_file)).read : "\{\}"
       end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: glib-web
 version: !ruby/object:Gem::Version
-  version: 0.5.5
+  version: 0.5.12
 platform: ruby
 authors:
 - ''
@@ -98,6 +98,7 @@ files:
 - app/helpers/glib/json_ui/view_builder/charts.rb
 - app/helpers/glib/json_ui/view_builder/fields.rb
 - app/helpers/glib/json_ui/view_builder/panels.rb
+- app/helpers/glib/urls_helper.rb
 - app/models/glib/active_storage/attachment.rb
 - app/models/glib/active_storage/blob.rb
 - app/models/glib/dynamic_text_record.rb
@@ -157,6 +158,7 @@ files:
 - app/views/json_ui/garage/pages/layout.json.jbuilder
 - app/views/json_ui/garage/pages/loading_indicator.json.jbuilder
 - app/views/json_ui/garage/pages/nav_buttons.json.jbuilder
+- app/views/json_ui/garage/pages/nested_scroll.json.jbuilder
 - app/views/json_ui/garage/pages/tab_bar.json.jbuilder
 - app/views/json_ui/garage/panels/_styled.json.jbuilder
 - app/views/json_ui/garage/panels/card.json.jbuilder
@@ -182,8 +184,8 @@ files:
 - app/views/json_ui/garage/views/_chart_data.json.jbuilder
 - app/views/json_ui/garage/views/banners.json.jbuilder
 - app/views/json_ui/garage/views/calendar_data.json.jbuilder
-- app/views/json_ui/garage/views/carousels.json.jbuilder
 - app/views/json_ui/garage/views/charts.json.jbuilder
+- app/views/json_ui/garage/views/icons.json.jbuilder
 - app/views/json_ui/garage/views/images.json.jbuilder
 - app/views/json_ui/garage/views/index.json.jbuilder
 - app/views/json_ui/garage/views/links.json.jbuilder
@@ -212,6 +214,7 @@ files:
 - lib/glib/json_crawler/action_crawlers/forms_submit.rb
 - lib/glib/json_crawler/action_crawlers/menu.rb
 - lib/glib/json_crawler/action_crawlers/nav_initiate.rb
+- lib/glib/json_crawler/action_crawlers/run_multiple.rb
 - lib/glib/json_crawler/action_crawlers/windows_open.rb
 - lib/glib/json_crawler/coverage.rb
 - lib/glib/json_crawler/http.rb

data/app/views/json_ui/garage/views/carousels.json.jbuilder

@@ -1,37 +0,0 @@
-json.title 'Views'
-
-image_url1 = 'http://ichef.bbci.co.uk/news/976/cpsprodpb/18106/production/_97266589_gettyimages-474547165.jpg'
-image_url2 = 'https://s.abcnews.com/images/International/Guam03-gty-jrl-170809_16x9_992.jpg'
-
-json_ui_page json do |page|
-  render "#{@path_prefix}/nav_menu", json: json, page: page
-  
-  page.scroll childViews: ->(scroll) do
-    scroll.label text: "\n"
-    scroll.h1 text: 'Carousel with labels'
-    scroll.panels_carousel width: 'matchParent', childViews: ->(carousel) do
-      carousel.label text: 'Item 1'
-      carousel.label text: 'Item 2'
-    end
-
-    scroll.label text: "\n"
-    scroll.h1 text: 'Carousel with images'
-    scroll.panels_carousel width: 'matchParent', childViews: ->(carousel) do
-      carousel.image url: image_url1, width: 'matchParent'
-      carousel.image url: image_url2, width: 'matchParent'
-    end
-
-    scroll.label text: "\n"
-    scroll.h1 text: 'Carousel with complex layout'
-    scroll.panels_carousel width: 'matchParent', childViews: ->(carousel) do
-      carousel.panels_vertical childViews: ->(panel) do
-        panel.h3 text: 'Item 1'
-        panel.image url: image_url1, width: 'matchParent'
-      end
-      carousel.panels_vertical childViews: ->(panel) do
-        panel.h3 text: 'Item 2'
-        panel.image url: image_url2, width: 'matchParent'
-      end
-    end
-  end
-end