glib-web 3.11.1 → 3.13.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 67a72ba29ae5a4a9d5d61d529db6ad2316af2fb2d76042ca7fda76b309b5dcba
-  data.tar.gz: c3e935f1d809ee9ce3ec3fa78bdf53250303192949909b12ebf8ac5f9f27f7b3
+  metadata.gz: 8188479eb502da835ae017b7b4a61237628595bd7dcff2f9dfc313b75b032fb4
+  data.tar.gz: 2d86cbb1a9091873bff0cce3d76bed7d5644a5433a5c1784e1963f8b4f0adec6
 SHA512:
-  metadata.gz: 588dc4f17590880d8c0e6eaacf7f467a1db815a24e317d0d458449c7065d9dbd8ac77ddf7b621581a48992528306334d45439f8b9a1b7acaf4c4e42d53b72ba9
-  data.tar.gz: c1d4655e081970ad4739397ce2b0f221cb7a491757c9da532c433dd85245ba0a4b39e87164c00a2e83942e008c439298b76d528b7bd65cb93abf5b8b54ec089d
+  metadata.gz: 0b483156bb8b301c19f61bf3fa1d1b49e26cefb0d594d89f937bcbbb29abd4d3c1c5b9448f97242754c8bbac32d0f4ba80e7e7e4b6cc7f459fc875655df6736b
+  data.tar.gz: 8c0065b3579447d6d7aa00deb5c2e62f07fd86375e9a6f57334b9b2346fb4a22a4f4090a5532dd2dd63690caf22a4fc63962b28c23a19b94e34e72290104895a

data/app/helpers/glib/enum_helper.rb

@@ -5,15 +5,11 @@ module Glib
       keys ||= clazz.defined_enums[enum_name].keys
       keys.map do |i|
         text = clazz.glib_enum_humanize(enum_field, i)
-
-        if text.nil?
-          raise "activerecord.attributes.#{clazz.model_name.i18n_key}.#{enum_field.to_s.pluralize}.#{i}"
-        end
-
         if include_hints
           i18n_key = clazz.model_name.i18n_key
-          hint = I18n.t("dt_models.#{i18n_key}.#{enum_name.pluralize}.#{i}.hint")
-          text += " #{hint}"
+          if (hint = I18n.t("dt_models.#{i18n_key}.#{enum_name.pluralize}.#{i}.hint")).present?
+            text += " #{hint}"
+          end
         end
         { text: text, value: i }
       end

data/app/helpers/glib/json_ui/action_builder/components.rb

@@ -1,6 +1,11 @@
 class Glib::JsonUi::ActionBuilder
   module Components
 
+    class Find < Action
+      string :targetId
+      action :onFind
+    end
+
     class Update < Action
       string :targetId
       views :views

data/app/helpers/glib/json_ui/action_builder/popovers.rb

@@ -11,6 +11,7 @@ class Glib::JsonUi::ActionBuilder
 
     class Close < Action
       string :key
+      action :onClose
     end
   end
 end

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

@@ -263,6 +263,16 @@ class Glib::JsonUi::ViewBuilder
       hash :infoSpec
     end
 
+    class MultipleUpload < AbstractField
+      hash :accepts
+      array :files
+      string :directUploadUrl
+      string :title
+      string :subtitle
+      string :uploadTitle
+      string :uploadFailedText
+    end
+
     # TODO
     # class MultiImage < Text
     #   # file_rules = { fileType: 'image/*', maxFileSize: 5000 }

data/app/helpers/glib/urls_helper.rb

@@ -23,7 +23,8 @@ module Glib
         host: host,
         port: port,
         path: path,
-        query: params.to_query
+        # Prevent trailing `?` when there is no params
+        query: params.empty? ? nil : params.to_query
       )
     end
   end

data/app/models/concerns/glib/soft_deletable.rb

@@ -42,7 +42,7 @@ module Glib
 
             hard_destroy
           when :disallowed
-            raise_hard_delete_disallowed
+            raise_hard_delete_disallowed(4502)
           else
             raise "Unsupported on_mark_for_destruction behaviour: #{behaviour}"
           end
@@ -50,7 +50,7 @@ module Glib
           return true # Tell Rails that destroy has succeeded
         end
 
-        raise_hard_delete_disallowed
+        raise_hard_delete_disallowed(4501)
       end
 
 
@@ -79,7 +79,9 @@ module Glib
       # records are updated/validated one at a time.
       # Besides, it's probably not a good idea to prevent soft-deletion of objects that are already not valid.
       def _soft_destroy
+        before_soft_destroy
         update_columns(deleted_at: DateTime.current)
+        after_soft_destroy
         soft_destroy_associated_records
       end
 
@@ -99,8 +101,8 @@ module Glib
           end
         end
 
-        def raise_hard_delete_disallowed
-          raise ActiveRecord::ConfigurationError, "Hard deletion is not allowed for #{self.class.name}"
+        def raise_hard_delete_disallowed(code)
+          raise ActiveRecord::ConfigurationError, "Hard deletion is not allowed for #{self.class.name} (error #{code})"
         end
 
         def process_soft_deletable_relationship(relationship, &block)
@@ -110,8 +112,10 @@ module Glib
           # to existing objects which could cause a side effect.
           relation = send(relationship)
 
-          if relation.respond_to?(:find_each)
-            relation.find_each do |record|
+          # Use `each` instead of `find_each` because `each` is cached which is important to retain the
+          # `marked_for_destruction` status.
+          if relation.respond_to?(:each)
+            relation.each do |record|
               block.call(record)
             end
           else
@@ -140,6 +144,14 @@ module Glib
         def soft_deletable_associations
           []
         end
+
+        def before_soft_destroy
+          # To be overridden
+        end
+
+        def after_soft_destroy
+          # To be overridden
+        end
     end
   end
 end

data/app/views/json_ui/garage/forms/basic_post.json.jbuilder

@@ -1,14 +1,31 @@
 name, _ = params.require(:user).values_at(:name)
+is_valid = name.present?
 json_ui_response json do |action|
-  if !name.present?
+  if !is_valid
     action.dialogs_alert message: 'Please enter name'
   else
     if params[:mode] == 'dialog'
-      action.dialogs_close onClose: ->(subaction) do
-        render "#{@path_prefix}/forms/alert_post_data", action: subaction
-      end
+      render "#{@path_prefix}/forms/alert_post_data", action: action
+
+      # action.dialogs_close onClose: ->(subaction) do
+      #   render "#{@path_prefix}/forms/alert_post_data", action: subaction
+      # end
     else
       render "#{@path_prefix}/forms/alert_post_data", action: action
     end
   end
 end
+
+if params[:mode] == 'dialog' && is_valid
+  json.title 'This is a response'
+
+  # This should update the content of the dialog.
+  page = json_ui_page json
+  page.scroll \
+    width: 'matchParent',
+    padding: glib_json_padding_body,
+    childViews: ->(scroll) do
+      scroll.label text: 'Success!'
+      scroll.spacer height: 20
+    end
+end

data/app/views/json_ui/garage/forms/file_upload.json.jbuilder

@@ -36,5 +36,17 @@ page.form options.merge(childViews: ->(form) do
   # form.fields_multiImage name: 'user[photos][]', width: 'matchParent', label: 'Avatar', accepts: rules, directUploadUrl: rails_direct_uploads_url,
   #   placeholderView: { type: 'avatar', width: 100, height: 100, url: 'data:image/jpeg;base64,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' }
 
+  form.spacer height: 16
+  form.fields_multipleUpload \
+    name: 'user[multi][]',
+    directUploadUrl: rails_direct_uploads_url,
+    title: 'Select file or drag and drop here',
+    subtitle: 'JPG, PNG or PDF, file size no more than 10MB',
+    uploadTitle: 'File added:',
+    uploadFailedText: '(UPLOAD FAILED)',
+    files: [
+      { name: 'File (Example)', signed_id: ActiveStorage::Attachment.last&.signed_id }
+    ]
+  form.spacer height: 16
   form.fields_submit text: 'Submit'
 end)

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

@@ -56,24 +56,31 @@ module Glib
           json = @http.patch url, action, params
           perform(json['onResponse'])
         when :post
-          if (params = form_post_params)
-            json = @http.post url, action, params
-            perform(json['onResponse'])
+          if (groups = form_post_param_groups)
+            groups.each do |group_params|
+              json = @http.post url, action, group_params
+              perform(json['onResponse'])
+            end
           else
             @http.router.log action, url
           end
         end
       end
 
-      def form_post_params
+      def form_post_param_groups
         route = Rails.application.routes.recognize_path(@http.router.page_url)
         action_path = "#{route[:controller]}##{route[:action]}"
 
-        post_data[action_path]
+        post_request_scenarios[action_path]
       end
 
+      # # Redeclare this class and implement this method.
+      # def post_data
+      #   {}
+      # end
+
       # Redeclare this class and implement this method.
-      def post_data
+      def post_request_scenarios
         {}
       end
     end

data/lib/glib/json_crawler/router.rb

@@ -91,9 +91,18 @@ module Glib
         end
       end
 
-      def follow(http, target_router)
+      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_router.read_only_actions.each do |crawler_action|
+        target_actions.each do |crawler_action|
           action, url = crawler_action
           http.get(url, action, {}, false)
         end

data/lib/glib/test_helpers.rb

@@ -1,35 +1,125 @@
 module Glib
   module TestHelpers
+    extend ActiveSupport::Concern
+
+    included do
+      extend ClassMethods
+    end
+
+    module ClassMethods
+      def define_crawler_test(user, crawled_at, &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)
+            on_after_crawl&.call(router)
+          end
+
+          # Right now we're not benefitting from these due to Ruby's limited concurrency.
+          # Thread.new(user) { crawl_pages(user) }.join
+        end
+      end
+    end
+
+    HOST = 'www.lvh.me:3000'
+    # LOG_DIR = File.expand_path(
+    #   File.join(File.dirname(__FILE__), 'integration/json_ui_crawler_test_results')
+    # )
+
     def response_assert_equal
       expected = __get_previous_result_from_git
-      result = __log(response.body)
-      assert_equal JSON.parse(expected), JSON.parse(result), "Result mismatch! #{__git_is_available? ? `git diff #{__log_dir}/#{__log_file}` : ''}"
+      result = __log_controller_data(response.body)
+      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)
+      __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
+        router.step(
+          http,
+          'onClick' => {
+            'action' => user[:action] || 'initiate_navigation',
+            'url' => user[:url] || "http://#{HOST}#{path}"
+          }
+        )
+      end
+    end
+
+    def retrace_json_pages(user, guiding_routers:)
+      __execute_crawler(user, check_result: true) do |router, http|
+        router.follow(http, guiding_routers)
+      end
+    end
+
+    def logout
+      delete logout_url
+      assert_response :success
+    end
+
+    def logout_url
+      "http://#{HOST}/users/sign_out.json"
     end
 
     private
+      def __execute_crawler(user, check_result: true, 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)
+        block.call(router, http)
+
+        logout
+
+        if check_result
+          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
+
+        router
+      end
+
       def __git_is_available?
         @__git_is_available ||= (`git status 2>&1` =~ /fatal/).nil?
       end
 
-      def __log_dir
-        if @__log_dir.nil?
-          @__log_dir = File.expand_path(
+      def __crawler_log_dir
+        if @__crawler_log_dir.nil?
+          @__crawler_log_dir = File.expand_path(
+            "#{Rails.root}/test/integration/#{self.class.to_s.underscore}_results",
+            File.dirname(__FILE__)
+          )
+          unless File.directory?(@__crawler_log_dir)
+            FileUtils.mkdir_p(@__crawler_log_dir)
+          end
+        end
+        @__crawler_log_dir
+      end
+
+      def __controller_log_dir
+        if @__controller_log_dir.nil?
+          @__controller_log_dir = File.expand_path(
             "#{Rails.root}/test/controllers/#{self.class.to_s.underscore}_results",
             File.dirname(__FILE__)
           )
-          unless File.directory?(@__log_dir)
-            FileUtils.mkdir_p(@__log_dir)
+          unless File.directory?(@__controller_log_dir)
+            FileUtils.mkdir_p(@__controller_log_dir)
           end
         end
-        @__log_dir
+        @__controller_log_dir
       end
 
-      def __log_file
-        @__log_file ||= "#{self.method_name}.json"
+      def __controller_log_file
+        @__controller_log_file ||= "#{self.method_name}.json"
       end
 
-      def __log(json)
-        file = File.open("#{File.join(__log_dir, __log_file)}", 'w') do |f|
+      def __log_controller_data(json)
+        file = File.open("#{File.join(__controller_log_dir, __controller_log_file)}", 'w') do |f|
           f << JSON.pretty_generate(JSON.parse(json))
         end
         file.close
@@ -38,12 +128,12 @@ module Glib
 
       def __get_previous_result_from_git
         if __git_is_available?
-          `git checkout -- "#{File.join(__log_dir, __log_file)}" > /dev/null 2>&1`
+          `git checkout -- "#{File.join(__controller_log_dir, __controller_log_file)}" > /dev/null 2>&1`
         end
         if File.exist?(
-          File.join(__log_dir, __log_file)
+          File.join(__controller_log_dir, __controller_log_file)
         )
-          File.read(File.join(__log_dir, __log_file))
+          File.read(File.join(__controller_log_dir, __controller_log_file))
         else
           "\{\}"
         end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: glib-web
 version: !ruby/object:Gem::Version
-  version: 3.11.1
+  version: 3.13.0
 platform: ruby
 authors:
 - ''
@@ -319,8 +319,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 3.4.6
 signing_key: 
 specification_version: 4
 summary: ''