glib-web 4.34.1 → 4.34.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a897a2657114bf12b52da917ad8857e4b7e1070bc99eefe7e4cc49c519508bdb
-  data.tar.gz: 2bf662a93d9a308f5eec89dc7d3562b4ddc7462886f0ec0a239bd64dd81c75d0
+  metadata.gz: fb968a7bdcca5cd93fba46a281cbd210464b6bd5be04372769f7b5952e7cfcf8
+  data.tar.gz: 63a29dfa8bcf152baaf619811c303955a2e092d872633fc62ed7e931cfecd8b9
 SHA512:
-  metadata.gz: c8a8915e195ed0e6e5f9e39789fdb886887cdb264e7fbc873f3833906be02b44308ca9a7488a9ad30170720ab0e9761ef46dbdf7e230edaac81f3da764c5fe63
-  data.tar.gz: 4e8d8a377ccf28259fcde1ce4d265cddf4d67096a391e96aabecd48a77742d1ace91775b322614879a355fb1b2d0728144461eb3ff4677983a4013d4bd20bf76
+  metadata.gz: 28c433305962fc28761eea800c4cf6d278bbcb73dd3a644fd041d651519005cd1febd6b099e5d9e08d64c35cc1fe36fbe83f0c4477cb1785f937000203e5a258
+  data.tar.gz: 6f75947877922db21c797a56dfcbc665baed3bc6e028a0a696e58b5d9d56e52e4de05faa8ce2432ce558b6e00a5134e9c38f8244a0c8f49271920709da8fa8f2

data/lib/glib/json_crawler/http.rb

@@ -11,33 +11,34 @@ module Glib
         403, ## FORBIDDEN Should be used for logged-in but not allowed to access
       ].flatten
 
-      def initialize(context, user, router)
+      def initialize(context, user, router, inspect_result: true)
         @context = context
         @history = []
         @content_history = []
         @response_times = []
         @user = user
         @router = router
+        @inspect_result = inspect_result
       end
 
-      def get(url, action, params = {}, inspect_result = true)
-        fetch(:get, url, action, params, inspect_result)
+      def get(url, action, params = {})
+        fetch(:get, url, action, params, @inspect_result)
       end
 
-      def post(url, action, params, inspect_result = true)
-        fetch(:post, url, action, params)
+      def post(url, action, params)
+        fetch(:post, url, action, params, @inspect_result)
       end
 
-      def patch(url, action, params, inspect_result = true)
-        fetch(:patch, url, action, params)
+      def patch(url, action, params)
+        fetch(:patch, url, action, params, @inspect_result)
       end
 
-      def put(url, action, params, inspect_result = true)
-        fetch(:put, url, action, params)
+      def put(url, action, params)
+        fetch(:put, url, action, params, @inspect_result)
       end
 
-      def delete(url, action, params = {}, inspect_result = true)
-        fetch(:delete, url, action, {})
+      def delete(url, action, params = {})
+        fetch(:delete, url, action, {}, @inspect_result)
       end
 
       private

data/lib/glib/json_crawler/router.rb

@@ -137,22 +137,22 @@ module Glib
       end
 
       # deprecated
-      def follow(http, target_routers)
-        if !target_routers.is_a?(Array)
-          target_routers = [target_routers]
-        end
-
-        target_actions = Set.new
-        target_routers.each do |router|
-          target_actions += router.read_only_actions
-        end
-
-        @depth += 1
-        target_actions.each do |crawler_action|
-          action, url = crawler_action
-          http.get(url, action, {}, false)
-        end
-      end
+      # def follow(http, target_routers)
+      #   if !target_routers.is_a?(Array)
+      #     target_routers = [target_routers]
+      #   end
+
+      #   target_actions = Set.new
+      #   target_routers.each do |router|
+      #     target_actions += router.read_only_actions
+      #   end
+
+      #   @depth += 1
+      #   target_actions.each do |crawler_action|
+      #     action, url = crawler_action
+      #     http.get(url, action, {})
+      #   end
+      # end
 
       def follow_v2(http, crawler_actions)
         @depth += 1
@@ -164,15 +164,15 @@ module Glib
 
           case action.to_s.downcase
           when 'http/post-v1', 'forms/post'
-            http.post(url, action, params, false)
+            http.post(url, action, params)
           when 'http/patch-v1', 'forms/patch'
-            http.patch(url, action, params, false)
+            http.patch(url, action, params)
           when 'http/put-v1', 'forms/put'
-            http.put(url, action, params, false)
+            http.put(url, action, params)
           when 'http/delete-v1'
-            http.delete(url, action, params, false)
+            http.delete(url, action, params)
           else
-            http.get(url, action, params, false)
+            http.get(url, action, params)
           end
         end
       end

data/lib/glib/test_helpers.rb

@@ -7,10 +7,10 @@ module Glib
     end
 
     module ClassMethods
-      def define_crawler_test(user, crawled_at, &on_after_crawl)
+      def define_crawler_test(user, crawled_at, dump_path:, &on_after_crawl)
         test "crawl api for #{user[:email]} #{user[:device]} #{user[:version] || 'current'}" do
           Timecop.freeze(crawled_at || user[:crawled_at]) do
-            router = crawl_json_pages(user)
+            router = crawl_json_pages(user, dump_actions: dump_path.present?, dump_path: dump_path)
             on_after_crawl&.call(router)
           end
 
@@ -36,8 +36,8 @@ module Glib
       assert_equal JSON.parse(expected), JSON.parse(result), "Result mismatch! #{__git_is_available? ? `git diff #{__controller_log_dir}/#{__controller_log_file}` : ''}"
     end
 
-    def crawl_json_pages(user, check_result: true, log_file: nil, dump_actions: false, &block)
-      __execute_crawler(user, check_result: true) do |router, http|
+    def crawl_json_pages(user, log_file: nil, dump_actions: false, dump_path: nil, &block)
+      __execute_crawler(user, inspect_http: true) do |router, http|
         path = user[:path] ? "#{user[:path]}?format=json" : '/users/me?format=json&redirect=default'
         router.host = HOST
         router.step(
@@ -53,16 +53,23 @@ module Glib
             action, url, params = row
             [action, url, JSON.generate(params)].to_csv
           end.join
-          filename = "#{user[:email]}[#{user[:device]}][#{user[:version] || 'current'}].csv"
-          filepath = File.join(__crawler_log_dir, filename)
+
+          filepath = crawler_output_file(user, file_dir: dump_path)
           File.write(filepath, csv_string)
         end
       end
     end
 
-    def retrace_json_pages(user, guiding_routers:)
-      __execute_crawler(user, check_result: true) do |router, http|
-        router.follow(http, guiding_routers)
+    def crawler_output_file(user, file_dir: nil)
+      filename = "#{user[:email]}[#{user[:device]}][#{user[:version] || 'current'}].csv"
+      File.join(file_dir || __crawler_log_dir, filename)
+    end
+
+    def retrace_json_pages(user, past_actions:)
+      __execute_crawler(user, inspect_http: false) do |router, http|
+        # router.follow(http, guiding_routers)
+        # router.follow_v2(Glib::JsonCrawler::Http.new(self, user, router), actions)
+        router.follow_v2(http, past_actions)
       end
     end
 
@@ -76,25 +83,23 @@ module Glib
     end
 
     private
-      def __execute_crawler(user, check_result: true, log_file: nil, &block)
+      def __execute_crawler(user, inspect_http:, log_file: nil, &block)
         auth_token = login user
         user[:token] = auth_token
 
         router = Glib::JsonCrawler::Router.new
-        http = Glib::JsonCrawler::Http.new(self, user, router)
+        http = Glib::JsonCrawler::Http.new(self, user, router, inspect_result: inspect_http)
         block.call(router, http)
 
         logout
 
-        if check_result
-          log_file = "#{user[:email]}[#{user[:device]}][#{user[:version] || 'current'}].txt" if log_file.nil?
+        log_file = "#{user[:email]}[#{user[:device]}][#{user[:version] || 'current'}].txt" if log_file.nil?
 
-          file_path = File.join(__crawler_log_dir, log_file)
-          expected = File.exist?(file_path) ? File.read(file_path) : ''
-          result = router.logger
-          File.write(file_path, result)
-          assert_equal expected, result, "Result mismatch! #{log_file.sub(/\.txt$/, '')}"
-        end
+        file_path = File.join(__crawler_log_dir, log_file)
+        expected = File.exist?(file_path) ? File.read(file_path) : ''
+        result = router.logger
+        File.write(file_path, result)
+        assert_equal expected, result, "Result mismatch! #{log_file.sub(/\.txt$/, '')}"
 
         router
       end

metadata

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