glib-web 4.1.5 → 4.3.0

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

@@ -342,6 +342,40 @@ page.form \
       form.fields_text id: 'field4', name: 'user[loadif_target8]', width: 'matchParent', value: params[:key]
     end
 
+    # form.fields_check name: 'user[loadif7]', label: 'Show target nested panels', checkValue: 'true', uncheckValue: 'false', value: 'false', onChangeAndLoad: ->(action) do
+    #   action.logics_set targetId: 'panel7a', conditionalData: { displayed: { "==": [{ "var": 'user[loadif7]' }, 'true'] } }
+    # end
+
+    form.spacer height: 20
+    options = [
+      { text: 'Option 1', value: 'option1' },
+      { text: 'Option 2', value: 'option2' }
+    ]
+    form.fields_select name: 'user[loadif7]', width: 'matchParent', label: 'Select "show"', options: options, value: '', onChangeAndLoad: ->(action) do
+      action.runMultiple childActions: ->(saction) do
+        saction.logics_set targetId: 'panel7a', conditionalData: { displayed: { "==": [{ "var": 'user[loadif7]' }, 'option1'] } }
+        saction.logics_set targetId: 'panel7b', conditionalData: { displayed: { "==": [{ "var": 'user[loadif7]' }, 'option2'] } }
+      end
+    end
+
+    form.panels_vertical \
+      id: 'panel7a',
+      styleClass: 'border-2',
+      width: 'matchParent',
+      padding: { top: 8, right: 8, bottom: 8, left: 8 },
+      childViews: ->(res) do
+        res.fields_text name: 'user[loadif_target9]', width: 'matchParent', value: 'Value 7a'
+      end
+
+    form.panels_vertical \
+      id: 'panel7b',
+      styleClass: 'border-2',
+      width: 'matchParent',
+      padding: { top: 8, right: 8, bottom: 8, left: 8 },
+      childViews: ->(res) do
+        res.fields_text name: 'user[loadif_target9]', width: 'matchParent', value: 'Value 7b'
+      end
+
     form.spacer height: 20
     form.fields_submit text: 'Submit'
 

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

@@ -113,7 +113,7 @@ page.scroll childViews: ->(scroll) do
         width: 'matchParent',
         label: 'Avatar',
         accepts: rules,
-        directUploadUrl: rails_direct_uploads_url,
+        directUploadUrl: glib_direct_uploads_url,
         placeholderView: { type: 'avatar', width: 100, height: 100, url: 'data:image/jpeg;base64,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' },
         onChange: ->(action) do
           action.sheets_select message: 'Submit data?', buttons: ->(menu) do

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

@@ -8,13 +8,14 @@ page.form \
   url: json_ui_garage_url(path: 'forms/generic_post'),
   method: 'post',
   padding: glib_json_padding_body,
+  autoValidate: true,
   childViews: ->(form) do
     form.fields_text \
       prop: :name,
       name: 'user[name]',
       width: 'matchParent',
-      label: 'Name',
-      validation: { format: { regex: 'Doe', message: 'This job is only for person named Doe' } }
+      label: 'Name'
+
 
     form.fields_email \
       name: 'user[email]',
@@ -30,8 +31,8 @@ page.form \
       prop: :age,
       name: 'user[age]',
       width: 'matchParent',
-      label: 'Age',
-      autoValidate: true
+      label: 'Age'
+
 
     form.fields_phone \
       name: 'user[phone1]',
@@ -57,8 +58,8 @@ page.form \
       name: 'user[words]',
       width: 'matchParent',
       label: 'Textarea with maxLength',
-      maxLength: 1000,
-      autoValidate: true
+      maxLength: 1000
+
 
     options = ['programmer', 'devops', 'designer', 'ceo', 'office_boy'].map { |v| { text: v.humanize, value: v } }
     form.fields_select \
@@ -66,8 +67,8 @@ page.form \
       name: 'user[position]',
       width: 'matchParent',
       label: 'Position',
-      options: options,
-      autoValidate: true
+      options: options
+
 
     form.spacer height: 10
     form.h4 text: 'Gender'
@@ -95,7 +96,7 @@ page.form \
       end
 
     form.spacer height: 10
-    form.fields_check prop: :accept, label: 'Accept terms & condition', name: 'user[accept]', autoValidate: true
+    form.fields_check prop: :accept, label: 'Accept terms & condition', name: 'user[accept]'
 
     form.spacer height: 30
     form.fields_submit text: 'Submit'

data/app/views/json_ui/garage/pages/paste_file.jbuilder

@@ -5,7 +5,7 @@ page = json_ui_page json
 render "#{@path_prefix}/nav_menu", json: json, page: page
 
 page.filePaster \
-  directUploadUrl: rails_direct_uploads_url,
+  directUploadUrl: glib_direct_uploads_url,
   accepts: {
     fileType: 'image',
     maxFileSize: 100,

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

@@ -4,6 +4,19 @@ page = json_ui_page json
 render "#{@path_prefix}/nav_menu", json: json, page: page
 
 page.scroll padding: glib_json_padding_body, childViews: ->(scroll) do
+  scroll.h1 text: 'Show/hide'
+  scroll.panels_flow id: 'flow1', width: 300, innerPadding: { top: 0 }, backgroundColor: '#b3bac2', childViews: ->(panel) do
+    panel.button text: '1'
+    panel.button text: '2'
+    panel.button text: '3'
+  end
+  scroll.button text: 'show', onClick: ->(action) do
+    action.components_set targetId: 'flow1', data: { displayed: true }
+  end
+  scroll.button text: 'hide', onClick: ->(action) do
+    action.components_set targetId: 'flow1', data: { displayed: false }
+  end
+
   scroll.h1 text: 'Basic'
   scroll.panels_flow width: 300, innerPadding: { top: 0 }, backgroundColor: '#b3bac2', childViews: ->(panel) do
     panel.button text: '1'

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

@@ -4,6 +4,19 @@ json_ui_page json do |page|
   render "#{@path_prefix}/nav_menu", json: json, page: page
 
   page.scroll padding: glib_json_padding_body, childViews: ->(scroll) do
+    scroll.h1 text: 'Show/hide'
+    scroll.panels_horizontal id: 'hor1', width: 200, height: 100, backgroundColor: '#b3bac2', childViews: ->(panel) do
+      panel.button text: '1'
+    end
+    scroll.button text: 'show', onClick: ->(action) do
+      action.components_set targetId: 'hor1', data: { displayed: true }
+    end
+    scroll.button text: 'hide', onClick: ->(action) do
+      action.components_set targetId: 'hor1', data: { displayed: false }
+    end
+
+    scroll.label text: "\n"
+
     scroll.h1 text: 'Basic'
     scroll.panels_horizontal backgroundColor: '#b3bac2', childViews: ->(panel) do
       panel.button text: '1'

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

@@ -4,6 +4,18 @@ page = json_ui_page json
 render "#{@path_prefix}/nav_menu", json: json, page: page
 
 page.scroll padding: glib_json_padding_body, childViews: ->(scroll) do
+  scroll.h1 text: 'Show/hide'
+  scroll.panels_responsive id: 'res1', width: 300, backgroundColor: '#b3bac2', childViews: ->(panel) do
+    panel.button text: '1'
+    panel.button text: '2'
+  end
+  scroll.button text: 'show', onClick: ->(action) do
+    action.components_set targetId: 'res1', data: { displayed: true }
+  end
+  scroll.button text: 'hide', onClick: ->(action) do
+    action.components_set targetId: 'res1', data: { displayed: false }
+  end
+
   scroll.h1 text: 'Panels Columns'
   scroll.label text: 'Shrink the browser\'s width to see how the column panels are rearranged. On mobile screens, they are always arranged vertically'
   scroll.spacer height: 8

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

@@ -4,6 +4,19 @@ page = json_ui_page json
 render "#{@path_prefix}/nav_menu", json: json, page: page
 
 page.scroll padding: glib_json_padding_body, childViews: ->(scroll) do
+  scroll.h2 text: 'Show/hide'
+  scroll.spacer height: 6
+  scroll.panels_ul id: 'ul', childViews: ->(li) do
+    li.label text: 'text1'
+    li.label text: 'text2'
+  end
+  scroll.button text: 'show', onClick: ->(action) do
+    action.components_set targetId: 'ul', data: { displayed: true }
+  end
+  scroll.button text: 'hide', onClick: ->(action) do
+    action.components_set targetId: 'ul', data: { displayed: false }
+  end
+  scroll.spacer height: 14
   scroll.h2 text: 'Standard Usage'
   scroll.spacer height: 6
   scroll.panels_ul childViews: ->(ul) do

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

@@ -4,6 +4,19 @@ json_ui_page json do |page|
   render "#{@path_prefix}/nav_menu", json: json, page: page
 
   page.scroll padding: glib_json_padding_body, childViews: ->(scroll) do
+
+    scroll.h1 text: 'Show/Hide'
+    scroll.panels_vertical id: 'vert1', width: 200, height: 100, backgroundColor: '#b3bac2', childViews: ->(panel) do
+      panel.button text: 'Button1'
+    end
+    scroll.button text: 'show', onClick: ->(action) do
+      action.components_set targetId: 'vert1', data: { displayed: true }
+    end
+    scroll.button text: 'hide', onClick: ->(action) do
+      action.components_set targetId: 'vert1', data: { displayed: false }
+    end
+
+    scroll.label text: "\n"
     scroll.h1 text: 'Basic'
     scroll.panels_vertical backgroundColor: '#b3bac2', childViews: ->(panel) do
       panel.button text: 'Button1'

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

@@ -2257,7 +2257,7 @@ page.scroll padding: glib_json_padding_body, childViews: ->(scroll) do
     icon_names.each do |icon_name|
       scroll.panels_column lg: { cols: 4 }, childViews: ->(column) do
         column.panels_horizontal align: 'middle', childViews: ->(horizontal) do
-          horizontal.icon spec: icon_name
+          horizontal.icon name: icon_name
           horizontal.spacer width: 6
           horizontal.label text: icon_name
 

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

@@ -11,7 +11,7 @@ json_ui_page json do |page|
         flow.treeView \
           inputName: 'user',
           url: json_ui_garage_url(path: 'forms/generic_post'),
-          directUploadUrl: rails_direct_uploads_url,
+          directUploadUrl: glib_direct_uploads_url,
           width: 240,
           selected: 'parent-1',
           items: [

data/config/routes.rb

@@ -5,5 +5,7 @@ Glib::Web::Engine.routes.draw do
     patch 'json_ui_garage', to: 'home#json_ui_garage'
     delete 'json_ui_garage', to: 'home#json_ui_garage'
     post 'chat', to: 'home#chat'
+
+    resources :glib_direct_uploads, only: [:create]
   end
 end

data/lib/active_storage/service/glib_s3_service.rb

@@ -0,0 +1,22 @@
+require 'active_storage/service/s3_service'
+
+module ActiveStorage
+  class Service::GlibS3Service < Service::S3Service
+    attr_accessor :tagging
+
+    # 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:, 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
+
+        [generated_url, headers]
+      end
+    end
+  end
+end

data/lib/glib/engine.rb

@@ -2,13 +2,6 @@ module Glib
   module Web
     class Engine < ::Rails::Engine
       # isolate_namespace Glib::Web
-
-      # modify direct upload
-      config.to_prepare do
-        require_relative 's3_service'
-        require_relative 'blob'
-        require_relative 'direct_uploads_controller'
-      end
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: glib-web
 version: !ruby/object:Gem::Version
-  version: 4.1.5
+  version: 4.3.0
 platform: ruby
 authors:
 - ''
@@ -14,16 +14,16 @@ dependencies:
   name: activestorage
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 5.2.3
+        version: '7.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 5.2.3
+        version: '7.0'
 - !ruby/object:Gem::Dependency
   name: pundit
   requirement: !ruby/object:Gem::Requirement
@@ -56,16 +56,30 @@ dependencies:
   name: actioncable
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 6.0.1
+        version: '7.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '7.0'
+- !ruby/object:Gem::Dependency
+  name: js_regex
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.11'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 6.0.1
+        version: '3.11'
 description: 
 email: ''
 executables: []
@@ -86,6 +100,7 @@ files:
 - app/controllers/concerns/glib/json/traversal.rb
 - app/controllers/concerns/glib/json/ui.rb
 - app/controllers/concerns/glib/json/validation.rb
+- app/controllers/glib/glib_direct_uploads_controller.rb
 - app/controllers/glib/home_controller.rb
 - app/helpers/glib/app_feature_support_helper.rb
 - app/helpers/glib/dynamic_images_helper.rb
@@ -302,6 +317,7 @@ files:
 - app/views/layouts/json_ui/no_custom.html.erb
 - app/views/layouts/json_ui/renderer.html.erb
 - config/routes.rb
+- lib/active_storage/service/glib_s3_service.rb
 - lib/generators/glib/install_generator.rb
 - lib/generators/templates/20191017062519_create_texts.rb
 - lib/generators/templates/20191024063257_add_scope_to_texts.rb
@@ -310,9 +326,7 @@ files:
 - lib/generators/templates/database.yml
 - lib/generators/templates/dynamic_text.rb
 - lib/glib-web.rb
-- lib/glib/blob.rb
 - lib/glib/crypt/utils.rb
-- lib/glib/direct_uploads_controller.rb
 - lib/glib/dynamic_text.rb
 - lib/glib/dynamic_text/config.rb
 - lib/glib/engine.rb
@@ -330,7 +344,6 @@ 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
@@ -355,7 +368,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: ''

data/lib/glib/blob.rb

@@ -1,23 +0,0 @@
-::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, 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, tagging: nil)
-      key_name = key || generate_unique_secure_token
-      if prefix.present?
-        key_name = "#{prefix}/#{key_name}"
-      end
-      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

@@ -1,32 +0,0 @@
-::ActiveStorage::DirectUploadsController.class_eval do
-  # include Rails.application.routes.url_helpers
-  before_action :authenticate_user!
-
-  rescue_from StandardError do |e|
-    if !Rails.env.production?
-      raise e
-    end
-    render json: { message: 'Upload failed' }, status: 500
-  end
-
-  rescue_from Glib::Auth::Policy::UnauthorizedError do
-    render json: { message: 'Forbidden' }, status: 403
-  end
-
-  rescue_from ActionController::InvalidAuthenticityToken do
-    render json: { message: 'Session expired. Please refresh page' }, status: 401
-  end
-
-  private
-    def blob_args
-      params.require(:blob).permit(:filename, :byte_size, :checksum, :content_type, :prefix, :tagging, metadata: {}).to_h.symbolize_keys
-    end
-
-    def authenticate_user!
-      current_user.present? ? nil : raise_error
-    end
-
-    def raise_error
-      raise Glib::Auth::Policy::UnauthorizedError
-    end
-end

data/lib/glib/s3_service.rb

@@ -1,30 +0,0 @@
-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