glib-web 0.4.60 → 0.4.61

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7e115e3000243622421f51568643954470a02eb1
-  data.tar.gz: cf697c88ba64ac3ce3731fbdb49a69f993d87f9e
+  metadata.gz: 187ee3620edc45227fa9735cf7fa76dcc3222e2f
+  data.tar.gz: 8186ad4c2983ff890edf11ec300be961d9c8687a
 SHA512:
-  metadata.gz: 738eaed2dd23bb59903ed80a1e1c05cc06d95928a9e68ae8a24ee6137739d5d181fb40076aa1d60a3a766546d987da50271076f499d28a67ab7d2437b1f620d0
-  data.tar.gz: 98be8ec4b19300946473005aa238bec89e1c02b0146ea0ecafb29b2dd32faf5719112562db95055813f8804da2cf893622182a10d9057ec67bde33ee8db8c54a
+  metadata.gz: 99ad724fbafa89f6401c08477abe1d64f3d0b0fd3c8732fa84efcef6fd24eac5a4f6e411f914b65666e25c423560d1a3dafba4ab59ffd11ab0ccf20fe020292f
+  data.tar.gz: 881746e07bfea3b4d200fbbed451bb6ffa8dcec1f3d530318417cf9859a9e87f2bc681f1cd7a3ee6d6fa1e461f87204f7bd2d32c2844ebe429776fdb464f751a

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

@@ -1,11 +1,11 @@
 module Glib
   module JsonCrawler
     class NavInitiate < ActionCrawler
-      def initialize(http, args, controller)
+      def initialize(http, args, action)
         super(http)
-        
+
         @http = http
-        if (json = @http.get args['url'], controller) && (left_drawer = json['leftDrawer'])
+        if (json = @http.get args['url'], action) && (left_drawer = json['leftDrawer'])
           crawl left_drawer['header']&.[]('childViews')
           crawl left_drawer['rows']
         end

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

@@ -1,10 +1,10 @@
 module Glib
   module JsonCrawler
     class WindowsOpen < ActionCrawler
-      def initialize http, args, controller
+      def initialize(http, args, action)
         @http = http
         if (url = args['url'])
-          json = @http.get url, controller
+          json = @http.get url, action
 
           unless json.nil?
             crawl json['header']&.[]('childViews')

data/lib/glib/json_crawler/http.rb

@@ -1,4 +1,3 @@
-
 module Glib
   module JsonCrawler
     class Http
@@ -21,30 +20,26 @@ module Glib
         @router = router
       end
 
-      def get(url, controller)
-        fetch(:get, url, controller)
+      def get(url, action, inspect_result = true)
+        fetch(:get, url, action, {}, inspect_result)
       end
 
-      def post(url, controller, params)
-        fetch(:post, url, controller, params)
+      def post(url, action, params)
+        fetch(:post, url, action, params)
       end
 
-      def patch(url, controller, params)
-        fetch(:patch, url, controller, params)
+      def patch(url, action, params)
+        fetch(:patch, url, action, params)
       end
 
-      def put(url, controller, params)
-        fetch(:put, url, controller, params)
+      def put(url, action, params)
+        fetch(:put, url, action, params)
       end
 
-      def delete(url, controller, params = {})
-        fetch(:delete, url, controller, {})
+      def delete(url, action, params = {})
+        fetch(:delete, url, action, {})
       end
 
-      # def log(controller, url, response)
-      #   @router.log(controller, url, response)
-      # end
-
       def controller
         @context.integration_session.controller
       end
@@ -54,7 +49,7 @@ module Glib
       end
 
       private
-        def fetch(method, url, controller, params = {})
+        def fetch(method, url, action, params = {}, inspect_result = true)
           return nil if url.blank?
 
           if method == :get
@@ -82,19 +77,21 @@ module Glib
             raise
           end
           response = @context.response
-          @router.log(controller, url, response)
-
-          if (code = response.code.to_i) == 302
-            redirect_uri = URI(response.headers['Location'])
-            redirect_uri.query = [redirect_uri.query, 'format=json'].compact.join('&')
-            get redirect_uri.to_s, controller
-          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)
+          @router.log(action, url, response)
+
+          if inspect_result
+            if (code = response.code.to_i) == 302
+              redirect_uri = URI(response.headers['Location'])
+              redirect_uri.query = [redirect_uri.query, 'format=json'].compact.join('&')
+              get redirect_uri.to_s, action
             else
-              nil
+              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)
+              else
+                nil
+              end
             end
           end
         end

data/lib/glib/json_crawler/router.rb

@@ -1,84 +1,85 @@
-
-module Glib
-  module JsonCrawler
-    class Router
-      # @@crawler_actions = Set.new
-      # @@store_action = false
-
-      # def self.crawler_actions
-      #   @@crawler_actions
-      # end
-
-      def log(action, url, response = nil)
-        @logger.puts '  ' * @depth + [
-          action,
-          response.present? ? response.code : nil,
-          url
-        ].compact.join(' :: ')
-      end
-
-      def initialize(logger, store_action)
-        # @@depth = -1
-        # @@logger = logger
-        # @@visitor = Glib::Json::Traversal::Visitor.new
-        # @@store_action = store_action
-
-        @depth = -1
-        @logger = logger
-        @visitor = Glib::Json::Traversal::Visitor.new
-        @store_action = store_action
-      end
-
-      def step(http, args)
-        if (controller = http.controller)
-          Glib::JsonCrawler::Coverage.coverage_files.add(http.controller.class.instance_method(http.action_name).source_location.first)
-        end
-
-        if args.is_a?(Hash) && args['rel'] != 'nofollow'
-          if (onClick = (args.fetch('onClick', nil) || args.fetch('onResponse', nil)))
-            action = onClick['action']
-            params = onClick
-          end
-
-          if action.present?
-            @depth += 1
-            child = case action
-            when 'initiate_navigation'
-              # @@crawler_actions.add([action, params['url']]) if @@store_action
-              JsonCrawler::NavInitiate.new(http, params, action)
-            when 'windows/open-v1', 'dialogs/open-v1', 'windows/reload-v1'
-              unless action == 'dialogs/open-v1'
-                # @@crawler_actions.add([action, params['url']]) if @@store_action
-              end
-              JsonCrawler::WindowsOpen.new(http, params, action)
-            # when 'http/delete-v1'
-            #   JsonCrawler::ActionHttp.new(:delete, http, params, action)
-            when 'http/post-v1'
-              JsonCrawler::ActionHttp.new(:post, http, params, action)
-            when 'forms/submit-v1'
-              forms = @visitor.forms
-              raise 'Submit action needs to be inside a form' if forms.size < 1
-              JsonCrawler::FormsSubmit.new(http, params, action, forms.last)
-            else
-              unless ['http/delete-v1', 'dialogs/oauth-v1', 'windows/openWeb-v1'].include?(action)
-                # @@crawler_actions.add([action, params['url']]) if @@store_action
-              end
-              self.log action, params['url']
-            end
-            @depth -= 1
-            child
-          end
-        end
-      end
-
-      def tear_down
-        @logger.close
-      end
-
-      def crawl_multiple(views, block)
-        @visitor.traverse_multiple views, block
-      end
-
-    end
-  end
-end
+module Glib
+  module JsonCrawler
+    class Router
+      attr_reader :read_only_actions
+
+      def log(action, url, response = nil)
+        @logger.puts '  ' * @depth + [
+          action,
+          response.present? ? response.code : nil,
+          url
+        ].compact.join(' :: ')
+      end
+
+      def initialize(logger)
+        @depth = -1
+        @logger = logger
+        @visitor = Glib::Json::Traversal::Visitor.new
+
+        # @store_action = store_action
+
+        @read_only_actions = Set.new
+      end
+
+      def step(http, args)
+        if (controller = http.controller)
+          Glib::JsonCrawler::Coverage.coverage_files.add(controller.class.instance_method(http.action_name).source_location.first)
+        end
+
+        if args.is_a?(Hash) && args['rel'] != 'nofollow'
+          if (onClick = (args.fetch('onClick', nil) || args.fetch('onResponse', nil)))
+            action = onClick['action']
+            params = onClick
+          end
+
+          if action.present?
+            @depth += 1
+            child = case action
+            when 'initiate_navigation'
+              # @@crawler_actions.add([action, params['url']]) if @@store_action
+              @read_only_actions.add([action, params['url']])
+              JsonCrawler::NavInitiate.new(http, params, action)
+            when 'windows/open-v1', 'dialogs/open-v1', 'windows/reload-v1'
+              # TODO: Shouldn't dialog be crawled as well?
+              unless action == 'dialogs/open-v1'
+                # @@crawler_actions.add([action, params['url']]) if @@store_action
+                @read_only_actions.add([action, params['url']])
+              end
+              JsonCrawler::WindowsOpen.new(http, params, action)
+            when 'http/post-v1'
+              JsonCrawler::ActionHttp.new(:post, http, params, action)
+            when 'forms/submit-v1'
+              forms = @visitor.forms
+              raise 'Submit action needs to be inside a form' if forms.size < 1
+              JsonCrawler::FormsSubmit.new(http, params, action, forms.last)
+            else
+              unless ['http/delete-v1', 'dialogs/oauth-v1', 'windows/openWeb-v1'].include?(action)
+                # @@crawler_actions.add([action, params['url']]) if @@store_action
+                @read_only_actions.add([action, params['url']])
+              end
+              self.log action, params['url']
+            end
+            @depth -= 1
+            child
+          end
+        end
+      end
+
+      def follow(http, target_router)
+        @depth += 1
+        target_router.read_only_actions.each do |crawler_action|
+          action, url = crawler_action
+          http.get url, action, false
+        end
+      end
+
+      def tear_down
+        @logger.close
+      end
+
+      def crawl_multiple(views, block)
+        @visitor.traverse_multiple views, block
+      end
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: glib-web
 version: !ruby/object:Gem::Version
-  version: 0.4.60
+  version: 0.4.61
 platform: ruby
 authors:
 - ''