glib-web 4.1.1 → 4.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5022fe611c19e51340f145ab4bb5577c208211186b575a2e784f8f50de06860c
-  data.tar.gz: c1fc17633202ac17023f5040129165779283654334212168933608ed7df12e4f
+  metadata.gz: 59ce4822a2cbafa2933d7bf884df8eb63af65ebcd4046e4484a652fda583b5c6
+  data.tar.gz: f652bfbdb23e198af85cd46f0afef1f753da089a196ff18a13c4cbc57bf834b2
 SHA512:
-  metadata.gz: d42b359a6e270fcdadfb8592af408974defc48bbd632d9cf91116f3a37fba4c47ac4bd54f53417c07ccb36afc883b1cbb72cd4afc1e0378b7a7dff283079c365
-  data.tar.gz: 2b96d286b67a6e6faa900a474ea93d34a060eef45c0c1d85a493993757497ba8c0a14a624ba3e0764ad9c599bf35518c761f3c061af7a9ec20fa22c6948fd8ae
+  metadata.gz: ed0d06a31f63ab5fe4deffdf1995f1a673d751595da56fbbc2e1e8b3e3c55d7466957945cbf17f6aa78f094130480ea9c41d29c092b17f45aa6f4c5b90df60e5
+  data.tar.gz: 3ffb43696bb3c525282eead1ecd4232078acddc578091d056964b3c774e35e4c3be464a0ddb2230176a08d1a4578c53118d1cfe61893c6f802133d8cceecd7f2

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

@@ -257,6 +257,10 @@ class Glib::JsonUi::ViewBuilder
       action :onClick
       string :offIcon
       string :onIcon
+      string :imageUrl
+      string :icon
+      string :iconColor
+      string :iconSize
 
       views :childViews
     end
@@ -321,7 +325,7 @@ class Glib::JsonUi::ViewBuilder
 
       string :storagePrefix
       hash :metadata
-      hash :tags
+      string :tagging
 
       required :accepts, :directUploadUrl
 

data/app/views/json_ui/garage/_nav_menu.json.jbuilder

@@ -10,7 +10,7 @@ end
 
 
 if local_assigns[:top_nav] || json_ui_app_is_web?
-  page.leftDrawer styleClasses:['maxi'], content: ->(drawer) do
+  page.leftDrawer styleClasses: ['maxi'], content: ->(drawer) do
     drawer.header childViews: ->(header) do
       header.button text: 'App', styleClasses: ['link', 'logo'], onClick: ->(action) do
         action.windows_open url: root_url
@@ -51,6 +51,10 @@ if local_assigns[:top_nav] || json_ui_app_is_web?
         action.windows_open url: json_ui_garage_url(path: 'services/index')
       end
 
+      menu.button text: 'Test Page', onClick: ->(action) do
+        action.windows_open url: json_ui_garage_url(path: 'test_page/index')
+      end
+
       menu.divider
       menu.label text: 'Misc Menu'
 

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

@@ -50,6 +50,7 @@ page.form options.merge(childViews: ->(form) do
       foo: 'bar',
       zoo: 'baz'
     },
+    tagging: 'key=value&key1=value1',
     files: [
       { name: 'File (Example)', signed_id: ActiveStorage::Attachment.last&.signed_id }
     ]

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

@@ -106,8 +106,8 @@ page.form \
         end
       end,
       childViews: ->(group) do
-        group.fields_radio value: 'show', label: 'Show'
-        group.fields_radio value: 'hide', label: 'Hide'
+        group.fields_radio value: 'show', label: 'Show', icon: 'edit', iconSize: 40
+        group.fields_radio value: 'hide', label: 'Hide', imageUrl: 'https://cdn.pixabay.com/photo/2020/08/05/13/12/eco-5465432_1280.png'
         group.fields_radio value: '', label: 'Empty'
       end
     form.spacer height: 10

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

@@ -0,0 +1,112 @@
+json.title 'Test Page'
+
+page = json_ui_page json
+
+page.body childViews: ->(body) do
+  body.panels_responsive padding: glib_json_padding_body, childViews: ->(res) do
+    res.panels_column lg: { cols: 6 }, childViews: ->(col) do
+      res.h2 text: 'Reactivity'
+      res.spacer height: 8
+      res.panels_form \
+        url: json_ui_garage_url(path: 'forms/generic_post'),
+        method: 'post',
+        childViews: ->(form) do
+          form.panels_horizontal childViews: ->(hori) do
+            hori.button text: 'components/set', onClick: ->(action) do
+              action.runMultiple childActions: ->(saction) do
+                saction.components_set targetId: 'text', data: { value: 'Doe John' }
+                saction.components_set targetId: 'textarea', data: { value: 'The quick brown fox jumps over the lazy dog' }
+                new_options = [{ text: 'Option99', value: 'option99' }]
+                ['select', 'chip_group'].each do |id|
+                  saction.components_set targetId: id, data: { options: new_options, value: ['option99'] }
+                end
+              end
+            end
+            hori.spacer width: 4
+            hori.button text: 'logics/set', onClick: ->(action) do
+              action.logics_set targetId: 'date', conditionalData: { value: { "+": [{ "var": ['user[date]'] }, 60 * 60 * 24 * 3] } }
+            end
+            hori.spacer width: 4
+            hori.button text: 'components/replace', onClick: ->(action) do
+              action.runMultiple childActions: ->(saction) do
+                saction.components_replace targetId: 'radio_group', newView: ->(view) do
+                  view.fields_radioGroup value: '', childViews: ->(sview) do
+                    sview.fields_radio label: 'Option99', value: 'option99'
+                  end
+                end
+
+                saction.components_replace targetId: 'check_group', newView: ->(view) do
+                  view.fields_checkGroup value: '', childViews: ->(sview) do
+                    sview.fields_check label: 'Option99', value: nil, checkValue: 'option99'
+                  end
+                end
+              end
+            end
+          end
+
+          form.spacer height: 8
+          form.hr width: 'matchParent'
+          form.spacer height: 8
+
+          validation = { required: { message: 'Required' } }
+          options = ['option1', 'option2', 'option3', 'option4'].map { |option| { 'text'=> option.humanize, 'value' => option } }
+
+          form.fields_date width: 'matchParent', name: 'user[date]', id: 'date', value: Date.new(2024, 7, 24), validation: validation
+          form.hr width: 'matchParent'
+          form.fields_select multiple: true, width: 'matchParent', name: 'user[select]', id: 'select', options: options, value: ['option1', 'option2'], validation: validation
+          form.hr width: 'matchParent'
+          form.fields_chipGroup width: 'matchParent', name: 'user[chip_group]', id: 'chip_group', options: options, value: ['option2'], validation: validation
+          form.hr width: 'matchParent'
+          form.fields_radioGroup width: 'matchParent', name: 'user[radio_group]', id: 'radio_group', value: 'option3', validation: validation, childViews: ->(radio) do
+            options.each do |option|
+              radio.fields_radio label: option['text'], value: option['value']
+            end
+          end
+          form.hr width: 'matchParent'
+          check_group_value = ['option3', 'option1']
+          form.fields_checkGroup width: 'matchParent', name: 'user[check_group]', id: 'check_group', value: check_group_value, validation: validation, childViews: ->(radio) do
+            options.each do |option|
+              radio.fields_check label: option['text'], value: check_group_value.include?(option['value']) ? option['value'] : nil, checkValue: option['value']
+            end
+          end
+          form.hr width: 'matchParent'
+          form.fields_text width: 'matchParent', name: 'user[text]', id: 'text', value: 'John Doe', validation: validation
+
+          form.hr width: 'matchParent'
+
+          form.fields_textarea width: 'matchParent', name: 'user[textarea]', id: 'textarea', value: 'Lorem ipsum et dumet bla bla bla...'
+
+          form.hr width: 'matchParent'
+          form.fields_submit text: 'submit'
+          form.spacer height: 2
+          form.fields_submit text: 'submit (if form valid)', disableIfFormInvalid: true
+        end
+
+
+      res.spacer height: 16
+
+    end
+
+
+    res.panels_column lg: { cols: 6 }, childViews: ->(col) do
+      res.h2 text: 'Dialog'
+      res.spacer height: 8
+      res.button text: 'Dialog updateExisting', onClick: ->(action) do
+        action.runMultiple childActions: ->(saction) do
+          saction.dialogs_show updateExisting: true, content: ->(dialog) do
+            dialog.body padding: glib_json_padding_body, childViews: ->(sbody) do
+              sbody.h1 text: 'Hello world'
+              sbody.button text: 'change dialog content', onClick: ->(ssaction) do
+                ssaction.dialogs_show updateExisting: true, disableCloseButton: true, content: ->(sdialog) do
+                  sdialog.body padding: glib_json_padding_body, childViews: ->(ssbody) do
+                    ssbody.h1 text: 'Hello world (updated)'
+                  end
+                end
+              end
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/glib/blob.rb

@@ -1,15 +1,23 @@
 ::ActiveStorage::Blob.class_eval do
+  attr_accessor :tagging
+
+  # removing custom_metadata and add tagging
   def service_headers_for_direct_upload
-    service.headers_for_direct_upload key, filename: filename, content_type: content_type, content_length: byte_size, checksum: checksum
+    service.headers_for_direct_upload key, filename: filename, content_type: content_type, content_length: byte_size, checksum: checksum, tagging: tagging
+  end
+  def service_url_for_direct_upload(expires_in: ActiveStorage.service_urls_expire_in)
+    service.url_for_direct_upload key, expires_in: expires_in, content_type: content_type, content_length: byte_size, checksum: checksum, custom_metadata: custom_metadata, tagging: tagging
   end
 
   class << self
-    def create_before_direct_upload!(key: nil, filename:, byte_size:, checksum:, content_type: nil, metadata: nil, service_name: nil, record: nil, prefix: nil)
+    def create_before_direct_upload!(key: nil, filename:, byte_size:, checksum:, content_type: nil, metadata: nil, service_name: nil, record: nil, prefix: nil, tagging: nil)
       key_name = key || generate_unique_secure_token
       if prefix.present?
         key_name = "#{prefix}/#{key_name}"
       end
-      create! key: key_name, filename: filename, byte_size: byte_size, checksum: checksum, content_type: content_type, metadata: metadata, service_name: service_name
+      blob = create! key: key_name, filename: filename, byte_size: byte_size, checksum: checksum, content_type: content_type, metadata: metadata, service_name: service_name
+      blob.tagging = tagging
+      blob
     end
   end
 end

data/lib/glib/direct_uploads_controller.rb

@@ -19,7 +19,7 @@
 
   private
     def blob_args
-      params.require(:blob).permit(:filename, :byte_size, :checksum, :content_type, :prefix, metadata: {}).to_h.symbolize_keys
+      params.require(:blob).permit(:filename, :byte_size, :checksum, :content_type, :prefix, :tagging, metadata: {}).to_h.symbolize_keys
     end
 
     def authenticate_user!

data/lib/glib/engine.rb

@@ -5,8 +5,9 @@ module Glib
 
       # modify direct upload
       config.to_prepare do
+        require_relative 's3_service'
         require_relative 'blob'
-        require_relative 'direct_uploads_controller' 
+        require_relative 'direct_uploads_controller'
       end
     end
   end

data/lib/glib/s3_service.rb

@@ -0,0 +1,30 @@
+require 'active_storage/service/s3_service'
+
+::ActiveStorage::Service::S3Service.class_eval do
+  attr_reader :headers_for_request
+
+  # Change presigned_url to presigned_request
+  # appearently presigned_url hoist all header `x-amz-` to query params.
+  # This is cause problem because S3 server ignore `x-amz-tagging` query params so it fails to tagging an object
+  # API: https://docs.aws.amazon.com/sdk-for-ruby/v3/api/Aws/S3/Presigner.html#presigned_request-instance_method
+  # Detail about problem: https://github.com/aws/aws-sdk/issues/782
+  def url_for_direct_upload(key, expires_in:, content_type:, content_length:, checksum:, tagging: nil, custom_metadata: {})
+    instrument :url, key: key do |payload|
+      generated_url, headers = object_for(key).presigned_request :put, expires_in: expires_in.to_i,
+        content_type: content_type, content_length: content_length, content_md5: checksum,
+        metadata: custom_metadata, whitelist_headers: ['content-length'], tagging: tagging, **upload_options
+
+      payload[:url] = generated_url
+      @headers_for_request = headers
+
+      generated_url
+    end
+  end
+
+  def headers_for_direct_upload(key, content_type:, checksum:, filename: nil, disposition: nil, tagging: nil, custom_metadata: {}, **)
+    content_disposition = content_disposition_with(type: disposition, filename: filename) if filename
+
+    headers = { 'Content-Type' => content_type, 'Content-MD5' => checksum, 'Content-Disposition' => content_disposition, **custom_metadata_headers(custom_metadata) }
+    headers.merge(headers_for_request)
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: glib-web
 version: !ruby/object:Gem::Version
-  version: 4.1.1
+  version: 4.1.3
 platform: ruby
 authors:
 - ''
@@ -271,6 +271,7 @@ files:
 - app/views/json_ui/garage/tables/index.json.jbuilder
 - app/views/json_ui/garage/tables/layout.json.jbuilder
 - app/views/json_ui/garage/tables/panel_content.json.jbuilder
+- app/views/json_ui/garage/test_page/index.json.jbuilder
 - app/views/json_ui/garage/views/_chart_data.json.jbuilder
 - app/views/json_ui/garage/views/banners.json.jbuilder
 - app/views/json_ui/garage/views/calendar_data.json.jbuilder
@@ -328,6 +329,7 @@ files:
 - lib/glib/json_crawler/http.rb
 - lib/glib/json_crawler/router.rb
 - lib/glib/mailer_tester.rb
+- lib/glib/s3_service.rb
 - lib/glib/test_helpers.rb
 - lib/glib/time_freezable_mailer.rb
 - lib/glib/time_returning_mailer.rb
@@ -352,8 +354,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 3.4.6
 signing_key: 
 specification_version: 4
 summary: ''