glib-web 3.22.2 → 3.23.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 806df354ed58edcee98f342d40209e0f42b16343f79427941accd17b796d6c33
-  data.tar.gz: 8b0de205b315c74ad1a773cf6963f461e2952cf1fbf5f36e63aea66c648c4640
+  metadata.gz: 45dc3048668b5ebaea724341b5f6ee89cd90a467f7859d03923c1824ffdbb729
+  data.tar.gz: 69d8c59495ac1d84d17ee027a851b0761f1ae7981852a516ac449d36671f3d72
 SHA512:
-  metadata.gz: 5e9062feefed9651443c3a128de05df41e63a755cafdc10b66167f60643b9bf847a1dc4c68af9f95e8b9eff4f7a0f3b52d31fa61907575a6f09de7903dffb684
-  data.tar.gz: 651ae04bd671192239d8bc08e144733a011f6777e6b33347739579ec7511c7ff9bd9d0f23ff36ff110076242424606ac0500cb80ba0212b4487f788b177b7f55
+  metadata.gz: 9d31cca0cb02fb134b52c2eb166bd76fa4040ad64a88b4f3a7cd5d3080bf85a390c568e07805fc0fa91c0eab6529247b4d209f28a8c68385be82f31227ba9a4c
+  data.tar.gz: 0bc9b7c6b5d1e13fc1a4e6735f33f2819c5799c32ce6ee0001783c62eb9d6d9ed33d2771c80d695276d768e602e90ec591ebfa17b60b2234d696116312a5f49c

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

@@ -62,27 +62,14 @@ module Glib::Json::Libs
     JSON.parse(render_to_string(template, locals: args))
   end
 
-  def glib_html_url(url)
-    url = url.include?('?') ? url.sub(/.json\?/, '?') : url.sub(/.json$/, '')
-
-    # 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\&/, '');
-
-    # If no match, then we replace the front fragment
-    url.sub(/[\&\?]format=json/, '');
-  end
-
-  def glib_redirect_to(url, return_to_previous: false)
-    url = __delete_redirect_back_url(url) if return_to_previous
-
+  def glib_redirect_to(url)
     respond_to do |format|
       format.html do
         redirect_to url
       end
       format.json do
         if __json_ui_rendering?
-          redirect_to glib_html_url(url)
+          redirect_to url
           return
         end
 
@@ -160,10 +147,10 @@ module Glib::Json::Libs
     session.delete(REDIRECT_BACK_KEY) || url
   end
 
-  # def html_ui_redirect_back_or_to(default_url)
-  #   redirect_url = __delete_redirect_back_url(default_url)
-  #   redirect_to redirect_url
-  # end
+  def html_ui_redirect_back_or_to(default_url)
+    redirect_url = __delete_redirect_back_url(default_url)
+    redirect_to redirect_url
+  end
 
   def json_ui_redirect_back_or_to(default_url, json_action)
     redirect_url = __delete_redirect_back_url(default_url)
@@ -223,15 +210,9 @@ module Glib::Json::Libs
   end
 
   def json_ui_redirect_to(url)
-    # `onLoad` also executes in `onResponse` situation, e.g. form submit.
-    on_load = { action: 'windows/open', url: url }
-
-    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_load = { action: 'dialogs/close', onClose: on_load }
-    end
-    render json: { onLoad: on_load }
+    render json: {
+      onResponse: { action: 'dialogs/close', onClose: { action: 'windows/open', url: url } }
+    }
   end
 
   module ClassMethods

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

@@ -51,8 +51,10 @@ class Glib::JsonUi::ActionBuilder
       length :width
       length :height
       bool :closeOnBlur
+      bool :updateExisting
     end
 
+    # deprecated
     class Reload < Action
       panels_builder :content, :body
       string :url, cache: true

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

@@ -16,6 +16,7 @@ module Glib
       end
 
       class Action < JsonUiElement
+        string :targetId
         # def analytics(value)
         #   if value.is_a?(String)
         #     @analyticsEnabled = true
@@ -129,7 +130,6 @@ module Glib
 
       module Labels
         class Set < Action
-          string :targetId
           string :text
           action :onSet
         end
@@ -137,7 +137,6 @@ module Glib
 
       module Lists
         class Append < Action
-          string :targetId
           hash :row
         end
       end

data/app/helpers/glib/urls_helper.rb

@@ -1,7 +1,7 @@
 module Glib
   module UrlsHelper
-    def glib_url_current(override_params: params.to_unsafe_h, extra_params: {})
-      url_for(override_params.merge(extra_params.merge(only_path: false)))
+    def glib_url_current(new_params = {})
+      url_for(params.to_unsafe_h.merge(new_params.merge(only_path: false)))
     end
 
     def glib_url_equals_current?(url)

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

@@ -80,6 +80,10 @@ section.rows builder: ->(template) do
     action.dialogs_open url: json_ui_garage_url(path: 'forms/dialogs_update', mode: 'dialog')
   end
 
+  template.thumbnail title: 'dialogs/open (page with dialogs/open with updateExisting)', onClick: ->(action) do
+    action.dialogs_open url: json_ui_garage_url(path: 'forms/dialogs_update2')
+  end
+
   template.thumbnail title: 'dialogs/oauth', onClick: ->(action) do
     if respond_to?(:user_facebook_omniauth_authorize_url)
       provider = {

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

@@ -18,7 +18,7 @@ action.send "dialogs_#{dialog_mode}", **options, content: ->(dialog) do
       split.left childViews: ->(left) do
         left.panels_horizontal height: 'matchParent', align: 'middle', childViews: ->(horizontal) do
           horizontal.label text: 'Open current', onClick: ->(subaction) do
-            subaction.dialogs_reload width: 900, fullscreen: 'mobile', url: json_ui_garage_url(path: 'forms/basic', mode: 'dialog_reload')
+            subaction.dialogs_open width: 900, fullscreen: 'mobile', url: json_ui_garage_url(path: 'forms/basic')
           end
         end
       end

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

@@ -0,0 +1,14 @@
+json.title 'Forms'
+
+page = json_ui_page json
+render "#{@path_prefix}/nav_menu", json: json, page: page
+
+page.scroll childViews: ->(scroll) do
+  scroll.label text: 'This content will be replaced'
+end
+
+page.on load: ->(action) do
+  action.timeouts_set interval: 500, onTimeout: ->(subaction) do
+    subaction.dialogs_open url: json_ui_garage_url(path: 'forms/basic', mode: 'dialog'), updateExisting: true
+  end
+end

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

@@ -19,7 +19,66 @@ page.form \
     form.fields_text name: 'user[dirty_check_enabled]', width: 'matchParent', label: 'Dirty check enabled'
     form.spacer height: 14
     form.fields_text name: 'user[dirty_check_disabled]', width: 'matchParent', label: 'Dirty check disabled', disableDirtyCheck: true
+    form.spacer height: 14
+    form.fields_text name: 'user[dirty_check_with_value]', width: 'matchParent', label: 'Dirty check with value', value: 'Hello'
+    form.spacer height: 14
+
+    form.h3 text: 'Other inputs'
+    form.spacer height: 14
+    form.fields_number name: 'user[dirty_number]', width: 'matchParent', label: 'Number'
+    form.spacer height: 14
+    options = [{ text: 'Option 1', value: 'option_1' }, { text: 'Option 2', value: 'option_2' }]
+    form.fields_select name: 'user[dirty_select]', width: 'matchParent', label: 'Select', options: options
+    form.spacer height: 14
+    form.fields_select multiple: true, name: 'user[dirty_select_multiple]', width: 'matchParent', label: 'Select (multiple)', options: options, value: ['option_1']
+    form.spacer height: 14
+    form.fields_date name: 'user[dirty_date]', width: 'matchParent', label: 'Date', value: DateTime.current
+    form.spacer height: 14
+    form.label text: 'Chip group', padding: { bottom: 4 }
+    form.fields_chipGroup name: 'user[dirty_chipgroup]', width: 'matchParent', label: 'Chipgroup', value: ['option_2'], options: options
+    form.spacer height: 14
+
+    form.h3 text: 'valueIf'
+    form.fields_check name: 'user[check_all]', label: 'All', checkValue: true
+
+    form.fields_check name: 'user[check1]', label: 'Check 1', checkValue: true, valueIf: {
+      "==": [
+        {
+          "var": 'user[check_all]'
+        },
+        true
+      ]
+    }
+    form.fields_check name: 'user[check2]', label: 'Check 2', checkValue: true, valueIf: {
+      "==": [
+        {
+          "var": 'user[check_all]'
+        },
+        true
+      ]
+    }
+    form.fields_check name: 'user[check3]', label: 'Check 3', checkValue: true, valueIf: {
+      "==": [
+        {
+          "var": 'user[check_all]'
+        },
+        true
+      ]
+    }
+
+    form.h3 text: 'Radio'
+    form.spacer height: 14
+    form.fields_radioGroup name: 'user[gender]', value: 'F', childViews: ->(group) do
+      group.fields_radio value: '', label: 'Unknown'
+      group.fields_radio value: 'M', label: 'Male'
+      group.fields_radio value: 'F', label: 'Female'
+    end
+
+    form.h3 text: 'Rich text'
+    form.spacer height: 14
+    form.fields_richText name: 'user[richtext]', width: 'matchParent', value: 'lorem ipsum dumet...'
 
+    form.spacer height: 24
     form.panels_split width: 'matchParent', content: ->(split) do
       split.left childViews: ->(left) do
         left.panels_horizontal height: 'matchParent', align: 'middle', childViews: ->(horizontal) do

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

@@ -5,6 +5,7 @@ render "#{@path_prefix}/nav_menu", json: json, page: page
 
 page.scroll childViews: ->(scroll) do
   scroll.panels_form \
+    id: 'form',
     url: json_ui_garage_url(path: 'forms/generic_post'),
     method: 'post',
     padding: glib_json_padding_body,
@@ -20,7 +21,7 @@ page.scroll childViews: ->(scroll) do
         paramNameForFormData: 'message',
         onChange: ->(action) do
           action.dialogs_alert title: 'Submit data?', onClose: ->(subaction) do
-            action.forms_submit
+            action.forms_submit targetId: 'form'
           end
         end
 
@@ -30,7 +31,7 @@ page.scroll childViews: ->(scroll) do
         label: 'I am an employer (no default value)',
         onChange: ->(action) do
           action.dialogs_alert message: 'The form will be submitted when the dialog is closed', onClose: ->(subaction) do
-            action.forms_submit
+            action.forms_submit targetId: 'form'
           end
         end
 
@@ -46,7 +47,7 @@ page.scroll childViews: ->(scroll) do
         onChange: ->(action) do
           action.snackbars_select message: 'Submit data?', buttons: ->(menu) do
             menu.button text: 'Yes, submit', onClick: ->(subaction) do
-              subaction.forms_submit
+              subaction.forms_submit targetId: 'form'
             end
           end
         end
@@ -64,7 +65,7 @@ page.scroll childViews: ->(scroll) do
         onChange: ->(action) do
           action.sheets_select message: 'Submit data?', buttons: ->(menu) do
             menu.button text: 'Yes, submit', onClick: ->(subaction) do
-              action.forms_submit
+              action.forms_submit targetId: 'form'
             end
           end
         end
@@ -77,7 +78,7 @@ page.scroll childViews: ->(scroll) do
         onChange: ->(action) do
           action.sheets_select message: 'Submit data?', buttons: ->(menu) do
             menu.button text: 'Yes, submit', onClick: ->(subaction) do
-              action.forms_submit
+              action.forms_submit targetId: 'form'
             end
           end
         end
@@ -91,7 +92,7 @@ page.scroll childViews: ->(scroll) do
         onChange: ->(action) do
           action.sheets_select message: 'Submit data?', buttons: ->(menu) do
             menu.button text: 'Yes, submit', onClick: ->(subaction) do
-              action.forms_submit
+              action.forms_submit targetId: 'form'
             end
           end
         end
@@ -117,7 +118,7 @@ page.scroll childViews: ->(scroll) do
         onChange: ->(action) do
           action.sheets_select message: 'Submit data?', buttons: ->(menu) do
             menu.button text: 'Yes, submit', onClick: ->(subaction) do
-              action.forms_submit
+              action.forms_submit targetId: 'form'
             end
           end
         end

data/lib/glib/crypt/utils.rb

@@ -1,6 +1,5 @@
-# Deprecated. Use Glib::Crypt instead.
 module Glib
-  class Crypt
+  module Crypt
     class Utils
       def self.encrypt(original_message, encryption_secret, encryption_salt)
         encryptor = message_encryptor(encryption_secret, encryption_salt)

data/lib/glib/crypt.rb

@@ -1,28 +1 @@
 require_relative './crypt/utils'
-
-# A replacement of Glib::Crypt::Utils
-module Glib
-  class Crypt
-    # Recommended digest: 'SHA256'
-    def self.encrypt(original_message, encryption_secret, encryption_salt, digest)
-      encryptor = message_encryptor(encryption_secret, encryption_salt, digest)
-      CGI.escape(encryptor.encrypt_and_sign(original_message))
-    end
-
-    def self.decrypt(encrypted_message, encryption_secret, encryption_salt, digest)
-      encryptor = message_encryptor(encryption_secret, encryption_salt, digest)
-      begin
-        encryptor.decrypt_and_verify(CGI.unescape(encrypted_message))
-      rescue ActiveSupport::MessageEncryptor::InvalidMessage
-        nil
-      end
-    end
-
-    private
-      def self.message_encryptor(encryption_secret, encryption_salt, digest)
-        key_generator = ActiveSupport::KeyGenerator.new(encryption_secret, iterations: 1000)
-        key_secret = key_generator.generate_key(encryption_salt, 32)
-        ActiveSupport::MessageEncryptor.new(key_secret, digest: digest, serializer: JSON)
-      end
-  end
-end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: glib-web
 version: !ruby/object:Gem::Version
-  version: 3.22.2
+  version: 3.23.0
 platform: ruby
 authors:
 - ''
@@ -164,6 +164,7 @@ files:
 - app/views/json_ui/garage/forms/conditional_value.json.jbuilder
 - app/views/json_ui/garage/forms/dialogs_close.json.jbuilder
 - app/views/json_ui/garage/forms/dialogs_update.json.jbuilder
+- app/views/json_ui/garage/forms/dialogs_update2.json.jbuilder
 - app/views/json_ui/garage/forms/dirty_prompt.json.jbuilder
 - app/views/json_ui/garage/forms/dynamic_group.json.jbuilder
 - app/views/json_ui/garage/forms/dynamic_select.json.jbuilder
@@ -335,8 +336,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: ''