glib-web 0.5.9 → 0.5.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8cb6ba9cc8312e05a50ed1179f7690b3dd985410
-  data.tar.gz: b896cd852f0f42fa7e5a198ff6d3a49f5fca037e
+  metadata.gz: 1fa8b104b9be3155b11356fdadff6265d8320dca
+  data.tar.gz: 7e4a6dbccc939a2b3438d5699f550173d3292c0e
 SHA512:
-  metadata.gz: b151098400b68a0eea5271b0d513be08a527fb091668d25769375215d6975d2c71f10268d2303125c156fdba610cf8d6a965b6ec8eb9d3c18a61c32f5fc528f6
-  data.tar.gz: 030e32c03a9d1b4ad9b4141406d367b60de018b6ce7738eab0080ef5327a9b2958b363d84a182663bcaae9df4fa4b8b66554af4cbcc61a738cebc1d7511be292
+  metadata.gz: 66f64b2d23d1c8fca7a66d6517c938c010ae49d7314dfb712d164d39cb6b276be8a769a54e5f8db0186ee10591f0d83a2d56e1d048c7804ba71a1ca36d0f95ea
+  data.tar.gz: 5b4d4d505cdf52861a1bfe3102eb34d2697005d6259b84065f63258b73b1fb2153cbed5062aa495a6d1aedd02cea7e472aed4368e394c4e93759e8a5fac24a5e

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

@@ -76,8 +76,9 @@ module Glib::Json::Traversal
       # Table/List
       if (sections = view['sections']).is_a? Array
         sections.each do |section|
-          # Table
+          traverse_vertical_content section['header'], block
           traverse_multiple section['rows'], block
+          traverse_vertical_content section['footer'], block
         end
       end
     end

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

@@ -31,8 +31,8 @@ module Glib::Json::Ui
     @__json_ui_activated
   end
 
-  def json_ui_lifecycle_prop(name)
-    if (hash = json_transformation_start).is_a?(Hash)
+  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

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

@@ -66,6 +66,9 @@ module Glib
           string :token
           action :onSave
         end
+
+        class Restart < Action
+        end
       end
 
       module Analytics

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

@@ -7,7 +7,11 @@ module Glib
         end
 
         class AbstractTemplate < JsonUiElement
-          # hash :padding
+          # def contextButtons(block)
+          #   json.contextButtons do
+          #     block.call page.menu_builder
+          #   end
+          # end
 
           def editButtons(block)
             json.editButtons do
@@ -22,12 +26,13 @@ module Glib
           end
         end
 
-        class Thumbnail < AbstractTemplate
+        class Standard < AbstractTemplate
           string :title
           string :subtitle
           string :subsubtitle
           string :imageUrl
           action :onClick
+          action :onLongPress
           icon :icon
           bool :avatar
 
@@ -36,10 +41,19 @@ module Glib
           # views :accessoryViews
         end
 
-        class Featured < Thumbnail
+        class Featured < Standard
         end
 
-        class Custom < Thumbnail
+        class Thumbnail < Standard
+        end
+
+        class CommentOutgoing < Standard
+        end
+
+        class CommentIncoming < Standard
+        end
+
+        class Custom < Standard
           string :template
 
           # TODO: Experimental

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

@@ -12,7 +12,6 @@ section.rows builder: ->(template) do
       menu.button text: 'Option2', onClick: ->(subaction) do
         subaction.dialogs_alert message: 'Option 2'
       end
-      menu.button text: 'Cancel'
     end
   end
 

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

@@ -0,0 +1,112 @@
+json.title 'Lists'
+
+liked = params[:liked] == 'true'
+
+json_ui_page json do |page|
+  render "#{@path_prefix}/nav_menu", json: json, page: page
+
+  page.list firstSection: ->(section) do
+    section.header padding: { top: 12, left: 16, right: 16, bottom: 12 }, childViews: ->(header) do
+      header.h3 text: 'Chat with John Doe'
+    end
+
+    section.rows builder: ->(template) do
+      # template.thumbnail title: "windows/reload (timestamp: #{DateTime.current.to_i}) -- #{liked}", onClick: ->(action) do
+      #   action.windows_reload
+      # end, onLongPress: ->(action) do
+      #   action.sheets_select message: "Context Menu (#{DateTime.current.to_i})", buttons: ->(menu) do
+      #     if liked
+      #       menu.button text: 'Cancel 👍', onClick: ->(subaction) do
+      #         subaction.windows_reload url: json_ui_garage_url(path: 'lists/chat', liked: false)
+      #       end
+      #     else
+      #       menu.button text: 'Give 👍', onClick: ->(subaction) do
+      #         subaction.windows_reload url: json_ui_garage_url(path: 'lists/chat', liked: true)
+      #       end
+      #     end
+      #   end
+      # end
+
+      template.commentOutgoing subtitle: 'Hey!', subsubtitle: l(10.minutes.ago, format: :short), imageUrl: glib_json_image_standard_url, chips: ->(menu) do
+        menu.button text: '😊 2', styleClass: 'info'
+      end
+
+      template.commentOutgoing subtitle: 'How are you?', subsubtitle: l(DateTime.current, format: :short)
+
+      template.commentIncoming title: 'John Doe', subtitle: 'Very well', subsubtitle: l(7.minutes.ago, format: :short), imageUrl: glib_json_image_standard_url, chips: ->(menu) do
+        menu.button text: "👍 #{liked ? 2 : 1}"
+      end, onLongPress: ->(action) do
+        action.sheets_select message: 'Context Menu', buttons: ->(menu) do
+          if liked
+            menu.button text: 'Cancel 👍', onClick: ->(subaction) do
+              subaction.windows_reload url: json_ui_garage_url(path: 'lists/chat', liked: false)
+            end
+          else
+            menu.button text: 'Give 👍', onClick: ->(subaction) do
+              subaction.windows_reload url: json_ui_garage_url(path: 'lists/chat', liked: true)
+            end
+          end
+        end
+      end
+    end
+
+    section.footer padding: { top: 12, left: 16, right: 16, bottom: 12 }, childViews: ->(footer) do
+      # footer.
+
+      # 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
+      #   }
+      # })
+
+      # page.form 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 "links"
+      #   json.event "new_link"
+      #   json.payload({
+      #     "club_id": "2",
+      #     "room_id": "30",
+      #     "user_id": "2"
+      #       #  title: "TITLE",
+      #       #  url: "URL"
+      #   })
+
+      # end, childViews: ->(form) do
+      #   form.spacer height: 14
+      #   form.label text: "Message: #{params[:message]}"
+      #   form.spacer height: 14
+
+      #   form.fields_text name: 'message[body]', width: 'matchParent', label: 'Message'
+
+      #   # 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
+      #     # 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
+
+    end
+  end
+end

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

@@ -2,7 +2,7 @@ json.title 'Lists'
 
 json_ui_page json do |page|
   render "#{@path_prefix}/nav_menu", json: json, page: page
-  
+
   page.list firstSection: ->(section) do
     section.rows builder: ->(template) do
       template.thumbnail title: 'Click menu (web) or swipe left (Android/iOS)', editButtons: ->(menu) do
@@ -13,6 +13,30 @@ json_ui_page json do |page|
           action.dialogs_alert message: 'Perform action'
         end
       end
+
+      template.thumbnail title: 'Long press to get an alert', onLongPress: ->(action) do
+        action.dialogs_alert message: 'This is an alert'
+      end
+
+      template.thumbnail title: 'Long press to see menu', onLongPress: ->(action) do
+        action.sheets_select message: 'Context Menu', buttons: ->(menu) do
+          menu.button icon: 'edit', text: 'Edit', onClick: ->(subaction) do
+            subaction.dialogs_alert message: 'Perform action'
+          end
+          menu.button icon: 'delete', text: 'Delete', onClick: ->(subaction) do
+            subaction.dialogs_alert message: 'Perform action'
+          end
+        end
+      end
+
+      # template.thumbnail title: 'Long press to see menu', contextButtons: ->(menu) do
+      #   menu.button text: 'Edit', onClick: ->(action) do
+      #     action.dialogs_alert message: 'Perform action'
+      #   end
+      #   menu.button text: 'Delete', onClick: ->(action) do
+      #     action.dialogs_alert message: 'Perform action'
+      #   end
+      # end
     end
 
   end

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

@@ -17,6 +17,9 @@ json_ui_page json do |page|
       template.thumbnail title: 'FAB (Floating Action Button)', onClick: ->(action) do
         action.windows_open url: json_ui_garage_url(path: 'lists/fab')
       end
+      template.thumbnail title: 'Chat Prototype', onClick: ->(action) do
+        action.windows_open url: json_ui_garage_url(path: 'lists/chat')
+      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/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

@@ -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
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: glib-web
 version: !ruby/object:Gem::Version
-  version: 0.5.9
+  version: 0.5.15
 platform: ruby
 authors:
 - ''
@@ -107,7 +107,6 @@ files:
 - app/validators/email_typo_validator.rb
 - app/validators/email_validator.rb
 - app/validators/url_validator.rb
-- app/views/app/views/json_ui/vue/renderer.html.erb
 - app/views/json_ui/garage/_nav_menu.json.jbuilder
 - app/views/json_ui/garage/actions/_dialogs.json.jbuilder
 - app/views/json_ui/garage/actions/_http.json.jbuilder
@@ -144,6 +143,7 @@ files:
 - app/views/json_ui/garage/home/index.json.jbuilder
 - app/views/json_ui/garage/home/slow.json.jbuilder
 - app/views/json_ui/garage/lists/_infinite_scroll_section.json.jbuilder
+- app/views/json_ui/garage/lists/chat.json.jbuilder
 - app/views/json_ui/garage/lists/edit_actions.json.jbuilder
 - app/views/json_ui/garage/lists/fab.json.jbuilder
 - app/views/json_ui/garage/lists/index.json.jbuilder
@@ -214,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/app/views/json_ui/vue/renderer.html.erb

@@ -1,35 +0,0 @@
-<!-- Deprecated. Use layouts instead
-<!DOCTYPE html>
-<html>
-
-<head>
-  <meta charset="utf-8" />
-  <meta content="width=device-width, initial-scale=1, shrink-to-fit=no" name="viewport" />
-  
-  <title>App</title>
-  <%= csrf_meta_tags %>
-  
-  <%= javascript_pack_tag 'vue_renderer', defer: true %>
-  <%#= javascript_include_tag 'vue_renderer_extras', defer: true %>
-
-  <%= stylesheet_pack_tag 'vue_renderer' %>
-  <% if (custom_css_path = options[:custom_css_path]) %>
-    <%= stylesheet_link_tag custom_css_path, media: 'all' %>
-  <% end %>
-
-  <link href="https://fonts.googleapis.com/css?family=Material+Icons" rel="stylesheet" />
-</head>
-
-<body>
-  <noscript>Please enable JavaScript to view this web site.</noscript>
-  <div id="app"></div>
-  
-  <script>
-    var __page = <%= raw @__json_ui_orig_page%>;
-  </script>
-
-  <% locals[:footer_block]&.call %>
-</body>
-
-</html>
--->