glib-web 3.20.0 → 3.20.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f7d54630cdd25d883da692e88f98d775f50718d1b0f9edb5ce1bef914044883a
-  data.tar.gz: a1c732849861960b1822ba8ae7ff72d237e0206c7e90780b3f3e36a9ca0cdae0
+  metadata.gz: 50cd95cb3043e936a17b46b0b3e3a102cbe3faa2894e3b67e53228ac115e2a83
+  data.tar.gz: c6a7069e1c997a5e0731039dabeb56c926fd452668a41ff75cc4f06ab0379a27
 SHA512:
-  metadata.gz: 88f51b200e02d93754093488d74ccaae5a21cc2deb8ad80801bb21db2a3353301b209de2163a50200a0568867650ca5e24a2c467d4e127464ba504f9dcbbab7c
-  data.tar.gz: b5dbf27b9c38e17d22d359f5845704fc5ac6a11ab612fd2feebee2d9271ef38d241824dcf21c8776039cfc3070b8ab8816825f1bdf781bfe9d001b28ac0ca9c8
+  metadata.gz: 3b9134e80a27875fc0971a9dc05dc2d7e1daea7c9bb156e14a3f5fad294db2f1a831f8ecc48d8e42dd7ff02d3a5d7772bca18cc9bb37f176eebb540dfc86ec6f
+  data.tar.gz: 844365e90f4a43e1ec06a54a380ac56df052ded036dddfb6fd40b5e747dc5e579cbae07e308cc5a7088c1071ea3ad342687df2c9abe19c923ea70e5c5ae863dc

data/app/controllers/concerns/glib/auth/policy.rb

@@ -51,7 +51,7 @@ module Glib::Auth
 
       # Expose protected method
       public  # Override
-      def policy_scope(*args)
+      def policy_scope(*args, **opts)
         super
       end
 

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

@@ -116,6 +116,11 @@ module Glib::Json::Libs
         redirect_to user_default_url
       end
       format.json do
+        if __json_ui_rendering?
+          redirect_to user_default_url
+          return
+        end
+
         render json: if glib_json_dialog_mode?
           { onLoad: __glib_error_dialog('Access denied', "Make sure you're logged in with the correct account.") }
         else

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

@@ -32,6 +32,10 @@ module Glib::Json::Ui
     @__json_ui_activated
   end
 
+  def __json_ui_rendering?
+    @__json_ui_rendering != nil
+  end
+
   def json_ui_page_lifecycle_prop(name)
     if (hash = json_transformation_start).is_a?(Hash) && hash['body']  # A valid page
       hash[name] ||= { 'action' => 'runMultiple', 'childActions' => [] }

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

@@ -295,7 +295,12 @@ class Glib::JsonUi::ViewBuilder
         json.set! :buttonLabels, @buttonLabels
 
         if @prop && context
-          json.fileTitle context.field_value(@prop).blob&.filename
+          # json.fileTitle context.field_value(@prop).blob&.filename
+
+          if (value = context.field_value(@prop)).attached?
+            json.fileTitle value.blob.filename
+            json.fileUrl url_for(value)
+          end
         end
 
         super
@@ -303,7 +308,9 @@ class Glib::JsonUi::ViewBuilder
 
       @Override
       def determine_value(context, prop)
-        context.field_value(prop)&.signed_id || ''
+        if (value = context.field_value(prop)).attached?
+          value.signed_id || ''
+        end
       end
     end
 

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

@@ -272,6 +272,9 @@ module Glib
         string :imageUrl
         action :onCLick
         bool :showTitle
+        bool :aboveLeftDrawer
+        bool :collapseButtonsOnMobile
+        int :elevation
 
         # def leftButtons(block)
         #   json.leftButtons do

data/app/models/glib/application_record.rb

@@ -7,6 +7,9 @@ module Glib
     scope :created_asc, -> { order(created_at: :asc) }
     scope :created_desc, -> { order(created_at: :desc) }
 
+    scope :updated_asc, -> { order(updated_at: :asc) }
+    scope :updated_desc, -> { order(updated_at: :desc) }
+
     def self.glib_has_one_attached(field_name)
       has_one_attached field_name
 

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

@@ -127,7 +127,7 @@ json_ui_page json do |page|
       end
 
       section.rows builder: ->(template) do
-        template.thumbnail title: 'Grid', subtitle: 'Arrage child component in grid like', onClick: ->(action) do
+        template.thumbnail title: 'Grid', subtitle: 'Arrange child component in grid like', onClick: ->(action) do
           action.windows_open url: json_ui_garage_url(path: 'panels/grid')
         end
 

data/lib/glib/mailer_tester.rb

@@ -15,7 +15,9 @@ module Glib
         preview_class.instance_methods(false).each do |mailer_method|
           test "mailer for #{preview_class}##{mailer_method}" do
             preview.send(mailer_method).deliver_now
-            Timecop.return # Allows mailer preview to use Timecop.freeze()
+
+            # See TimeFreezableMailer
+            preview.try(:return_time_if_frozen)
 
             logfile = File.join(log_dir, "#{preview_class.name.underscore}##{mailer_method}.txt")
 

data/lib/glib/time_freezable_mailer.rb

@@ -0,0 +1,37 @@
+module Glib
+  module TimeFreezableMailer
+    @@__mailer_freeze_time = false
+
+    def allow_time_freeze?
+      Rails.env.development? || Rails.env.test?
+    end
+
+    def return_time_if_frozen
+      return unless allow_time_freeze?
+      return unless @@__mailer_freeze_time
+
+      @@__mailer_freeze_time = false
+
+      Timecop.return # Allows mailer preview to use Timecop.freeze()
+    end
+
+    def freeze_time(year, month, day)
+      return unless allow_time_freeze?
+
+      if @@__mailer_freeze_time
+        example_code = %{
+          Rails.application.config.to_prepare do
+            class ::Rails::MailersController
+              prepend Glib::TimeReturningMailer
+            end
+          end
+        }
+
+        raise "Please create `config/initializers/mailer_preview_setup.rb` and add the following: #{example_code}"
+      end
+
+      @@__mailer_freeze_time = true
+      Timecop.freeze(DateTime.new(year, month, day))
+    end
+  end
+end

data/lib/glib/time_returning_mailer.rb

@@ -0,0 +1,15 @@
+module Glib
+  module TimeReturningMailer
+    extend ActiveSupport::Concern
+
+    prepended do
+      include Glib::TimeFreezableMailer
+    end
+
+    # Override Rails::MailersController's preview
+    def preview
+      super
+      return_time_if_frozen
+    end
+  end
+end

data/lib/glib-web.rb

@@ -6,4 +6,7 @@ require 'glib/json_crawler'
 require 'glib/dynamic_text'
 require 'glib/crypt'
 require 'glib/test_helpers'
+
+require 'glib/time_freezable_mailer'
+require 'glib/time_returning_mailer'
 require 'glib/mailer_tester'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: glib-web
 version: !ruby/object:Gem::Version
-  version: 3.20.0
+  version: 3.20.2
 platform: ruby
 authors:
 - ''
@@ -310,6 +310,8 @@ files:
 - lib/glib/json_crawler/router.rb
 - lib/glib/mailer_tester.rb
 - lib/glib/test_helpers.rb
+- lib/glib/time_freezable_mailer.rb
+- lib/glib/time_returning_mailer.rb
 - lib/glib/value.rb
 - lib/glib/version.rb
 - lib/tasks/db.rake
@@ -331,7 +333,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.6
+rubyforge_project: 
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: ''