glib-web 0.5.9 → 0.5.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8cb6ba9cc8312e05a50ed1179f7690b3dd985410
-  data.tar.gz: b896cd852f0f42fa7e5a198ff6d3a49f5fca037e
+  metadata.gz: 9c409da37352d6e9066f4b7895d76c3cba5e81f2
+  data.tar.gz: 7116d6e9e13cc00d98811010acb550749acdcbba
 SHA512:
-  metadata.gz: b151098400b68a0eea5271b0d513be08a527fb091668d25769375215d6975d2c71f10268d2303125c156fdba610cf8d6a965b6ec8eb9d3c18a61c32f5fc528f6
-  data.tar.gz: 030e32c03a9d1b4ad9b4141406d367b60de018b6ce7738eab0080ef5327a9b2958b363d84a182663bcaae9df4fa4b8b66554af4cbcc61a738cebc1d7511be292
+  metadata.gz: 5ce3e630395c565eb252a653db28eb026388100082105109d4f2a380f19bab6d0465bd5d04ff65ff0da4c729c4273a08d800c2e8db614678767349ef279a8422
+  data.tar.gz: cb22a75b02ed382066e4d6060026600093cd543032c0d9c0679f64628750068a8ffa3dca4070995907040db5871b75ae171a4a5172ec445aa4e762357bd73235

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/views/json_ui/garage/tables/autoload_as_needed.json.jbuilder

@@ -5,35 +5,33 @@ next_page = {
   autoload: 'asNeeded'
 }
 
+page = json_ui_page json
 column_indexes = (1..3)
+
 if params[:section_only].present?
   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.11
 platform: ruby
 authors:
 - ''
@@ -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