iqvoc 4.13.0 → 4.13.2

data/db/schema.rb

@@ -2,15 +2,15 @@
 # of editing this file, please use the migrations feature of Active Record to
 # incrementally modify your database, and then regenerate this schema definition.
 #
-# Note that this schema.rb definition is the authoritative source for your
-# database schema. If you need to create the application database on another
-# system, you should be using db:schema:load, not running all the migrations
-# from scratch. The latter is a flawed and unsustainable approach (the more migrations
-# you'll amass, the slower it'll run and the greater likelihood for issues).
+# This file is the source Rails uses to define your schema when running `bin/rails
+# db:schema:load`. When creating a new database, `bin/rails db:schema:load` tends to
+# be faster and is potentially less error prone than running all of your
+# migrations from scratch. Old migrations may fail to apply correctly if those
+# migrations use external dependencies or application code.
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 2020_09_01_143030) do
+ActiveRecord::Schema.define(version: 2022_01_07_114201) do
 
   # These are extensions that must be enabled in order to support this database
   enable_extension "plpgsql"

data/iqvoc.gemspec

@@ -11,17 +11,17 @@ Gem::Specification.new do |s|
   s.homepage    = 'http://github.com/innoq/iqvoc'
   s.summary     = 'iQvoc'
   s.description = 'iQvoc - a SKOS(-XL) vocabulary management system built on the Semantic Web'
-  s.license     = 'Apache License 2.0'
+  s.license     = 'Apache-2.0'
 
-  s.add_dependency 'rails', '>= 5.2.0', '< 6.0'
+  s.add_dependency 'rails', '~> 6.1.5', '>= 6.1.5.1'
   s.add_dependency 'puma', '< 6.0'
-  s.add_dependency 'bootsnap', '>= 1.1.0'
+  s.add_dependency 'bootsnap', '>= 1.4.4'
   s.add_dependency 'bundler'
-  s.add_dependency 'kaminari', '~> 1.2.0'
-  s.add_dependency 'authlogic', '~> 6.2.0'
+  s.add_dependency 'kaminari'
+  s.add_dependency 'authlogic'
   s.add_dependency 'scrypt'
-  s.add_dependency 'cancancan', '~> 2.3.0'
-  s.add_dependency 'iq_rdf', '>= 0.1.16'
+  s.add_dependency 'cancancan'
+  s.add_dependency 'iq_rdf'
   s.add_dependency 'json'
   s.add_dependency 'rails_autolink'
   s.add_dependency 'faraday', '0.9.0'
@@ -32,18 +32,17 @@ Gem::Specification.new do |s|
   s.add_dependency 'linkeddata'
   s.add_dependency 'rdf-vocab'
   s.add_dependency 'deep_cloneable'
-  s.add_dependency 'uglifier', '>= 1.3.0'
   s.add_dependency 'apipie-rails'
   s.add_dependency 'maruku'
   s.add_dependency 'database_cleaner', '~> 1.8.5'
-  s.add_dependency 'delayed_job_active_record', '~> 4.1.1'
+  s.add_dependency 'delayed_job_active_record'
   s.add_dependency 'carrierwave'
   s.add_dependency 'rack-mini-profiler'
   s.add_dependency 'faucet_pipeline_rails'
 
   s.files = %w(LICENSE README.md CHANGELOG.md Gemfile Gemfile.lock Rakefile iqvoc.gemspec) +
-    Dir.glob('{app,config,db,public,lib,test,vendor}/**/*')
-  s.test_files = s.files.grep(%r{^test/})
+    Dir.glob('{app,bin,config,db,lib}/**/*')
+  s.test_files = Dir['{test}/**/*']
   s.executables = s.files.grep(%r{^bin/}) { |f| File.basename(f) }
   s.require_paths = ['lib']
 end

data/lib/iqvoc/configuration/core.rb

@@ -118,7 +118,8 @@ module Iqvoc
           'collection',
           'languages',
           'change_note',
-          'datasets'
+          'datasets',
+          'options',
         ]
 
         # ignored database tables during thesaurus truncation
@@ -132,11 +133,13 @@ module Iqvoc
         # initialize
         self.config.register_settings({
           'title' => 'iQvoc',
+          'concept_modal_preview' => true,
           'languages.pref_labeling' => ['en', 'de'],
           'languages.further_labelings.Labeling::SKOS::AltLabel' => ['en', 'de'],
           'languages.notes' => ['en', 'de'],
           'performance.unbounded_hierarchy' => false,
-          'sources.iqvoc' => ['']
+          'sources.iqvoc' => [''],
+          'sources.create_reverse_matches' => true
         })
       end
 
@@ -189,6 +192,10 @@ module Iqvoc
           self.config.register_setting('title', value)
         end
 
+        def concept_modal_preview_enabled?
+          config['concept_modal_preview'] == true
+        end
+
         def engine?
           Iqvoc.const_defined?(:Engine)
         end

data/lib/iqvoc/configuration/instance_configuration.rb

@@ -80,7 +80,7 @@ module Iqvoc
 
         json = JSON.dump([value])[1..-2] # temporary array wrapper ensures valid JSON text
         if setting = ConfigurationSetting.find_by_key(key)
-          setting.update_attributes(value: json)
+          setting.update(value: json)
         else
           ConfigurationSetting.create(key: key, value: json)
         end

data/lib/iqvoc/environments/development.rb

@@ -1,11 +1,12 @@
+require "active_support/core_ext/integer/time"
 require 'iqvoc'
 
 module Iqvoc::Environments
   def self.setup_development(config)
     # Settings specified here will take precedence over those in config/application.rb.
 
-    # In the development environment your application's code is reloaded on
-    # every request. This slows down response time but is perfect for development
+    # In the development environment your application's code is reloaded any time
+    # it changes. This slows down response time but is perfect for development
     # since you don't have to restart the web server when you make code changes.
     config.cache_classes = false
 
@@ -19,6 +20,7 @@ module Iqvoc::Environments
     # Run rails dev:cache to toggle caching.
     if Rails.root.join('tmp', 'caching-dev.txt').exist?
       config.action_controller.perform_caching = true
+      config.action_controller.enable_fragment_cache_logging = true
 
       config.cache_store = :memory_store
       config.public_file_server.headers = {
@@ -30,7 +32,7 @@ module Iqvoc::Environments
       config.cache_store = :null_store
     end
 
-    # Store uploaded files on the local file system (see config/storage.yml for options)
+    # Store uploaded files on the local file system (see config/storage.yml for options).
     config.active_storage.service = :local
 
     # Don't care if the mailer can't send.
@@ -41,20 +43,29 @@ module Iqvoc::Environments
     # Print deprecation notices to the Rails logger.
     config.active_support.deprecation = :log
 
+    # Raise exceptions for disallowed deprecations.
+    config.active_support.disallowed_deprecation = :raise
+
+    # Tell Active Support which deprecation messages to disallow.
+    config.active_support.disallowed_deprecation_warnings = []
+
     # Raise an error on page load if there are pending migrations.
     config.active_record.migration_error = :page_load
 
     # Highlight code that triggered database queries in logs.
     config.active_record.verbose_query_logs = true
 
-    # Raises error for missing translations
-    config.action_view.raise_on_missing_translations = true
+    # Raises error for missing translations.
+    config.i18n.raise_on_missing_translations = true
 
-    # Raises error for missing translations
-    config.i18n.enforce_available_locales = true
+    # Annotate rendered view with file names.
+    config.action_view.annotate_rendered_view_with_filenames = true
 
     # Use an evented file watcher to asynchronously detect changes in source code,
     # routes, locales, etc. This feature depends on the listen gem.
     config.file_watcher = ActiveSupport::EventedFileUpdateChecker
+
+    # Uncomment if you wish to allow Action Cable access from any origin.
+    # config.action_cable.disable_request_forgery_protection = true
   end
 end

data/lib/iqvoc/environments/production.rb

@@ -1,3 +1,4 @@
+require "active_support/core_ext/integer/time"
 require 'iqvoc'
 
 module Iqvoc::Environments
@@ -26,16 +27,16 @@ module Iqvoc::Environments
     config.public_file_server.enabled = ENV['RAILS_SERVE_STATIC_FILES'].present?
 
     # Enable serving of images, stylesheets, and JavaScripts from an asset server.
-    # config.action_controller.asset_host = 'http://assets.example.com'
+    # config.asset_host = 'http://assets.example.com'
 
     # Specifies the header that your server uses for sending files.
     # config.action_dispatch.x_sendfile_header = 'X-Sendfile' # for Apache
     # config.action_dispatch.x_sendfile_header = 'X-Accel-Redirect' # for NGINX
 
-    # Store uploaded files on the local file system (see config/storage.yml for options)
+    # Store uploaded files on the local file system (see config/storage.yml for options).
     config.active_storage.service = :local
 
-    # Mount Action Cable outside main process or domain
+    # Mount Action Cable outside main process or domain.
     # config.action_cable.mount_path = nil
     # config.action_cable.url = 'wss://example.com/cable'
     # config.action_cable.allowed_request_origins = [ 'http://example.com', /http:\/\/example.*/ ]
@@ -43,8 +44,8 @@ module Iqvoc::Environments
     # Force all access to the app over SSL, use Strict-Transport-Security, and use secure cookies.
     # config.force_ssl = true
 
-    # Use the lowest log level to ensure availability of diagnostic information
-    # when problems arise.
+    # Include generic and useful information about system operation, but avoid logging too much
+    # information to avoid inadvertent exposure of personally identifiable information (PII).
     config.log_level = (ENV['LOG_LEVEL'] || :info)
 
     # Prepend all log lines with the following tags.
@@ -53,9 +54,9 @@ module Iqvoc::Environments
     # Use a different cache store in production.
     # config.cache_store = :mem_cache_store
 
-    # Use a real queuing backend for Active Job (and separate queues per environment)
+    # Use a real queuing backend for Active Job (and separate queues per environment).
     # config.active_job.queue_adapter     = :resque
-    # config.active_job.queue_name_prefix = "iqvoc_#{Rails.env}"
+    # config.active_job.queue_name_prefix = "iqvoc_production"
 
     config.action_mailer.perform_caching = false
 
@@ -70,11 +71,17 @@ module Iqvoc::Environments
     # Send deprecation notices to registered listeners.
     config.active_support.deprecation = :notify
 
+    # Log disallowed deprecations.
+    config.active_support.disallowed_deprecation = :log
+
+    # Tell Active Support which deprecation messages to disallow.
+    config.active_support.disallowed_deprecation_warnings = []
+
     # Use default logging formatter so that PID and timestamp are not suppressed.
     config.log_formatter = ::Logger::Formatter.new
 
     # Use a different logger for distributed setups.
-    # require 'syslog/logger'
+    # require "syslog/logger"
     # config.logger = ActiveSupport::TaggedLogging.new(Syslog::Logger.new 'app-name')
 
     if ENV["RAILS_LOG_TO_STDOUT"].present?
@@ -86,9 +93,25 @@ module Iqvoc::Environments
     # Do not dump schema after migrations.
     config.active_record.dump_schema_after_migration = false
 
-    config.i18n.enforce_available_locales = true
-
-    # Raises error for missing translations
-    config.action_view.raise_on_missing_translations = false
+    # Inserts middleware to perform automatic connection switching.
+    # The `database_selector` hash is used to pass options to the DatabaseSelector
+    # middleware. The `delay` is used to determine how long to wait after a write
+    # to send a subsequent read to the primary.
+    #
+    # The `database_resolver` class is used by the middleware to determine which
+    # database is appropriate to use based on the time delay.
+    #
+    # The `database_resolver_context` class is used by the middleware to set
+    # timestamps for the last write to the primary. The resolver uses the context
+    # class timestamps to determine how long to wait before reading from the
+    # replica.
+    #
+    # By default Rails will store a last write timestamp in the session. The
+    # DatabaseSelector middleware is designed as such you can define your own
+    # strategy for connection switching and pass that into the middleware through
+    # these configuration options.
+    # config.active_record.database_selector = { delay: 2.seconds }
+    # config.active_record.database_resolver = ActiveRecord::Middleware::DatabaseSelector::Resolver
+    # config.active_record.database_resolver_context = ActiveRecord::Middleware::DatabaseSelector::Resolver::Session
   end
 end

data/lib/iqvoc/environments/test.rb

@@ -1,13 +1,10 @@
+require "active_support/core_ext/integer/time"
 require 'iqvoc'
 
 module Iqvoc::Environments
   def self.setup_test(config)
     # Settings specified here will take precedence over those in config/application.rb.
 
-    # The test environment is used exclusively to run your application's
-    # test suite. You never need to work with it otherwise. Remember that
-    # your test database is "scratch space" for the test suite and is wiped
-    # and recreated between test runs. Don't rely on the data there!
     config.cache_classes = true
 
     # Do not eager load code on boot. This avoids loading your whole application
@@ -24,6 +21,7 @@ module Iqvoc::Environments
     # Show full error reports and disable caching.
     config.consider_all_requests_local       = true
     config.action_controller.perform_caching = false
+    config.cache_store = :null_store
 
     # Raise exceptions instead of rendering exception templates.
     config.action_dispatch.show_exceptions = false
@@ -31,7 +29,7 @@ module Iqvoc::Environments
     # Disable request forgery protection in test environment.
     config.action_controller.allow_forgery_protection = false
 
-    # Store uploaded files on the local file system in a temporary directory
+    # Store uploaded files on the local file system in a temporary directory.
     config.active_storage.service = :test
 
     config.action_mailer.perform_caching = false
@@ -44,7 +42,16 @@ module Iqvoc::Environments
     # Print deprecation notices to the stderr.
     config.active_support.deprecation = :stderr
 
-    # Raises error for missing translations
-    config.action_view.raise_on_missing_translations = true
+    # Raise exceptions for disallowed deprecations.
+    config.active_support.disallowed_deprecation = :raise
+
+    # Tell Active Support which deprecation messages to disallow.
+    config.active_support.disallowed_deprecation_warnings = []
+
+    # Raises error for missing translations.
+    config.i18n.raise_on_missing_translations = true
+
+    # Annotate rendered view with file names.
+    # config.action_view.annotate_rendered_view_with_filenames = true
   end
 end

data/lib/iqvoc/version.rb

@@ -15,5 +15,5 @@
 # limitations under the License.
 
 module Iqvoc
-  VERSION = "4.13.0"
+  VERSION = "4.13.2"
 end

data/lib/tasks/sync.rake

@@ -14,7 +14,7 @@ namespace :sync do
     default_url_options[:host] = ROOT
 
     class FakeController
-      include RDFSyncService::Helper
+      include RdfSyncService::Helper
       delegate :url_helpers, :to => "Rails.application.routes"
 
       def root_url(*args)

data/test/authentication.rb

@@ -27,7 +27,7 @@ module Authentication
       u.password_confirmation = 'omgomgomg'
       u.role = 'reader'
       u.active = true
-      u.role = role || User.default_role
+      u.role = role || User.default_user_role
     end
   end
 end

data/test/controllers/hierarchy_test.rb

@@ -150,7 +150,7 @@ boot:
 
     get :show, params: { lang: 'en', format: 'ttl', root: 'root' }
     assert_response 200
-    assert_equal @response.content_type, 'text/turtle'
+    assert_equal @response.media_type, 'text/turtle'
     assert @response.body =~ /:root[^\.]+skos:topConceptOf[^\.]+:scheme/m
     assert @response.body =~ /:root[^\.]+skos:prefLabel[^\.]+"Root"@en/m
     assert @response.body =~ /:root[^\.]+skos:narrower[^\.]+:bar/m
@@ -180,7 +180,7 @@ boot:
 
     get :show, params: { lang: 'en', format: 'ttl', root: 'lorem', dir: 'up' }
     assert_response 200
-    assert_equal @response.content_type, 'text/turtle'
+    assert_equal @response.media_type, 'text/turtle'
     assert @response.body.include?(<<-EOS)
 :lorem a skos:Concept;
        skos:prefLabel "Lorem"@en;
@@ -210,7 +210,7 @@ boot:
 
     get :show, params: { lang: 'en', format: 'rdf', root: 'root' }
     assert_response 200
-    assert_equal @response.content_type, 'application/rdf+xml'
+    assert_equal @response.media_type, 'application/rdf+xml'
   end
 
   test 'root parameter handling' do
@@ -357,7 +357,7 @@ boot:
   test 'avoid duplication' do # in response to a bug report
     get :show, params: { lang: 'en', format: 'ttl', root: 'uno', dir: 'up' }
     assert_response 200
-    assert_equal 'text/turtle', @response.content_type
+    assert_equal 'text/turtle', @response.media_type
     assert @response.body.include?(<<-EOS)
 :bravo a skos:Concept;
        skos:prefLabel "Bravo"@en;

data/test/integration/client_edit_concept_test.rb

@@ -69,7 +69,7 @@ class ClientEditConceptsTest < ActionDispatch::IntegrationTest
     page.click_link_or_button('Speichern')
     assert page.has_css?('.alert.alert-success')
     # return to edit mode
-    page.click_link_or_button('Weiterbearbeiten')
+    page.click_link_or_button('Bearbeiten')
     assert page.has_css?('#edit_concept')
 
     section = page.find('#note_skos_definitions_data')

data/test/integration/concept_collection_assignment_test.rb

@@ -51,9 +51,9 @@ class ConceptCollectionAssignmentTest < ActionDispatch::IntegrationTest
     click_link_or_button 'Save'
 
     # there should be two collections
-    assert_equal 2, page.all('#assigned_collections ul li a').size
+    assert_equal 2, page.all('#collection_member_bases ul li a').size
 
-    within('#assigned_collections') do
+    within('#collection_member_bases') do
       assert page.has_content? 'Sports'
       assert page.has_content? 'Hobbies'
     end
@@ -64,9 +64,9 @@ class ConceptCollectionAssignmentTest < ActionDispatch::IntegrationTest
     click_link_or_button 'Save'
 
     # there should be one collection left
-    assert_equal 1, page.all('#assigned_collections ul li a').size
+    assert_equal 1, page.all('#collection_member_bases ul li a').size
 
-    within('#assigned_collections') do
+    within('#collection_member_bases') do
       assert page.has_content? 'Sports'
       refute page.has_content? 'Hobbies'
     end
@@ -77,9 +77,9 @@ class ConceptCollectionAssignmentTest < ActionDispatch::IntegrationTest
     click_link_or_button 'Save'
 
     # there should be no collections anymore
-    assert_equal 0, page.all('#assigned_collections ul li a').size
+    assert_equal 0, page.all('#collection_member_bases ul li a').size
 
-    within('#assigned_collections') do
+    within('#collection_member_bases') do
       refute page.has_content?('Sports'), 'Sports should be removed'
       refute page.has_content?('Hobbies'), 'Hobbies should be removed'
     end

data/test/integration/search_test.rb

@@ -101,9 +101,9 @@ class SearchTest < ActionDispatch::IntegrationTest
         with: 'Air'
     click_button 'Save'
 
-    Iqvoc::Concept.base_class.third.update_attributes published_at: Date.today
-    Iqvoc::Concept.base_class.fourth.update_attributes published_at: Date.today
-    Note::Annotated::Base.where(predicate: "created").first.update_attributes value: (Date.today - 10.days).to_s
+    Iqvoc::Concept.base_class.third.update(published_at: Date.today)
+    Iqvoc::Concept.base_class.fourth.update(published_at: Date.today)
+    Note::Annotated::Base.where(predicate: "created").first.update(value: (Date.today - 10.days).to_s)
 
     visit search_path(lang: 'en', format: 'html')
     find('#t').select 'Labels'

data/test/integration_test_helper.rb

@@ -16,12 +16,12 @@
 require File.expand_path('test_helper', File.dirname(__FILE__))
 require 'capybara/rails'
 require 'capybara/dsl'
-require 'capybara/poltergeist'
+require 'capybara/cuprite'
 require 'webmock'
 require File.expand_path('authentication', File.dirname(__FILE__))
 
 Capybara.server = :webrick
-Capybara.javascript_driver = :poltergeist
+Capybara.javascript_driver = :cuprite
 
 WebMock.allow_net_connect! # required for integration tests
 

data/test/models/rdf_sync_test.rb

@@ -16,7 +16,7 @@
 
 require File.join(File.expand_path(File.dirname(__FILE__)), '../test_helper')
 
-class RDFSyncTest < ActiveSupport::TestCase
+class RdfSyncTest < ActiveSupport::TestCase
   setup do
     @rdf = 'http://www.w3.org/1999/02/22-rdf-syntax-ns#'
     @skos = 'http://www.w3.org/2004/02/skos/core#'
@@ -32,7 +32,7 @@ class RDFSyncTest < ActiveSupport::TestCase
     end
     @view_context = FakeViewContext.new
 
-    @sync = RDFSyncService.new(@base_url, @target_host, username: @username,
+    @sync = RdfSyncService.new(@base_url, @target_host, username: @username,
         view_context: @view_context)
 
     @concepts = 1.upto(15).map do |i|
@@ -104,7 +104,7 @@ class RDFSyncTest < ActiveSupport::TestCase
     concept_count = concepts.count
     batch_count = 3
 
-    sync = RDFSyncService.new(@base_url, @target_host, username: @username,
+    sync = RdfSyncService.new(@base_url, @target_host, username: @username,
         batch_size: (concept_count / batch_count).ceil,
         view_context: @view_context)
 

data/test/models/zeitwerk_compliance_test.rb

@@ -0,0 +1,7 @@
+require File.join(File.expand_path(File.dirname(__FILE__)), '../test_helper')
+
+class ZeitwerkComplianceTest < ActiveSupport::TestCase
+  test "eager loads all files without errors" do
+    assert_nothing_raised { Rails.application.eager_load! }
+  end
+end