diff --git a/.ruby-version b/.ruby-version index 2aa51319..7921bd0c 100644 --- a/.ruby-version +++ b/.ruby-version @@ -1 +1 @@ -3.4.7 +3.4.8 diff --git a/Gemfile.lock b/Gemfile.lock index 739c883a..ea4e8897 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -10,29 +10,29 @@ GEM specs: action_text-trix (2.1.16) railties - actioncable (8.1.1) - actionpack (= 8.1.1) - activesupport (= 8.1.1) + actioncable (8.1.2) + actionpack (= 8.1.2) + activesupport (= 8.1.2) nio4r (~> 2.0) websocket-driver (>= 0.6.1) zeitwerk (~> 2.6) - actionmailbox (8.1.1) - actionpack (= 8.1.1) - activejob (= 8.1.1) - activerecord (= 8.1.1) - activestorage (= 8.1.1) - activesupport (= 8.1.1) + actionmailbox (8.1.2) + actionpack (= 8.1.2) + activejob (= 8.1.2) + activerecord (= 8.1.2) + activestorage (= 8.1.2) + activesupport (= 8.1.2) mail (>= 2.8.0) - actionmailer (8.1.1) - actionpack (= 8.1.1) - actionview (= 8.1.1) - activejob (= 8.1.1) - activesupport (= 8.1.1) + actionmailer (8.1.2) + actionpack (= 8.1.2) + actionview (= 8.1.2) + activejob (= 8.1.2) + activesupport (= 8.1.2) mail (>= 2.8.0) rails-dom-testing (~> 2.2) - actionpack (8.1.1) - actionview (= 8.1.1) - activesupport (= 8.1.1) + actionpack (8.1.2) + actionview (= 8.1.2) + activesupport (= 8.1.2) nokogiri (>= 1.8.5) rack (>= 2.2.4) rack-session (>= 1.0.1) @@ -40,16 +40,16 @@ GEM rails-dom-testing (~> 2.2) rails-html-sanitizer (~> 1.6) useragent (~> 0.16) - actiontext (8.1.1) + actiontext (8.1.2) action_text-trix (~> 2.1.15) - actionpack (= 8.1.1) - activerecord (= 8.1.1) - activestorage (= 8.1.1) - activesupport (= 8.1.1) + actionpack (= 8.1.2) + activerecord (= 8.1.2) + activestorage (= 8.1.2) + activesupport (= 8.1.2) globalid (>= 0.6.0) nokogiri (>= 1.8.5) - actionview (8.1.1) - activesupport (= 8.1.1) + actionview (8.1.2) + activesupport (= 8.1.2) builder (~> 3.1) erubi (~> 1.11) rails-dom-testing (~> 2.2) @@ -59,22 +59,22 @@ GEM activemodel (>= 4.1) case_transform (>= 0.2) jsonapi-renderer (>= 0.1.1.beta1, < 0.3) - activejob (8.1.1) - activesupport (= 8.1.1) + activejob (8.1.2) + activesupport (= 8.1.2) globalid (>= 0.3.6) - activemodel (8.1.1) - activesupport (= 8.1.1) - activerecord (8.1.1) - activemodel (= 8.1.1) - activesupport (= 8.1.1) + activemodel (8.1.2) + activesupport (= 8.1.2) + activerecord (8.1.2) + activemodel (= 8.1.2) + activesupport (= 8.1.2) timeout (>= 0.4.0) - activestorage (8.1.1) - actionpack (= 8.1.1) - activejob (= 8.1.1) - activerecord (= 8.1.1) - activesupport (= 8.1.1) + activestorage (8.1.2) + actionpack (= 8.1.2) + activejob (= 8.1.2) + activerecord (= 8.1.2) + activesupport (= 8.1.2) marcel (~> 1.0) - activesupport (8.1.1) + activesupport (8.1.2) base64 bigdecimal concurrent-ruby (~> 1.0, >= 1.3.1) @@ -96,7 +96,7 @@ GEM base64 (0.3.0) bigdecimal (4.0.1) bindex (0.8.1) - bootsnap (1.19.0) + bootsnap (1.21.1) msgpack (~> 1.2) builder (3.3.0) bunny (2.24.0) @@ -150,16 +150,16 @@ GEM factory_bot_rails (6.5.1) factory_bot (~> 6.5) railties (>= 6.1.0) - faraday (2.12.2) + faraday (2.14.1) faraday-net_http (>= 2.0, < 3.5) json logger faraday-gzip (2.0.1) faraday (>= 1.0) zlib (~> 3.0) - faraday-net_http (3.4.0) - net-http (>= 0.5.0) - ffi (1.17.1) + faraday-net_http (3.4.2) + net-http (~> 0.5) + ffi (1.17.3) globalid (1.3.0) activesupport (>= 6.1) i18n (1.14.8) @@ -181,7 +181,7 @@ GEM turbolinks jquery-ui-rails (8.0.0) railties (>= 3.2.16) - json (2.18.0) + json (2.18.1) json_api_client (1.23.0) activemodel (>= 6.0.0) activesupport (>= 6.0.0) @@ -192,7 +192,8 @@ GEM jsonapi-renderer (0.2.2) language_server-protocol (3.17.0.5) lint_roller (1.1.0) - listen (3.9.0) + listen (3.10.0) + logger rb-fsevent (~> 0.10, >= 0.10.3) rb-inotify (~> 0.9, >= 0.9.10) logger (1.7.0) @@ -212,14 +213,14 @@ GEM mini_portile2 (2.8.9) minitest (6.0.1) prism (~> 1.5) - mocha (2.8.2) + mocha (3.0.1) ruby2_keywords (>= 0.0.5) msgpack (1.8.0) mysql2 (0.5.7) bigdecimal - net-http (0.6.0) - uri - net-imap (0.5.12) + net-http (0.9.1) + uri (>= 0.11.1) + net-imap (0.6.2) date net-protocol net-pop (0.1.2) @@ -234,21 +235,22 @@ GEM racc (~> 1.4) ostruct (0.6.3) parallel (1.27.0) - parser (3.3.10.0) + parser (3.3.10.1) ast (~> 2.4.1) racc pp (0.6.3) prettyprint prettyprint (0.2.0) - prism (1.6.0) - pry (0.15.2) + prism (1.8.0) + pry (0.16.0) coderay (~> 1.1) method_source (~> 1.0) + reline (>= 0.6.0) psych (5.3.1) date stringio public_suffix (6.0.1) - puma (7.1.0) + puma (7.2.0) nio4r (~> 2.0) racc (1.8.1) rack (3.2.4) @@ -262,20 +264,20 @@ GEM rack (>= 1.3) rackup (2.3.1) rack (>= 3) - rails (8.1.1) - actioncable (= 8.1.1) - actionmailbox (= 8.1.1) - actionmailer (= 8.1.1) - actionpack (= 8.1.1) - actiontext (= 8.1.1) - actionview (= 8.1.1) - activejob (= 8.1.1) - activemodel (= 8.1.1) - activerecord (= 8.1.1) - activestorage (= 8.1.1) - activesupport (= 8.1.1) + rails (8.1.2) + actioncable (= 8.1.2) + actionmailbox (= 8.1.2) + actionmailer (= 8.1.2) + actionpack (= 8.1.2) + actiontext (= 8.1.2) + actionview (= 8.1.2) + activejob (= 8.1.2) + activemodel (= 8.1.2) + activerecord (= 8.1.2) + activestorage (= 8.1.2) + activesupport (= 8.1.2) bundler (>= 1.15.0) - railties (= 8.1.1) + railties (= 8.1.2) rails-controller-testing (1.0.5) actionpack (>= 5.0.1.rc1) actionview (>= 5.0.1.rc1) @@ -292,9 +294,9 @@ GEM rails-html-sanitizer (1.6.2) loofah (~> 2.21) nokogiri (>= 1.15.7, != 1.16.7, != 1.16.6, != 1.16.5, != 1.16.4, != 1.16.3, != 1.16.2, != 1.16.1, != 1.16.0.rc1, != 1.16.0) - railties (8.1.1) - actionpack (= 8.1.1) - activesupport (= 8.1.1) + railties (8.1.2) + actionpack (= 8.1.2) + activesupport (= 8.1.2) irb (~> 1.13) rackup (>= 1.0.0) rake (>= 12.2) @@ -308,7 +310,7 @@ GEM ffi (~> 1.0) rb-readline (0.5.5) rbtree (0.4.6) - rdoc (7.0.3) + rdoc (7.1.0) erb psych (>= 4.0.0) tsort @@ -333,7 +335,7 @@ GEM rspec-mocks (~> 3.13) rspec-support (~> 3.13) rspec-support (3.13.5) - rubocop (1.81.7) + rubocop (1.82.1) json (~> 2.3) language_server-protocol (~> 3.17.0.2) lint_roller (~> 1.1.0) @@ -341,12 +343,12 @@ GEM parser (>= 3.3.0.2) rainbow (>= 2.2.2, < 4.0) regexp_parser (>= 2.9.3, < 3.0) - rubocop-ast (>= 1.47.1, < 2.0) + rubocop-ast (>= 1.48.0, < 2.0) ruby-progressbar (~> 1.7) unicode-display_width (>= 2.4.0, < 4.0) - rubocop-ast (1.48.0) + rubocop-ast (1.49.0) parser (>= 3.3.7.2) - prism (~> 1.4) + prism (~> 1.7) rubocop-capybara (2.22.1) lint_roller (~> 1.1) rubocop (~> 1.72, >= 1.72.1) @@ -357,13 +359,13 @@ GEM lint_roller (~> 1.1) rubocop (>= 1.75.0, < 2.0) rubocop-ast (>= 1.47.1, < 2.0) - rubocop-rails (2.33.4) + rubocop-rails (2.34.3) activesupport (>= 4.2.0) lint_roller (~> 1.1) rack (>= 1.1) rubocop (>= 1.75.0, < 2.0) rubocop-ast (>= 1.44.0, < 2.0) - rubocop-rspec (3.8.0) + rubocop-rspec (3.9.0) lint_roller (~> 1.1) rubocop (~> 1.81) rubocop-rspec_rails (2.32.0) @@ -374,7 +376,7 @@ GEM rexml ruby-progressbar (1.13.0) ruby2_keywords (0.0.5) - rubyzip (3.2.1) + rubyzip (3.2.2) sass-rails (6.0.0) sassc-rails (~> 2.1, >= 2.1.1) sassc (2.4.0) @@ -389,7 +391,7 @@ GEM rdoc (>= 5.0) securerandom (0.4.1) select2-rails (4.0.13) - selenium-webdriver (4.38.0) + selenium-webdriver (4.40.0) base64 (~> 0.2) logger (~> 1.4) rexml (~> 3.2, >= 3.2.5) @@ -414,9 +416,9 @@ GEM railties (>= 5.0) teaspoon-jasmine (2.9.1) teaspoon (>= 1.0.0) - thor (1.4.0) + thor (1.5.0) tilt (2.5.0) - timeout (0.4.4) + timeout (0.6.0) tsort (0.2.0) turbolinks (5.2.1) turbolinks-source (~> 5.2) @@ -427,7 +429,7 @@ GEM execjs (>= 0.3.0, < 3) unicode-display_width (3.2.0) unicode-emoji (~> 4.1) - unicode-emoji (4.1.0) + unicode-emoji (4.2.0) uri (1.1.1) useragent (0.16.11) web-console (4.2.1) diff --git a/app/controllers/api/coordinates_controller.rb b/app/controllers/api/coordinates_controller.rb index c1e0a749..6958cbbf 100644 --- a/app/controllers/api/coordinates_controller.rb +++ b/app/controllers/api/coordinates_controller.rb @@ -10,13 +10,13 @@ def update if coordinates_form.submit(params) render json: coordinates_form.coordinates else - render json: { errors: coordinates_form.errors.full_messages }, status: :unprocessable_entity + render json: { errors: coordinates_form.errors.full_messages }, status: :unprocessable_content end end private def record_not_found(error) - render json: { errors: error.message }, status: :unprocessable_entity + render json: { errors: error.message }, status: :unprocessable_content end end diff --git a/app/controllers/api/labwares_controller.rb b/app/controllers/api/labwares_controller.rb index c663a0d3..208b9ca2 100644 --- a/app/controllers/api/labwares_controller.rb +++ b/app/controllers/api/labwares_controller.rb @@ -18,7 +18,7 @@ def create if uploader.run render json: Labware.by_barcode_known_locations(uploader.labwares), each_serializer: LabwareLiteSerializer else - render json: { errors: uploader.errors.full_messages }, status: :unprocessable_entity + render json: { errors: uploader.errors.full_messages }, status: :unprocessable_content end end diff --git a/app/controllers/api/location_types_controller.rb b/app/controllers/api/location_types_controller.rb index f1fb242d..3181d16a 100644 --- a/app/controllers/api/location_types_controller.rb +++ b/app/controllers/api/location_types_controller.rb @@ -30,7 +30,7 @@ def process_location_type if @location_type.submit(params) render json: @location_type, serializer: LocationTypeSerializer else - render json: { errors: @location_type.errors.full_messages }, status: :unprocessable_entity + render json: { errors: @location_type.errors.full_messages }, status: :unprocessable_content end end end diff --git a/app/controllers/api/locations/coordinates_controller.rb b/app/controllers/api/locations/coordinates_controller.rb index 0027900b..185a710e 100644 --- a/app/controllers/api/locations/coordinates_controller.rb +++ b/app/controllers/api/locations/coordinates_controller.rb @@ -14,7 +14,7 @@ def update if coordinate_form.submit(params) render json: coordinate else - render json: { errors: coordinate_form.errors.full_messages }, status: :unprocessable_entity + render json: { errors: coordinate_form.errors.full_messages }, status: :unprocessable_content end end diff --git a/app/controllers/api/locations_controller.rb b/app/controllers/api/locations_controller.rb index aafedf27..3064aac4 100644 --- a/app/controllers/api/locations_controller.rb +++ b/app/controllers/api/locations_controller.rb @@ -37,7 +37,7 @@ def info if location render json: { labwares: location.labwares.to_a, depth: location.max_descendant_depth } else - render json: { errors: ['Location not found'] }, status: :unprocessable_entity + render json: { errors: ['Location not found'] }, status: :unprocessable_content end end @@ -51,7 +51,7 @@ def process_location(succeeded) if succeeded render json: @location, serializer: "#{@location.type}Serializer".constantize else - render json: { errors: @location.errors.full_messages }, status: :unprocessable_entity + render json: { errors: @location.errors.full_messages }, status: :unprocessable_content end end diff --git a/app/controllers/api/scans_controller.rb b/app/controllers/api/scans_controller.rb index d7f406da..b4c5e4b8 100644 --- a/app/controllers/api/scans_controller.rb +++ b/app/controllers/api/scans_controller.rb @@ -7,7 +7,7 @@ def create if @scan.submit(params) render json: @scan, serializer: ScanSerializer else - render json: { errors: @scan.errors.full_messages }, status: :unprocessable_entity + render json: { errors: @scan.errors.full_messages }, status: :unprocessable_content end end end diff --git a/app/controllers/api/searches_controller.rb b/app/controllers/api/searches_controller.rb index 1abcbf9d..83e94ecb 100644 --- a/app/controllers/api/searches_controller.rb +++ b/app/controllers/api/searches_controller.rb @@ -7,7 +7,7 @@ def create if @search.valid? render json: @search.results else - render json: @search.errors.full_messages, status: :unprocessable_entity + render json: @search.errors.full_messages, status: :unprocessable_content end end diff --git a/app/forms/move_location_form.rb b/app/forms/move_location_form.rb index 2d8a7d51..e49003d8 100644 --- a/app/forms/move_location_form.rb +++ b/app/forms/move_location_form.rb @@ -56,7 +56,7 @@ def child_locations=(child_location_barcodes) .uniq .collect(&:strip) .collect do |barcode| - Location.find_by(barcode: barcode) || barcode + Location.find_by(barcode: barcode) || barcode end end