glib-web 4.1.0 → 4.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 075c1d55a3db9efb8b8fd9302c410203f54f3feaf13e9debb3273fab7facf009
-  data.tar.gz: c9f19882259bb4e898578994734ece1c472a63b0dfffd7b41cb9fa8a3f89d1bb
+  metadata.gz: bbf47486dbe68678b731438238a642383682ac7fa2b5fd85c40784a46dd8b05e
+  data.tar.gz: 48745d3666ada734c838020fc10828187d22c0d06b8f95ad8d45b942ad922518
 SHA512:
-  metadata.gz: 7c07ee59726cdf85c3cedf5970097fff38916c1e56d062332f61d7fd2692ebf316d9eacb32c9d6e4a65bedec4af28f66ceddf86fe95c84d0fba87ec215250ca6
-  data.tar.gz: 70d5e728d9730c9b0f2d63d9d34bea15654d8d8048eba682f114ec29c937020c1e058d205d523837a63ea54fa3ef878de498cd310cf1d96e52b435d7ded18109
+  metadata.gz: 8bb4e390bb6058cfa4e262ca6da33770fe934508865790a08cfb42425603e3480ccc928f92ed81493fae82a953a15946f68231310a9983cfa42446361f8d56a7
+  data.tar.gz: c62be0278b0a8f13005d250ffe06beb52cae2fc500eee818995209c8acde78174fc00b449a126ef37eae5f0336be611dbbbcbd4cdf7a0aa7359b7afdcd419bcb

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

@@ -53,6 +53,10 @@ class Glib::JsonUi::ViewBuilder
         @prop = prop
       end
 
+      def autoValidate(autoValidate)
+        @autoValidate = autoValidate
+      end
+
       # Override
       def created
         if @prop && (form = page.current_form)
@@ -79,8 +83,7 @@ class Glib::JsonUi::ViewBuilder
         # - Placeholder competes with label for space
         json.placeholder @placeholder if @placeholder
 
-        # TODO: Add a flag so the framework's user can turn it on and off.
-        # json.validation @validation if @validation
+        json.validation @validation if @autoValidate
       end
 
       # To be overridden
@@ -139,6 +142,7 @@ class Glib::JsonUi::ViewBuilder
       string :text
       color :color
       icon :icon
+      bool :disableIfFormInvalid
     end
 
     class CheckGroup < AbstractField
@@ -317,6 +321,7 @@ class Glib::JsonUi::ViewBuilder
 
       string :storagePrefix
       hash :metadata
+      string :tagging
 
       required :accepts, :directUploadUrl
 

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

@@ -121,10 +121,40 @@ class Glib::JsonUi::ViewBuilder
       def self.field_validation(model, prop)
         validations = {}
         model.class.validators_on(prop).each do |validator|
-          if validator.kind == :presence
-            validations[:required] = { message: 'Required' }
+          validations[validator.kind] = validator.options.except(:if, :unless)
+          validations[validator.kind][:message] = validator.options[:message]
+          case validator.kind
+          when :presence
+            validations[validator.kind][:message] ||= I18n.t('errors.messages.present')
+          when :acceptance
+            validations[validator.kind][:message] ||= I18n.t('errors.messages.accepted')
+          when :confirmation
+            # raise NotImplemented
+          when :numericality
+            # raise NotImplemented
+          when :comparison
+            comparison = validator.options.first[0]
+            validations[validator.kind][:message] ||= I18n.t("errors.messages.#{comparison}")
+          when :format
+            validations[validator.kind][:message] ||= I18n.t('errors.messages.invalid')
+          when :inclusion
+            validations[validator.kind][:message] ||= I18n.t('errors.messages.inclusion')
+          when :exclusion
+            validations[validator.kind][:message] ||= I18n.t('errors.messages.exclusion')
+          when :length
+            validations[validator.kind][:message] = {
+              too_long: I18n.t('errors.messages.too_long'),
+              wrong_length: I18n.t('errors.messages.wrong_length'),
+              too_short: I18n.t('errors.messages.too_short')
+            }
           end
         end
+
+        if validations[:presence].present?
+          validations[:required] = validations[:presence]
+          validations.delete(:presence)
+        end
+
         validations
       end
 

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

@@ -32,6 +32,11 @@ page.scroll childViews: ->(scroll) do
           group.fields_check checkValue: 4, label: 'Photography'
         end
 
+      form.spacer height: 20
+      form.h2 text: 'Check without group'
+      form.spacer height: 4
+      form.fields_check name: 'user[driver]', label: 'Do you have driver license?'
+
       form.spacer height: 20
       form.button text: 'Submit', onClick: ->(action) { action.forms_submit }
     end

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/text_validation.json.jbuilder

@@ -106,4 +106,5 @@ page.form \
 
     form.spacer height: 30
     form.fields_submit text: 'Submit'
+    form.fields_submit text: 'Submit (disable if form invalid)', disableIfFormInvalid: true
   end

data/app/views/json_ui/garage/lists/_autoload_section.json.jbuilder

@@ -11,7 +11,7 @@ section.rows builder: ->(row) do
   array.each do |i|
     index = page_index * batch_count + i
     if local_assigns[:reorder]
-      row.thumbnail title: "Item #{index}", id: "item_#{index}"
+      row.thumbnail title: "Item #{index}"
     else
       row.thumbnail title: "Item #{index}", subtitle: "Sub Item #{index}", subsubtitle: "Sub Sub Item #{index}"
     end

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

@@ -38,10 +38,25 @@ page.scroll padding: glib_json_padding_body, childViews: ->(scroll) do
         action.windows_open url: json_ui_garage_url(path: 'home/blank')
       end
 
-      ul.button icon: 'keyboard_arrow_down', text: 'Level 2', styleClass: 'link', childButtons: ->(menu) do
-        menu.button text: 'Dropdown item 1'
-        menu.button text: 'Dropdown item 2'
-        menu.button text: 'Dropdown item 3'
+      ul.button icon: 'keyboard_arrow_down', text: 'Level 2', styleClass: 'link', onClick: ->(action) do
+        action.popovers_show \
+          key: 'menu',
+          placement: 'bottom-start',
+          content: ->(dialog) do
+            dialog.body childViews: ->(view) do
+              view.panels_responsive styleClass: 'popover-menu', width: 200, childViews: ->(res) do
+                res.label text: 'Item 1', styleClass: 'popover-menu-item', onClick: ->(saction) do
+                  saction.popovers_close key: 'menu'
+                end
+                res.label text: 'Item 2', styleClass: 'popover-menu-item', onClick: ->(saction) do
+                  saction.popovers_close key: 'menu'
+                end
+                res.label text: 'Item 3', styleClass: 'popover-menu-item', onClick: ->(saction) do
+                  saction.popovers_close key: 'menu'
+                end
+              end
+            end
+          end
       end
       ul.label text: 'Level 3'
     end

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

@@ -58,7 +58,7 @@ json_ui_page json do |page|
     scroll.spacer height: 20
     scroll.h2 text: 'Icon with onClick'
     scroll.spacer height: 6
-    scroll.icon spec: 'info', onClick: ->(action) do
+    scroll.icon name: 'info', onClick: ->(action) do
       action.windows_open url: json_ui_garage_url(path: 'home/blank')
     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.0
+  version: 4.1.2
 platform: ruby
 authors:
 - ''
@@ -328,6 +328,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 +353,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: ''