iqvoc_skosxl 2.9.1 → 2.11.3

data/config/storage.yml

@@ -0,0 +1,34 @@
+test:
+  service: Disk
+  root: <%= Rails.root.join("tmp/storage") %>
+
+local:
+  service: Disk
+  root: <%= Rails.root.join("storage") %>
+
+# Use rails credentials:edit to set the AWS secrets (as aws:access_key_id|secret_access_key)
+# amazon:
+#   service: S3
+#   access_key_id: <%= Rails.application.credentials.dig(:aws, :access_key_id) %>
+#   secret_access_key: <%= Rails.application.credentials.dig(:aws, :secret_access_key) %>
+#   region: us-east-1
+#   bucket: your_own_bucket
+
+# Remember not to checkin your GCS keyfile to a repository
+# google:
+#   service: GCS
+#   project: your_project
+#   credentials: <%= Rails.root.join("path/to/gcs.keyfile") %>
+#   bucket: your_own_bucket
+
+# Use rails credentials:edit to set the Azure Storage secret (as azure_storage:storage_access_key)
+# microsoft:
+#   service: AzureStorage
+#   storage_account_name: your_account_name
+#   storage_access_key: <%= Rails.application.credentials.dig(:azure_storage, :storage_access_key) %>
+#   container: your_container_name
+
+# mirror:
+#   service: Mirror
+#   primary: local
+#   mirrors: [ amazon, google, microsoft ]

data/db/migrate/20110408121540_extend_label.rb

@@ -1,4 +1,4 @@
-class ExtendLabel < ActiveRecord::Migration
+class ExtendLabel < ActiveRecord::Migration[4.2]
   FIELDS = [
     {'rev' => {type: :integer, options: {default: 1}}},
     {'published_version_id' => {type: :integer}},
@@ -14,7 +14,7 @@ class ExtendLabel < ActiveRecord::Migration
     FIELDS.each do |hsh|
       hsh.each do |column_name, hsh2|
         unless column_exists?(:labels, column_name)
-          add_column(:labels, column_name, hsh2[:type], (hsh2[:options] || {}))
+          add_column(:labels, column_name, hsh2[:type], **(hsh2[:options] || {}))
         end
       end
     end
@@ -31,4 +31,4 @@ class ExtendLabel < ActiveRecord::Migration
       end
     end
   end
-end
+end

data/db/migrate/20110408123644_add_label_relations.rb

@@ -1,4 +1,4 @@
-class AddLabelRelations < ActiveRecord::Migration
+class AddLabelRelations < ActiveRecord::Migration[4.2]
   def self.up
     unless table_exists?('label_relations')
       create_table 'label_relations', force: true do |t|

data/db/migrate/20150108154312_add_fk_contraints_iqvoc_skosxl.rb

@@ -1,4 +1,4 @@
-class AddFkContraintsIqvocSkosxl < ActiveRecord::Migration
+class AddFkContraintsIqvocSkosxl < ActiveRecord::Migration[4.2]
   def change
     add_foreign_key :labels, :labels, column: 'published_version_id', on_update: :cascade, on_delete: :cascade
     add_foreign_key :label_relations, :labels, column: 'domain_id', on_update: :cascade, on_delete: :cascade

data/db/migrate/20150414083600_remove_fk_constraints_iqvoc_skosxl.rb

@@ -1,4 +1,4 @@
-class RemoveFkConstraintsIqvocSkosxl < ActiveRecord::Migration
+class RemoveFkConstraintsIqvocSkosxl < ActiveRecord::Migration[4.2]
   def change
     remove_foreign_key :labels, column: 'published_version_id'
   end

data/db/migrate/20231012174634_remove_locked_by_for_label.rb

@@ -0,0 +1,5 @@
+class RemoveLockedByForLabel < ActiveRecord::Migration[7.0]
+  def change
+    remove_column :labels, :locked_by
+  end
+end

data/db/schema.rb

@@ -1,227 +1,218 @@
-# encoding: UTF-8
 # This file is auto-generated from the current state of the database. Instead
 # 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: 20150414083600) do
+ActiveRecord::Schema[7.0].define(version: 2023_10_12_174634) do
+  # These are extensions that must be enabled in order to support this database
+  enable_extension "plpgsql"
 
-  create_table "collection_members", force: :cascade do |t|
-    t.integer "collection_id", limit: 4
-    t.integer "target_id",     limit: 4
-    t.string  "type",          limit: 255
+  create_table "collection_members", id: :serial, force: :cascade do |t|
+    t.integer "collection_id"
+    t.integer "target_id"
+    t.string "type"
+    t.index ["collection_id", "target_id", "type"], name: "ix_collections_fk_type"
+    t.index ["type"], name: "index_collection_members_on_type"
   end
 
-  add_index "collection_members", ["collection_id", "target_id", "type"], name: "ix_collections_fk_type", using: :btree
-  add_index "collection_members", ["target_id"], name: "fk_rails_2a51b48094", using: :btree
-
-  create_table "concept_relations", force: :cascade do |t|
-    t.string   "type",       limit: 255
-    t.integer  "owner_id",   limit: 4
-    t.integer  "target_id",  limit: 4
-    t.datetime "created_at"
-    t.datetime "updated_at"
-    t.integer  "rank",       limit: 4,   default: 100
+  create_table "concept_relations", id: :serial, force: :cascade do |t|
+    t.string "type"
+    t.integer "owner_id"
+    t.integer "target_id"
+    t.datetime "created_at", precision: nil
+    t.datetime "updated_at", precision: nil
+    t.integer "rank", default: 100
+    t.index ["owner_id", "target_id"], name: "ix_concept_relations_fk"
   end
 
-  add_index "concept_relations", ["owner_id", "target_id"], name: "ix_concept_relations_fk", using: :btree
-  add_index "concept_relations", ["target_id"], name: "fk_rails_fd6c6e6fd7", using: :btree
-
-  create_table "concepts", force: :cascade do |t|
-    t.string   "type",                 limit: 255
-    t.string   "origin",               limit: 4000
-    t.integer  "rev",                  limit: 4,    default: 1
-    t.date     "published_at"
-    t.integer  "published_version_id", limit: 4
-    t.integer  "locked_by",            limit: 4
-    t.date     "expired_at"
-    t.date     "follow_up"
-    t.boolean  "to_review",            limit: 1
-    t.date     "rdf_updated_at"
-    t.datetime "created_at"
-    t.datetime "updated_at"
-    t.boolean  "top_term",             limit: 1,    default: false
+  create_table "concepts", id: :serial, force: :cascade do |t|
+    t.string "type"
+    t.string "origin", limit: 4000
+    t.integer "rev", default: 1
+    t.date "published_at"
+    t.integer "published_version_id"
+    t.date "expired_at"
+    t.date "follow_up"
+    t.boolean "to_review"
+    t.date "rdf_updated_at"
+    t.datetime "created_at", precision: nil
+    t.datetime "updated_at", precision: nil
+    t.boolean "top_term", default: false
+    t.index ["origin"], name: "ix_concepts_on_origin"
+    t.index ["published_version_id"], name: "ix_concepts_publ_version_id"
   end
 
-  add_index "concepts", ["locked_by"], name: "fk_rails_69655c7fd3", using: :btree
-  add_index "concepts", ["origin"], name: "ix_concepts_on_origin", length: {"origin"=>255}, using: :btree
-  add_index "concepts", ["published_version_id"], name: "ix_concepts_publ_version_id", using: :btree
-
-  create_table "configuration_settings", force: :cascade do |t|
-    t.string "key",   limit: 255
-    t.string "value", limit: 255
+  create_table "configuration_settings", id: :serial, force: :cascade do |t|
+    t.string "key"
+    t.string "value"
   end
 
-  create_table "delayed_jobs", force: :cascade do |t|
-    t.integer  "priority",                    limit: 4,     default: 0, null: false
-    t.integer  "attempts",                    limit: 4,     default: 0, null: false
-    t.text     "handler",                     limit: 65535,             null: false
-    t.text     "last_error",                  limit: 65535
-    t.datetime "run_at"
-    t.datetime "locked_at"
-    t.datetime "failed_at"
-    t.string   "locked_by",                   limit: 255
-    t.string   "queue",                       limit: 255
-    t.datetime "created_at"
-    t.datetime "updated_at"
-    t.string   "error_message",               limit: 255
-    t.string   "delayed_reference_type",      limit: 255
-    t.integer  "delayed_reference_id",        limit: 4
-    t.string   "delayed_global_reference_id", limit: 255
+  create_table "delayed_jobs", id: :serial, force: :cascade do |t|
+    t.integer "priority", default: 0, null: false
+    t.integer "attempts", default: 0, null: false
+    t.text "handler", null: false
+    t.text "last_error"
+    t.datetime "run_at", precision: nil
+    t.datetime "locked_at", precision: nil
+    t.datetime "failed_at", precision: nil
+    t.string "locked_by"
+    t.string "queue"
+    t.datetime "created_at", precision: nil
+    t.datetime "updated_at", precision: nil
+    t.string "error_message"
+    t.string "delayed_reference_type"
+    t.integer "delayed_reference_id"
+    t.string "delayed_global_reference_id"
+    t.index ["delayed_global_reference_id"], name: "delayed_jobs_delayed_global_reference_id"
+    t.index ["delayed_reference_id"], name: "delayed_jobs_delayed_reference_id"
+    t.index ["delayed_reference_type"], name: "delayed_jobs_delayed_reference_type"
+    t.index ["priority", "run_at"], name: "delayed_jobs_priority"
+    t.index ["queue"], name: "delayed_jobs_queue"
   end
 
-  add_index "delayed_jobs", ["delayed_global_reference_id"], name: "delayed_jobs_delayed_global_reference_id", using: :btree
-  add_index "delayed_jobs", ["delayed_reference_id"], name: "delayed_jobs_delayed_reference_id", using: :btree
-  add_index "delayed_jobs", ["delayed_reference_type"], name: "delayed_jobs_delayed_reference_type", using: :btree
-  add_index "delayed_jobs", ["priority", "run_at"], name: "delayed_jobs_priority", using: :btree
-  add_index "delayed_jobs", ["queue"], name: "delayed_jobs_queue", using: :btree
-
-  create_table "exports", force: :cascade do |t|
-    t.integer  "user_id",           limit: 4
-    t.text     "output",            limit: 65535
-    t.boolean  "success",           limit: 1,     default: false
-    t.integer  "file_type",         limit: 4
-    t.string   "token",             limit: 255
-    t.datetime "created_at"
-    t.datetime "updated_at"
-    t.datetime "finished_at"
-    t.string   "default_namespace", limit: 255
+  create_table "exports", id: :serial, force: :cascade do |t|
+    t.integer "user_id"
+    t.text "output"
+    t.boolean "success", default: false
+    t.integer "file_type"
+    t.string "token"
+    t.datetime "created_at", precision: nil
+    t.datetime "updated_at", precision: nil
+    t.datetime "finished_at", precision: nil
+    t.string "default_namespace"
+    t.index ["user_id"], name: "index_exports_on_user_id"
   end
 
-  add_index "exports", ["user_id"], name: "index_exports_on_user_id", using: :btree
-
-  create_table "imports", force: :cascade do |t|
-    t.integer  "user_id",           limit: 4
-    t.text     "output",            limit: 65535
-    t.boolean  "success",           limit: 1,     default: false
-    t.datetime "created_at"
-    t.datetime "updated_at"
-    t.datetime "finished_at"
-    t.string   "import_file",       limit: 255
-    t.boolean  "publish",           limit: 1
-    t.string   "default_namespace", limit: 255
+  create_table "imports", id: :serial, force: :cascade do |t|
+    t.integer "user_id"
+    t.text "output"
+    t.boolean "success", default: false
+    t.datetime "created_at", precision: nil
+    t.datetime "updated_at", precision: nil
+    t.datetime "finished_at", precision: nil
+    t.string "import_file"
+    t.boolean "publish"
+    t.string "default_namespace"
+    t.index ["user_id"], name: "index_imports_on_user_id"
   end
 
-  add_index "imports", ["user_id"], name: "index_imports_on_user_id", using: :btree
-
-  create_table "label_relations", force: :cascade do |t|
-    t.string   "type",       limit: 255
-    t.integer  "domain_id",  limit: 4
-    t.integer  "range_id",   limit: 4
-    t.datetime "created_at"
-    t.datetime "updated_at"
+  create_table "label_relations", id: :serial, force: :cascade do |t|
+    t.string "type"
+    t.integer "domain_id"
+    t.integer "range_id"
+    t.datetime "created_at", precision: nil
+    t.datetime "updated_at", precision: nil
+    t.index ["domain_id", "range_id", "type"], name: "ix_label_rel_dom_rng_type"
+    t.index ["type"], name: "ix_label_relations_on_type"
   end
 
-  add_index "label_relations", ["domain_id", "range_id", "type"], name: "ix_label_rel_dom_rng_type", using: :btree
-  add_index "label_relations", ["range_id"], name: "fk_rails_a56a2bdf28", using: :btree
-  add_index "label_relations", ["type"], name: "ix_label_relations_on_type", using: :btree
-
-  create_table "labelings", force: :cascade do |t|
-    t.string   "type",       limit: 255
-    t.integer  "owner_id",   limit: 4
-    t.integer  "target_id",  limit: 4
-    t.datetime "created_at"
-    t.datetime "updated_at"
+  create_table "labelings", id: :serial, force: :cascade do |t|
+    t.string "type"
+    t.integer "owner_id"
+    t.integer "target_id"
+    t.datetime "created_at", precision: nil
+    t.datetime "updated_at", precision: nil
+    t.index ["owner_id", "target_id", "type"], name: "ix_labelings_fk_type"
+    t.index ["type"], name: "ix_labelings_on_type"
   end
 
-  add_index "labelings", ["owner_id", "target_id", "type"], name: "ix_labelings_fk_type", using: :btree
-  add_index "labelings", ["target_id"], name: "fk_rails_5897707e64", using: :btree
-  add_index "labelings", ["type"], name: "ix_labelings_on_type", using: :btree
-
-  create_table "labels", force: :cascade do |t|
-    t.string   "type",                 limit: 255
-    t.string   "origin",               limit: 4000
-    t.string   "language",             limit: 255
-    t.string   "value",                limit: 1024
-    t.datetime "created_at"
-    t.datetime "updated_at"
-    t.integer  "rev",                  limit: 4,    default: 1
-    t.integer  "published_version_id", limit: 4
-    t.date     "published_at"
-    t.integer  "locked_by",            limit: 4
-    t.date     "expired_at"
-    t.date     "follow_up"
-    t.boolean  "to_review",            limit: 1
-    t.date     "rdf_updated_at"
+  create_table "labels", id: :serial, force: :cascade do |t|
+    t.string "type"
+    t.string "origin", limit: 4000
+    t.string "language"
+    t.string "value", limit: 1024
+    t.datetime "created_at", precision: nil
+    t.datetime "updated_at", precision: nil
+    t.integer "rev", default: 1
+    t.integer "published_version_id"
+    t.date "published_at"
+    t.date "expired_at"
+    t.date "follow_up"
+    t.boolean "to_review"
+    t.date "rdf_updated_at"
+    t.index ["language"], name: "ix_labels_on_language"
+    t.index ["origin"], name: "ix_labels_on_origin"
+    t.index ["published_version_id"], name: "ix_labels_on_published_v"
   end
 
-  add_index "labels", ["language"], name: "ix_labels_on_language", using: :btree
-  add_index "labels", ["origin"], name: "ix_labels_on_origin", length: {"origin"=>255}, using: :btree
-  add_index "labels", ["published_version_id"], name: "ix_labels_on_published_v", using: :btree
-
-  create_table "matches", force: :cascade do |t|
-    t.integer  "concept_id", limit: 4
-    t.string   "type",       limit: 255
-    t.string   "value",      limit: 255
-    t.datetime "created_at"
-    t.datetime "updated_at"
+  create_table "matches", id: :serial, force: :cascade do |t|
+    t.integer "concept_id"
+    t.string "type"
+    t.string "value"
+    t.datetime "created_at", precision: nil
+    t.datetime "updated_at", precision: nil
+    t.index ["concept_id", "type"], name: "ix_matches_fk_type"
+    t.index ["type"], name: "ix_matches_on_type"
   end
 
-  add_index "matches", ["concept_id", "type"], name: "ix_matches_fk_type", using: :btree
-  add_index "matches", ["type"], name: "ix_matches_on_type", using: :btree
-
-  create_table "notations", force: :cascade do |t|
-    t.integer "concept_id", limit: 4
-    t.string  "value",      limit: 4000
-    t.string  "data_type",  limit: 4000
+  create_table "notations", id: :serial, force: :cascade do |t|
+    t.integer "concept_id"
+    t.string "value", limit: 4000
+    t.string "data_type", limit: 4000
+    t.index ["concept_id"], name: "index_notations_on_concept_id"
   end
 
-  add_index "notations", ["concept_id"], name: "index_notations_on_concept_id", using: :btree
-
-  create_table "note_annotations", force: :cascade do |t|
-    t.integer  "note_id",    limit: 4
-    t.string   "predicate",  limit: 50
-    t.string   "value",      limit: 1024
-    t.datetime "created_at"
-    t.datetime "updated_at"
-    t.string   "namespace",  limit: 50
-    t.string   "language",   limit: 255
+  create_table "note_annotations", id: :serial, force: :cascade do |t|
+    t.integer "note_id"
+    t.string "predicate", limit: 50
+    t.string "value", limit: 1024
+    t.datetime "created_at", precision: nil
+    t.datetime "updated_at", precision: nil
+    t.string "namespace", limit: 50
+    t.string "language"
+    t.index ["note_id"], name: "ix_note_annotations_fk"
+    t.index ["value"], name: "index_note_annotations_on_value"
   end
 
-  add_index "note_annotations", ["note_id"], name: "ix_note_annotations_fk", using: :btree
-
-  create_table "notes", force: :cascade do |t|
-    t.string   "language",   limit: 2
-    t.string   "value",      limit: 4000
-    t.string   "type",       limit: 50
-    t.datetime "created_at"
-    t.datetime "updated_at"
-    t.integer  "owner_id",   limit: 4
-    t.string   "owner_type", limit: 255,  null: false
+  create_table "notes", id: :serial, force: :cascade do |t|
+    t.string "language", limit: 2
+    t.string "value", limit: 4000
+    t.string "type", limit: 50
+    t.datetime "created_at", precision: nil
+    t.datetime "updated_at", precision: nil
+    t.integer "owner_id"
+    t.string "owner_type", null: false
+    t.integer "position"
+    t.index ["language"], name: "ix_notes_on_language"
+    t.index ["owner_id", "owner_type", "type"], name: "ix_notes_fk_type"
+    t.index ["type"], name: "ix_notes_on_type"
   end
 
-  add_index "notes", ["language"], name: "ix_notes_on_language", using: :btree
-  add_index "notes", ["owner_id", "owner_type", "type"], name: "ix_notes_fk_type", using: :btree
-  add_index "notes", ["type"], name: "ix_notes_on_type", using: :btree
-
-  create_table "users", force: :cascade do |t|
-    t.string   "forename",          limit: 255
-    t.string   "surname",           limit: 255
-    t.string   "email",             limit: 255
-    t.string   "crypted_password",  limit: 255
-    t.boolean  "active",            limit: 1
-    t.datetime "created_at"
-    t.datetime "updated_at"
-    t.string   "password_salt",     limit: 255
-    t.string   "persistence_token", limit: 255
-    t.string   "perishable_token",  limit: 255
-    t.string   "role",              limit: 255
-    t.string   "telephone_number",  limit: 255
-    t.string   "type",              limit: 255, default: "User"
+  create_table "users", id: :serial, force: :cascade do |t|
+    t.string "forename"
+    t.string "surname"
+    t.string "email"
+    t.string "crypted_password"
+    t.boolean "active"
+    t.datetime "created_at", precision: nil
+    t.datetime "updated_at", precision: nil
+    t.string "password_salt"
+    t.string "persistence_token"
+    t.string "perishable_token"
+    t.string "role"
+    t.string "telephone_number"
+    t.string "type", default: "User"
+    t.text "comment"
+    t.integer "login_count", default: 0, null: false
+    t.integer "failed_login_count", default: 0, null: false
+    t.datetime "last_request_at", precision: nil
+    t.datetime "current_login_at", precision: nil
+    t.datetime "last_login_at", precision: nil
+    t.string "current_login_ip"
+    t.string "last_login_ip"
   end
 
   add_foreign_key "collection_members", "concepts", column: "collection_id", on_update: :cascade
   add_foreign_key "collection_members", "concepts", column: "target_id", on_update: :cascade
   add_foreign_key "concept_relations", "concepts", column: "owner_id", on_update: :cascade
   add_foreign_key "concept_relations", "concepts", column: "target_id", on_update: :cascade
-  add_foreign_key "concepts", "users", column: "locked_by", on_update: :cascade, on_delete: :nullify
   add_foreign_key "exports", "users", on_update: :cascade, on_delete: :nullify
   add_foreign_key "imports", "users", on_update: :cascade, on_delete: :nullify
   add_foreign_key "label_relations", "labels", column: "domain_id", on_update: :cascade, on_delete: :cascade

data/iqvoc_skosxl.gemspec

@@ -13,8 +13,8 @@ Gem::Specification.new do |s|
   s.license     = 'Apache License 2.0'
   s.description = 'iQvoc - a SKOS(-XL) vocabulary management system built on the Semantic Web'
 
-  s.add_dependency 'iqvoc', '>= 4.4.0', '~> 4.11'
-  s.add_development_dependency 'bundler', '~> 1.6'
+  s.add_dependency 'iqvoc', '~> 4.14.4'
+  s.add_development_dependency 'bundler'
 
   s.files = %w(README.md Gemfile Gemfile.lock Rakefile iqvoc_skosxl.gemspec) +
             Dir.glob('{app,config,db,public,lib,test}/**/*')

data/lib/iqvoc/skosxl/version.rb

@@ -1,5 +1,5 @@
 module Iqvoc
   module SKOSXL
-    VERSION = "2.9.1"
+    VERSION = "2.11.3"
   end
 end

data/lib/iqvoc_skosxl.rb

@@ -1,3 +1,6 @@
+require 'iqvoc/xllabel'
+require 'iqvoc/skosxl/version'
+
 module IqvocSKOSXL
   unless Iqvoc.const_defined?(:SKOSXL) && Iqvoc::SKOSXL.const_defined?(:Application)
     require File.join(File.dirname(__FILE__), '../config/engine')
@@ -11,7 +14,8 @@ module IqvocSKOSXL
       cfg.deregister_setting("#{prefix}Labeling::SKOS::AltLabel") # iQvoc core default
       cfg.register_settings({
         'title' => 'iQvoc SKOS-XL',
-        "#{prefix}Labeling::SKOSXL::AltLabel" => ['en', 'de']
+        "#{prefix}Labeling::SKOSXL::AltLabel" => ['en', 'de'],
+        "label_duplicate_check_mode" => "contains"
       })
     end
 
@@ -22,6 +26,9 @@ module IqvocSKOSXL
     Iqvoc::Concept.include_module_names << 'Concept::SKOSXL::Extension'
     Iqvoc::Concept.pref_labeling_class_name = 'Labeling::SKOSXL::PrefLabel'
     Iqvoc::Concept.alt_labeling_class_name = 'Labeling::SKOSXL::AltLabel'
+    Iqvoc::Concept.hidden_labeling_class_name = 'Labeling::SKOSXL::HiddenLabel'
+
+    Iqvoc::Collection.include_module_names << 'Collection::SKOSXL::Extension'
 
     # TODO
     # Iqvoc.searchable_class_names = Iqvoc::Concept.labeling_class_names.keys +