glib-web 0.3.3 → 0.3.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 475f70869ed2e476e536ca4d45eba093616c9f37
-  data.tar.gz: b2db4e4b640976122e49dab51e179160ba992e57
+  metadata.gz: 914905b67e8a3e6fa089723850360b7ff684a53f
+  data.tar.gz: 4fc3dfc87dce95a3b5d7b74555781fb75d362efe
 SHA512:
-  metadata.gz: 5054f0eaef4ef2f9fe67b57529b5e671e7acdb2165549c175f7db9e0ab24765b5dec6d00d783bbedc6b110d6e39dc648d9f7f3ade9e109648cb66b625e6fa3a3
-  data.tar.gz: c008a419d862bb0e718a4a83ccd6867ab6f6bd3e1cb8177e0104aa2ad8ed6d298a058cb1a366b37fe263e58a8ee4ece72c3a048a225513c48af4d7bc4195f42e
+  metadata.gz: a7ccc5a33d14a02abd8d849abc13ef3e53a9307866a167af012eb065b3ee7df13db117dc6939af7fd985a7cf03f7afd323a4f72c475d9c12bc784b25f85dcc55
+  data.tar.gz: 3602887b7f41295009a0b988a0ea97b9ec5d80d511e1d256de8c101c29cf38711d0a4d73140838e8bcec779ccb9e54996204c957a6faa906dffafccf80196ead

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

@@ -13,6 +13,11 @@ module Concerns::Application::Json::Ui
     end
   end
 
+  # Override
+  def form_authenticity_token
+    Rails.env.test? ? 'test_token' : super
+  end
+
   # NOTE: Override default_url_options and call this method
   def json_ui_url_options
     options = {}

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

@@ -37,10 +37,12 @@ module Glib
 
         def header(options = {})
           json.header do
-            json.padding options[:padding]
-            json.childViews do
-              options[:childViews]&.call page.view_builder
-            end
+            page.vertical_content(options)
+
+            # json.padding options[:padding]
+            # json.childViews do
+            #   options[:childViews]&.call page.view_builder
+            # end
           end
         end
 
@@ -59,10 +61,12 @@ module Glib
 
         def footer(options = {})
           json.footer do
-            json.padding options[:padding]
-            json.childViews do
-              options[:childViews]&.call page.view_builder
-            end
+            page.vertical_content(options)
+
+            # json.padding options[:padding]
+            # json.childViews do
+            #   options[:childViews]&.call page.view_builder
+            # end
           end
         end
       end

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

@@ -16,7 +16,7 @@ module Glib
 
       class Page
         attr_reader :json, :context, :view_builder, :action_builder, :menu_builder
-        attr_reader :list_section_builder, :drawer_content_builder, :table_section_builder
+        attr_reader :list_section_builder, :table_section_builder, :drawer_content_builder, :split_content_builder
 
         # See Panels::Form
         attr_accessor :current_form
@@ -32,7 +32,7 @@ module Glib
           @list_section_builder = ListBuilders::Section.new(json, self, ListBuilders::Template.new(json, self))
           @drawer_content_builder = ListBuilders::Section.new(json, self, @menu_builder)
           @table_section_builder = TableBuilders::Section.new(json, self, TableBuilders::Template.new(json, self))
-          # @table_template_builder = TableBuilders::Template.new(json, self)
+          @split_content_builder = SplitBuilders::Content.new(json, self, @view_builder)
         end
         
         def rightNavButtons
@@ -106,18 +106,21 @@ module Glib
           end
         end
 
-        private
         def vertical_content(options)
           options = options.reverse_merge(width: 'matchParent')
 
           [:padding, :backgroundColor, :width, :height, :align].each do |name|
-            if (value = options[name])
+            if (value = options.delete(name))
               json.set! name, value
             end
           end
           json.childViews do
-            options[:childViews]&.call @view_builder
+            if (childViews = options.delete(:childViews))
+              childViews.call @view_builder
+            end
           end
+
+          raise "Invalid properties: #{options.keys}" if options.size > 0
         end
 
       end

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

@@ -0,0 +1,39 @@
+module Glib
+  module JsonUi
+    module SplitBuilders
+
+      class Content < AbstractBuilder
+        def initialize json, page, template
+          super json, page
+          @template = template
+        end
+
+        def left(options = {})
+          json.left do
+            page.vertical_content(options)
+          end
+        end
+
+        def center(options = {})
+          json.center do
+            page.vertical_content(options)
+          end
+        end
+        
+        def right(options = {})
+          json.right do
+            page.vertical_content(options)
+          end
+          
+          # json.right do
+          #   json.padding options[:padding]
+          #   json.childViews do
+          #     options[:childViews]&.call page.view_builder
+          #   end
+          # end
+        end
+      end
+      
+    end
+  end
+end

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

@@ -75,8 +75,9 @@ class Glib::JsonUi::ViewBuilder
             json.child! do
               json.view 'fields/hidden-v1'
               json.name 'authenticity_token'
+              json.value page.context.form_authenticity_token
               # Produce consistent token for predictible test results
-              json.value Rails.env.test? ? 'test_token' : page.context.form_authenticity_token
+              # json.value Rails.env.test? ? 'test_token' : page.context.form_authenticity_token
             end
           end
 
@@ -140,10 +141,17 @@ class Glib::JsonUi::ViewBuilder
       string :align
     end
 
+    # class Split < View
+    #   views :leftViews
+    #   views :centerViews
+    #   views :rightViews
+    #   string :align
+    # end
+
     class Split < View
-      views :leftViews
-      views :centerViews
-      views :rightViews
+      def content(block)
+        block.call page.split_content_builder
+      end
     end
 
     class Responsive < View

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

@@ -41,34 +41,28 @@ module Glib
 
       ### View definitions
 
-      class H1 < View
+      class AbstractText < View
+        string :textAlign
         string :text
         color :color
       end
 
-      class H2 < View
-        string :text
-        color :color
+      class H1 < AbstractText
       end
 
-      class H3 < View
-        string :text
-        color :color
+      class H2 < AbstractText
       end
 
-      class H4 < View
-        string :text
-        color :color
+      class H3 < AbstractText
       end
 
-      class P < View
-        string :text
-        color :color
+      class H4 < AbstractText
+      end
+
+      class P < AbstractText
       end
       
-      class Label < View
-        string :text
-        color :color
+      class Label < AbstractText
         action :onClick
       end
 

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

@@ -41,10 +41,14 @@ if local_assigns[:top_nav] || json_ui_app_is_web?
       menu.divider
       menu.label text: 'Misc Menu'
       
-      menu.button icon: 'list', text: 'Categories', onClick: ->(action) do
-        action.windows_open url: json_ui_garage_url
+      menu.button icon: 'notifications', text: 'Notifications', onClick: ->(action) do
+        action.windows_open url: json_ui_garage_url(path: 'notifications/index')
       end
   
+      menu.button icon: 'list', text: 'UI Elements', onClick: ->(action) do
+        action.windows_open url: json_ui_garage_url
+      end
+      
       menu.button icon: { name: 'zoom_in', badge: '!' }, text: 'Diagnostics', onClick: ->(action) do
         action.dialogs_alert message: %{
           Bundle ID: #{json_ui_app_bundle_id || '<unknown>'}

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

@@ -5,7 +5,7 @@ json_ui_page json do |page|
 
   page.list sections: [
     ->(section) do
-      section.header padding: { top: 12, bottom: 12, left: 16, right: 16 }, childViews: ->(header) do
+      section.header padding: glib_json_padding_list, childViews: ->(header) do
         header.h3 text: 'Dialogs'
       end
 
@@ -46,7 +46,7 @@ json_ui_page json do |page|
 
       end
     end, ->(section) do
-      section.header padding: { top: 12, bottom: 12, left: 16, right: 16 }, childViews: ->(header) do
+      section.header padding: glib_json_padding_list, childViews: ->(header) do
         header.h3 text: 'Snackbars'
       end
 
@@ -83,7 +83,7 @@ json_ui_page json do |page|
 
       end
     end, ->(section) do
-      section.header padding: { top: 12, bottom: 12, left: 16, right: 16 }, childViews: ->(header) do
+      section.header padding: glib_json_padding_list, childViews: ->(header) do
         header.h3 text: 'Windows'
       end
 
@@ -107,7 +107,7 @@ json_ui_page json do |page|
         end
       end
     end, ->(section) do
-      section.header padding: { top: 12, bottom: 12, left: 16, right: 16 }, childViews: ->(header) do
+      section.header padding: glib_json_padding_list, childViews: ->(header) do
         header.h3 text: 'Reload'
         header.spacer height: 6
         header.label text: 'Reload does not open a new page/screen. Click reload a few times, then click back and notice that it goes back to the page before the reload.'

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

@@ -7,12 +7,25 @@ json_ui_page json do |page|
     form.fields_text name: 'user[name]', width: 'matchParent', label: 'Name'
     form.fields_password name: 'user[password]', width: 'matchParent', label: 'Password'
     
-    form.panels_split width: 'matchParent', leftViews: ->(split) do
-      if params[:mode] == 'dialog'
-        split.button styleClass: 'link', text: 'cancel', onClick: ->(action) { action.dialogs_close }
+    # form.panels_split width: 'matchParent', leftViews: ->(split) do
+    #   if params[:mode] == 'dialog'
+    #     split.button styleClass: 'link', text: 'cancel', onClick: ->(action) { action.dialogs_close }
+    #   end
+    # end, rightViews: ->(split) do
+    #   split.button text: 'Submit', onClick: ->(action) { action.forms_submit }
+    # end
+    
+    form.panels_split width: 'matchParent', content: ->(split) do
+      split.left childViews: ->(left) do
+        if params[:mode] == 'dialog'
+          left.button styleClass: 'link', text: 'cancel', onClick: ->(action) { action.dialogs_close }
+        end
+      end
+      split.right childViews: ->(right) do
+        right.button text: 'Submit', onClick: ->(action) { action.forms_submit }
       end
-    end, rightViews: ->(split) do
-      split.button text: 'Submit', onClick: ->(action) { action.forms_submit }
     end
+    
   end
+  
 end

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

@@ -15,8 +15,14 @@ json_ui_page json do |page|
     form.spacer height: 10
     form.fields_text name: 'user[name]', width: 'matchParent', label: 'Name'
     
-    form.panels_split width: 'matchParent', rightViews: ->(split) do
-      split.button text: 'Submit', onClick: ->(action) { action.forms_submit }
+    # form.panels_split width: 'matchParent', rightViews: ->(split) do
+    #   split.button text: 'Submit', onClick: ->(action) { action.forms_submit }
+    # end
+    
+    form.panels_split width: 'matchParent', content: ->(split) do
+      split.right childViews: ->(right) do
+        right.button text: 'Submit', onClick: ->(action) { action.forms_submit }
+      end
     end
   end
 end

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

@@ -0,0 +1,13 @@
+json.title 'Notifications'
+
+json_ui_page json do |page|
+  render "#{@path_prefix}/nav_menu", json: json, page: page, top_nav: true
+  
+  page.list firstSection: ->(section) do
+    section.rows builder: ->(template) do
+      template.thumbnail title: 'Send Desktop Notification', onClick: ->(action) do
+        # TODO: Send and display desktop notification
+      end
+    end
+  end
+end

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

@@ -44,16 +44,32 @@ json_ui_page json do |page|
       panel.button text: 'Button3'
     end
 
+    # scroll.spacer height: 20
+    # scroll.h2 text: 'Split panel'
+    # scroll.spacer height: 6
+    # scroll.panels_split styleClass: 'card', padding: glib_json_padding_body, width: 'matchParent', leftViews: ->(panel) do
+    #   panel.button text: '1'
+    # end, centerViews: ->(panel) do
+    #   panel.button width: 'matchParent', text: '2'
+    # end, rightViews: ->(panel) do
+    #   panel.button text: '3'
+    # end
+    
     scroll.spacer height: 20
     scroll.h2 text: 'Split panel'
     scroll.spacer height: 6
-    scroll.panels_split styleClass: 'card', padding: glib_json_padding_body, width: 'matchParent', leftViews: ->(panel) do
-      panel.button text: '1'
-    end, centerViews: ->(panel) do
-      panel.button width: 'matchParent', text: '2'
-    end, rightViews: ->(panel) do
-      panel.button text: '3'
+    scroll.panels_split styleClass: 'card', padding: glib_json_padding_body, width: 'matchParent', content: ->(split) do
+      split.left childViews: ->(left) do
+        left.button text: '1'
+      end
+      split.center childViews: ->(center) do
+        center.button width: 'matchParent', text: '2'
+      end
+      split.right childViews: ->(right) do
+        right.button text: '3'
+      end
     end
+    
 
     scroll.spacer height: 20
     scroll.h2 text: 'Responsive panel'

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

@@ -7,6 +7,8 @@ json_ui_page json do |page|
     ->(section) do
       section.header padding: glib_json_padding_list, childViews: ->(header) do
         header.h2 text: 'Layout for child components'
+        header.spacer height: 6
+        header.label text: 'May contain infinite number of child components'
       end
 
       section.rows builder: ->(template) do

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

@@ -5,136 +5,304 @@ json_ui_page json do |page|
   
   page.scroll padding: glib_json_padding_body, childViews: ->(scroll) do
 
-    # TODO: Consider moving towards this
-    # scroll.panels_split width: 'matchParent', builder: ->(builder) do
-    #   builder.left childViews: ->(left) do
-    #     left.button text: '1'
-    #   end
-    #   builder.right childViews: ->(right) do
-    #     right.button text: '2'
-    #   end
-    # end
-
     scroll.h1 text: '2 columns'
-    scroll.panels_split width: 'matchParent', leftViews: ->(panel) do
-      panel.button text: '1'
-    end, rightViews: ->(panel) do
-      panel.button text: '2'
+    scroll.panels_split width: 'matchParent', content: ->(content) do
+      content.left childViews: ->(left) do
+        left.button text: '1'
+      end
+      content.right childViews: ->(right) do
+        right.button text: '2'
+      end
     end
 
     scroll.label text: "\n"
     scroll.h1 text: '3 columns'
-    scroll.panels_split width: 'matchParent', leftViews: ->(panel) do
-      panel.button text: '1'
-    end, centerViews: ->(panel) do
-      panel.button width: 'matchParent', text: '2'
-    end, rightViews: ->(panel) do
-      panel.button text: '3'
+    scroll.panels_split width: 'matchParent', content: ->(content) do
+      content.left childViews: ->(left) do
+        left.button text: '1'
+      end
+      content.center childViews: ->(center) do
+        center.button width: 'matchParent', text: '2'
+      end
+      content.right childViews: ->(right) do
+        right.button text: '3'
+      end
     end
 
     scroll.label text: "\n"
     scroll.h1 text: 'Expandable left'
-    scroll.panels_split width: 'matchParent', centerViews: ->(panel) do
-      panel.button width: 'matchParent', text: '1'
-    end, rightViews: ->(panel) do
-      panel.button text: '2'
+    scroll.panels_split width: 'matchParent', content: ->(content) do
+      content.center childViews: ->(center) do
+        center.button width: 'matchParent', text: '1'
+      end
+      content.right childViews: ->(right) do
+        right.button text: '2'
+      end
     end
 
     scroll.label text: "\n"
     scroll.h1 text: 'Expandable right'
-    scroll.panels_split width: 'matchParent', leftViews: ->(panel) do
-      panel.button text: '1'
-    end, centerViews: ->(panel) do
-      panel.button width: 'matchParent', text: '2'
+    scroll.panels_split width: 'matchParent', content: ->(content) do
+      content.left childViews: ->(left) do
+        left.button text: '1'
+      end
+      content.center childViews: ->(center) do
+        center.button width: 'matchParent', text: '2'
+      end
     end
 
     scroll.label text: "\n"
     scroll.h1 text: 'Short center text'
-    scroll.panels_split width: 'matchParent', leftViews: ->(panel) do
-      panel.button text: '1'
-    end, centerViews: ->(panel) do
-      panel.label text: 'short'
-    end, rightViews: ->(panel) do
-      panel.button text: '2'
+    scroll.panels_split width: 'matchParent', content: ->(content) do
+      content.left childViews: ->(left) do
+        left.button text: '1'
+      end
+      content.center childViews: ->(center) do
+        center.label text: 'short'
+      end
+      content.right childViews: ->(right) do
+        right.button text: '2'
+      end
     end
 
     scroll.label text: "\n"
     scroll.h1 text: 'Long center text'
-    scroll.panels_split width: 'matchParent', leftViews: ->(panel) do
-      panel.button text: '1'
-    end, centerViews: ->(panel) do
-      panel.label text: 'a very very very very very very very very very very very very very very very very very very very very very very very very very very very very long text'
-    end, rightViews: ->(panel) do
-      panel.button text: '2'
+    scroll.panels_split width: 'matchParent', content: ->(content) do
+      content.left childViews: ->(left) do
+        left.button text: '1'
+      end
+      content.center childViews: ->(center) do
+        center.label text: 'a very very very very very very very very very very very very very very very very very very very very very very very very very very very very long text'
+      end
+      content.right childViews: ->(right) do
+        right.button text: '2'
+      end
     end
 
     scroll.label text: "\n"
     scroll.h1 text: 'Few center items'
-    scroll.panels_split width: 'matchParent', leftViews: ->(panel) do
-      panel.button text: 'L'
-    end, centerViews: ->(panel) do
-      panel.panels_horizontal childViews: ->(h) do
-        h.button text: '1'
-        h.button text: '2'
-        h.button text: '3'
-      end
-    end, rightViews: ->(panel) do
-      panel.button text: 'R'
+    scroll.panels_split width: 'matchParent', content: ->(content) do
+      content.left childViews: ->(left) do
+        left.button text: 'L'
+      end
+      content.center childViews: ->(center) do
+        center.panels_horizontal childViews: ->(h) do
+          h.button text: '1'
+          h.button text: '2'
+          h.button text: '3'
+        end
+      end
+      content.right childViews: ->(right) do
+        right.button text: 'R'
+      end
     end
 
     scroll.label text: "\n"
     scroll.h1 text: 'Many center items'
-    scroll.panels_split width: 'matchParent', leftViews: ->(panel) do
-      panel.button text: 'L'
-    end, centerViews: ->(panel) do
-      panel.panels_horizontal childViews: ->(h) do
-        (1..20).each do |index|
-          h.button text: index
+    scroll.panels_split width: 'matchParent', content: ->(content) do
+      content.left childViews: ->(left) do
+        left.button text: 'L'
+      end
+      content.center childViews: ->(center) do
+        center.panels_horizontal childViews: ->(h) do
+          (1..20).each do |index|
+            h.button text: index
+          end
         end
       end
-    end, rightViews: ->(panel) do
-      panel.button text: 'R'
+      content.right childViews: ->(right) do
+        right.button text: 'R'
+      end
     end
 
     scroll.label text: "\n"
     scroll.h1 text: 'Center filled equally'
-    scroll.panels_split width: 'matchParent', leftViews: ->(panel) do
-      panel.button text: 'L'
-    end, centerViews: ->(panel) do
-      panel.panels_horizontal backgroundColor: '#b3bac2', distribution: 'fillEqually', childViews: ->(h) do
-        h.button text: '1'
-        h.button text: '2'
-        h.button text: '3'
-      end
-    end, rightViews: ->(panel) do
-      panel.button text: 'R'
+    scroll.panels_split width: 'matchParent', content: ->(content) do
+      content.left childViews: ->(left) do
+        left.button text: 'L'
+      end
+      content.center childViews: ->(center) do
+        center.panels_horizontal width: 'matchParent', backgroundColor: '#b3bac2', distribution: 'fillEqually', childViews: ->(h) do
+          h.button text: '1'
+          h.button text: '2'
+          h.button text: '3'
+        end
+      end
+      content.right childViews: ->(right) do
+        right.button text: 'R'
+      end
     end
 
     scroll.label text: "\n"
     scroll.h1 text: 'Center spaced equally'
-    scroll.panels_split width: 'matchParent', leftViews: ->(panel) do
-      panel.button text: 'L'
-    end, centerViews: ->(panel) do
-      panel.panels_horizontal backgroundColor: '#b3bac2', distribution: 'spaceEqually', childViews: ->(h) do
-        h.button text: '1'
-        h.button text: '2'
-        h.button text: '3'
-      end
-    end, rightViews: ->(panel) do
-      panel.button text: 'R'
+    scroll.panels_split width: 'matchParent', content: ->(content) do
+      content.left childViews: ->(left) do
+        left.button text: 'L'
+      end
+      content.center childViews: ->(center) do
+        center.panels_horizontal width: 'matchParent', backgroundColor: '#b3bac2', distribution: 'spaceEqually', childViews: ->(h) do
+          h.button text: '1'
+          h.button text: '2'
+          h.button text: '3'
+        end
+      end
+      content.right childViews: ->(right) do
+        right.button text: 'R'
+      end
     end
 
     scroll.label text: "\n"
     scroll.h1 text: 'Combo 1'
-    scroll.panels_split width: 'matchParent', leftViews: ->(panel) do
-      panel.label text: 'a very very very very very very very very very very very very very very very very very very very very very very very very very very very very long text'
-    end, rightViews: ->(panel) do
-      panel.panels_horizontal backgroundColor: '#b3bac2', distribution: 'spaceEqually', childViews: ->(h) do
-        h.label text: 'Label One'
-        h.label text: 'Label Two'
+    scroll.panels_split width: 'matchParent', content: ->(content) do
+      content.left childViews: ->(left) do
+        left.label text: 'a very very very very very very very very very very very very very very very very very very very very very very very very very very very very long text'
+      end
+      content.right childViews: ->(right) do
+        right.panels_horizontal backgroundColor: '#b3bac2', distribution: 'spaceEqually', childViews: ->(h) do
+          h.label text: 'Label One'
+          h.label text: 'Label Two'
+        end
       end
     end
 
+    scroll.label text: "\n"
+    scroll.h1 text: 'Combo 2'
+    scroll.panels_split content: ->(content) do
+      content.left childViews: ->(left) do
+        left.button text: 'Big'
+      end
+      content.right childViews: ->(right) do
+        right.panels_horizontal height: 'matchParent', align: 'middle', childViews: ->(h) do
+          h.spacer width: 10
+          h.button text: 'small', styleClass: 'link'
+        end
+      end
+    end
+
+    
+
+
+
+    # scroll.h1 text: '2 columns'
+    # scroll.panels_split width: 'matchParent', leftViews: ->(panel) do
+    #   panel.button text: '1'
+    # end, rightViews: ->(panel) do
+    #   panel.button text: '2'
+    # end
+
+    # scroll.label text: "\n"
+    # scroll.h1 text: '3 columns'
+    # scroll.panels_split width: 'matchParent', leftViews: ->(panel) do
+    #   panel.button text: '1'
+    # end, centerViews: ->(panel) do
+    #   panel.button width: 'matchParent', text: '2'
+    # end, rightViews: ->(panel) do
+    #   panel.button text: '3'
+    # end
+
+    # scroll.label text: "\n"
+    # scroll.h1 text: 'Expandable left'
+    # scroll.panels_split width: 'matchParent', centerViews: ->(panel) do
+    #   panel.button width: 'matchParent', text: '1'
+    # end, rightViews: ->(panel) do
+    #   panel.button text: '2'
+    # end
+
+    # scroll.label text: "\n"
+    # scroll.h1 text: 'Expandable right'
+    # scroll.panels_split width: 'matchParent', leftViews: ->(panel) do
+    #   panel.button text: '1'
+    # end, centerViews: ->(panel) do
+    #   panel.button width: 'matchParent', text: '2'
+    # end
+
+    # scroll.label text: "\n"
+    # scroll.h1 text: 'Short center text'
+    # scroll.panels_split width: 'matchParent', leftViews: ->(panel) do
+    #   panel.button text: '1'
+    # end, centerViews: ->(panel) do
+    #   panel.label text: 'short'
+    # end, rightViews: ->(panel) do
+    #   panel.button text: '2'
+    # end
+
+    # scroll.label text: "\n"
+    # scroll.h1 text: 'Long center text'
+    # scroll.panels_split width: 'matchParent', leftViews: ->(panel) do
+    #   panel.button text: '1'
+    # end, centerViews: ->(panel) do
+    #   panel.label text: 'a very very very very very very very very very very very very very very very very very very very very very very very very very very very very long text'
+    # end, rightViews: ->(panel) do
+    #   panel.button text: '2'
+    # end
+
+    # scroll.label text: "\n"
+    # scroll.h1 text: 'Few center items'
+    # scroll.panels_split width: 'matchParent', leftViews: ->(panel) do
+    #   panel.button text: 'L'
+    # end, centerViews: ->(panel) do
+    #   panel.panels_horizontal childViews: ->(h) do
+    #     h.button text: '1'
+    #     h.button text: '2'
+    #     h.button text: '3'
+    #   end
+    # end, rightViews: ->(panel) do
+    #   panel.button text: 'R'
+    # end
+
+    # scroll.label text: "\n"
+    # scroll.h1 text: 'Many center items'
+    # scroll.panels_split width: 'matchParent', leftViews: ->(panel) do
+    #   panel.button text: 'L'
+    # end, centerViews: ->(panel) do
+    #   panel.panels_horizontal childViews: ->(h) do
+    #     (1..20).each do |index|
+    #       h.button text: index
+    #     end
+    #   end
+    # end, rightViews: ->(panel) do
+    #   panel.button text: 'R'
+    # end
+
+    # scroll.label text: "\n"
+    # scroll.h1 text: 'Center filled equally'
+    # scroll.panels_split width: 'matchParent', leftViews: ->(panel) do
+    #   panel.button text: 'L'
+    # end, centerViews: ->(panel) do
+    #   panel.panels_horizontal backgroundColor: '#b3bac2', distribution: 'fillEqually', childViews: ->(h) do
+    #     h.button text: '1'
+    #     h.button text: '2'
+    #     h.button text: '3'
+    #   end
+    # end, rightViews: ->(panel) do
+    #   panel.button text: 'R'
+    # end
+
+    # scroll.label text: "\n"
+    # scroll.h1 text: 'Center spaced equally'
+    # scroll.panels_split width: 'matchParent', leftViews: ->(panel) do
+    #   panel.button text: 'L'
+    # end, centerViews: ->(panel) do
+    #   panel.panels_horizontal backgroundColor: '#b3bac2', distribution: 'spaceEqually', childViews: ->(h) do
+    #     h.button text: '1'
+    #     h.button text: '2'
+    #     h.button text: '3'
+    #   end
+    # end, rightViews: ->(panel) do
+    #   panel.button text: 'R'
+    # end
+
+    # scroll.label text: "\n"
+    # scroll.h1 text: 'Combo 1'
+    # scroll.panels_split width: 'matchParent', leftViews: ->(panel) do
+    #   panel.label text: 'a very very very very very very very very very very very very very very very very very very very very very very very very very very very very long text'
+    # end, rightViews: ->(panel) do
+    #   panel.panels_horizontal backgroundColor: '#b3bac2', distribution: 'spaceEqually', childViews: ->(h) do
+    #     h.label text: 'Label One'
+    #     h.label text: 'Label Two'
+    #   end
+    # end
+
   end
 end
 

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

@@ -4,7 +4,7 @@ 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: 'Vertical panel'
+    scroll.h1 text: 'Basic'
     scroll.panels_vertical backgroundColor: '#b3bac2', childViews: ->(panel) do
       panel.button text: 'Button1'
       panel.button text: 'Button2', width: 200
@@ -12,7 +12,7 @@ json_ui_page json do |page|
     end
 
     scroll.label text: "\n"
-    scroll.h1 text: 'Vertical panel with equal filling'
+    scroll.h1 text: 'Equal filling'
     scroll.panels_vertical backgroundColor: '#b3bac2', height: 300, distribution: 'fillEqually', childViews: ->(panel) do
       panel.button text: 'Button1'
       panel.button text: 'Button2'
@@ -20,7 +20,7 @@ json_ui_page json do |page|
     end
 
     scroll.label text: "\n"
-    scroll.h1 text: 'Vertical panel with equal spacing'
+    scroll.h1 text: 'Equal spacing'
     scroll.panels_vertical backgroundColor: '#b3bac2', height: 300, distribution: 'spaceEqually', childViews: ->(panel) do
       panel.button text: 'Button1'
       panel.button text: 'Button2'
@@ -28,7 +28,7 @@ json_ui_page json do |page|
     end
 
     scroll.label text: "\n"
-    scroll.h1 text: 'Vertical panel with alignment'
+    scroll.h1 text: 'Alignments'
     scroll.panels_vertical width: 'matchParent', backgroundColor: '#b3bac2', align: 'center', childViews: ->(panel) do
       panel.button text: 'Center'
     end
@@ -37,7 +37,7 @@ json_ui_page json do |page|
     end
 
     scroll.label text: "\n"
-    scroll.h1 text: 'Vertical panel with spacers'
+    scroll.h1 text: 'Spacers'
     scroll.panels_vertical width: 'matchParent', childViews: ->(panel) do
       panel.button text: '1'
       panel.spacer height: 10

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

@@ -3,30 +3,76 @@ json.title 'Views'
 json_ui_page json do |page|
   render "#{@path_prefix}/nav_menu", json: json, page: page, top_nav: true
   
-  page.list firstSection: ->(section) do
-    section.rows builder: ->(template) do
-      template.thumbnail title: 'Texts', onClick: ->(action) do
-        action.windows_open url: json_ui_garage_url(path: 'views/texts')
+  page.list sections: [ 
+    ->(section) do
+      section.header padding: glib_json_padding_list, childViews: ->(header) do
+        header.h2 text: 'Components'
       end
-      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: 'Misc', onClick: ->(action) do
-        action.windows_open url: json_ui_garage_url(path: 'views/misc')
+
+      section.rows builder: ->(template) do
+        template.thumbnail title: 'Texts', onClick: ->(action) do
+          action.windows_open url: json_ui_garage_url(path: 'views/texts')
+        end
+        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: 'Misc', onClick: ->(action) do
+          action.windows_open url: json_ui_garage_url(path: 'views/misc')
+        end
       end
-      template.thumbnail title: 'Links', onClick: ->(action) do
-        action.windows_open url: json_ui_garage_url(path: 'views/links')
+    end,
+    ->(section) do
+      section.header padding: glib_json_padding_list, childViews: ->(header) do
+        header.h2 text: 'Styling and Formatting'
       end
-      template.thumbnail title: 'Banners', onClick: ->(action) do
-        action.windows_open url: json_ui_garage_url(path: 'views/banners')
+
+      section.rows builder: ->(template) do
+        template.thumbnail title: 'Markdowns', onClick: ->(action) do
+          action.windows_open url: json_ui_garage_url(path: 'views/markdowns')
+        end
+        template.thumbnail title: 'Links', onClick: ->(action) do
+          action.windows_open url: json_ui_garage_url(path: 'views/links')
+        end
       end
     end
+  ]
+
+  # page.list firstSection: ->(section) do
+  #   section.rows builder: ->(template) do
+  #     template.thumbnail title: 'Texts', onClick: ->(action) do
+  #       action.windows_open url: json_ui_garage_url(path: 'views/texts')
+  #     end
+  #     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: 'Misc', onClick: ->(action) do
+  #       action.windows_open url: json_ui_garage_url(path: 'views/misc')
+  #     end
+  #     template.thumbnail title: 'Markdowns', onClick: ->(action) do
+  #       action.windows_open url: json_ui_garage_url(path: 'views/markdowns')
+  #     end
+  #     template.thumbnail title: 'Links', onClick: ->(action) do
+  #       action.windows_open url: json_ui_garage_url(path: 'views/links')
+  #     end
+  #   end
 
-  end
+  # end
 end

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

@@ -0,0 +1,30 @@
+json.title 'Views'
+
+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.spacer height: 20
+    scroll.h2 text: 'Paragraph'
+    scroll.spacer height: 6
+    scroll.p format: 'markdown', text: 
+      '# h1 Heading' + "\n" +
+      '## h2 Heading' + "\n" +
+      '### h3 Heading' + "\n" +
+      '#### h4 Heading' + "\n" +
+      '##### h5 Heading' + "\n" +
+      '###### h6 Heading' + "\n" +
+      "\n" +
+      '## Emphasis' + "\n" +
+      "\n" +
+      '**This is bold text**' + "\n" +
+      "\n" +
+      '__This is bold text__' + "\n" +
+      "\n" +
+      '*This is italic text*' + "\n" +
+      "\n" +
+      '_This is italic text_' + "\n" +
+      "\n" +
+      '~~Strikethrough~~' + "\n"
+  end
+end

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

@@ -37,11 +37,5 @@ json_ui_page json do |page|
     scroll.h2 text: 'Chip'
     scroll.spacer height: 6
     scroll.chip text: 'pending'
-  
-    scroll.spacer height: 20
-    scroll.h2 text: 'Banner'
-    scroll.spacer height: 6
-    scroll.banners_alert icon: 'info', message: 'This is an alert banner'
-  
   end
 end

data/lib/glib/json_crawler/action_crawler.rb

@@ -6,28 +6,11 @@ module Glib
       end
 
       def crawl views
-        if views.is_a? Array
-          views.each do |view|
-            click view
-
-            # Generic view children
-            crawl view['childViews']
-
-            # panels/split
-            crawl view['leftViews']
-            crawl view['rightViews']
-
-            # Table/List
-            if (sections = view['sections']).is_a? Array
-              sections.each do |section|
-                # Table
-                crawl section['rows']
-              end
-            end
-
-          end
+        JsonCrawler::Router::crawl_multiple views, ->(view) do
+          click view
         end
       end
     end
+
   end
 end

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

@@ -0,0 +1,32 @@
+module Glib
+  module JsonCrawler
+    class FormsSubmit < ActionCrawler
+      def initialize http, params, action, form
+        @http = http
+
+        case form['method']
+        when 'patch', 'put'
+          submit_update(form, action)
+        else
+          JsonCrawler::Router.log action, params['url']
+        end
+      end
+      
+      def submit_update(view, action)
+        url = view['url']
+        fields = []
+        params = {}
+        JsonCrawler::Router.crawl_multiple view['childViews'], ->(child) do
+          if child['view'].start_with?('fields/')
+            fields << child
+            params[child['name']] = child['value']
+          end
+        end
+        
+        json = @http.patch url, action, params
+        click(json)
+      end
+
+    end
+  end
+end

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

@@ -6,7 +6,9 @@ module Glib
         json = @http.get args['url'], controller
 
         unless json.nil?
+          crawl json['header']&.[]('childViews')
           crawl json['body']&.[]('childViews')
+          crawl json['footer']&.[]('childViews')
 
           json['rightNavButtons']&.each do |button|
             click button

data/lib/glib/json_crawler/http.rb

@@ -50,21 +50,22 @@ module Glib
               nil
             end
           end
-
-          # response_times << response.headers['X-Runtime'].to_f
-          # @context.assert_includes VALID_RESPONSE_CODES, response.code.to_i, "Expected a valid response but was [#{response.code}] #{Rack::Utils::HTTP_STATUS_CODES[response.code.to_i]}:\n#{url}"
-          # if response.content_type == 'application/json'
-          #   return response, JSON.parse(response.body)
-          # else
-          #   return response, nil
-          # end
         end
+        
       end
 
       def post(url, controller, params)
         fetch(:post, url, controller, params)
       end
 
+      def patch(url, controller, params)
+        fetch(:patch, url, controller, params)
+      end
+
+      def put(url, controller, params)
+        fetch(:put, url, controller, params)
+      end
+
       def delete(url, controller, params = {})
         fetch(:delete, url, controller, {})
       end
@@ -74,7 +75,7 @@ module Glib
           if url.blank? || history.include?(url)
             nil
           else
-            history << url
+            # history << url
             @context.assert_match(URI_REGEXP, url)
 
             http_header = {

data/lib/glib/json_crawler/router.rb

@@ -1,43 +1,99 @@
+
 module Glib
   module JsonCrawler
     class Router
-      cattr_accessor :depth
-      cattr_accessor :logger
-
-      def self.log controller, url, response = nil
+      def self.log action, url, response = nil
         @@logger.puts '  ' * @@depth + [
-          controller,
+          action,
           response.present? ? response.code : nil,
           url
         ].compact.join(' :: ')
       end
+      
+      def self.set_up(logger)
+        @@depth = -1
+        @@logger = logger
+        @@forms = []
+      end
 
       def self.step(http, args)
         if args.is_a?(Hash) && args['rel'] != 'nofollow'
           if (onClick = (args.fetch('onClick', nil) || args.fetch('onResponse', nil)))
-            controller = onClick['action']
+            action = onClick['action']
             params = onClick
           end
 
-          if controller.present?
+          if action.present?
             @@depth += 1
-            child = case controller
+            child = case action
             when 'initiate_navigation'
-              JsonCrawler::NavInitiate.new(http, params, controller)
-            when 'windows/open-v1'
-              JsonCrawler::WindowsOpen.new(http, params, controller)
+              JsonCrawler::NavInitiate.new(http, params, action)
+            when 'windows/open-v1', 'dialogs/open-v1'
+              JsonCrawler::WindowsOpen.new(http, params, action)
             when 'http/delete-v1'
-              JsonCrawler::ActionHttp.new(:delete, http, params, controller)
+              JsonCrawler::ActionHttp.new(:delete, http, params, action)
             when 'http/post-v1'
-              JsonCrawler::ActionHttp.new(:post, http, params, controller)
+              JsonCrawler::ActionHttp.new(:post, http, params, action)
+            when 'forms/submit-v1'
+              raise 'Submit action needs to be inside a form' if @@forms.size < 1
+              JsonCrawler::FormsSubmit.new(http, params, action, @@forms.last)
             else
-              self.log controller, params['url']
+              self.log action, params['url']
             end
             @@depth -= 1
             return child
           end
         end
       end
+
+      def self.tear_down
+        @@logger.close
+      end
+        
+      def self.crawl_multiple views, block
+        if views.is_a? Array
+          views.each do |view|
+            case view['view']
+            when 'panels/form-v1'
+              @@forms << view
+              crawl_single view, block
+              @@forms.pop
+            else
+              crawl_single view, block
+            end
+          end
+        end
+      end
+
+      def self.crawl_vertical_content view, block
+        crawl_multiple view['childViews'], block if view
+      end
+
+      def self.crawl_single view, block
+        block.call view
+
+        # Generic view children
+        crawl_multiple view['childViews'], block
+
+        # panels/split
+        # crawl_multiple view['leftViews'], block
+        # crawl_multiple view['rightViews'], block
+        
+        # Split panel
+        crawl_vertical_content view['left'], block
+        crawl_vertical_content view['center'], block
+        crawl_vertical_content view['right'], block
+
+        # TODO: crawl header and footer
+        # Table/List
+        if (sections = view['sections']).is_a? Array
+          sections.each do |section|
+            # Table
+            crawl_multiple section['rows'], block
+          end
+        end
+      end
+
     end
   end
-end
+end

data/lib/glib/json_crawler.rb

@@ -4,4 +4,5 @@ require_relative './json_crawler/action_crawler'
 
 require_relative './json_crawler/action_crawlers/nav_initiate'
 require_relative './json_crawler/action_crawlers/windows_open'
-require_relative './json_crawler/action_crawlers/action_http'
+require_relative './json_crawler/action_crawlers/action_http'
+require_relative './json_crawler/action_crawlers/forms_submit'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: glib-web
 version: !ruby/object:Gem::Version
-  version: 0.3.3
+  version: 0.3.4
 platform: ruby
 authors:
 - ''
@@ -41,6 +41,7 @@ files:
 - app/helpers/glib/json_ui/menu_builder.rb
 - app/helpers/glib/json_ui/page_helper.rb
 - app/helpers/glib/json_ui/response_helper.rb
+- app/helpers/glib/json_ui/split_builders.rb
 - app/helpers/glib/json_ui/styling_helper.rb
 - app/helpers/glib/json_ui/table_builders.rb
 - app/helpers/glib/json_ui/view_builder.rb
@@ -77,6 +78,7 @@ files:
 - app/views/json_ui/garage/lists/index.json.jbuilder
 - app/views/json_ui/garage/lists/infinite_scroll.json.jbuilder
 - app/views/json_ui/garage/lists/templating.json.jbuilder
+- app/views/json_ui/garage/notifications/index.json.jbuilder
 - app/views/json_ui/garage/pages/flat_centered.json.jbuilder
 - app/views/json_ui/garage/pages/full_width.json.jbuilder
 - app/views/json_ui/garage/pages/full_width_height.json.jbuilder
@@ -105,6 +107,7 @@ files:
 - app/views/json_ui/garage/views/index.json.jbuilder
 - app/views/json_ui/garage/views/links.json.jbuilder
 - app/views/json_ui/garage/views/map_data.json.jbuilder
+- app/views/json_ui/garage/views/markdowns.json.jbuilder
 - app/views/json_ui/garage/views/misc.json.jbuilder
 - app/views/json_ui/garage/views/texts.json.jbuilder
 - config/routes.rb
@@ -113,6 +116,7 @@ files:
 - lib/glib/json_crawler.rb
 - lib/glib/json_crawler/action_crawler.rb
 - lib/glib/json_crawler/action_crawlers/action_http.rb
+- lib/glib/json_crawler/action_crawlers/forms_submit.rb
 - lib/glib/json_crawler/action_crawlers/nav_initiate.rb
 - lib/glib/json_crawler/action_crawlers/windows_open.rb
 - lib/glib/json_crawler/http.rb