glib-web 0.5.4 → 0.5.11

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

@@ -7,3 +7,5 @@ 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/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/menu.rb

@@ -0,0 +1,12 @@
+module Glib
+  module JsonCrawler
+    class Menu < ActionCrawler
+      def initialize(http, args, action)
+        super(http)
+
+        @http.router.log action, nil
+        crawl args['buttons']
+      end
+    end
+  end
+end

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

@@ -3,12 +3,14 @@ module Glib
     class NavInitiate < ActionCrawler
       def initialize(http, args, action)
         super(http)
-        
+
         @http = http
         if (json = (@http.get args['url'], action, args.except('url'))) && (left_drawer = json['leftDrawer'])
           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/http.rb

@@ -8,8 +8,8 @@ module Glib
       VALID_RESPONSE_CODES = [
         (200..299).to_a,
         ## Note, the JSON API does not allow redirects
-        401, ## UNAUTHORIZED Should be used for not-logged-in
-        403, ## FORBIDDEN Should be used for logged-in but not allowed to access
+        # 401, ## UNAUTHORIZED Should be used for not-logged-in
+        # 403, ## FORBIDDEN Should be used for logged-in but not allowed to access
       ].flatten
 
       def initialize(context, user, router)
@@ -105,6 +105,7 @@ module Glib
               get redirect_uri.to_s, action, params
             else
               response_times << response.headers['X-Runtime'].to_f
+
               @context.assert_includes VALID_RESPONSE_CODES, code, "Expected a valid response but was [#{response.code}] #{Rack::Utils::HTTP_STATUS_CODES[response.code.to_i]}:\n#{url}"
               if response.media_type == 'application/json'
                 JSON.parse(response.body)

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,39 +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
-            # child = 
-            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 '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.4
+  version: 0.5.11
 platform: ruby
 authors:
 - ''
@@ -73,6 +73,7 @@ files:
 - app/controllers/concerns/glib/json/ui.rb
 - app/controllers/concerns/glib/json/validation.rb
 - app/controllers/glib/home_controller.rb
+- app/helpers/glib/app_feature_support_helper.rb
 - app/helpers/glib/dynamic_images_helper.rb
 - app/helpers/glib/dynamic_texts_helper.rb
 - app/helpers/glib/forms_helper.rb
@@ -97,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
@@ -156,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
@@ -173,6 +176,7 @@ files:
 - app/views/json_ui/garage/services/index.json.jbuilder
 - app/views/json_ui/garage/tables/_autoload_section.json.jbuilder
 - app/views/json_ui/garage/tables/autoload_all.json.jbuilder
+- app/views/json_ui/garage/tables/autoload_as_needed.json.jbuilder
 - app/views/json_ui/garage/tables/export_import.json.jbuilder
 - app/views/json_ui/garage/tables/horizontal_scroll.json.jbuilder
 - app/views/json_ui/garage/tables/index.json.jbuilder
@@ -180,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
@@ -208,7 +212,9 @@ files:
 - 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/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