glib-web 4.22.0 → 4.23.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 973660b5005d3ea4990845eeb17cbb853bc2e9545aef54659654e0c4955776a3
-  data.tar.gz: 8b5f8c01195733b5eadca70ff45b1b5d992ed2f6bf2c8f87818ac34a51e760bb
+  metadata.gz: 9044e86258995ce4d869c421c35d5c17d3d2c7127f5129d5a8247bf9b94cc560
+  data.tar.gz: c1f3991fbe7147ffabc04e626aa02e9ce4809957f1618b5c2e73835f2830cb48
 SHA512:
-  metadata.gz: 7980032e83ea3569932729997e50f57be9d4e6204590f81455f7d774911aafa68ce6302a91caa7913671b55d7645492aab7e4b58e278ec9bc10f39430359bff7
-  data.tar.gz: 8487bce20e4614df9099e751a210431340eb62cbea2b71a5bdd6c226b459a30172a20f46f0e645ee08225cb9b3cd6b5c1c33438b84b3f8a5c41a85b251585444
+  metadata.gz: b3f10f85edf2d3dc57bb70723b70683691c624295a8ef673c870731449bf0f7222d5786317fa6c77bb3c8a55bc90315864c641e94dbf52eae5fc94de7250bc25
+  data.tar.gz: 447a0021c20e6cd60be6f5d140ae7d25f975927e40686d10d13faf83ad71bef7fbbece7ade06104533a6ff1538606f0900be3580911aa5968f9e6e7ad9166e46

data/app/controllers/concerns/glib/auth/policy.rb

@@ -22,8 +22,7 @@ module Glib::Auth
     end
 
     module Overrides
-
-      public  # Override
+      # Override
       def policy(record, policy_name = nil, context = nil)
         policy_name ||= record
 
@@ -50,11 +49,10 @@ module Glib::Auth
       end
 
       # Expose protected method
-      public  # Override
+      # Override
       def policy_scope(*args, **opts)
         super
       end
-
     end
 
     def glib_raise_forbidden
@@ -71,13 +69,11 @@ module Glib::Auth
       policy(record, nil, context).send("#{action}?")
     end
 
-    public
     def cannot?(action, record, context = nil)
       !policy(record, nil, context).send("#{action}?")
     end
 
     # Inspired from https://github.com/ryanb/cancan/wiki/Non-RESTful-Controllers
-    public
     def glib_authorize_resource(*args)
       options = args.extract_options!
       resource_name = args.first
@@ -104,14 +100,11 @@ module Glib::Auth
       raise_access_denied(resource_instance, policy_instance) unless policy_instance.public_send(query)
     end
 
-
-
     class UnauthorizedError < Pundit::NotAuthorizedError
     end
 
-
-
     module ClassMethods
+      # rubocop:disable Style/ClassVars
       def glib_auth_init
         @@__glib_auth_init = true
 
@@ -122,40 +115,40 @@ module Glib::Auth
       def glib_auth_inited?
         @@__glib_auth_init ||= false
       end
+      # rubocop:enable Style/ClassVars
 
       # TODO: Consider deprecating
-      public
-      def authorize_resource(*args)
-        options = args.extract_options!
-        resource_name = args.first
-
-        self.before_action(options.slice(:only, :except, :if, :unless)) do |controller|
-          resource_name ||= resource_name_from_controller
-
-          begin
-            if !(resource_key = options[:class]).nil?
-              resource = case resource_key
-                         when false
-                           resource_name.to_sym
-                         when Symbol, Class
-                           resource_key
-                         else
-                           raise "Invalid resource class: #{resource_key}"
-              end
-
-              authorize resource
-            elsif (resource_instance = controller.instance_variable_get("@#{resource_name}"))
-              authorize resource_instance
-            else
-              authorize resource_name.camelize.constantize
-            end
-          rescue Pundit::NotAuthorizedError => e
-            raise_access_denied(e.record, e.policy)
-          end
-
-          verify_authorized
-        end
-      end
+      # def authorize_resource(*args)
+      #   options = args.extract_options!
+      #   resource_name = args.first
+
+      #   self.before_action(options.slice(:only, :except, :if, :unless)) do |controller|
+      #     resource_name ||= resource_name_from_controller
+
+      #     begin
+      #       if !(resource_key = options[:class]).nil?
+      #         resource = case resource_key
+      #                    when false
+      #                      resource_name.to_sym
+      #                    when Symbol, Class
+      #                      resource_key
+      #                    else
+      #                      raise "Invalid resource class: #{resource_key}"
+      #         end
+
+      #         authorize resource
+      #       elsif (resource_instance = controller.instance_variable_get("@#{resource_name}"))
+      #         authorize resource_instance
+      #       else
+      #         authorize resource_name.camelize.constantize
+      #       end
+      #     rescue Pundit::NotAuthorizedError => e
+      #       raise_access_denied(e.record, e.policy)
+      #     end
+
+      #     verify_authorized
+      #   end
+      # end
     end
 
     def resource_name_from_controller

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

@@ -7,7 +7,7 @@ module Glib::Json::Libs
     helper_method :json_ui_app_bundle_id, :json_ui_app_build_version, :json_ui_app_device_os
     helper_method :json_ui_app_is_android?, :json_ui_app_is_ios?, :json_ui_app_is_web?
     # helper_method :json_ui_redirect_back_or_to
-    helper_method :delete_redirect_back_url
+    helper_method :delete_redirect_back_url, :redirect_back_url
 
     include Glib::Auth::Response
     helper_method :glib_json_dialog_mode?
@@ -171,6 +171,10 @@ module Glib::Json::Libs
     end
   end
 
+  def redirect_back_url
+    session[REDIRECT_BACK_KEY]
+  end
+
   def __delete_redirect_back_url(url)
     session.delete(REDIRECT_BACK_KEY) || url
   end

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

@@ -15,6 +15,7 @@ class Glib::JsonUi::ActionBuilder
       length :width
       bool :closeOnBlur
       bool :updateExisting
+      action :onClose
 
       # def initialize(json, page)
       #   @json = json
@@ -34,6 +35,7 @@ class Glib::JsonUi::ActionBuilder
       length :height
       bool :closeOnBlur
       bool :updateExisting
+      action :onClose
     end
 
     class Reload < Action

data/app/policies/glib/application_policy.rb

@@ -6,6 +6,7 @@ module Glib
     attr_reader :user, :record, :policy_name, :controller, :request, :params
 
     private
+      # rubocop:disable Metrics/ParameterLists
       def initialize(user, record, policy_name, controller, request, params)
         @user = user
         @record = record
@@ -16,13 +17,14 @@ module Glib
         @params = params
         @policy_name = policy_name
       end
+      # rubocop:enable Metrics/ParameterLists
 
       class << self
         attr_reader :catch_all
 
         # This is to define the authorization logic for an action (or a group of actions). It's different from controller's
         # authorize().
-        private  # Used by child
+        private # Used by child
           def authorize(*actions, &block)
             actions.each do |action|
               if action == :glib_all
@@ -33,19 +35,17 @@ module Glib
                 # Avoid accidentally redefining multiple times from child policies. But it's okay if the child policy
                 # wants to override the parent's authorization method.
                 raise "Action authorization has been declared: #{action}" if instance_methods(false).include?(method_name.to_sym)
+
                 define_method method_name, &block
               end
             end
           end
-
       end
 
-    private
       def catch_all
         self.class.catch_all
       end
 
-    private
       # To ensure the block is called on the policy's instance instead class.
       def call_catch_all
         instance_eval(&catch_all)
@@ -100,14 +100,17 @@ module Glib
 
     public
     def method_missing(name, *args, &block)
-      if name.to_s.end_with?('?') && catch_all
+      if respond_to_missing?(name) && catch_all
         call_catch_all
       else
         super
       end
     end
 
-    public
+    def respond_to_missing?(method_name, include_private = false)
+      method_name.to_s.end_with?('?') || super
+    end
+
     def scope
       policy_scope_class = Pundit::PolicyFinder.new(@policy_name).scope
       return unless policy_scope_class
@@ -115,15 +118,11 @@ module Glib
       controller.policy_scope(record.class, policy_scope_class: policy_scope_class)
     end
 
-    public
     def self.args_builder
-      Proc.new { |controller| [] }
+      proc { |_controller| [] }
     end
 
-    public
-    def helpers
-      controller.helpers
-    end
+    delegate :helpers, to: :controller
 
     class Scope
       attr_reader :user, :scope
@@ -143,7 +142,7 @@ module Glib
       end
     end
 
-    private  # Used by child
+    private # Used by child
       def everyone
         true
       end

data/app/views/json_ui/garage/actions/_dialogs.json.jbuilder

@@ -49,7 +49,14 @@ section.rows builder: ->(template) do
   end
 
   template.thumbnail title: 'dialogs/open', onClick: ->(action) do
-    action.dialogs_open width: 950, url: json_ui_garage_url(path: 'forms/basic', mode: 'dialog'), disableCloseButton: true
+    action.dialogs_open \
+      width: 950,
+      url: json_ui_garage_url(path: 'forms/basic', mode: 'dialog'),
+      disableCloseButton: true,
+      closeOnBlur: true,
+      onClose: ->(saction) do
+        saction.snackbars_alert message: 'dialog closed'
+      end
   end
 
   template.thumbnail title: 'dialogs/open (fullscreen on mobile)', onClick: ->(action) do

data/app/views/json_ui/garage/actions/_dialogs_show.json.jbuilder

@@ -12,7 +12,9 @@ end
 
 include_form = local_assigns[:include_form]
 
-action.send "dialogs_#{dialog_mode}", **options, content: ->(dialog) do
+action.send "dialogs_#{dialog_mode}", **options,
+onClose: ->(action) { action.snackbars_alert message: 'dialog closed' },
+content: ->(dialog) do
   dialog.body padding: glib_json_padding_body, childViews: ->(body) do
     body.markdown text: markdown
 

data/app/views/json_ui/garage/tables/pagination.json.jbuilder

@@ -9,7 +9,7 @@ per_page = 20
 page_index = params[:page]&.to_i || 1
 
 page.scroll padding: glib_json_padding_body, childViews: ->(scroll) do
-  scroll.panels_table key: params[:page], firstSection: ->(section) do
+  scroll.panels_table firstSection: ->(section) do
     section.header cellViews: ->(header) do
       header.label text: 'Name'
       header.label text: 'Status'

data/app/views/json_ui/garage/test_page/selectable.json.jbuilder

@@ -79,6 +79,13 @@ page.body padding: glib_json_padding_body, childViews: ->(body) do
       form.fields_check id: 'check3', name: 'user[foo][]', label: 'Option 3', checkValue: true
 
       form.spacer height: 8
+
+      form.h2 text: 'Timezone'
+      form.fields_timeZone name: 'user[timezone]', label: 'Timezone', value: 'Asia/Shanghai'
+      form.fields_timeZone name: 'user[timezone_with_current_local]', label: 'Local Timezone'
+
+      form.spacer height: 8
+
       form.fields_submit text: 'Submit'
     end
 end

metadata

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