Merge pull request #72 from innoq/rails-7

Rails 7.1

app/models/services/similar_terms_service.rb

@@ -102,9 +102,9 @@ def self.find_related_and_narrower_concepts(concepts, lang, *terms)
                                                  .map(&:label_id)
                                                  .first
 
-                    Iqvoc::XLLabel.base_class.where(:language => lang, :id => label_id).first
+                    Iqvoc::Xllabel.base_class.where(:language => lang, :id => label_id).first
                   else
-                    Iqvoc::XLLabel.base_class.where('LOWER(value) = ?', term.downcase).first
+                    Iqvoc::Xllabel.base_class.where('LOWER(value) = ?', term.downcase).first
                   end
 
           results << label.compound_in.map { |ci| ci.concepts.map { |c| c.id } } if label.present?
@@ -125,9 +125,9 @@ def self.terms_to_labels(lang, *terms)
                                       .where(normal_hash: reduce.call(hashes))
                                       .map(&:label_id)
 
-        return Iqvoc::XLLabel.base_class.where(language: lang, id: reduce.call(label_ids))
-      elsif Iqvoc.const_defined?(:XLLabel)
-        return Iqvoc::XLLabel.base_class
+        return Iqvoc::Xllabel.base_class.where(language: lang, id: reduce.call(label_ids))
+      elsif Iqvoc.const_defined?(:Xllabel)
+        return Iqvoc::Xllabel.base_class
                              .where(language: lang)
                              .where('LOWER(value) IN (?)', terms.map(&:downcase))
       else

app/views/similar_terms/show.xml.builder

@@ -1,17 +1,17 @@
-xml = Builder::XmlMarkup.new(:indent => 2)
 xml.instruct!
 
 xml.OneBoxResults "xmlns:xlink" => "http://www.w3.org/1999/xlink" do
   xml.resultCode "success"
   xml.totalResults @results.length
   xml.urlText t("txt.views.similar_terms.title")
-  xml.urlLink url_for(request.query_parameters.
-      merge(:only_path => false, :anchor => ""))
-  xml.MODULE_RESULT do
-    xml.title t("txt.views.similar_terms.results_heading",
-        :terms => params[:terms])
-    @results.each do |label|
-      xml.Field label.value, "name" => label.value
+  xml.urlLink url_for(request.query_parameters.merge(only_path: false, anchor: ""))
+
+  if @results.length > 0
+    xml.MODULE_RESULT do
+      xml.title t("txt.views.similar_terms.results_heading", terms: params[:terms])
+      @results.each do |label|
+        xml.Field label.value, "name" => label.value
+      end
     end
-  end if @results.length > 0
+  end
 end

bin/setup

@@ -5,7 +5,7 @@ require "fileutils"
 APP_ROOT = File.expand_path("..", __dir__)
 
 def system!(*args)
-  system(*args) || abort("\n== Command #{args} failed ==")
+  system(*args, exception: true)
 end
 
 FileUtils.chdir APP_ROOT do

config/application.rb

@@ -21,7 +21,12 @@
 module Iqvoc::SimilarTerms
   class Application < Rails::Application
     # Initialize configuration defaults for originally generated Rails version.
-    config.load_defaults 7.0
+    config.load_defaults 7.1
+
+    # Please, add to the `ignore` list any other `lib` subdirectories that do
+    # not contain `.rb` files, or that should not be reloaded or eager loaded.
+    # Common ones are `templates`, `generators`, or `middleware`, for example.
+    config.autoload_lib(ignore: %w(assets tasks))
 
     # Configuration for the application, engines, and railties goes here.
     #

config/environments/development.rb

@@ -3,6 +3,6 @@
 if Iqvoc::SimilarTerms.const_defined?(:Application)
   Iqvoc::SimilarTerms::Application.configure do
     # Settings specified here will take precedence over those in config/environment.rb
-    Iqvoc::Environments.setup_development(config)
+    Iqvoc::Environments::Development.setup(config)
   end
 end

config/environments/production.rb

@@ -3,6 +3,6 @@
 if Iqvoc::SimilarTerms.const_defined?(:Application)
   Iqvoc::SimilarTerms::Application.configure do
     # Settings specified here will take precedence over those in config/environment.rb
-    Iqvoc::Environments.setup_production(config)
+    Iqvoc::Environments::Production.setup(config)
   end
 end

config/environments/test.rb

@@ -3,6 +3,6 @@
 if Iqvoc::SimilarTerms.const_defined?(:Application)
   Iqvoc::SimilarTerms::Application.configure do
     # Settings specified here will take precedence over those in config/environment.rb
-    Iqvoc::Environments.setup_test(config)
+    Iqvoc::Environments::Test.setup(config)
   end
 end

config/initializers/content_security_policy.rb

@@ -16,9 +16,9 @@
 #     # policy.report_uri "/csp-violation-report-endpoint"
 #   end
 #
-#   # Generate session nonces for permitted importmap and inline scripts
+#   # Generate session nonces for permitted importmap, inline scripts, and inline styles.
 #   config.content_security_policy_nonce_generator = ->(request) { request.session.id.to_s }
-#   config.content_security_policy_nonce_directives = %w(script-src)
+#   config.content_security_policy_nonce_directives = %w(script-src style-src)
 #
 #   # Report violations without enforcing the policy.
 #   # config.content_security_policy_report_only = true

config/initializers/filter_parameter_logging.rb

@@ -1,8 +1,8 @@
 # Be sure to restart your server when you modify this file.
 
-# Configure parameters to be filtered from the log file. Use this to limit dissemination of
-# sensitive information. See the ActiveSupport::ParameterFilter documentation for supported
-# notations and behaviors.
+# Configure parameters to be partially matched (e.g. passw matches password) and filtered from the log file.
+# Use this to limit dissemination of sensitive information.
+# See the ActiveSupport::ParameterFilter documentation for supported notations and behaviors.
 Rails.application.config.filter_parameters += [
   :passw, :secret, :token, :_key, :crypt, :salt, :certificate, :otp, :ssn
 ]