glib-web 4.35.5 → 4.36.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bd64c82e1baa6874b8791fdc0a330916a9463e92145a5e7c8ac3a6b64ef271dd
-  data.tar.gz: 85ea472517490fd0d2fc572531869964240111df12d2e93b9fc35a569ece071d
+  metadata.gz: 94b3768dec74f3a05c32ffd19612d151afce3829643e070f173899d02627e72f
+  data.tar.gz: e7f8124643269e1634a979683210b93a7ca613fd1cf975a0ff20419a3f08f9f2
 SHA512:
-  metadata.gz: 4cfd05eee3620fc4177e75f7e5f43904e1560084979aad3bc522beb837afc45e86b47f766feb2ada4b69d4f20a14b236907f04e4072968316d7b2b99100fdebe
-  data.tar.gz: 1afe10ae33a3688b85be1cd1f966ff8bd01d60eaca51fb3602d4d1c8d52b6276701371f455758d488248c1ea344c8e019e6c2b61878dcd5ea88be52725c15dd2
+  metadata.gz: 91cf7697395548ce7d8ee306269688c1166ed9e9d1ca0778a5d2d2dfd72d26dab277a3d22069a1d4ef31727511816854bd12de8ef984629069b4413f295095c5
+  data.tar.gz: 4b655db49df2bfba84b0c524d02e41fdaadcacfb687418f7d3651c24712c9c7a55ed1b5bf4a1951b3107264a5db09b348b892293efaee7212c06d05b9b36408e

data/app/controllers/concerns/glib/json/libs.rb

@@ -68,10 +68,10 @@ module Glib::Json::Libs
 
     # As much as possible, try retaining the front fragment by matching the back, because
     # the front could be either a `?` or `&`
-    url = url.sub(/format=json\&/, '')
+    url = url.sub(/format=json\&/, '');
 
     # If no match, then we replace the front fragment
-    url.sub(/[\&\?]format=json/, '')
+    url.sub(/[\&\?]format=json/, '');
   end
 
   def glib_redirect_to(url, return_to_previous: false, status: :ok)
@@ -87,13 +87,6 @@ module Glib::Json::Libs
           return
         end
 
-        # Inside a dialog, it's easier to simply use HTTP redirect, as opposed to trying to
-        # get the dialog to perform manual redirection.
-        if glib_json_dialog_mode?
-          redirect_to url
-          return
-        end
-
         json_ui_redirect_to url, status: status
       end
     end
@@ -159,14 +152,14 @@ module Glib::Json::Libs
         end
 
         render json: if glib_json_dialog_mode?
-                       { onLoad: __glib_error_dialog('Access denied', "Make sure you're logged in with the correct account.") }
-                     else
-                       {
-                         onResponse: {
-                           action: 'windows/open', url: user_default_url
-                         }
-                       }
-                     end, status: Rails.env.test? ? :forbidden : :ok
+          { onLoad: __glib_error_dialog('Access denied', "Make sure you're logged in with the correct account.") }
+        else
+          {
+            onResponse: {
+              action: 'windows/open', url: user_default_url
+            }
+          }
+        end, status: Rails.env.test? ? :forbidden : :ok
       end
       format.csv do
         if Rails.env.test?
@@ -236,7 +229,7 @@ module Glib::Json::Libs
     if json_ui_activated?
       if Rails.env.production? || preview_mode
         if defined?(Rollbar) && !preview_mode
-          Rollbar.error(exception, use_exception_level_filters: true)
+          Rollbar.error(exception, :use_exception_level_filters => true)
         end
 
         render file: Rails.root.join('public', '500.html'), status: :internal_server_error
@@ -268,7 +261,7 @@ module Glib::Json::Libs
     if glib_json_dialog_mode?
       # Only do this in dialog mode because this seems to add to the rendering time
       # (i.e. longer flicker time), presumably due to the use of things like `nextTick()`.
-      on_response = { action: 'dialogs/close', onClose: on_response }
+      on_response = { action: 'dialogs/close', onClose: on_load }
     end
 
     # Use onResponse because it is harder to guarantee that `onLoad` executes in Vuejs because it relies

data/app/validators/mutually_exclusive_with_validator.rb

@@ -0,0 +1,22 @@
+class MutuallyExclusiveWithValidator < ActiveModel::EachValidator
+  include ActiveSupport::Inflector
+
+  def validate_each(record, attribute, _value)
+    other_attribute = options[:with]
+
+    validate_mutual_exclusivity(record, attribute, other_attribute)
+    validate_mutual_exclusivity(record, other_attribute, attribute)
+  end
+
+  private
+    def validate_mutual_exclusivity(record, attribute, other_attribute)
+      attribute_value = record.send(attribute)
+      other_attribute_value = record.send(other_attribute)
+
+      if attribute_value.present? && other_attribute_value.present?
+        record.errors.add(attribute, :present, **options)
+      elsif attribute_value.nil? && other_attribute_value.nil?
+        record.errors.add(attribute, :blank, **options)
+      end
+    end
+end

data/app/validators/presence_only_if_validator.rb

@@ -0,0 +1,22 @@
+class PresenceOnlyIfValidator < ActiveModel::EachValidator
+  include ActiveSupport::Inflector
+
+  def validate_each(record, attribute, _value)
+    condition = options[:with]
+
+    if condition.is_a?(Symbol)
+      evaluate_condition(record, attribute, ->(record) { record.send(condition) })
+    elsif condition.respond_to?(:call)
+      evaluate_condition(record, attribute, condition)
+    else
+      raise 'Invalid option'
+    end
+  end
+
+  private
+    def evaluate_condition(record, attribute, condition)
+      if condition.call(record) && record.send(attribute).nil?
+        record.errors.add(attribute, :blank, **options)
+      end
+    end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: glib-web
 version: !ruby/object:Gem::Version
-  version: 4.35.5
+  version: 4.36.0
 platform: ruby
 authors:
 - ''
@@ -217,6 +217,8 @@ files:
 - app/policies/glib/application_policy.rb
 - app/validators/email_typo_validator.rb
 - app/validators/email_validator.rb
+- app/validators/mutually_exclusive_with_validator.rb
+- app/validators/presence_only_if_validator.rb
 - app/validators/url_validator.rb
 - app/views/json_ui/garage/_nav_menu.json.jbuilder
 - app/views/json_ui/garage/actions/_commands.json.jbuilder