glib-web 0.5.83 → 0.5.84

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

@@ -1,247 +1,248 @@
-module Glib
-  module JsonUi
-    class ViewBuilder < AbstractBuilder
-      def initialize(json, page, multiple)
-        super(json, page)
-
-        @multiple = multiple
-      end
-
-      def add_view(name, *args)
-        if @multiple
-          add_element_to_array_v1 'view', name, *args
-        else
-          add_singleton_element_v1 'view', name, *args
-        end
-      end
-
-      def add_singleton_view(name, *args)
-        add_singleton_element 'view', name, *args
-      end
-
-      def method_missing(m, *args)
-        add_view m, *args
-      end
-
-      class View < JsonUiElement
-        string :id
-        length :width
-        length :height
-        color :backgroundColor
-        hash :padding
-        singleton_array :styleClass, :styleClasses
-        hash :showIf
-        hash :valueIf
-        hash :analytics
-
-        # def initialize(json, page)
-        #   super(json, page)
-
-        #   # Can be improved by making it configurable site-wide.
-        #   @analyticsEnabled = true
-        # end
-
-        # def analytics(value)
-        #   if value.is_a?(String)
-        #     @analyticsEnabled = true
-        #     @analyticsId = value
-        #   else
-        #     @analyticsEnabled = value == true
-        #   end
-        # end
-
-        # # Override
-        # def created
-        #   # if @analyticsEnabled
-        #   #   context = page.context
-        #   #   json.analytics do
-        #   #     content = @analyticsId || (@text || @icon)&.gsub(/\s+/, '_')&.downcase || 'nil'
-        #   #     json.namePrefix [context.controller_name, context.action_name, content].join('_')
-        #   #   end
-        #   # end
-
-        #   json.analytics do
-        #     if @analyticsEnabled
-        #       if @analyticsId
-        #         json.placement @analyticsId
-        #       end
-        #     else
-        #       json.disabled true
-        #     end
-        #   end
-        # end
-
-      end
-
-      ### View definitions
-
-      class AbstractText < View 
-        string :textAlign
-        text :text
-        color :color
-      end
-
-      class H1 < AbstractText
-      end
-
-      class H2 < AbstractText
-      end
-
-      class H3 < AbstractText
-      end
-
-      class H4 < AbstractText
-      end
-
-      class H5 < AbstractText
-      end
-
-      class H6 < AbstractText
-      end
-
-      class P < AbstractText
-      end
-
-      class Markdown < AbstractText
-        bool :previewVideo
-      end
-
-      class Html < AbstractText
-      end
-
-      class Label < AbstractText
-        hash :actionCable
-        # string :format
-        action :onClick
-      end
-
-      class Image < View
-        string :url
-        string :base64Data
-        action :onClick
-        string :fit
-      end
-
-      class Avatar < View
-        int    :size
-        string :url
-        action :onClick
-      end
-
-      class Icon < View
-        # TODO: Remove later. Deprecated.
-        icon :spec
-
-        action :onClick
-        color :color
-
-        def name(value)
-          @name = value
-        end
-
-        def size(value)
-          @size = value
-        end
-
-        # Override
-        def created
-          if @name
-            json.material do
-              json.name @name
-              json.size @size if @size
-            end
-          end
-        end
-      end
-
-      # class Banner < View
-      #   icon :icon
-      #   string :text
-      # end
-
-      class Button < View
-        icon :icon, cache: true
-        string :text, cache: true
-        action :onClick
-        color :color
-      end
-
-      class Fab < View
-        icon :icon
-        action :onClick
-      end
-
-      class Switch < View
-        string :text, cache: true
-        bool :enabled
-
-        action :onEnabled
-        action :onDisabled
-      end
-
-      class Hr < View
-        color :color
-      end
-
-      class Spacer < View
-      end
-
-      class Map < View
-        float :latitude
-        float :longitude
-        int :zoom
-        string :dataUrl
-        bool :cluster
-      end
-
-      class Chip < View
-        string :text
-        action :onClick
-      end
-
-      class Calendar < View
-        string :dataUrl
-      end
-
-      class TabBar < View
-        color :color
-
-        def buttons(block)
-          json.buttons do
-            block.call page.menu_builder
-          end
-        end
-      end
-
-      class AppBar < View
-        color :color
-        panels_builder :content, :logo
-
-        # def leftButtons(block)
-        #   json.leftButtons do
-        #     block.call page.menu_builder
-        #   end
-        # end
-
-        def rightButtons(block)
-          json.rightButtons do
-            block.call page.menu_builder
-          end
-        end
-      end
-
-      class Datetime < View
-        date_time :value
-        string :format
-        bool :tick
-      end
-
-      class ProgressBar < View
-        float :value
-        color :color
-        color :backgroundColor
-        bool :reversed
-      end
-    end
-  end
-end
+module Glib
+  module JsonUi
+    class ViewBuilder < AbstractBuilder
+      def initialize(json, page, multiple)
+        super(json, page)
+
+        @multiple = multiple
+      end
+
+      def add_view(name, *args)
+        if @multiple
+          add_element_to_array_v1 'view', name, *args
+        else
+          add_singleton_element_v1 'view', name, *args
+        end
+      end
+
+      def add_singleton_view(name, *args)
+        add_singleton_element 'view', name, *args
+      end
+
+      def method_missing(m, *args)
+        add_view m, *args
+      end
+
+      class View < JsonUiElement
+        string :id
+        length :width
+        length :height
+        color :backgroundColor
+        hash :padding
+        singleton_array :styleClass, :styleClasses
+        hash :showIf
+        hash :valueIf
+        hash :analytics
+
+        # def initialize(json, page)
+        #   super(json, page)
+
+        #   # Can be improved by making it configurable site-wide.
+        #   @analyticsEnabled = true
+        # end
+
+        # def analytics(value)
+        #   if value.is_a?(String)
+        #     @analyticsEnabled = true
+        #     @analyticsId = value
+        #   else
+        #     @analyticsEnabled = value == true
+        #   end
+        # end
+
+        # # Override
+        # def created
+        #   # if @analyticsEnabled
+        #   #   context = page.context
+        #   #   json.analytics do
+        #   #     content = @analyticsId || (@text || @icon)&.gsub(/\s+/, '_')&.downcase || 'nil'
+        #   #     json.namePrefix [context.controller_name, context.action_name, content].join('_')
+        #   #   end
+        #   # end
+
+        #   json.analytics do
+        #     if @analyticsEnabled
+        #       if @analyticsId
+        #         json.placement @analyticsId
+        #       end
+        #     else
+        #       json.disabled true
+        #     end
+        #   end
+        # end
+
+      end
+
+      ### View definitions
+
+      class AbstractText < View 
+        string :textAlign
+        text :text
+        color :color
+      end
+
+      class H1 < AbstractText
+      end
+
+      class H2 < AbstractText
+      end
+
+      class H3 < AbstractText
+      end
+
+      class H4 < AbstractText
+      end
+
+      class H5 < AbstractText
+      end
+
+      class H6 < AbstractText
+      end
+
+      class P < AbstractText
+      end
+
+      class Markdown < AbstractText
+        bool :previewVideo
+      end
+
+      class Html < AbstractText
+      end
+
+      class Label < AbstractText
+        hash :actionCable
+        # string :format
+        action :onClick
+      end
+
+      class Image < View
+        string :url
+        string :base64Data
+        action :onClick
+        string :fit
+      end
+
+      class Avatar < View
+        int    :size
+        string :url
+        action :onClick
+      end
+
+      class Icon < View
+        # TODO: Remove later. Deprecated.
+        icon :spec
+
+        action :onClick
+        color :color
+
+        def name(value)
+          @name = value
+        end
+
+        def size(value)
+          @size = value
+        end
+
+        # Override
+        def created
+          if @name
+            json.material do
+              json.name @name
+              json.size @size if @size
+            end
+          end
+        end
+      end
+
+      # class Banner < View
+      #   icon :icon
+      #   string :text
+      # end
+
+      class Button < View
+        icon :icon, cache: true
+        string :text, cache: true
+        action :onClick
+        color :color
+      end
+
+      class Fab < View
+        icon :icon
+        action :onClick
+      end
+
+      class Switch < View
+        string :text, cache: true
+        bool :enabled
+
+        action :onEnabled
+        action :onDisabled
+      end
+
+      class Hr < View
+        color :color
+      end
+
+      class Spacer < View
+      end
+
+      class Map < View
+        float :latitude
+        float :longitude
+        int :zoom
+        string :dataUrl
+        bool :cluster
+      end
+
+      class Chip < View
+        string :text
+        action :onClick
+      end
+
+      class Calendar < View
+        string :dataUrl
+      end
+
+      class TabBar < View
+        int :height
+        color :color
+
+        def buttons(block)
+          json.buttons do
+            block.call page.menu_builder
+          end
+        end
+      end
+
+      class AppBar < View
+        color :color
+        panels_builder :content, :logo
+
+        # def leftButtons(block)
+        #   json.leftButtons do
+        #     block.call page.menu_builder
+        #   end
+        # end
+
+        def rightButtons(block)
+          json.rightButtons do
+            block.call page.menu_builder
+          end
+        end
+      end
+
+      class Datetime < View
+        date_time :value
+        string :format
+        bool :tick
+      end
+
+      class ProgressBar < View
+        float :value
+        color :color
+        color :backgroundColor
+        bool :reversed
+      end
+    end
+  end
+end

data/app/helpers/glib/urls_helper.rb

@@ -1,12 +1,12 @@
-module Glib
-  module UrlsHelper
-    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)
-      route = Rails.application.routes.recognize_path(url)
-      route[:controller] == controller_name && route[:action] == action_name
-    end
-  end
-end
+module Glib
+  module UrlsHelper
+    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)
+      route = Rails.application.routes.recognize_path(url)
+      route[:controller] == controller_name && route[:action] == action_name
+    end
+  end
+end

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

@@ -1,68 +1,68 @@
-module Glib
-  module SoftDeletable
-    extend ActiveSupport::Concern
-
-    included do
-      default_scope { where(deleted_at: nil) }
-      scope :with_deleted, -> { unscope(where: :deleted_at) }
-
-      # "Soft delete" - set deleted_at if it is nil, actually destroy the record
-      # if forced.
-      #
-      # @param force [Boolean]
-      def destroy(force = nil)
-        return force_destroy_record if force == :force
-        return self if deleted?
-
-        soft_destroy_record
-      end
-
-      # Revive a soft-deleted record and associated records if soft-deleted,
-      # otherwise return self
-      def revive
-        return self unless deleted?
-
-        ActiveRecord::Base.transaction do
-          update(deleted_at: nil)
-          revive_associated_records
-        end
-      end
-
-      # Whether or not a record is deleted
-      def deleted?
-        deleted_at.present?
-      end
-
-      private
-        def force_destroy_record
-          ActiveRecord::Base.transaction do
-            destroy_associated_records(:force)
-            method(:destroy).super_method.call
-          end
-        end
-
-        def soft_destroy_record
-          ActiveRecord::Base.transaction do
-            destroy_associated_records
-            update(deleted_at: Time.zone.now)
-          end
-        end
-
-        def destroy_associated_records(force = nil)
-          associated_records.each { |r| r.destroy(force) }
-        end
-
-        def revive_associated_records
-          associated_records.each(&:revive)
-        end
-
-        # This should return an array of all associated records of an object that
-        # should be soft deleted with it (i.e. those that have dependent: :destroy
-        # set). In principle we could figure this out automatically but in the
-        # interest of simplicity we'll just define it manually for each class.
-        def associated_records
-          []
-        end
-    end
-  end
-end
+module Glib
+  module SoftDeletable
+    extend ActiveSupport::Concern
+
+    included do
+      default_scope { where(deleted_at: nil) }
+      scope :with_deleted, -> { unscope(where: :deleted_at) }
+
+      # "Soft delete" - set deleted_at if it is nil, actually destroy the record
+      # if forced.
+      #
+      # @param force [Boolean]
+      def destroy(force = nil)
+        return force_destroy_record if force == :force
+        return self if deleted?
+
+        soft_destroy_record
+      end
+
+      # Revive a soft-deleted record and associated records if soft-deleted,
+      # otherwise return self
+      def revive
+        return self unless deleted?
+
+        ActiveRecord::Base.transaction do
+          update(deleted_at: nil)
+          revive_associated_records
+        end
+      end
+
+      # Whether or not a record is deleted
+      def deleted?
+        deleted_at.present?
+      end
+
+      private
+        def force_destroy_record
+          ActiveRecord::Base.transaction do
+            destroy_associated_records(:force)
+            method(:destroy).super_method.call
+          end
+        end
+
+        def soft_destroy_record
+          ActiveRecord::Base.transaction do
+            destroy_associated_records
+            update(deleted_at: Time.zone.now)
+          end
+        end
+
+        def destroy_associated_records(force = nil)
+          associated_records.each { |r| r.destroy(force) }
+        end
+
+        def revive_associated_records
+          associated_records.each(&:revive)
+        end
+
+        # This should return an array of all associated records of an object that
+        # should be soft deleted with it (i.e. those that have dependent: :destroy
+        # set). In principle we could figure this out automatically but in the
+        # interest of simplicity we'll just define it manually for each class.
+        def associated_records
+          []
+        end
+    end
+  end
+end

data/app/models/glib/active_storage/attachment.rb

@@ -1,9 +1,9 @@
-module Glib
-  module ActiveStorage
-    class Attachment < ::ActiveStorage::Attachment
-      if Glib::DynamicText::Config.database_url.present?
-        connects_to database: { writing: :dynamic_text, reading: :dynamic_text }
-      end
-    end
-  end
-end
+module Glib
+  module ActiveStorage
+    class Attachment < ::ActiveStorage::Attachment
+      if Glib::DynamicText::Config.database_url.present?
+        connects_to database: { writing: :dynamic_text, reading: :dynamic_text }
+      end
+    end
+  end
+end