diff --git a/Gemfile.lock b/Gemfile.lock index 37c948ff..9e079740 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -144,7 +144,7 @@ GEM rails-dom-testing (>= 1, < 3) railties (>= 4.2.0) thor (>= 0.14, < 2.0) - json (2.6.3) + json (2.7.1) json_api_client (1.21.0) activemodel (>= 3.2.0) activesupport (>= 3.2.0) @@ -152,6 +152,7 @@ GEM faraday (>= 0.15.2, < 2.0) faraday_middleware (>= 0.9.0, < 2.0) rack (>= 0.2) + language_server-protocol (3.17.0.3) launchy (2.5.2) addressable (~> 2.8) listen (3.8.0) @@ -198,9 +199,10 @@ GEM nokogiri (1.16.0-x86_64-linux) racc (~> 1.4) oj (3.14.2) - parallel (1.22.1) - parser (3.2.1.0) + parallel (1.24.0) + parser (3.3.0.2) ast (~> 2.4.1) + racc pry (0.14.2) coderay (~> 1.1) method_source (~> 1.0) @@ -250,28 +252,29 @@ GEM rb-fsevent (0.11.2) rb-inotify (0.10.1) ffi (~> 1.0) - regexp_parser (2.8.3) + regexp_parser (2.9.0) rexml (3.2.6) roo (2.8.3) nokogiri (~> 1) rubyzip (>= 1.3.0, < 3.0.0) - rubocop (1.46.0) + rubocop (1.59.0) json (~> 2.3) + language_server-protocol (>= 3.17.0) parallel (~> 1.10) - parser (>= 3.2.0.0) + parser (>= 3.2.2.4) rainbow (>= 2.2.2, < 4.0) regexp_parser (>= 1.8, < 3.0) rexml (>= 3.2.5, < 4.0) - rubocop-ast (>= 1.26.0, < 2.0) + rubocop-ast (>= 1.30.0, < 2.0) ruby-progressbar (~> 1.7) unicode-display_width (>= 2.4.0, < 3.0) - rubocop-ast (1.26.0) + rubocop-ast (1.30.0) parser (>= 3.2.1.0) rubocop-rails (2.17.4) activesupport (>= 4.2.0) rack (>= 1.1) rubocop (>= 1.33.0, < 2.0) - ruby-progressbar (1.11.0) + ruby-progressbar (1.13.0) ruby2_keywords (0.0.5) rubyzip (2.3.2) sassc (2.4.0) @@ -313,7 +316,7 @@ GEM concurrent-ruby (~> 1.0) uglifier (4.2.0) execjs (>= 0.3.0, < 3) - unicode-display_width (2.4.2) + unicode-display_width (2.5.0) webrick (1.7.0) websocket (1.2.10) websocket-driver (0.7.6) diff --git a/app/models/presenter/tag_layout_template.rb b/app/models/presenter/tag_layout_template.rb index d22e657b..0538d99f 100644 --- a/app/models/presenter/tag_layout_template.rb +++ b/app/models/presenter/tag_layout_template.rb @@ -5,7 +5,7 @@ class Presenter::TagLayoutTemplate < Presenter::Template def grouped_templates compatible_templates.group_by do |template| - template_is_suggested = (suggested_names == :all || suggested_names.include?(template.name)) + template_is_suggested = suggested_names == :all || suggested_names.include?(template.name) template_is_suggested ? 'Suggested Templates' : 'Other Templates' end end diff --git a/app/models/qc_asset_creator/multiple_tag2_conversion.rb b/app/models/qc_asset_creator/multiple_tag2_conversion.rb index fccc97c5..2a3f5cb2 100644 --- a/app/models/qc_asset_creator/multiple_tag2_conversion.rb +++ b/app/models/qc_asset_creator/multiple_tag2_conversion.rb @@ -125,7 +125,7 @@ def all_tag2_locations end def each_tag2_template_with_tube_and_locations - tag2_tubes_barcodes.each do |index, barcode| + tag2_tubes_barcodes.each_value do |barcode| qcable = tag2_qcables[barcode] yield qcable.lot.template.uuid, qcable.asset.uuid, tag2_locations_for_barcode(barcode) end diff --git a/config/initializers/settings.rb b/config/initializers/settings.rb index 0de7acb9..04acedd5 100644 --- a/config/initializers/settings.rb +++ b/config/initializers/settings.rb @@ -6,8 +6,8 @@ def respond_to?(method, include_private = false) super || instance.respond_to?(method, include_private) end - def method_missing(method, *args, &) - instance.send(method, *args, &) + def method_missing(method, *, &) + instance.send(method, *, &) end protected :method_missing diff --git a/test/mock_api.rb b/test/mock_api.rb index 34b04aee..034e5ccc 100644 --- a/test/mock_api.rb +++ b/test/mock_api.rb @@ -72,8 +72,8 @@ def initialize(parent, resource_name, records) ## # Method missing first tries passing things on to the association array - def method_missing(method_name, *args, &) - return @records.send(:"#{method_name}", *args, &) if @records.respond_to?(:"#{method_name}") + def method_missing(method_name, *, &) + return @records.send(:"#{method_name}", *, &) if @records.respond_to?(:"#{method_name}") super end @@ -206,9 +206,9 @@ def registry )) end - def each_resource - registry.each { |resource, records| yield resource } - aliases.each { |resource, _| yield resource.to_s } + def each_resource(&) + registry.each_key(&) + aliases.each_key { |resource| yield resource.to_s } end def aliases