glib-web 4.33.2 → 4.34.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9040c82eb897876dc746766352ceb20dd9da9bb9510e18ed1e5fd8d73a6a19c0
-  data.tar.gz: fcd3e8be8b8074949b91c63371b924d220fb949b8f21346433e70a3243c84204
+  metadata.gz: a897a2657114bf12b52da917ad8857e4b7e1070bc99eefe7e4cc49c519508bdb
+  data.tar.gz: 2bf662a93d9a308f5eec89dc7d3562b4ddc7462886f0ec0a239bd64dd81c75d0
 SHA512:
-  metadata.gz: 8b32c7996999ef3525e307e2a8209bb1ec27ad4848393ce824c77a0732bc140acd342b177ca885689f363af74a1f7cf839256634b249c8d2d313522d8d66c343
-  data.tar.gz: 21a99663c601f50f8f6df910c4bd81310cc3156d968f2da276ab8de63f4f04d5bb1e084a87df2abad0a4a8210bef9bb19f68a79db82b263cc6840d56890b9dd6
+  metadata.gz: c8a8915e195ed0e6e5f9e39789fdb886887cdb264e7fbc873f3833906be02b44308ca9a7488a9ad30170720ab0e9761ef46dbdf7e230edaac81f3da764c5fe63
+  data.tar.gz: 4e8d8a377ccf28259fcde1ce4d265cddf4d67096a391e96aabecd48a77742d1ace91775b322614879a355fb1b2d0728144461eb3ff4677983a4013d4bd20bf76

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

@@ -313,7 +313,7 @@ module Glib::Json::Libs
       end
     end
 
-    def json_libs_rescue_csrf
+    def json_libs_rescue_csrf(sign_in_url_proc)
       rescue_from ActionController::InvalidAuthenticityToken do |exception|
         # sign_out(:user)
 
@@ -330,7 +330,7 @@ module Glib::Json::Libs
 
         respond_to do |format|
           format.html do
-            redirect_to sign_in_url
+            redirect_to instance_exec(&sign_in_url_proc)
           end
           format.json do
             render json: {

data/app/models/concerns/glib/soft_deletable.rb

@@ -116,7 +116,7 @@ module Glib
 
           # Use `send()` instead of `association(relationship).scope` because the latter returns new record objects as opposed
           # to existing objects which could cause a side effect.
-          relation = send(relationship)
+          relation = public_send(relationship)
 
           # Use `each` instead of `find_each` because `each` is cached which is important to retain the
           # `marked_for_destruction` status.

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

@@ -4,7 +4,7 @@ page = json_ui_page json
 
 render "#{@path_prefix}/nav_menu", json: json, page: page
 
-page.form url: json_ui_garage_url(path: 'forms/generic_post'), method: 'post', padding: glib_json_padding_body, childViews: ->(form) do
+page.form id: 'form', url: json_ui_garage_url(path: 'forms/generic_post'), method: 'post', padding: glib_json_padding_body, childViews: ->(form) do
 
   form.spacer height: 20
   form.h2 text: 'Basic select fields'
@@ -62,7 +62,7 @@ page.form url: json_ui_garage_url(path: 'forms/generic_post'), method: 'post', p
       options: options,
       value: ['melbourne', 'sydney'],
       multiple: true,
-      onChange: ->(action) do
+            onChange: ->(action) do
         action.dialogs_alert message: 'Options selected'
       end
 
@@ -141,11 +141,25 @@ page.form url: json_ui_garage_url(path: 'forms/generic_post'), method: 'post', p
     end
 
   form.fields_select \
+    id: 'lang',
     name: 'user[languages][]',
     width: 'matchParent',
     label: 'Primary Language',
     options: options,
     value: ['ja', 'de'],
+    accessory: ->(view) do
+        view.footer padding: { x: 16, y: 10 }, width: 'matchParent', styleClass: 'sticky-footer', childViews: ->(footer) do
+          footer.panels_flow width: 'matchParent', styleClass: 'justify-end', childViews: ->(hori) do
+            hori.label text: 'Reset', styleClass: 'text-primary', onClick: ->(action) do
+              action.components_set targetId: 'lang', data: { value: [] }
+            end
+            hori.spacer width: 16
+            hori.label text: 'Apply', styleClass: 'text-primary', onClick: ->(action) do
+              action.forms_submit targetId: 'form'
+            end
+          end
+        end
+      end,
     multiple: true
 
   form.spacer height: 6
@@ -196,7 +210,7 @@ page.form url: json_ui_garage_url(path: 'forms/generic_post'), method: 'post', p
     label: 'Time Zone',
     clearable: true,
     value: 'America/Chicago'
-    # value: 'Australia/Melbourne'
+  # value: 'Australia/Melbourne'
 
 
   form.button text: 'Submit', onClick: ->(action) { action.forms_submit }

data/lib/glib/rubocop/cops/localize.rb

@@ -0,0 +1,26 @@
+# frozen_string_literal: true
+
+module RuboCop
+  module Cop
+    module Glib
+      class Localize < Base
+        RESTRICT_ON_SEND = %i[h1 h2 h3 h4 h5 p label markdown
+        fields_text fields_number fields_select fields_password
+        fields_textarea fields_check fields_checkGroup fields_chipGroup
+        fields_timeZone fields_radioGroup fields_date fields_datetime].freeze
+
+        def_node_matcher :watched_key?, <<~PATTERN
+          (send _ _ (hash <(pair (sym {:title | :subtitle | :subsubtitle | :label | :placeholder | :text}) $...) ...>))
+        PATTERN
+
+        def on_send(node)
+          watched_key?(node) do |snode|
+            add_offense(snode.first, message: 'Unlocalized string') if snode.first.str_type? || snode.first.dstr_type?
+          end
+        end
+
+        alias on_csend on_send
+      end
+    end
+  end
+end

data/lib/glib/rubocop.rb

@@ -0,0 +1 @@
+require_relative 'rubocop/cops/localize'

data/lib/glib/snapshot.rb

@@ -13,10 +13,31 @@ module Glib
 
       before_save do
         self.attributes_before_save = attributes_in_database
-        self.snapshot_changed = changed?
+        self.snapshot_changed = check_snapshot_changed
       end
     end
 
+    def check_snapshot_changed
+      return true if changed?
+
+      associations_for_snapshot.each do |association_name|
+        if (association = self.class.reflect_on_association(association_name))
+          case association.macro
+          when :has_many
+            public_send(association_name).each do |record|
+              return true if record.changed?
+            end
+          when :has_one, :belongs_to
+            return true if public_send(association_name).changed?
+          end
+        else
+          raise "Invalid association: #{association_name}"
+        end
+      end
+
+      false
+    end
+
     def where_snapshots(user: nil, field: nil, action: nil, association: nil, association_action: nil, like: nil)
       query = snapshots
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: glib-web
 version: !ruby/object:Gem::Version
-  version: 4.33.2
+  version: 4.34.1
 platform: ruby
 authors:
 - ''
@@ -417,6 +417,8 @@ files:
 - lib/glib/json_crawler/http.rb
 - lib/glib/json_crawler/router.rb
 - lib/glib/mailer_tester.rb
+- lib/glib/rubocop.rb
+- lib/glib/rubocop/cops/localize.rb
 - lib/glib/snapshot.rb
 - lib/glib/test_helpers.rb
 - lib/glib/time_freezable_mailer.rb