glib-web 4.21.0 → 4.23.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d78202b475738a29ed66ed9ab23374b4ccebdbd9d58554e60273d41fa99acf8a
-  data.tar.gz: b51e17878e5274b4955a2784a8c28f1fd739668ecea83a216b73380f4aa75d48
+  metadata.gz: 9044e86258995ce4d869c421c35d5c17d3d2c7127f5129d5a8247bf9b94cc560
+  data.tar.gz: c1f3991fbe7147ffabc04e626aa02e9ce4809957f1618b5c2e73835f2830cb48
 SHA512:
-  metadata.gz: a70cb51681f41ee739ff26fc4551b85ed5a7518267d9c911fcc0c5822261a7b0daa51bf25eab87868fba4206567355448cea1bf241bca10a903b3f6b2d603259
-  data.tar.gz: dfa00b2574d73744bf31643d1e71db360772c79eebae88e2e1bc6ce9c6fae18a999f0caee5756dba83b5081f698a52753693a5300e6ca9d0e80709281be795fe
+  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/helpers/glib/json_ui/action_builder/fields.rb

@@ -9,12 +9,13 @@ class Glib::JsonUi::ActionBuilder
       action :onBlur
     end
 
+    # deprecated, change to Clear at next major version release
     class Reset < Action
       string :targetId
       action :onReset
     end
 
-    # deprecated
+    # deprecated, delete at next major version release
     class GetDynamicGroupEntryValues < Action
       array :names
       action :onGet

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/forms/checkboxes.json.jbuilder

@@ -47,16 +47,16 @@ page.scroll childViews: ->(scroll) do
       form.spacer height: 20
       form.h2 text: 'Checkboxes with none_of_above'
       form.fields_checkGroup \
-      valueForDisableAll: 'none_of_above',
-          name: 'user[favorite_fruits][]',
-          value: 'grape',
-          uncheckValue: 1,
-          childViews: ->(group) do
-            group.fields_check label: 'Grape', checkValue: 'grape'
-            group.fields_check label: 'Banana', checkValue: 'banana'
-            group.fields_check label: 'Durian', checkValue: 'durian'
-            group.fields_check label: 'I dont like fruits', checkValue: 'none_of_above'
-          end
+        valueForDisableAll: 'none_of_above',
+            name: 'user[favorite_fruits][]',
+            value: 'grape',
+            uncheckValue: 1,
+            childViews: ->(group) do
+              group.fields_check label: 'Grape', checkValue: 'grape'
+              group.fields_check label: 'Banana', checkValue: 'banana'
+              group.fields_check label: 'Durian', checkValue: 'durian'
+              group.fields_check label: 'I dont like fruits', checkValue: 'none_of_above'
+            end
 
       form.spacer height: 20
       form.h2 text: 'Check all with checkGroup'
@@ -100,6 +100,26 @@ page.scroll childViews: ->(scroll) do
       form.fields_check id: 'check2', name: 'user[foo][]', label: 'Option 2', checkValue: true
       form.fields_check id: 'check3', name: 'user[foo][]', label: 'Option 3', checkValue: true
 
+      form.spacer height: 20
+      form.h2 text: 'Custom panels checkgroup'
+      form.fields_checkGroup \
+        width: 'matchParent',
+        name: 'user[custom_panels][]',
+        uncheckValue: 'unchecked',
+        childViews: ->(group) do
+          group.panels_flow id: 'flow', xs: { gap: { all: 8 } }, backgroundColor: 'grey', width: 'matchParent', childViews: ->(flow) do
+            flow.fields_check checkValue: '1', label: 'Choice 1', onChange: ->(action) do
+              action.components_set targetId: 'flow', data: { backgroundColor: '#ff0000' }
+            end
+            flow.fields_check checkValue: '2', label: 'Choice 2', onChange: ->(action) do
+              action.components_set targetId: 'flow', data: { backgroundColor: '#00ff00' }
+            end
+            flow.fields_check checkValue: '3', label: 'Choice 3', onChange: ->(action) do
+              action.components_set targetId: 'flow', data: { backgroundColor: '#0000ff' }
+            end
+          end
+        end
+
       form.spacer height: 20
       form.button text: 'Submit', onClick: ->(action) { action.forms_submit }
     end

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

@@ -30,7 +30,7 @@ page.form \
     form.h2 text: 'Button Date'
     form.label text: 'Plus 30 days'
     form.spacer height: 6
-    form.fields_date width: 150, name: 'user[date_start1]', label: 'Add start date', value: '2024-12-12', template: { type: 'text' }, onChange: ->(action) do
+    form.fields_date name: 'user[date_start1]', label: 'Add start date', value: '2024-12-12', min: '2024-11-1', max: '2024-12-31', template: { type: 'text' }, onChange: ->(action) do
       action.logics_set targetId: 'date3', conditionalData: { value: { "sum_date": [{ "var": 'user[date_start1]' }, { value: 86400 * 30, format: 'date' }] } }
     end
     form.spacer height: 6

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

@@ -130,25 +130,19 @@ page.form \
               column.fields_radio\
                 width: 'matchParent',
                 height: 'matchParent',
-                value: 'yes', label: 'Yes', icon: { template: 'featured', name: 'edit', size: 40, color: '#d1d1d1' },
-                onClick: ->(action) do
-                  action.windows_openWeb url: 'http://www.google.com'
-                end
+                value: 'yes', label: 'Yes', icon: { template: 'featured', name: 'edit', size: 40, color: '#d1d1d1' }
             end
             res.panels_column width: 'matchParent', lg: { cols: 4, padding: { x: 10 } }, childViews: ->(column) do
               column.fields_radio\
                 width: 'matchParent',
                 value: 'no', label: 'No (very very very very very very very very very very very long description)',
-                image: { template: 'featured', url: 'https://cdn.pixabay.com/photo/2020/08/05/13/12/eco-5465432_1280.png', width: 80, height: 80 },
-                onClick: ->(action) do
-                  action.windows_openWeb url: 'http://www.google.com'
-                end
+                image: { template: 'featured', url: 'https://cdn.pixabay.com/photo/2020/08/05/13/12/eco-5465432_1280.png', width: 80, height: 80 }
             end
             res.panels_column width: 'matchParent', lg: { cols: 4 }, childViews: ->(column) do
               column.fields_radio\
                 value: 'idk', label: 'Not Sure',
                 image: { template: 'thumbnail', url: 'https://cdn.pixabay.com/photo/2020/08/05/13/12/eco-5465432_1280.png', width: 24, height: 24 }
-              column.fields_radio value: '', label: 'Empty'
+              column.fields_radio value: 'empty', label: 'Empty'
             end
 
           end

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/_header.json.jbuilder

@@ -1,4 +1,4 @@
-navs = ['form', 'dialog', 'form_dynamic', 'auto_validate', 'multiupload', 'dirty_state', 'window']
+navs = ['form', 'dialog', 'form_dynamic', 'auto_validate', 'multiupload', 'dirty_state', 'window', 'selectable']
 
 view.panels_flow innerPadding: { bottom: 0 }, styleClass: 'align-right', width: 'matchParent', childViews: ->(res) do
   navs.each_with_index do |nav, index|

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

@@ -37,7 +37,7 @@ page.body childViews: ->(body) do
             template.fields_text width: 'matchParent', name: 'question', label: 'Question', placeholder: 'Question', styleClass: 'question'
 
             form.panels_responsive id: 'responsive_{{entryIndex}}', childViews: ->(column) do
-                options = [:rating, :yes_no, :choices]
+                options = [:rating, :yes_no, :choices, :unspecified]
                 template.fields_select \
                   width: 'matchParent',
                   name: 'type',
@@ -51,6 +51,11 @@ page.body childViews: ->(body) do
                       multiple.fields_getValues fieldNames: { '{{entryPrefix}}[type]' => nil, '{{entryPrefix}}[question]' => nil }, onGet: ->(get) do
                         get.snackbars_alert paramName: 'message', fieldName: 'entry-{{entryIndex}}'
                       end
+                      multiple.logics_run \
+                        condition: { "==": [{ "var": '{{entryPrefix}}[type]' }, 'unspecified'] },
+                        onTrue: ->(subaction) do
+                          subaction.dialogs_alert message: 'Please select a valid type'
+                        end
                       multiple.logics_set \
                         targetId: 'responsive_{{entryIndex}}', dataBuilder: ->(set) do
                           set.panels_responsive width: 'matchParent', accessory: ->(accessory) do

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

@@ -0,0 +1,91 @@
+page = json_ui_page json
+
+languages = {
+    'East Asia' => {
+      'zh' => 'Chinese',
+      'ja' => 'Japanese',
+      'ko' => 'Korean',
+    },
+    'Middle East' => {
+      'ar' => 'Arabic',
+      'hi' => 'Hindi',
+    },
+    'Europe' => {
+      'nl' => 'Dutch',
+      'en' => 'English',
+      'fr' => 'French',
+      'de' => 'German',
+      'it' => 'Italian',
+      'pt' => 'Portuguese',
+      'es' => 'Spanish',
+    },
+    'Eastern Europe' => {
+      'ru' => 'Russian',
+    }
+  }
+options = []
+languages.each do |group, sub|
+  options << { type: 'label', text: group }
+  options.concat(sub.map { |k, v| { value: k, text: v, subtitle: 'Country' } })
+  options << { type: 'divider' }
+end
+options << { text: 'None of above', value: 'none_of_above' }
+
+page.body padding: glib_json_padding_body, childViews: ->(body) do
+  body.panels_form \
+    url: json_ui_garage_url(path: 'forms/generic_post'),
+    method: 'post',
+    onChange: ->(action) do
+      action.logics_set targetId: 'checker2', skipOnChange: true, conditionalData: {
+        value: { "==": [{ "countNonNull": [{ "var": 'user[foo][]' }] }, 3] },
+        indeterminate: { "<": [0, { "countNonNull": [{ "var": 'user[foo][]' }] }, 3] }
+      }
+    end,
+    width: 'matchParent',
+    childViews: ->(form) do
+      form.h2 text: 'Select prepend & none_of_above'
+
+      form.fields_select \
+        valueForDisableAll: 'none_of_above',
+        prependSelectAll: true,
+        name: 'user[cities2][]',
+        width: 'matchParent',
+        label: 'Cities',
+        options: options,
+        value: ['melbourne', 'sydney'],
+        multiple: true
+
+      form.spacer height: 8
+
+      form.h2 text: 'Checkboxes none_of_above'
+      form.fields_checkGroup \
+        valueForDisableAll: 'none_of_above',
+        name: 'user[favorite_fruits][]',
+        value: 'grape',
+        uncheckValue: 1,
+        childViews: ->(group) do
+          group.fields_check label: 'Grape', checkValue: 'grape'
+          group.fields_check label: 'Banana', checkValue: 'banana'
+          group.fields_check label: 'Durian', checkValue: 'durian'
+          group.fields_check label: 'I dont like fruits', checkValue: 'none_of_above'
+        end
+
+      form.h2 text: 'Check all'
+      form.fields_check name: 'check_all_1', id: 'checker2', label: 'check all', checkValue: true, onChange: ->(action) do
+        action.logics_set targetIds: ['check1', 'check2', 'check3'], conditionalData: { value: { "!!": [{ "var": 'check_all_1' }] } }
+      end
+      form.fields_check id: 'check1', name: 'user[foo][]', label: 'Option 1', checkValue: true
+      form.fields_check id: 'check2', name: 'user[foo][]', label: 'Option 2', checkValue: true
+      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

data/lib/tasks/db.rake

@@ -79,6 +79,8 @@ namespace :db do
                 attrs[key] = value.utc
               elsif value.is_a? ActiveSupport::HashWithIndifferentAccess
                 attrs[key] = value.to_json
+              elsif value.is_a? BigDecimal
+                attrs[key] = value.to_f
               end
             end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: glib-web
 version: !ruby/object:Gem::Version
-  version: 4.21.0
+  version: 4.23.0
 platform: ruby
 authors:
 - ''
@@ -325,6 +325,7 @@ files:
 - app/views/json_ui/garage/test_page/form.json.jbuilder
 - app/views/json_ui/garage/test_page/form_dynamic.json.jbuilder
 - app/views/json_ui/garage/test_page/multiupload.json.jbuilder
+- app/views/json_ui/garage/test_page/selectable.json.jbuilder
 - app/views/json_ui/garage/test_page/window.json.jbuilder
 - app/views/json_ui/garage/views/_chart_data.json.jbuilder
 - app/views/json_ui/garage/views/banners.json.jbuilder
@@ -408,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: ''