glib-web 3.20.5 → 3.22.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '09a9fcb392c01c3befef1f951014fe4934bafea422cb1d5a7f13d2eed5f3e5db'
-  data.tar.gz: 21c5e44448d4eaa6b51ff67dfdf8d20234e83cdbfc8f2bfd571c58ee5cbf98cb
+  metadata.gz: 61bf1dd4994bb6105fb043e7b7b0943cb44e4e418baf246556855816442d6293
+  data.tar.gz: 88902efc0cc5e18d925a1261106df0dca345f5880959dc2cbaca1a91938f83d4
 SHA512:
-  metadata.gz: 4420d70795aa12b42bb493cec14553c150740b48864bf7c90a92c4012139109c301721b61d31bba3333ddc85dab39a8a45cac82a0ce0d4b40e285b9e2554319f
-  data.tar.gz: bae84a5f666c73f04151cbc47e685335914bcfd527392350f31ba90b1450f18f09d3fd2aca1dc92ae7a9ff1c883e99b31a7403d15f437448f584d22c7927accb
+  metadata.gz: 8b86a31567e3e1eeb2252d5e3fa72796e563873ee7ff72f394e322227a876c31267bc4462383c323ebba40f302fa5fc16be86703569b86ebec3607cbc8caa967
+  data.tar.gz: ebdd87d23e46513bfce6804d6d1ed3fd6004cd00fa9c57b706aace77350d0c13b8603a8344b5e285535286b8fbb8e0b3bbdd23aeb227597ea289709736822e7f

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

@@ -68,6 +68,11 @@ module Glib::Json::Libs
         redirect_to url
       end
       format.json do
+        if __json_ui_rendering?
+          redirect_to url
+          return
+        end
+
         json_ui_redirect_to url
       end
     end
@@ -91,6 +96,10 @@ module Glib::Json::Libs
 
   REDIRECT_BACK_KEY = :glib_return_to_url
 
+  def json_ui_save_return_url(url = nil)
+    session[REDIRECT_BACK_KEY] = url || url_for(params.to_unsafe_h.merge(format: nil))
+  end
+
   def glib_handle_401(sign_in_url)
     if !glib_json_dialog_mode? && request.get?
       session[REDIRECT_BACK_KEY] = url_for(params.to_unsafe_h.merge(format: nil))
@@ -172,10 +181,29 @@ module Glib::Json::Libs
     }
   end
 
-  def glib_json_handle_500(exception)
-    if json_ui_activated? && Rails.env.production?
-      Rollbar.error(exception, :use_exception_level_filters => true) if defined?(Rollbar)
-      render file: Rails.root.join('public', '500.html'), status: :internal_server_error
+  def glib_json_handle_500(exception, preview_mode)
+    if json_ui_activated?
+      if Rails.env.production? || preview_mode
+        if defined?(Rollbar) && !preview_mode
+          Rollbar.error(exception, :use_exception_level_filters => true)
+        end
+
+        render file: Rails.root.join('public', '500.html'), status: :internal_server_error
+      else
+        raise exception
+      end
+    else
+      raise exception
+    end
+  end
+
+  def glib_json_handle_404(exception, preview_mode)
+    if json_ui_activated?
+      if Rails.env.production? || preview_mode
+        render file: Rails.root.join('public', '404.html'), status: :not_found
+      else
+        raise exception
+      end
     else
       raise exception
     end
@@ -262,18 +290,16 @@ module Glib::Json::Libs
 
     # Call this before other rescues. Later rescue_from statements will take precedence, so more specific
     # rescues have to be declared later.
-    def json_libs_rescue_500
+    def json_libs_rescue_500(preview_mode: false)
       rescue_from StandardError do |exception|
-        glib_json_handle_500(exception)
+        glib_json_handle_500(exception, preview_mode)
       end
     end
 
-    def json_libs_rescue_404
-      # Removed because it doesn't seem to offer anything extra
-      # rescue_from ActiveRecord::RecordNotFound do |exception|
-      #   glib_json_handle_404
-      # end
+    def json_libs_rescue_404(preview_mode: false)
+      rescue_from ActiveRecord::RecordNotFound do |exception|
+        glib_json_handle_404(exception, preview_mode)
+      end
     end
-
   end
 end

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

@@ -5,6 +5,10 @@ class Glib::JsonUi::ActionBuilder
       action :onFocus
     end
 
+    class Blur < Action
+      action :onBlur
+    end
+
     class Reset < Action
       string :targetId
       action :onReset

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

@@ -277,18 +277,21 @@ class Glib::JsonUi::ViewBuilder
     end
 
     class Column < View
+      hash :xxl
       hash :xl
       hash :lg
       hash :md
       hash :sm
       hash :xs
 
+      hash :xxlOnly
       hash :xlOnly
       hash :lgOnly
       hash :mdOnly
       hash :smOnly
       hash :xsOnly
 
+      hash :xxlAndDown
       hash :xlAndDown
       hash :lgAndDown
       hash :mdAndDown

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

@@ -275,6 +275,7 @@ module Glib
         bool :showTitle
         bool :aboveLeftDrawer
         bool :collapseButtonsOnMobile
+        bool :showBreakpoint
         int :elevation
 
         # def leftButtons(block)

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

@@ -82,7 +82,8 @@ page.form \
   form.h2 text: 'Country'
   form.spacer height: 6
   region_field = { name: 'user[city]', label: 'City' }
-  form.fields_country name: 'user[country]', width: 'matchParent', label: 'Country', region: region_field
+  form.fields_country name: 'user[country]', width: 'matchParent', label: 'Country', region: nil
+  form.fields_country name: 'user[country_with_region]', width: 'matchParent', label: 'Country with region', region: region_field
 
   form.spacer height: 20
   form.h2 text: 'Map'

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

@@ -72,6 +72,14 @@ page.form url: json_ui_garage_url(path: 'forms/generic_post'), method: 'post', p
       end
       accessory.footer padding: { x: 16, y: 10 }, childViews: ->(footer) do
         footer.label text: 'Footer'
+        footer.spacer height: 14
+        footer.label text: 'Click me', onClick: ->(action) do
+          action.components_findClosest view: 'fields/select', onFind: ->(subaction) do
+            subaction.components_set data: { value: 'pt' }, onSet: ->(subsubaction) do
+              subsubaction.fields_blur
+            end
+          end
+        end
       end
     end
 

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

@@ -16,4 +16,8 @@ page.scroll padding: glib_json_padding_body, childViews: ->(scroll) do
   scroll.spacer height: 20
   scroll.h2 text: 'Icon with badge'
   scroll.icon name: 'home', badge: { text: '22', backgroundColor: '#00ff00' }
+
+  scroll.spacer height: 20
+  scroll.h2 text: 'Icon with styleClasses'
+  scroll.icon name: 'home', styleClasses: ['small']
 end

data/lib/glib/mailer_tester.rb

@@ -3,37 +3,110 @@ module Glib
     extend ActiveSupport::Concern
 
     included do
-      project_root = Rails.root
-      paths = Dir.glob(project_root + 'test/mailers/previews/*')
-      paths.each do |file|
-        require file
-      end
+      extend ClassMethods
+    end
+
+    module ClassMethods
+      def generate_preview_tests
+        project_root = Rails.root
+        paths = Dir.glob(project_root + 'test/mailers/previews/*')
+        paths.each do |file|
+          require file
+        end
 
-      ActionMailer::Preview.subclasses.each do |preview_class|
-        preview = preview_class.new
+        ActionMailer::Preview.subclasses.each do |preview_class|
+          preview = preview_class.new
 
-        preview_class.instance_methods(false).each do |mailer_method|
-          test "mailer for #{preview_class}##{mailer_method}" do
-            preview.send(mailer_method).deliver_now
+          preview_class.instance_methods(false).each do |mailer_method|
+            test "mailer for #{preview_class}##{mailer_method}" do
+              preview.send(mailer_method).deliver_now
 
-            # See TimeFreezableMailer
-            preview.try(:return_time_if_frozen)
+              # See TimeFreezableMailer
+              preview.try(:return_time_if_frozen)
 
-            logfile = File.join(log_dir, "#{preview_class.name.underscore}##{mailer_method}.txt")
+              _assert_last_mail_body_unchanged("#{preview_class.name.underscore}##{mailer_method}")
 
-            # Use rstrip to avoid trailing space issues
-            expected = File.exist?(logfile) ? File.read(logfile).rstrip : ''
-            last_delivery = ActionMailer::Base.deliveries.last
-            result = last_delivery.html_part.body.raw_source.rstrip
+              # logfile = File.join(log_dir, "#{preview_class.name.underscore}##{mailer_method}.txt")
 
-            logger = File.open(logfile, 'w')
-            logger.puts result
-            logger.close
+              # # Use rstrip to avoid trailing space issues
+              # expected = File.exist?(logfile) ? File.read(logfile).rstrip : ''
+              # # last_delivery = ActionMailer::Base.deliveries.last
+              # # result = last_delivery.html_part.body.raw_source.rstrip
 
-            assert_equal expected, result, "Result mismatch! #{logfile.sub(/\.txt$/, '')}"
+              # # result = mails.last.html_part.body.raw_source.rstrip
+              # result = last_mail_body
+
+              # logger = File.open(logfile, 'w')
+              # logger.puts result
+              # logger.close
+
+              # assert_equal expected, result, "Result mismatch! #{logfile.sub(/\.txt$/, '')}"
+            end
           end
         end
       end
     end
+
+    def log_root_dir
+      raise 'Implementation needed'
+    end
+
+    # Overridable
+    def log_dir
+      File.expand_path(File.join(log_root_dir, "results/#{class_name.underscore}/"))
+    end
+
+    def reset_mails
+      ActionMailer::Base.deliveries = []
+    end
+
+    def mails
+      @mails ||= ActionMailer::Base.deliveries
+    end
+
+    def last_mail
+      raise 'Last mail does not exist' unless (mail = mails.last)
+
+      mail
+    end
+
+    def assert_mails_unchanged
+      mails.each do |mail|
+        assert_mail_unchanged(mail)
+      end
+    end
+
+    # TODO: Remove test result files that are not relevant anymore
+    def assert_mail_unchanged(mail)
+      # `method_name` refers to the name of the current test method.
+      dir = File.join(log_dir, method_name)
+      unless File.directory?(dir)
+        FileUtils.mkdir_p(dir)
+      end
+
+      mail.to.each do |recipient|
+        _assert_mail_body_unchanged("#{method_name}/#{recipient}", mail)
+      end
+    end
+
+    # def assert_last_mail_body_unchanged
+    #   # `method_name` refers to the name of the current test method.
+    #   _assert_mail_body_unchanged(method_name, last_mail)
+    # end
+
+    private
+      def _assert_mail_body_unchanged(log_path, mail)
+        file = File.join(log_dir, "#{log_path}.txt")
+
+        # Use rstrip to avoid trailing space issues
+        expected = File.exist?(file) ? File.read(file).rstrip : ''
+        result = mail.html_part.body.raw_source.rstrip
+
+        logger = File.open(file, 'w')
+        logger.puts result
+        logger.close
+
+        assert_equal expected, result, "Result mismatch! #{file.sub(/\.txt$/, '')}"
+      end
   end
 end

metadata

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