lcms-engine 0.5.3 → 0.5.5

data/README.md

@@ -199,7 +199,7 @@ $ brew cask install chromedriver
 #### Using Docker
 
 Launch the containers
-```sh
+```shell
 $ docker build -t lcms-engine .
 $ docker compose start
 $ docker compose exec app sh -c 'bin/rails db:create'
@@ -207,9 +207,14 @@ $ docker compose exec db sh -c "psql -U postgres -d template1 -c 'CREATE EXTENSI
 ```
 
 Start the specs
-```sh
+```shell
 $ docker compose exec app sh -c 'bundle exec rspec'
 ```
 
+In case you need to rebuild the image, use buildx command to create multi-arch image and push it to the registry
+```shell
+docker buildx build --platform linux/arm64/v8,linux/amd64 -t learningtapestry/lcms-engine --push .
+```
+
 ## License
 The gem is available as open source under the terms of the [Apache License](https://github.com/learningtapestry/lcms-engine/blob/master/LICENSE).

data/app/controllers/concerns/lcms/engine/reimportable.rb

@@ -26,11 +26,18 @@ module Lcms
 
       def prepare_result(job_class, jid)
         jid_res = job_class.fetch_result(jid)
-        return jid_res if jid_res['ok']
+        return jid_res if jid_res&.[]('ok')
+
+        error =
+          if jid_res.present?
+            "<a href=\"#{jid_res['link']}\">Source</a>: #{jid_res['errors'].join(', ')}"
+          else
+            "Error fetching result for #{jid}"
+          end
 
         {
           ok: false,
-          errors: Array.wrap("<a href=\"#{jid_res['link']}\">Source</a>: #{jid_res['errors'].join(', ')}")
+          errors: Array.wrap(error)
         }
       end
     end

data/app/javascript/components/admin/picker/pickerWindowWrapper.jsx

@@ -3,6 +3,7 @@ import PaginationBoxView from '../../paginate/PaginationBoxView';
 
 // eslint-disable-next-line no-unused-vars
 function pickerWindowWrapper(WrappedComponent, path) {
+  // eslint-disable-next-line react/display-name
   return class extends React.Component {
     constructor(props) {
       super(props);

data/app/models/lcms/engine/resource.rb

@@ -131,8 +131,8 @@ module Lcms
         end
 
         def where_metadata_in(key, arr)
-          arr = Array.wrap arr
-          clauses = Array.new(arr.count) { "metadata->>'#{key}' = ?" }.join(' OR ')
+          arr = Array.wrap(arr).compact.map(&:downcase)
+          clauses = Array.new(arr.count) { "lower(resources.metadata->>'#{key}') = ?" }.join(' OR ')
           where(clauses, *arr)
         end
       end

data/app/models/lcms/engine/search/repository.rb

@@ -47,7 +47,7 @@ module Lcms
         include Elasticsearch::Persistence::Repository
         include Elasticsearch::Persistence::Repository::DSL
 
-        client Elasticsearch::Client.new(host: ENV.fetch('ELASTICSEARCH_ADDRESS', nil))
+        client Elasticsearch::Client.new(host: ENV.fetch('ELASTICSEARCH_ADDRESS', nil), adapter: :net_http)
 
         index_name :"unbounded_documents_#{Rails.env}"
 

data/config/initializers/elasticsearch.rb

@@ -3,6 +3,7 @@
 require 'elasticsearch/model'
 
 Elasticsearch::Model.client = Elasticsearch::Client.new(
-  host: ENV.fetch('ELASTICSEARCH_ADDRESS', nil)
+  host: ENV.fetch('ELASTICSEARCH_ADDRESS', nil),
+  adapter: :net_http
 )
 Hashie.logger = Logger.new('/dev/null')

data/lcms-engine.gemspec

@@ -10,7 +10,7 @@ Gem::Specification.new do |s|
   s.name = 'lcms-engine'
   s.version = Lcms::Engine::VERSION
   s.authors = ['Alexander Kuznetsov', 'Abraham Sánchez', 'Rômulo Saksida']
-  s.email = %w(alexander@learningtapestry.com abraham@learningtapestry.com rm@learningtapestry.com)
+  s.email = %w(paranoic.san@gmail.com abraham@learningtapestry.com rm@learningtapestry.com)
   s.homepage = 'https://github.com/learningtapestry/lcms-engine'
   s.summary = 'Rails engine for LCMS applications'
   s.description = 'Implements common components and features for Rails-based LCMS systems'
@@ -52,14 +52,15 @@ Gem::Specification.new do |s|
   s.add_dependency 'fog-aws', '~> 3.5', '>= 3.5.2'
   s.add_dependency 'font-awesome-sass', '~> 5.12'
   s.add_dependency 'foundation-rails', '~> 6.6', '>= 6.6.1'
-  s.add_dependency 'google-api-client', '< 1'
+  s.add_dependency 'google-apis-drive_v3', '~> 0.46'
+  s.add_dependency 'google-apis-script_v1', '~> 0.21'
   s.add_dependency 'hiredis', '~> 0.6.3'
   s.add_dependency 'httparty', '~> 0.18'
   s.add_dependency 'jbuilder', '~> 2.10'
   s.add_dependency 'jquery-rails', '~> 4.3', '>= 4.3.5'
   s.add_dependency 'js-routes', '~> 1.4', '>= 1.4.9'
-  s.add_dependency 'lt-google-api', '~> 0.2', '>= 0.2.3'
-  s.add_dependency 'lt-lcms', '~> 0.4', '>= 0.4.4'
+  s.add_dependency 'lt-google-api', '~> 0.3'
+  s.add_dependency 'lt-lcms', '~> 0.6'
   s.add_dependency 'migration_data', '~> 0.6'
   s.add_dependency 'mini_magick', '~> 4.10', '>= 4.10.1'
   s.add_dependency 'nested_form', '~> 0.3.2'

data/lib/lcms/engine/version.rb

@@ -2,7 +2,7 @@
 
 module Lcms
   module Engine
-    VERSION = '0.5.3'
+    VERSION = '0.5.5'
     RAILS_5_VERSION = 5.2
   end
 end