glib-web 4.32.0 → 4.33.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f339d19fc2b321412b8c6677939a2aa4d68c4a7d542c7fb0f6e77975593003c7
-  data.tar.gz: acd6bbbde7c0631b3d8105e6fb796968184a7f3ac3104ddb22ef5c1881fe1d89
+  metadata.gz: 3500da71e998b625c15ef1a41519581ed5d52d9dd9562a3e031e08d16aa2908c
+  data.tar.gz: 6f781cafa2ffe0cacfe1c7e31656415b2699bd19af4f9149614a5c229f60d94e
 SHA512:
-  metadata.gz: 6ba9dd32fcbb17c785e56e806e9b55d283b8ae7db19a75cfbe223b2b357b57d6fdb022d21a403dd24d994fc3c110abe0182178e65cea7ce18b0917ef79f7c19b
-  data.tar.gz: 6b6aeddb28afa1afd684bf3d142bc923fbb86257009548bedc1889f966e5876a23c4548f738f6ebdd76acde196fd20570e11fef9205122dfc74bfaee529729b7
+  metadata.gz: 31478adf1a4abdd83df77febe25c6454ebdf66908ecef04b34cb4a48746878a8e0e058184c3cb093c7c4526831b948c539e79d88330c52a6a722fb5be885b4cc
+  data.tar.gz: 97f3164d075437ccb1bac37a6d0bea555ad1ec1b9a7b9870fb1d37a3619cc7a5a361a6684e0a412488d406da3c86dfa90416f7713445ead43bd9c355e18e9deb

data/app/helpers/glib/json_ui/view_builder/charts.rb

@@ -42,6 +42,8 @@ class Glib::JsonUi::ViewBuilder
         string :prefix
         string :suffix
         bool :formatYAxis
+        string :indexAxis
+        bool :horizontalStacked
         int :min
         int :max
         # https://www.chartjs.org/docs/latest/configuration/legend.html

data/app/views/json_ui/garage/views/charts.json.jbuilder

@@ -138,6 +138,40 @@ else
       plugins: default_plugins,
       colors: ['#7A71F4', '#53B3E4', 'skyblue'], legend: { override: true }
 
+
+      scroll.h2 text: 'Column chart (Right-to-left)'
+      scroll.charts_column dataGroups: [
+        -> do
+          json.title 'Data 1'
+
+          points = {
+            'Hotel One' => 10,
+            'Hotel Two' => 16,
+            'Hotel Three' => 18,
+          }
+          json.points points
+        end,
+        -> do
+          json.title 'Data 2'
+
+          points = {
+            'Hotel One' => 24,
+            'Hotel Two' => 22,
+          }
+          json.points points
+        end,
+        -> do
+          json.title 'Data 3'
+
+          points = {
+            'Hotel One' => 20,
+            'Hotel Two' => 23,
+          }
+          json.points points
+        end
+      ],
+      indexAxis: 'y', horizontalStacked: true,
+      colors: ['#7A71F4', '#53B3E4', 'red'], legend: { override: true }
       scroll.h2 text: 'Column chart (Stacked)'
       scroll.charts_column stacked: true, dataGroups: [
         -> do

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

@@ -4,6 +4,7 @@ module Glib
       def initialize(method, http, args, controller)
         @http = http
         json = @http.send(method, args['url'], controller, args.fetch('formData', {}))
+        @http.router.http_actions.add([args['action'], args['url'], args.fetch('formData', {})])
         perform(json['onResponse'])
       end
     end

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

@@ -76,11 +76,13 @@ module Glib
         case method
         when :patch, :put
           json = @http.patch url, action, params
+          @http.router.http_actions.add([action, url, params])
           perform(json['onResponse'])
         when :post
           if (groups = form_post_param_groups)
             groups.each do |group_params|
               json = @http.post url, action, group_params
+              @http.router.http_actions.add([action, url, group_params])
               perform(json['onResponse'])
             end
           else

data/lib/glib/json_crawler/http.rb

@@ -24,19 +24,19 @@ module Glib
         fetch(:get, url, action, params, inspect_result)
       end
 
-      def post(url, action, params)
+      def post(url, action, params, inspect_result = true)
         fetch(:post, url, action, params)
       end
 
-      def patch(url, action, params)
+      def patch(url, action, params, inspect_result = true)
         fetch(:patch, url, action, params)
       end
 
-      def put(url, action, params)
+      def put(url, action, params, inspect_result = true)
         fetch(:put, url, action, params)
       end
 
-      def delete(url, action, params = {})
+      def delete(url, action, params = {}, inspect_result = true)
         fetch(:delete, url, action, {})
       end
 

data/lib/glib/json_crawler/router.rb

@@ -1,7 +1,9 @@
 module Glib
   module JsonCrawler
     class Router
-      attr_reader :read_only_actions, :logger, :last_log, :deferred_actions
+      attr_reader :read_only_actions # deprecated
+      attr_reader :logger, :last_log, :deferred_actions
+      attr_reader :http_actions
       attr_accessor :host
 
       def log(action, url, response = nil)
@@ -46,6 +48,7 @@ module Glib
         @logger = ''
         @visitor = Glib::Json::Traversal::Visitor.new(crawler_test: true)
         @read_only_actions = Set.new
+        @http_actions = Set.new
         # default rails's development host
         @host ||= 'localhost:3000'
         @page_specs = []
@@ -72,7 +75,7 @@ module Glib
           end
         end
 
-        @read_only_actions.replace(@read_only_actions.sort_by { |e| e[1].to_s })
+        # @read_only_actions.replace(@read_only_actions.sort_by { |e| e[1].to_s })
       end
 
       def process_action(http, spec)
@@ -85,14 +88,16 @@ module Glib
           @depth += 1
           case action
           when 'initiate_navigation'
-            @read_only_actions.add([action, params['url']])
+            # @read_only_actions.add([action, params['url']])
+            http_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', 'windows/openWeb', 'windows/openWeb-v1'
             if allowed?(params['url'])
-              @read_only_actions.add([action, params['url']])
+              # @read_only_actions.add([action, params['url']])
+              http_actions.add([action, params['url']])
               JsonCrawler::WindowsOpen.new(http, params, action)
             else
               self.log action, params['url']
@@ -118,7 +123,8 @@ module Glib
               'http/delete',
               'dialogs/oauth'
             ].include?(action)
-              @read_only_actions.add([action, params['url']])
+              # @read_only_actions.add([action, params['url']])
+              http_actions.add([action, params['url']])
             end
             self.log action, params['url']
           end
@@ -130,6 +136,7 @@ module Glib
         @visitor.forms.last
       end
 
+      # deprecated
       def follow(http, target_routers)
         if !target_routers.is_a?(Array)
           target_routers = [target_routers]
@@ -147,6 +154,29 @@ module Glib
         end
       end
 
+      def follow_v2(http, crawler_actions)
+        @depth += 1
+        crawler_actions.each do |crawler_action|
+          action, url, params = crawler_action
+
+          params = JSON.parse(params) if params.is_a?(String)
+          params ||= {}
+
+          case action.to_s.downcase
+          when 'http/post-v1', 'forms/post'
+            http.post(url, action, params, false)
+          when 'http/patch-v1', 'forms/patch'
+            http.patch(url, action, params, false)
+          when 'http/put-v1', 'forms/put'
+            http.put(url, action, params, false)
+          when 'http/delete-v1'
+            http.delete(url, action, params, false)
+          else
+            http.get(url, action, params, false)
+          end
+        end
+      end
+
       def crawl_multiple(views, block)
         @visitor.traverse_multiple views, block
       end

data/lib/glib/snapshot.rb

@@ -17,6 +17,45 @@ module Glib
       end
     end
 
+    def where_snapshots(user: nil, field: nil, action: nil, association: nil, association_action: nil, like: nil)
+      query = snapshots
+
+      if user.present? && !user.is_a?(String)
+        query = query.where(user_id: user.id, user_type: user.class.to_s)
+      elsif user.present? && user.is_a?(String)
+        query = query.where("metadata ->> 'user' = ?", user)
+      end
+
+      if field.present?
+        query = query.where("metadata -> 'diff' ->> 'item' LIKE ?", "%#{field}%")
+      end
+
+      if action.present?
+        query = query.where("metadata ->> 'action' = ?", action)
+      end
+
+      if association.present?
+        query = query.where("metadata -> 'diff' -> 'associations' -> '#{association}' -> 0 IS NOT NULL")
+      end
+
+      if association_action.present?
+        raise ArgumentError.new('association_action expect association to be present') if association.blank?
+
+        known_actions = {
+          'create' => '+',
+          'destroy' => '-',
+          'update' => '~'
+        }
+        query = query.where("metadata -> 'diff' -> 'associations' ->> '#{association}' LIKE ?", "%\"#{known_actions[association_action.to_s]}\"%")
+      end
+
+      if like.present?
+        query = query.where("metadata ->> 'diff' LIKE ?", "%#{like}%")
+      end
+
+      query.to_a
+    end
+
     # information need to be store:
     # - action: create, update, destroy
     # - track changes
@@ -33,16 +72,20 @@ module Glib
           diff: diff,
           version: version
         }
+        snapshot_obj = {
+          identifier: "#{self.class.to_s.underscore}_#{id}_version_#{version}",
+          user: user,
+          metadata: metadata
+        }
+
+        if user.is_a?(String)
+          metadata[:user] = user
+          snapshot_obj.delete(:user)
+        end
 
         # dont create version if same as before
         if !same_as_before?
-
-          result = create_snapshot!(
-            identifier: "#{self.class.to_s.underscore}_#{id}_version_#{version}",
-            user: user,
-            metadata: metadata
-          )
-
+          result = create_snapshot!(**snapshot_obj)
           remove_old_snapshot if result.present?
         end
       end
@@ -62,11 +105,14 @@ module Glib
       default_ignored_keys = ['updated_at', 'created_at']
       ignore_keys = default_ignored_keys
 
-      if !try(:watched_keys_for_snapshot).nil?
+      if !watched_keys_for_snapshot.nil?
         ignored_keys_for_snapshot = attributes.except(*watched_keys_for_snapshot).keys
         ignore_keys = (default_ignored_keys + ignored_keys_for_snapshot.map(&:to_s)).uniq
       end
 
+      # always watch column with name *id
+      ignore_keys.filter! { |key| !key.ends_with?('id') || key != 'id' }
+
       if snapshot.present?
         item, associations = snapshot.fetch_reified_items
       else
@@ -80,6 +126,11 @@ module Glib
 
       obj['associations'] = associations_for_snapshot.reduce({}) do |prev, curr|
         first_record_off_same_collection = send(curr).first
+
+        if !first_record_off_same_collection.respond_to?(:watched_keys_for_snapshot) && !first_record_off_same_collection.nil?
+          raise NotImplementedError, "please add method 'watched_keys_for_snapshot' to #{first_record_off_same_collection.class}"
+        end
+
         association_ignored_keys =
           if !first_record_off_same_collection.try(:watched_keys_for_snapshot).nil?
             assoc_ignore_keys = first_record_off_same_collection.attributes.except(*first_record_off_same_collection.watched_keys_for_snapshot).keys.map(&:to_s)
@@ -88,16 +139,37 @@ module Glib
             default_ignored_keys
           end
 
-
-        attrs_before = (associations[curr] || []).map { |record| record.attributes.except(*association_ignored_keys) }
-        attrs_now = send(curr).order(id: :asc).map { |record| record.attributes.except(*association_ignored_keys) }
-
-        prev.merge(
-          curr.to_s => ::Hashdiff.diff(
-            attrs_before,
-            attrs_now
-          )
-        )
+        # always watch column with name *id
+        association_ignored_keys.filter! { |key| !key.ends_with?('id') || key != 'id' }
+
+        # attrs_before = (associations[curr] || []).map { |record| record.attributes.except(*association_ignored_keys) }
+        # attrs_now = send(curr).order(id: :asc).map { |record| record.attributes.except(*association_ignored_keys) }
+
+        before = (associations[curr] || [])
+        now = send(curr).order(id: :asc)
+
+        if before.blank?
+          prev.merge(curr.to_s => ::Hashdiff.diff([], now.map { |record| record.attributes.except(*association_ignored_keys) }))
+        else
+          diff = before.map.with_index do |record_before, index|
+            record_now = now.find_by(id: record_before.id)
+            if record_now.blank?
+              ['-', "[#{index}]", record_before.attributes.except(*association_ignored_keys)]
+            elsif record_now.present?
+              next if Hashdiff.diff(record_before.attributes.except(*association_ignored_keys), record_now.attributes.except(*association_ignored_keys)).blank?
+              ['~', "[#{index}]", record_before.attributes.except(*association_ignored_keys), record_now.attributes.except(*association_ignored_keys)]
+            end
+          end.compact_blank
+
+          diff2 = now.map.with_index do |record_now, index|
+            record_before = before.detect { |record| record.id == record_now.id }
+            if record_before.blank?
+              ['+', "[#{index}]", record_now.attributes.except(*association_ignored_keys)]
+            end
+          end.compact_blank
+
+          prev.merge(curr.to_s => (diff + diff2))
+        end
       end
 
       obj
@@ -124,6 +196,8 @@ module Glib
     end
 
     def remove_old_snapshot
+      return if max_snapshots.nil?
+
       newest_ids = snapshots.order(id: :desc).limit(max_snapshots).ids
       return unless newest_ids.size >= max_snapshots
 
@@ -131,7 +205,7 @@ module Glib
     end
 
     def watched_keys_for_snapshot
-      nil
+      raise NotImplementedError, "please add method 'watched_keys_for_snapshot' to #{self.class}"
     end
 
     def associations_for_snapshot

data/lib/glib/test_helpers.rb

@@ -36,7 +36,7 @@ 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, &block)
+    def crawl_json_pages(user, check_result: true, log_file: nil, dump_actions: false, &block)
       __execute_crawler(user, check_result: true) do |router, http|
         path = user[:path] ? "#{user[:path]}?format=json" : '/users/me?format=json&redirect=default'
         router.host = HOST
@@ -47,6 +47,16 @@ module Glib
             'url' => user[:url] || "http://#{HOST}#{path}"
           }
         )
+
+        if dump_actions
+          csv_string = router.http_actions.map do |row|
+            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)
+          File.write(filepath, csv_string)
+        end
       end
     end
 

metadata

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