glib-web 8.0.0 → 8.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: dfa432bee9f77048fec3655d894d354986edb1e2eb1750c457b30085c939b7e5
-  data.tar.gz: fb85b5fbc2e5d766883eaa623e64ad3ca1661dabc2527e56d9a804673e94e9d1
+  metadata.gz: 22842c76cc4c92471f28991ff906491e61429a891a9da912aff82af48ac90125
+  data.tar.gz: dcb1bfce2a976cae302dc39662c3d696a9c951eb0934fdf6e7d0d2257d5ad48e
 SHA512:
-  metadata.gz: d5293ff30003202c2ef89f75ad41b92c3d3ab326f40842d95df3f75d73e9c3aaf57ffbe1fa2ba21ae7b233061a2e6e13f2fc9a5f284d694dda0e69e06aa9e0f6
-  data.tar.gz: 2d14b253bee2be2015de7c9ced6d76109070568fc4e4018cdc6c24dcc371b5feae5cee4f727bc386696e292bb0dc5d9d8315a86c4aedac4f528503308f9f8944
+  metadata.gz: b094093515f7d56a0d4374779dac06b97ef70ee2bd164507668d03c22e5791913264ed68d3ea1ccf33aeeb7ae36cca6b939f78729c2ca94c228007d97024522f
+  data.tar.gz: 86a7cc0bc03aeefd9d96d3cbc06e382e0a9b1b6cb851a4b723dc701b825f474d5aac822151505932e320a166299bc246c722dbd9b5e34685b093bfc6826f1e54

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

@@ -991,6 +991,7 @@ class Glib::JsonUi::ViewBuilder
     class Carousel < View
       views :childViews
       string :distribution
+      int :interval
     end
 
     # # TODO: Deprecate in favour of styleClasses

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

@@ -31,9 +31,26 @@ module Glib
   # key and is almost always a bug) and override the reader to return a symbol,
   # so callers can compare with `record.status == :active` without tracking
   # which form they're holding (see backend/01a_defensive_programming.md item 7).
+  #
+  # The same symbolization covers the per-attribute dirty-tracking readers
+  # (`status_was`, `status_in_database`, `status_change`, `saved_change_to_status`,
+  # ...), which Rails builds from the raw attribute rather than through the
+  # reader and would otherwise hand back the enum's string label. The dirty
+  # PREDICATES (`status_changed?(from: :draft)`) need no override: Rails casts
+  # their from:/to: through the enum type, so symbols already work there.
+  # Hash-form readers (`changes`, `saved_changes`, `attributes`) are left as
+  # Rails returns them: they are keyed by attribute name rather than written
+  # per attribute, and their consumers (serialization, audit trails, update
+  # payloads) expect Rails' native form.
   module EnumSymbolization
     extend ActiveSupport::Concern
 
+    # Per-attribute dirty readers returning the single value (string or nil).
+    VALUE_SUFFIXES = %w[_was _previously_was _before_last_save _in_database].freeze
+    # Per-attribute dirty readers returning a [before, after] pair, or nil when
+    # unchanged. `saved_change_to_<attr>` is the prefixed member of this set.
+    PAIR_SUFFIXES = %w[_change _previous_change _change_to_be_saved].freeze
+
     class_methods do
       def enum_symbolize(*attrs, **opts)
         if attrs.size >= 2 && (attrs[1].is_a?(Hash) || attrs[1].is_a?(Array))
@@ -48,7 +65,7 @@ module Glib
           # remove or move below `enum`.
           attribute name, Glib::EnumSymbolization.backing_type(values)
           enum name, values, **opts
-          glib_symbolize_reader(name)
+          glib_symbolize_enum(name)
         else
           # Legacy form: enum_symbolize :a[, :b, ...] for enums already declared.
           if opts.any?
@@ -56,18 +73,38 @@ module Glib
               "enum_symbolize: pass enum values as a braced hash, " \
               "e.g. enum_symbolize :#{attrs.first}, { ... }"
           end
-          attrs.each { |attr| glib_symbolize_reader(attr) }
+          attrs.each { |attr| glib_symbolize_enum(attr) }
         end
       end
 
       private
 
-        def glib_symbolize_reader(attr)
+        # Overrides are defined on the model class itself, above the generated
+        # attribute-methods module Rails includes, so each `super()` reaches the
+        # Rails implementation.
+        def glib_symbolize_enum(attr)
           validates attr, presence: true
-          define_method(attr) { super()&.to_sym }
+          define_method(attr) { Glib::EnumSymbolization.symbolize(super()) }
+
+          VALUE_SUFFIXES.each do |suffix|
+            define_method("#{attr}#{suffix}") { Glib::EnumSymbolization.symbolize(super()) }
+          end
+
+          pair_methods = PAIR_SUFFIXES.map { |suffix| "#{attr}#{suffix}" } + ["saved_change_to_#{attr}"]
+          pair_methods.each do |method_name|
+            define_method(method_name) { super()&.map { |value| Glib::EnumSymbolization.symbolize(value) } }
+          end
         end
     end
 
+    # A label becomes a symbol; nil stays nil. Anything else passes through:
+    # with `validate: true` Rails casts an unknown raw value (99) to itself
+    # instead of raising, and that value must survive to fail validation
+    # rather than blow up in `to_sym`.
+    def self.symbolize(value)
+      value.is_a?(String) ? value.to_sym : value
+    end
+
     # Infer the attribute type backing an enum from its declared values, so the
     # type never depends on the (possibly not-yet-migrated) DB column. A hash
     # whose values are strings backs a :string column; integer-keyed hashes and

data/app/views/json_ui/garage/panels/carousel.json.jbuilder

@@ -34,5 +34,12 @@ json_ui_page json do |page|
         panel.image height: height, url: image_url2
       end
     end
+
+    scroll.spacer height: 20
+    scroll.h1 text: 'Carousel with cycle'
+    scroll.panels_carousel width: 'matchParent', interval: 3000, childViews: ->(carousel) do
+      carousel.image url: image_url1, width: 'matchParent'
+      carousel.image url: image_url2, width: 'matchParent'
+    end
   end
 end

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

@@ -153,6 +153,41 @@ page.form(
         res.fields_check name: 'user[tags][]', checkValue: 'b', label: 'Tag B', onChange: set_eq_check
         res.spacer height: 8
         res.label id: 'set_eq_status', text: 'PENDING'
+
+        res.spacer height: 16
+        res.h2 text: 'Logics Set - time of day'
+        res.spacer height: 8
+        # `minutesOfDay` parses a typed time of day exactly as a consuming
+        # app's server does and `formatHm` renders the length in explicit
+        # units ("4h", "1h 5m"), so a Start/End pair
+        # shows its duration live. The `+ 1440` before the `% 1440` keeps
+        # json-logic's JS remainder positive when the End is before the
+        # Start, which is also when "(next day)" is said. A missing time
+        # says a non-breaking space, not an empty string, so the label keeps
+        # its height and the page never jumps mid-typing.
+        duration_update = ->(action) do
+          start_minutes = { 'minutesOfDay' => { 'var' => 'user[start_time]' } }
+          end_minutes = { 'minutesOfDay' => { 'var' => 'user[end_time]' } }
+          action.logics_set(
+            targetId: 'duration_label',
+            conditionalData: {
+              text: {
+                'if' => [
+                  { 'or' => [{ '==' => [start_minutes, nil] }, { '==' => [end_minutes, nil] }] }, "\u00a0",
+                  {
+                    'cat' => ['Duration ',
+                              { 'formatHm' => { '%' => [{ '+' => [{ '-' => [end_minutes, start_minutes] }, 1440] }, 1440] } },
+                              { 'if' => [{ '<' => [end_minutes, start_minutes] }, ' (next day)', ''] }]
+                  }
+                ]
+              }
+            }
+          )
+        end
+        res.fields_text label: 'Start', name: 'user[start_time]', width: 300, onChange: duration_update
+        res.fields_text label: 'End', name: 'user[end_time]', width: 300, onChange: duration_update
+        res.spacer height: 8
+        res.label id: 'duration_label', text: 'PENDING'
       end
     )
   end

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

@@ -0,0 +1,42 @@
+json.title 'Test Page (panels_association)'
+
+page = json_ui_page json
+render 'json_ui/garage/test_page/header', json: json, page: page
+
+# The panels_association fixture (spec 353, D5): doculocker's submission-form
+# shape on dummy-app models, unpersisted so the page is deterministic against
+# the dummy host's empty database. One un-indexed association (the signature
+# form's singular nested model), two indexed associations each holding an
+# indexed nested association (the qualification form's two-deep shape), a
+# panels_responsive inside one (the signature form nests one), hidden id and
+# visible text props, and a submit.
+page.form \
+  url: json_ui_garage_url(path: 'forms/generic_post'),
+  model: Post.new(title: 'Fixture post'),
+  method: 'post',
+  padding: glib_json_padding_body,
+  childViews: ->(form) do
+  form.fields_text prop: :title, label: 'Post title'
+
+  form.h3 text: 'Unindexed association'
+  form.panels_association model: Comment.new(content: 'Lead comment'), width: 'matchParent', childViews: ->(assoc) do
+    assoc.fields_hidden prop: :id
+    assoc.panels_responsive width: 'matchParent', childViews: ->(responsive) do
+      responsive.fields_text prop: :content, label: 'Lead comment'
+    end
+  end
+
+  form.h3 text: 'Indexed associations'
+  [['First comment', 'first.pdf'], ['Second comment', 'second.pdf']].each_with_index do |(content, filename), index|
+    form.panels_association model: Comment.new(content: content), width: 'matchParent', order_index: index,
+      childViews: ->(comment) do
+      comment.fields_text prop: :content, label: "Comment #{index}"
+      comment.panels_association model: CommentFile.new(filename: filename), width: 'matchParent', order_index: 0,
+        childViews: ->(file) do
+        file.fields_text prop: :filename, label: "Comment #{index} file"
+      end
+    end
+  end
+
+  form.fields_submit text: 'Submit'
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: glib-web
 version: !ruby/object:Gem::Version
-  version: 8.0.0
+  version: 8.1.0
 platform: ruby
 authors:
 - ''
@@ -499,6 +499,7 @@ files:
 - app/views/json_ui/garage/test_page/multimedia_video.json.jbuilder
 - app/views/json_ui/garage/test_page/pagination.json.jbuilder
 - app/views/json_ui/garage/test_page/panels.json.jbuilder
+- app/views/json_ui/garage/test_page/panels_association.json.jbuilder
 - app/views/json_ui/garage/test_page/panels_bulkEdit3.json.jbuilder
 - app/views/json_ui/garage/test_page/popovers.json.jbuilder
 - app/views/json_ui/garage/test_page/progressCircle.json.jbuilder