glib-web 4.39.2 → 4.41.0

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

@@ -3,85 +3,94 @@ json.title 'Timeline Panels'
 page = json_ui_page json
 render "#{@path_prefix}/nav_menu", json: json, page: page
 
-page.scroll padding: glib_json_padding_body, childViews: ->(scroll) do
-  timeline_items = [
-      { icon: 'place', color: '#4BB543' },
-      { icon: 'check_circle', color: 'blue' },
-      { icon: 'hourglass_empty', color: 'blue', text: 'Pending' },
-      { icon: 'radio_button_unchecked' },
-      { icon: 'radio_button_unchecked' },
+page.scroll(
+  padding: glib_json_padding_body,
+  childViews: ->(scroll) do
+    timeline_items = [
+    { icon: 'place', color: '#4BB543' },
+    { icon: 'check_circle', color: 'blue' },
+    { icon: 'hourglass_empty', color: 'blue', text: 'Pending' },
+    { icon: 'radio_button_unchecked' },
+    { icon: 'radio_button_unchecked' },
     ]
-
-  scroll.h2 text: 'Basic timeline'
-  scroll.panels_timeline \
-    events: timeline_items,
-    childViews: ->(timeline) do
-      timeline.label styleClass: 'mt-2', text: 'Order submitted'
-
-      timeline.label styleClass: 'mt-2', text: 'Finding you a driver'
-
-      timeline.panels_vertical styleClass: 'mt-2', childViews: ->(vertical) do
-        vertical.h4 text: 'Driver found, picking you up..'
-        vertical.spacer height: 16
-        render 'json_ui/garage/panels/timeline_content', tview: vertical
+    scroll.h2 text: 'Basic timeline'
+    scroll.panels_timeline(
+      events: timeline_items,
+      childViews: ->(timeline) do
+        timeline.label styleClass: 'mt-2', text: 'Order submitted'
+        timeline.label styleClass: 'mt-2', text: 'Finding you a driver'
+        timeline.panels_vertical(
+          styleClass: 'mt-2',
+          childViews: ->(vertical) do
+            vertical.h4 text: 'Driver found, picking you up..'
+            vertical.spacer height: 16
+            render 'json_ui/garage/panels/timeline_content', tview: vertical
+          end
+        )
+        timeline.label styleClass: 'mt-2', text: 'On the way'
+        timeline.label styleClass: 'mt-2', text: 'Arrived'
       end
-
-      timeline.label styleClass: 'mt-2', text: 'On the way'
-
-      timeline.label styleClass: 'mt-2', text: 'Arrived'
-    end
-
-  timeline_items = [
-      { icon: 'place', color: '#4BB543', styleClasses: ['outlined'] },
-      { icon: 'check_circle', color: 'blue', styleClasses: ['outlined'] },
-      { icon: 'check_circle', color: 'blue', styleClasses: ['outlined'] },
-      { icon: 'check_circle', color: 'blue', styleClasses: ['outlined'] },
-      { icon: 'flag', color: '#FFA500', styleClasses: ['outlined'] },
+    )
+    timeline_items = [
+    { icon: 'place', color: '#4BB543', styleClasses: ['outlined'] },
+    { icon: 'check_circle', color: 'blue', styleClasses: ['outlined'] },
+    { icon: 'check_circle', color: 'blue', styleClasses: ['outlined'] },
+    { icon: 'check_circle', color: 'blue', styleClasses: ['outlined'] },
+    { icon: 'flag', color: '#FFA500', styleClasses: ['outlined'] },
     ]
-
-  scroll.h2 text: 'Timeline with outlined dots'
-  scroll.panels_timeline \
-    events: timeline_items,
-    childViews: ->(timeline) do
-      timeline.panels_vertical childViews: ->(vertical) do
-        vertical.h4 text: 'Order submitted'
-        vertical.spacer height: 2
-        vertical.label text: '15 minutes ago'
-      end
-
-      timeline.panels_vertical childViews: ->(vertical) do
-        vertical.h4 text: 'Finding you a driver'
-        vertical.spacer height: 2
-        vertical.label text: '15 minutes ago'
-      end
-
-      timeline.panels_vertical childViews: ->(vertical) do
-        vertical.h4 text: 'Driver found'
-        vertical.spacer height: 2
-        vertical.label text: '12 minutes ago'
-      end
-
-      timeline.panels_vertical childViews: ->(vertical) do
-        vertical.h4 text: 'On the way'
-        vertical.spacer height: 2
-        vertical.label text: 'Duration: 11 minutes'
+    timeline_events = [
+    { title: 'Order submitted', time: '15 minutes ago' },
+    { title: 'Finding you a driver', time: '15 minutes ago' },
+    { title: 'Driver found', time: '12 minutes ago' },
+    { title: 'On the way', time: 'Duration: 11 minutes' },
+    { title: 'Arrived', time: '1 minute ago' }
+    ]
+    scroll.spacer height: 32
+    scroll.h2 text: 'Timeline with outlined dots'
+    scroll.panels_timeline(
+      events: timeline_items,
+      childViews: ->(timeline) do
+        timeline_events.each do |event|
+          timeline.panels_vertical(
+            childViews: ->(vertical) do
+              vertical.h4 text: event[:title]
+              vertical.spacer height: 2
+              vertical.label text: event[:time]
+            end
+          )
+        end
       end
+    )
 
-      timeline.panels_vertical childViews: ->(vertical) do
-        vertical.h4 text: 'Arrived'
-        vertical.spacer height: 2
-        vertical.label text: '1 minute ago'
+    scroll.spacer height: 32
+    scroll.h2 text: 'Timeline horizontal'
+    scroll.panels_timeline(
+      events: timeline_items,
+      direction: 'horizontal',
+      side: 'end',
+      childViews: ->(timeline) do
+        timeline_events.each do |event|
+          timeline.panels_vertical(
+            childViews: ->(vertical) do
+              vertical.h4 text: event[:title]
+              vertical.spacer height: 2
+              vertical.label text: event[:time]
+            end
+          )
+        end
       end
-    end
+    )
 
-  timeline_items = [
-      { backgroundColor: 'blue', styleClasses: ['small'] },
-      { backgroundColor: 'blue', styleClasses: ['x-small'] },
-      { backgroundColor: 'blue', color: 'white', text: '3' },
-      { backgroundColor: 'white', icon: 'radio_button_unchecked', styleClasses: ['small'] },
-      { backgroundColor: 'white', icon: 'radio_button_unchecked', styleClasses: ['small'] },
+    scroll.spacer height: 32
+    timeline_items = [
+    { backgroundColor: 'blue', styleClasses: ['small'] },
+    { backgroundColor: 'blue', styleClasses: ['x-small'] },
+    { backgroundColor: 'blue', color: 'white', text: '3' },
+    { backgroundColor: 'white', icon: 'radio_button_unchecked', styleClasses: ['small'] },
+    { backgroundColor: 'white', icon: 'radio_button_unchecked', styleClasses: ['small'] },
     ]
+    scroll.h2 text: 'Timeline without content'
+    scroll.panels_timeline truncateLine: 'both', events: timeline_items
 
-  scroll.h2 text: 'Timeline without content'
-  scroll.panels_timeline truncateLine: 'both', events: timeline_items
-end
+  end
+)

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

@@ -9,6 +9,9 @@ page.on load: ->(action) do
 end,
 reRender: ->(action) do
   action.snackbars_alert message: 'page.onRerender'
+end,
+foreground: ->(action) do
+  action.snackbars_alert message: 'page.onForeground'
 end
 
 page.body childViews: ->(body) do

data/lib/glib/snapshot.rb

@@ -23,17 +23,25 @@ module Glib
       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?
+        association = self.class.reflect_on_association(association_name)
+        association_value = public_send(association_name)
+
+        if active_storage_association?(association, association_value)
+          active_storage_records(association_value).each do |record|
+            return true if record.changed?
           end
-        else
-          raise "Invalid association: #{association_name}"
+          next
+        end
+
+        raise "Invalid association: #{association_name}" if association.nil?
+
+        case association.macro
+        when :has_many
+          association_value.each do |record|
+            return true if record.changed?
+          end
+        when :has_one, :belongs_to
+          return true if association_value&.changed?
         end
       end
 
@@ -134,7 +142,7 @@ module Glib
       end
 
       # always watch column with name *id
-      ignore_keys.filter! { |key| !key.ends_with?('id') || key != 'id' }
+      ignore_keys.reject! { |key| key == 'id' || key.ends_with?('_id') }
 
       if snapshot.present?
         item, associations = snapshot.fetch_reified_items
@@ -147,15 +155,18 @@ module Glib
         'item' => ::Hashdiff.diff(item.attributes.except(*ignore_keys), attributes.except(*ignore_keys))
       }
 
-      obj['associations'] = associations_for_snapshot.reduce({}) do |prev, curr|
-        first_record_off_same_collection = send(curr).first
+      obj['associations'] = associations_for_snapshot.reduce({}) do |prev, curr| # rubocop:disable Glib/MultilineMethodCallStyle
+        association_records = records_for_snapshot(curr)
+        first_record_off_same_collection = association_records.first
 
-        if !first_record_off_same_collection.respond_to?(:watched_keys_for_snapshot) && !first_record_off_same_collection.nil?
+        if !first_record_off_same_collection.nil? && !active_storage_record?(first_record_off_same_collection) && !first_record_off_same_collection.respond_to?(:watched_keys_for_snapshot)
           raise NotImplementedError, "please add method 'watched_keys_for_snapshot' to #{first_record_off_same_collection.class}"
         end
 
         association_ignored_keys =
-          if !first_record_off_same_collection.try(:watched_keys_for_snapshot).nil?
+          if active_storage_record?(first_record_off_same_collection)
+            default_ignored_keys
+          elsif !first_record_off_same_collection.try(:watched_keys_for_snapshot).nil?
             assoc_ignore_keys = first_record_off_same_collection.attributes.except(*first_record_off_same_collection.watched_keys_for_snapshot.map(&:to_s)).keys.map(&:to_s)
             (default_ignored_keys + assoc_ignore_keys).uniq
           else
@@ -163,13 +174,13 @@ module Glib
           end
 
         # always watch column with name *id
-        association_ignored_keys.filter! { |key| !key.ends_with?('id') || key != 'id' }
+        association_ignored_keys.reject! { |key| key == 'id' || key.ends_with?('_id') }
 
         # attrs_before = (associations[curr] || []).map { |record| record.attributes.except(*association_ignored_keys) }
         # attrs_now = send(curr).order(id: :asc).map { |record| record.attributes.except(*association_ignored_keys) }
 
         before = (associations[curr] || [])
-        now = send(curr).order(id: :asc)
+        now = association_records
 
         if before.blank?
           prev.merge(curr.to_s => ::Hashdiff.diff([], now.map { |record| record.attributes.except(*association_ignored_keys) }))
@@ -238,5 +249,52 @@ module Glib
     def max_snapshots
       10
     end
+
+    private
+      def active_storage_association?(association, association_value)
+        return true if association&.macro == :has_many_attached || association&.macro == :has_one_attached
+        return false if association_value.nil?
+
+        if defined?(ActiveStorage::Attached)
+          return true if association_value.is_a?(ActiveStorage::Attached::Many) || association_value.is_a?(ActiveStorage::Attached::One)
+        end
+
+        association_value.respond_to?(:attachments) || association_value.respond_to?(:attachment)
+      end
+
+      def active_storage_records(value)
+        if value.respond_to?(:attachments)
+          value.attachments
+        elsif value.respond_to?(:attachment)
+          Array(value.attachment).compact
+        else
+          []
+        end
+      end
+
+      def active_storage_record?(record)
+        return false if record.nil?
+
+        (defined?(ActiveStorage::Attachment) && record.is_a?(ActiveStorage::Attachment)) ||
+          record.class.name.start_with?('ActiveStorage::Attachment')
+      end
+
+      def records_for_snapshot(association_name)
+        association_value = public_send(association_name)
+
+        records = if active_storage_association?(self.class.reflect_on_association(association_name), association_value)
+          active_storage_records(association_value)
+        else
+          association_value
+        end
+
+        if records.respond_to?(:order)
+          records.order(id: :asc)
+        elsif records.respond_to?(:sort_by)
+          records.sort_by { |record| record.try(:id) || 0 }
+        else
+          Array(records)
+        end
+      end
   end
 end

data/lib/tasks/db.rake

@@ -63,7 +63,7 @@ namespace :db do
 
           entries.each do |a|
             attrs = Hash[a.attributes.sort]
-            # attrs.delete_if { |k, v| v.nil? }
+            attrs.delete_if { |k, v| v.nil? }
 
             id = if attrs.include?('id')
               [a.id]

metadata

@@ -1,11 +1,11 @@
 --- !ruby/object:Gem::Specification
 name: glib-web
 version: !ruby/object:Gem::Version
-  version: 4.39.2
+  version: 4.41.0
 platform: ruby
 authors:
 - ''
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
 date: 2019-10-04 00:00:00.000000000 Z
@@ -136,7 +136,7 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description:
+description: 
 email: ''
 executables: []
 extensions: []
@@ -427,7 +427,6 @@ files:
 - lib/glib-web.rb
 - lib/glib/all_helpers.rb
 - lib/glib/crypt/utils.rb
-- lib/glib/doc_generator.rb
 - lib/glib/dynamic_text.rb
 - lib/glib/dynamic_text/config.rb
 - lib/glib/engine.rb
@@ -463,10 +462,10 @@ files:
 - lib/glib/version.rb
 - lib/tasks/db.rake
 - lib/tasks/docs.rake
-homepage:
+homepage: 
 licenses: []
 metadata: {}
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -482,7 +481,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubygems_version: 3.4.6
-signing_key:
+signing_key: 
 specification_version: 4
 summary: ''
 test_files: []