diff --git a/Gemfile.lock b/Gemfile.lock index 6f16202c1..08ab19d01 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -65,55 +65,55 @@ PATH GEM remote: https://rubygems.org/ specs: - actioncable (7.0.8) - actionpack (= 7.0.8) - activesupport (= 7.0.8) + actioncable (7.0.8.4) + actionpack (= 7.0.8.4) + activesupport (= 7.0.8.4) nio4r (~> 2.0) websocket-driver (>= 0.6.1) - actionmailbox (7.0.8) - actionpack (= 7.0.8) - activejob (= 7.0.8) - activerecord (= 7.0.8) - activestorage (= 7.0.8) - activesupport (= 7.0.8) + actionmailbox (7.0.8.4) + actionpack (= 7.0.8.4) + activejob (= 7.0.8.4) + activerecord (= 7.0.8.4) + activestorage (= 7.0.8.4) + activesupport (= 7.0.8.4) mail (>= 2.7.1) net-imap net-pop net-smtp - actionmailer (7.0.8) - actionpack (= 7.0.8) - actionview (= 7.0.8) - activejob (= 7.0.8) - activesupport (= 7.0.8) + actionmailer (7.0.8.4) + actionpack (= 7.0.8.4) + actionview (= 7.0.8.4) + activejob (= 7.0.8.4) + activesupport (= 7.0.8.4) mail (~> 2.5, >= 2.5.4) net-imap net-pop net-smtp rails-dom-testing (~> 2.0) - actionpack (7.0.8) - actionview (= 7.0.8) - activesupport (= 7.0.8) + actionpack (7.0.8.4) + actionview (= 7.0.8.4) + activesupport (= 7.0.8.4) rack (~> 2.0, >= 2.2.4) rack-test (>= 0.6.3) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.0, >= 1.2.0) - actiontext (7.0.8) - actionpack (= 7.0.8) - activerecord (= 7.0.8) - activestorage (= 7.0.8) - activesupport (= 7.0.8) + actiontext (7.0.8.4) + actionpack (= 7.0.8.4) + activerecord (= 7.0.8.4) + activestorage (= 7.0.8.4) + activesupport (= 7.0.8.4) globalid (>= 0.6.0) nokogiri (>= 1.8.5) - actionview (7.0.8) - activesupport (= 7.0.8) + actionview (7.0.8.4) + activesupport (= 7.0.8.4) builder (~> 3.1) erubi (~> 1.4) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.1, >= 1.2.0) active_storage_validations (0.9.5) rails (>= 5.2.0) - activejob (7.0.8) - activesupport (= 7.0.8) + activejob (7.0.8.4) + activesupport (= 7.0.8.4) globalid (>= 0.3.6) activemerchant (1.133.0) activesupport (>= 4.2) @@ -121,99 +121,100 @@ GEM i18n (>= 0.6.9) nokogiri (~> 1.4) rexml (~> 3.2.5) - activemodel (7.0.8) - activesupport (= 7.0.8) - activerecord (7.0.8) - activemodel (= 7.0.8) - activesupport (= 7.0.8) - activerecord-typedstore (1.5.1) + activemodel (7.0.8.4) + activesupport (= 7.0.8.4) + activerecord (7.0.8.4) + activemodel (= 7.0.8.4) + activesupport (= 7.0.8.4) + activerecord-typedstore (1.6.0) activerecord (>= 6.1) activerecord_json_validator (2.1.5) activerecord (>= 4.2.0, < 8) json_schemer (~> 0.2.18) - activestorage (7.0.8) - actionpack (= 7.0.8) - activejob (= 7.0.8) - activerecord (= 7.0.8) - activesupport (= 7.0.8) + activestorage (7.0.8.4) + actionpack (= 7.0.8.4) + activejob (= 7.0.8.4) + activerecord (= 7.0.8.4) + activesupport (= 7.0.8.4) marcel (~> 1.0) mini_mime (>= 1.1.0) - activesupport (7.0.8) + activesupport (7.0.8.4) concurrent-ruby (~> 1.0, >= 1.0.2) i18n (>= 1.6, < 2) minitest (>= 5.1) tzinfo (~> 2.0) - acts_as_list (1.1.0) - activerecord (>= 4.2) - addressable (2.8.5) - public_suffix (>= 2.0.2, < 6.0) + acts_as_list (1.2.1) + activerecord (>= 6.1) + activesupport (>= 6.1) + addressable (2.8.7) + public_suffix (>= 2.0.2, < 7.0) appraisal (2.5.0) bundler rake thor (>= 0.14.0) ast (2.4.2) - async (2.6.4) - console (~> 1.10) + async (2.12.1) + console (~> 1.25, >= 1.25.2) fiber-annotation - io-event (~> 1.1) - timers (~> 4.1) - async-http (0.60.2) - async (>= 1.25) - async-io (>= 1.28) - async-pool (>= 0.2) - protocol-http (~> 0.24.0) - protocol-http1 (~> 0.15.0) - protocol-http2 (~> 0.15.0) - traces (>= 0.10.0) - async-http-faraday (0.12.0) + io-event (~> 1.6, >= 1.6.5) + async-http (0.69.0) + async (>= 2.10.2) + async-pool (~> 0.7) + io-endpoint (~> 0.11) + io-stream (~> 0.4) + protocol-http (~> 0.26) + protocol-http1 (~> 0.19) + protocol-http2 (~> 0.18) + traces (>= 0.10) + async-http-faraday (0.14.0) async-http (~> 0.42) faraday - async-io (1.36.0) - async - async-pool (0.4.0) + async-pool (0.7.0) async (>= 1.25) auto_strip_attributes (2.6.0) activerecord (>= 4.0) - autoprefixer-rails (10.4.15.0) + autoprefixer-rails (10.4.16.0) execjs (~> 2) awesome_nested_set (3.6.0) activerecord (>= 4.0.0, < 7.2) awesome_print (1.9.2) - aws-eventstream (1.2.0) - aws-partitions (1.835.0) - aws-sdk-core (3.185.1) - aws-eventstream (~> 1, >= 1.0.2) + aws-eventstream (1.3.0) + aws-partitions (1.949.0) + aws-sdk-core (3.200.0) + aws-eventstream (~> 1, >= 1.3.0) aws-partitions (~> 1, >= 1.651.0) - aws-sigv4 (~> 1.5) + aws-sigv4 (~> 1.8) jmespath (~> 1, >= 1.6.1) - aws-sdk-kms (1.72.0) - aws-sdk-core (~> 3, >= 3.184.0) + aws-sdk-kms (1.87.0) + aws-sdk-core (~> 3, >= 3.199.0) aws-sigv4 (~> 1.1) - aws-sdk-s3 (1.136.0) - aws-sdk-core (~> 3, >= 3.181.0) + aws-sdk-s3 (1.155.0) + aws-sdk-core (~> 3, >= 3.199.0) aws-sdk-kms (~> 1) - aws-sigv4 (~> 1.6) - aws-sigv4 (1.6.0) + aws-sigv4 (~> 1.8) + aws-sigv4 (1.8.0) aws-eventstream (~> 1, >= 1.0.2) babel-source (5.8.35) babel-transpiler (0.7.0) babel-source (>= 4.0, < 6) execjs (~> 2.0) - base64 (0.1.1) - bcrypt (3.1.19) + base64 (0.2.0) + bcrypt (3.1.20) + bigdecimal (3.1.8) bootstrap (4.6.2) autoprefixer-rails (>= 9.1.0) popper_js (>= 1.16.1, < 2) sassc-rails (>= 2.0.0) - brakeman (6.0.1) - builder (3.2.4) + brakeman (6.1.2) + racc + builder (3.3.0) byebug (11.1.3) - cancancan (3.5.0) - capybara (3.39.2) + cancancan (3.6.1) + capybara (3.40.0) addressable matrix mini_mime (>= 0.1.3) - nokogiri (~> 1.8) + nokogiri (~> 1.11) rack (>= 1.6.0) rack-test (>= 0.6.3) regexp_parser (>= 1.5, < 3.0) @@ -224,17 +225,20 @@ GEM capybara-select-2 (0.5.1) carmen (1.1.3) activesupport (>= 3.0.0) + childprocess (5.0.0) chunky_png (1.4.0) coderay (1.1.3) - concurrent-ruby (1.2.2) + concurrent-ruby (1.3.3) connection_pool (2.4.1) - console (1.23.2) + console (1.25.2) fiber-annotation - fiber-local - crack (0.4.5) + fiber-local (~> 1.1) + json + crack (1.0.0) + bigdecimal rexml crass (1.0.6) - css_parser (1.16.0) + css_parser (1.17.1) addressable database_cleaner (2.0.2) database_cleaner-active_record (>= 2, < 3) @@ -242,14 +246,14 @@ GEM activerecord (>= 5.a) database_cleaner-core (~> 2.0.0) database_cleaner-core (2.0.1) - date (3.3.3) + date (3.3.4) deface (1.9.0) actionview (>= 5.2) nokogiri (>= 1.6) polyglot railties (>= 5.2) rainbow (>= 2.1.0) - devise (4.9.3) + devise (4.9.4) bcrypt (~> 3.0) orm_adapter (~> 0.1) railties (>= 4.1.0) @@ -257,11 +261,10 @@ GEM warden (~> 1.2.3) devise-encryptable (0.2.0) devise (>= 2.1.0) - diff-lcs (1.5.0) + diff-lcs (1.5.1) docile (1.4.0) - domain_name (0.5.20190701) - unf (>= 0.0.5, < 1.0.0) - doorkeeper (5.6.6) + domain_name (0.6.20240107) + doorkeeper (5.7.1) railties (>= 5) dry-configurable (1.1.0) dry-core (~> 1.0, < 2) @@ -275,7 +278,7 @@ GEM concurrent-ruby (~> 1.0) dry-core (~> 1.0, < 2) zeitwerk (~> 2.6) - dry-schema (1.13.3) + dry-schema (1.13.4) concurrent-ruby (~> 1.0) dry-configurable (~> 1.0, >= 1.0.1) dry-core (~> 1.0, < 2) @@ -283,7 +286,8 @@ GEM dry-logic (>= 1.4, < 2) dry-types (>= 1.7, < 2) zeitwerk (~> 2.6) - dry-types (1.7.1) + dry-types (1.7.2) + bigdecimal (~> 3.0) concurrent-ruby (~> 1.0) dry-core (~> 1.0) dry-inflector (~> 1.0) @@ -297,15 +301,15 @@ GEM zeitwerk (~> 2.6) ecma-re-validator (0.4.0) regexp_parser (~> 2.2) - elastic-transport (8.3.0) + elastic-transport (8.3.2) faraday (< 3) multi_json - elasticsearch (8.10.0) - elastic-transport (~> 8) - elasticsearch-api (= 8.10.0) - elasticsearch-api (8.10.0) + elasticsearch (8.14.0) + elastic-transport (~> 8.3) + elasticsearch-api (= 8.14.0) + elasticsearch-api (8.14.0) multi_json - erubi (1.12.0) + erubi (1.13.0) exception_notification (4.5.0) actionmailer (>= 5.2, < 8) activesupport (>= 5.2, < 8) @@ -327,7 +331,7 @@ GEM faraday-em_http (1.0.0) faraday-em_synchrony (1.0.0) faraday-excon (1.1.0) - faraday-http-cache (2.5.0) + faraday-http-cache (2.5.1) faraday (>= 0.8) faraday-httpclient (1.0.1) faraday-multipart (1.0.4) @@ -338,27 +342,31 @@ GEM faraday-rack (1.0.0) faraday-retry (1.0.3) ffaker (2.23.0) - ffi (1.16.3) - ffi-compiler (1.0.1) - ffi (>= 1.0.0) + ffi (1.17.0) + ffi (1.17.0-x86_64-darwin) + ffi (1.17.0-x86_64-linux-gnu) + ffi-compiler (1.3.2) + ffi (>= 1.15.5) rake fiber-annotation (0.2.0) - fiber-local (1.0.0) + fiber-local (1.1.0) + fiber-storage + fiber-storage (0.1.2) flag-icons-rails (3.4.6.1) sass-rails - flatpickr (4.6.13.0) + flatpickr (4.6.13.1) font-awesome-sass (6.4.2) sassc (~> 2.0) - friendly_id (5.5.0) + friendly_id (5.5.1) activerecord (>= 4.0.0) - gapic-common (0.20.0) + gapic-common (0.21.1) faraday (>= 1.9, < 3.a) faraday-retry (>= 1.0, < 3.a) - google-protobuf (~> 3.14) - googleapis-common-protos (>= 1.3.12, < 2.a) - googleapis-common-protos-types (>= 1.3.1, < 2.a) - googleauth (~> 1.0) - grpc (~> 1.36) + google-protobuf (~> 3.18) + googleapis-common-protos (>= 1.4.0, < 2.a) + googleapis-common-protos-types (>= 1.11.0, < 2.a) + googleauth (~> 1.9) + grpc (~> 1.59) gem-release (2.2.2) github_changelog_generator (1.16.4) activesupport @@ -372,48 +380,49 @@ GEM globalid (1.2.1) activesupport (>= 6.1) glyphicons (1.0.2) - google-cloud-core (1.6.0) - google-cloud-env (~> 1.0) + google-cloud-core (1.7.0) + google-cloud-env (>= 1.0, < 3.a) google-cloud-errors (~> 1.0) - google-cloud-env (1.6.0) - faraday (>= 0.17.3, < 3.0) - google-cloud-errors (1.3.1) - google-cloud-recaptcha_enterprise (1.3.0) + google-cloud-env (2.1.1) + faraday (>= 1.0, < 3.a) + google-cloud-errors (1.4.0) + google-cloud-recaptcha_enterprise (1.5.0) google-cloud-core (~> 1.6) - google-cloud-recaptcha_enterprise-v1 (>= 0.0, < 2.a) - google-cloud-recaptcha_enterprise-v1beta1 (>= 0.0, < 2.a) - google-cloud-recaptcha_enterprise-v1 (0.15.0) - gapic-common (>= 0.20.0, < 2.a) + google-cloud-recaptcha_enterprise-v1 (>= 0.17, < 2.a) + google-cloud-recaptcha_enterprise-v1beta1 (>= 0.12, < 2.a) + google-cloud-recaptcha_enterprise-v1 (0.22.0) + gapic-common (>= 0.21.1, < 2.a) google-cloud-errors (~> 1.0) - google-cloud-recaptcha_enterprise-v1beta1 (0.10.0) - gapic-common (>= 0.20.0, < 2.a) + google-cloud-recaptcha_enterprise-v1beta1 (0.14.0) + gapic-common (>= 0.21.1, < 2.a) google-cloud-errors (~> 1.0) - google-protobuf (3.24.4) - google-protobuf (3.24.4-x86_64-darwin) - google-protobuf (3.24.4-x86_64-linux) - googleapis-common-protos (1.4.0) - google-protobuf (~> 3.14) - googleapis-common-protos-types (~> 1.2) - grpc (~> 1.27) - googleapis-common-protos-types (1.9.0) - google-protobuf (~> 3.18) - googleauth (1.8.1) - faraday (>= 0.17.3, < 3.a) + google-protobuf (3.25.3) + google-protobuf (3.25.3-x86_64-darwin) + google-protobuf (3.25.3-x86_64-linux) + googleapis-common-protos (1.6.0) + google-protobuf (>= 3.18, < 5.a) + googleapis-common-protos-types (~> 1.7) + grpc (~> 1.41) + googleapis-common-protos-types (1.15.0) + google-protobuf (>= 3.18, < 5.a) + googleauth (1.11.0) + faraday (>= 1.0, < 3.a) + google-cloud-env (~> 2.1) jwt (>= 1.4, < 3.0) multi_json (~> 1.11) os (>= 0.9, < 2.0) signet (>= 0.16, < 2.a) - grpc (1.58.0) - google-protobuf (~> 3.23) + grpc (1.64.0) + google-protobuf (~> 3.25) googleapis-common-protos-types (~> 1.0) - grpc (1.58.0-x86_64-darwin) - google-protobuf (~> 3.23) + grpc (1.64.0-x86_64-darwin) + google-protobuf (~> 3.25) googleapis-common-protos-types (~> 1.0) - grpc (1.58.0-x86_64-linux) - google-protobuf (~> 3.23) + grpc (1.64.0-x86_64-linux) + google-protobuf (~> 3.25) googleapis-common-protos-types (~> 1.0) hana (1.3.7) - hashdiff (1.0.1) + hashdiff (1.1.0) hashie (5.0.0) highline (2.1.0) hotwire-rails (0.1.3) @@ -421,16 +430,17 @@ GEM stimulus-rails turbo-rails htmlentities (4.3.4) - http (5.1.1) + http (5.2.0) addressable (~> 2.8) + base64 (~> 0.1) http-cookie (~> 1.0) http-form_data (~> 2.2) - llhttp-ffi (~> 0.4.0) - http-cookie (1.0.5) + llhttp-ffi (~> 0.5.0) + http-cookie (1.0.6) domain_name (~> 0.5) http-form_data (2.3.0) httpclient (2.8.3) - i18n (1.14.1) + i18n (1.14.5) concurrent-ruby (~> 1.0) image_processing (1.12.2) mini_magick (>= 4.9.5, < 5) @@ -439,7 +449,9 @@ GEM activesupport (>= 3.0) nokogiri (>= 1.6) interactor (3.1.2) - io-event (1.3.2) + io-endpoint (0.11.0) + io-event (1.6.5) + io-stream (0.4.0) jmespath (1.6.2) jquery-rails (4.6.0) rails-dom-testing (>= 1, < 3) @@ -447,9 +459,9 @@ GEM thor (>= 0.14, < 2.0) jquery-ui-rails (6.0.1) railties (>= 3.2.16) - jsbundling-rails (1.2.1) + jsbundling-rails (1.3.0) railties (>= 6.0.0) - json (2.6.3) + json (2.7.2) json_schemer (0.2.25) ecma-re-validator (~> 0.3) hana (~> 1.3) @@ -475,12 +487,14 @@ GEM kaminari-core (= 1.2.2) kaminari-core (1.2.2) language_server-protocol (3.17.0.3) - launchy (2.5.2) + launchy (3.0.1) addressable (~> 2.8) - llhttp-ffi (0.4.0) + childprocess (~> 5.0) + llhttp-ffi (0.5.0) ffi-compiler (~> 1.0) rake (~> 13.0) - loofah (2.21.4) + logger (1.6.0) + loofah (2.22.0) crass (~> 1.0.2) nokogiri (>= 1.12.0) mail (2.8.1) @@ -488,35 +502,35 @@ GEM net-imap net-pop net-smtp - marcel (1.0.2) + marcel (1.0.4) matrix (0.4.2) - method_source (1.0.0) - mini_magick (4.12.0) + method_source (1.1.0) + mini_magick (4.13.1) mini_mime (1.1.5) - mini_portile2 (2.8.4) - minitest (5.20.0) - monetize (1.12.0) + mini_portile2 (2.8.7) + minitest (5.24.1) + monetize (1.13.0) money (~> 6.12) - money (6.16.0) + money (6.19.0) i18n (>= 0.6.4, <= 2) multi_json (1.15.0) - multipart-post (2.3.0) - net-imap (0.4.1) + multipart-post (2.4.1) + net-imap (0.4.14) date net-protocol net-pop (0.1.2) net-protocol - net-protocol (0.2.1) + net-protocol (0.2.2) timeout - net-smtp (0.4.0) + net-smtp (0.5.0) net-protocol - nio4r (2.5.9) - nokogiri (1.15.4) + nio4r (2.7.3) + nokogiri (1.16.6) mini_portile2 (~> 2.8.2) racc (~> 1.4) - nokogiri (1.15.4-x86_64-darwin) + nokogiri (1.16.6-x86_64-darwin) racc (~> 1.4) - nokogiri (1.15.4-x86_64-linux) + nokogiri (1.16.6-x86_64-linux) racc (~> 1.4) noticed (1.6.3) http (>= 4.0.0) @@ -526,17 +540,17 @@ GEM sawyer (~> 0.9) orm_adapter (0.5.0) os (1.1.4) - parallel (1.23.0) + parallel (1.25.1) paranoia (2.6.3) activerecord (>= 5.1, < 7.2) - parser (3.2.2.4) + parser (3.3.3.0) ast (~> 2.4.1) racc - pg (1.5.4) - phonelib (0.8.4) + pg (1.5.6) + phonelib (0.8.9) polyglot (0.3.5) popper_js (1.16.1) - premailer (1.21.0) + premailer (1.23.0) addressable css_parser (>= 1.12.0) htmlentities (>= 4.0.0) @@ -544,39 +558,39 @@ GEM actionmailer (>= 3) net-smtp premailer (~> 1.7, >= 1.7.9) - protocol-hpack (1.4.2) - protocol-http (0.24.7) - protocol-http1 (0.15.1) + protocol-hpack (1.4.3) + protocol-http (0.26.6) + protocol-http1 (0.19.1) protocol-http (~> 0.22) - protocol-http2 (0.15.1) + protocol-http2 (0.18.0) protocol-hpack (~> 1.4) protocol-http (~> 0.18) pry (0.14.2) coderay (~> 1.1) method_source (~> 1.0) - public_suffix (5.0.3) - puma (6.4.0) + public_suffix (6.0.0) + puma (6.4.2) nio4r (~> 2.0) rabl (0.16.1) activesupport (>= 2.3.14) - racc (1.7.1) - rack (2.2.8) + racc (1.8.0) + rack (2.2.9) rack-test (2.1.0) rack (>= 1.3) - rails (7.0.8) - actioncable (= 7.0.8) - actionmailbox (= 7.0.8) - actionmailer (= 7.0.8) - actionpack (= 7.0.8) - actiontext (= 7.0.8) - actionview (= 7.0.8) - activejob (= 7.0.8) - activemodel (= 7.0.8) - activerecord (= 7.0.8) - activestorage (= 7.0.8) - activesupport (= 7.0.8) + rails (7.0.8.4) + actioncable (= 7.0.8.4) + actionmailbox (= 7.0.8.4) + actionmailer (= 7.0.8.4) + actionpack (= 7.0.8.4) + actiontext (= 7.0.8.4) + actionview (= 7.0.8.4) + activejob (= 7.0.8.4) + activemodel (= 7.0.8.4) + activerecord (= 7.0.8.4) + activestorage (= 7.0.8.4) + activesupport (= 7.0.8.4) bundler (>= 1.15.0) - railties (= 7.0.8) + railties (= 7.0.8.4) rails-controller-testing (1.0.5) actionpack (>= 5.0.1.rc1) actionview (>= 5.0.1.rc1) @@ -588,44 +602,45 @@ GEM rails-html-sanitizer (1.6.0) loofah (~> 2.21) nokogiri (~> 1.14) - railties (7.0.8) - actionpack (= 7.0.8) - activesupport (= 7.0.8) + railties (7.0.8.4) + actionpack (= 7.0.8.4) + activesupport (= 7.0.8.4) method_source rake (>= 12.2) thor (~> 1.0) zeitwerk (~> 2.5) rainbow (3.1.1) - rake (13.0.6) + rake (13.2.1) ransack (2.6.0) activerecord (>= 6.0.4) activesupport (>= 6.0.4) i18n - redis (5.0.7) - redis-client (>= 0.9.0) - redis-client (0.17.0) + redis (5.2.0) + redis-client (>= 0.22.0) + redis-client (0.22.2) connection_pool - regexp_parser (2.8.2) + regexp_parser (2.9.2) responders (3.1.1) actionpack (>= 5.2) railties (>= 5.2) - rexml (3.2.6) + rexml (3.2.9) + strscan rqrcode (2.2.0) chunky_png (~> 1.0) rqrcode_core (~> 1.0) rqrcode_core (1.2.0) - rspec-activemodel-mocks (1.1.0) + rspec-activemodel-mocks (1.2.0) activemodel (>= 3.0) activesupport (>= 3.0) rspec-mocks (>= 2.99, < 4.0) - rspec-core (3.12.2) - rspec-support (~> 3.12.0) - rspec-expectations (3.12.3) + rspec-core (3.13.0) + rspec-support (~> 3.13.0) + rspec-expectations (3.13.1) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.12.0) - rspec-mocks (3.12.6) + rspec-support (~> 3.13.0) + rspec-mocks (3.13.1) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.12.0) + rspec-support (~> 3.13.0) rspec-rails (4.1.2) actionpack (>= 4.2) activesupport (>= 4.2) @@ -636,34 +651,34 @@ GEM rspec-support (~> 3.10) rspec-retry (0.6.2) rspec-core (> 3.3) - rspec-support (3.12.1) + rspec-support (3.13.1) rspec_junit_formatter (0.6.0) rspec-core (>= 2, < 4, != 2.12.0) - rubocop (1.57.1) - base64 (~> 0.1.1) + rubocop (1.64.1) json (~> 2.3) language_server-protocol (>= 3.17.0) parallel (~> 1.10) - parser (>= 3.2.2.4) + parser (>= 3.3.0.2) rainbow (>= 2.2.2, < 4.0) regexp_parser (>= 1.8, < 3.0) rexml (>= 3.2.5, < 4.0) - rubocop-ast (>= 1.28.1, < 2.0) + rubocop-ast (>= 1.31.1, < 2.0) ruby-progressbar (~> 1.7) unicode-display_width (>= 2.4.0, < 3.0) - rubocop-ast (1.29.0) - parser (>= 3.2.1.0) - rubocop-performance (1.19.1) - rubocop (>= 1.7.0, < 2.0) - rubocop-ast (>= 0.4.0) - rubocop-rails (2.21.2) + rubocop-ast (1.31.3) + parser (>= 3.3.1.0) + rubocop-performance (1.21.1) + rubocop (>= 1.48.1, < 2.0) + rubocop-ast (>= 1.31.1, < 2.0) + rubocop-rails (2.25.1) activesupport (>= 4.2.0) rack (>= 1.1) rubocop (>= 1.33.0, < 2.0) + rubocop-ast (>= 1.31.1, < 2.0) rubocop-rspec (1.42.0) rubocop (>= 0.87.0) ruby-progressbar (1.13.0) - ruby-vips (2.1.4) + ruby-vips (2.2.1) ffi (~> 1.12) ruby2_keywords (0.0.5) rubyzip (2.3.2) @@ -680,17 +695,19 @@ GEM sawyer (0.9.2) addressable (>= 2.3.5) faraday (>= 0.17.3, < 3) - searchkick (5.3.0) + searchkick (5.3.1) activemodel (>= 6.1) hashie select2-rails (4.0.13) - selenium-webdriver (4.14.0) + selenium-webdriver (4.22.0) + base64 (~> 0.2) + logger (~> 1.4) rexml (~> 3.2, >= 3.2.5) rubyzip (>= 1.2.2, < 3.0) websocket (~> 1.0) shoulda-matchers (5.3.0) activesupport (>= 5.2.0) - signet (0.18.0) + signet (0.19.0) addressable (~> 2.8) faraday (>= 0.17.5, < 3.a) jwt (>= 1.5, < 3.0) @@ -703,23 +720,22 @@ GEM simplecov_json_formatter (~> 0.1) simplecov-html (0.12.3) simplecov_json_formatter (0.1.4) - simpleidn (0.2.1) - unf (~> 0.1.4) - spree (4.5.3) - spree_api (= 4.5.3) - spree_cli (= 4.5.3) - spree_core (= 4.5.3) - spree_api (4.5.3) + simpleidn (0.2.3) + spree (4.5.5) + spree_api (= 4.5.5) + spree_cli (= 4.5.5) + spree_core (= 4.5.5) + spree_api (4.5.5) bcrypt (~> 3.1) doorkeeper (~> 5.3) jsonapi-serializer (~> 2.1) - spree_core (= 4.5.3) + spree_core (= 4.5.5) spree_api_v1 (4.5.0) rabl (~> 0.14, >= 0.14.2) responders spree (>= 4.4.0.rc1) spree_extension - spree_auth_devise (4.6.0) + spree_auth_devise (4.6.3) devise (~> 4.7) devise-encryptable (= 0.2.0) spree_core (>= 4.5.0) @@ -741,9 +757,9 @@ GEM spree (>= 4.4.0) sprockets (~> 4.0) tinymce-rails (~> 5.0) - spree_cli (4.5.3) + spree_cli (4.5.5) thor (~> 1.0) - spree_core (4.5.3) + spree_core (4.5.5) actionpack (>= 6.1) actionview (>= 6.1) active_storage_validations (~> 0.9, <= 0.9.5) @@ -773,9 +789,9 @@ GEM state_machines-activerecord (~> 0.6) stringex validates_zipcode - spree_emails (4.5.3) + spree_emails (4.5.5) actionmailer - spree_core (>= 4.5.3) + spree_core (>= 4.5.5) sprockets (>= 4.0) spree_extension (0.1.0) activerecord (>= 4.2) @@ -789,9 +805,9 @@ GEM sprockets (4.2.1) concurrent-ruby (~> 1.0) rack (>= 2.2.4, < 4) - sprockets-rails (3.4.2) - actionpack (>= 5.2) - activesupport (>= 5.2) + sprockets-rails (3.5.1) + actionpack (>= 6.1) + activesupport (>= 6.1) sprockets (>= 3.0.0) state_machines (0.6.0) state_machines-activemodel (0.9.0) @@ -800,24 +816,24 @@ GEM state_machines-activerecord (0.9.0) activerecord (>= 6.0) state_machines-activemodel (>= 0.9.0) - stimulus-rails (1.3.0) + stimulus-rails (1.3.3) railties (>= 6.0.0) stringex (2.8.6) - telegram-bot (0.15.7) - actionpack (>= 4.0, < 7.1) - activesupport (>= 4.0, < 7.1) + strscan (3.1.0) + telegram-bot (0.16.2) + actionpack (>= 4.0, < 7.2) + activesupport (>= 4.0, < 7.2) httpclient (~> 2.7) terminal-table (3.0.2) unicode-display_width (>= 1.1.1, < 3) - thor (1.2.2) - tilt (2.3.0) - timecop (0.9.8) - timeout (0.4.0) - timers (4.3.5) - tinymce-rails (5.10.7.1) + thor (1.3.1) + tilt (2.4.0) + timecop (0.9.10) + timeout (0.4.1) + tinymce-rails (5.10.9) railties (>= 3.1.1) traces (0.11.1) - turbo-rails (1.5.0) + turbo-rails (2.0.5) actionpack (>= 6.0.0) activejob (>= 6.0.0) railties (>= 6.0.0) @@ -827,9 +843,6 @@ GEM nokogiri (>= 1.6, < 2.0) tzinfo (2.0.6) concurrent-ruby (~> 1.0) - unf (0.1.4) - unf_ext - unf_ext (0.0.8.2) unicode-display_width (2.5.0) uri_template (0.7.0) validates_zipcode (0.5.2) @@ -841,7 +854,7 @@ GEM nokogiri (~> 1.6) rubyzip (>= 1.3.0) selenium-webdriver (> 3.141, < 5.0) - webmock (3.19.1) + webmock (3.23.1) addressable (>= 2.8.0) crack (>= 0.3.2) hashdiff (>= 0.4.0, < 2.0.0) @@ -851,7 +864,7 @@ GEM websocket-extensions (0.1.5) xpath (3.2.0) nokogiri (~> 1.8) - zeitwerk (2.6.12) + zeitwerk (2.6.16) PLATFORMS ruby diff --git a/app/controllers/spree/admin/video_on_demands_controller.rb b/app/controllers/spree/admin/video_on_demands_controller.rb index 9b7c267c7..c5d3b0460 100644 --- a/app/controllers/spree/admin/video_on_demands_controller.rb +++ b/app/controllers/spree/admin/video_on_demands_controller.rb @@ -3,6 +3,16 @@ module Admin class VideoOnDemandsController < Spree::Admin::ResourceController before_action :load_parent before_action :load_video_on_demands, only: %i[index new edit] + before_action :build_thumbnails, only: :create + before_action :create_thumbnails, only: :update + + def build_thumbnails + @object.build_thumbnail(attachment: permitted_resource_params.delete(:thumbnail)) if permitted_resource_params[:thumbnail] + end + + def create_thumbnails + @object.create_thumbnail(attachment: permitted_resource_params.delete(:thumbnail)) if permitted_resource_params[:thumbnail] + end def edit @video_on_demand = SpreeCmCommissioner::VideoOnDemand.find(params[:id]) diff --git a/app/models/spree_cm_commissioner/video_on_demand.rb b/app/models/spree_cm_commissioner/video_on_demand.rb index f69f39429..c2cedb51d 100644 --- a/app/models/spree_cm_commissioner/video_on_demand.rb +++ b/app/models/spree_cm_commissioner/video_on_demand.rb @@ -1,8 +1,11 @@ module SpreeCmCommissioner class VideoOnDemand < SpreeCmCommissioner::Base belongs_to :variant, class_name: 'Spree::Variant' + has_one_attached :file - has_one_attached :thumbnail + has_one :thumbnail, as: :viewable, dependent: :destroy, class_name: 'SpreeCmCommissioner::VideoOnDemandThumbnail' + + validates_associated :thumbnail validates :title, :description, :file, :thumbnail, presence: true validates :variant_id, uniqueness: true diff --git a/app/models/spree_cm_commissioner/video_on_demand_thumbnail.rb b/app/models/spree_cm_commissioner/video_on_demand_thumbnail.rb new file mode 100644 index 000000000..0aae6aa65 --- /dev/null +++ b/app/models/spree_cm_commissioner/video_on_demand_thumbnail.rb @@ -0,0 +1,11 @@ +module SpreeCmCommissioner + class VideoOnDemandThumbnail < SpreeCmCommissioner::Asset + def asset_styles + { + mini: '160x90>', + small: '240x135>', + large: '360x202>' + } + end + end +end diff --git a/app/views/spree/admin/video_on_demands/edit.html.erb b/app/views/spree/admin/video_on_demands/edit.html.erb index 05ba2ee0d..ff09f10b2 100644 --- a/app/views/spree/admin/video_on_demands/edit.html.erb +++ b/app/views/spree/admin/video_on_demands/edit.html.erb @@ -8,9 +8,8 @@
<%= f.label :thumbnail, Spree.t(:thumbnail) %> -
- <%= image_tag (main_app.rails_blob_url(@video_on_demand.thumbnail)), height: "200px" if @video_on_demand&.thumbnail %> -
+ <%= image_tag main_app.cdn_image_url(@video_on_demand.thumbnail.url(:medium)) if @video_on_demand.thumbnail %> +
diff --git a/app/views/spree/admin/video_on_demands/index.html.erb b/app/views/spree/admin/video_on_demands/index.html.erb index 951f9a287..c79dd68de 100644 --- a/app/views/spree/admin/video_on_demands/index.html.erb +++ b/app/views/spree/admin/video_on_demands/index.html.erb @@ -8,7 +8,7 @@ <% if !@video_on_demands.any? %>
<%= Spree.t(:no_resource_found, resource: plural_resource_name(SpreeCmCommissioner::VideoOnDemand)) %>, - <%= link_to(Spree.t(:add_one), admin_product_video_on_demands_url(@product)) if can? :create, SpreeCmCommissioner::VideoOnDemand %>! + <%= link_to(Spree.t(:add_one), new_admin_product_video_on_demand_url(@product)) if can? :create, SpreeCmCommissioner::VideoOnDemand %>!
<% else %>
@@ -28,9 +28,7 @@ <%= video_on_demand.title %> <%= video_on_demand.variant.options_text %> -
- <%= image_tag (main_app.rails_blob_url(video_on_demand.thumbnail)) if video_on_demand&.thumbnail&.attached? %> -
+ <%= image_tag main_app.cdn_image_url(video_on_demand.thumbnail.url(:mini)) if video_on_demand.thumbnail %> <% if video_on_demand&.file.attached? %> diff --git a/db/migrate/20240531074327_create_cm_video_on_demands.rb b/db/migrate/20240531074327_create_cm_video_on_demands.rb index dc3494fce..5267768de 100644 --- a/db/migrate/20240531074327_create_cm_video_on_demands.rb +++ b/db/migrate/20240531074327_create_cm_video_on_demands.rb @@ -1,6 +1,6 @@ class CreateCmVideoOnDemands < ActiveRecord::Migration[7.0] def change - create_table :cm_video_on_demands do |t| + create_table :cm_video_on_demands, if_not_exists: true do |t| t.string :title t.text :description