iqvoc_compound_forms 2.9.0 → 2.11.3

data/README.md

@@ -1,9 +1,8 @@
-[![Build Status](https://travis-ci.org/innoq/iqvoc_compound_forms.svg?branch=master)](https://travis-ci.org/innoq/iqvoc_compound_forms)
+# Compound forms for iQvoc
 
-Compound forms for iQvoc
+![CI](https://github.com/innoq/iqvoc_compound_forms/workflows/CI/badge.svg)
 
-Getting Started
-===============
+## Getting Started
 
 1. Initialize database:
 

data/app/assets/javascripts/iqvoc_compound_forms/manifest.js

@@ -1 +1 @@
-//= require iqvoc_compound_forms/compound_forms
+import './compound_forms';

data/app/assets/javascripts/manifest.js

@@ -1,4 +1,4 @@
-//= require framework
-//= require iqvoc/manifest
-//= require iqvoc_skosxl/manifest
-//= require iqvoc_compound_forms/manifest
+import '../../../node_modules/iqvoc/app/assets/javascripts/framework';
+import '../../../node_modules/iqvoc/app/assets/javascripts/iqvoc/manifest';
+import '../../../node_modules/iqvoc_skosxl/app/assets/javascripts/iqvoc_skosxl/manifest';
+import './iqvoc_compound_forms/manifest';

data/app/assets/stylesheets/manifest.scss

@@ -0,0 +1 @@
+@import 'iqvoc_skosxl/app/assets/stylesheets/manifest';

data/app/models/application_record.rb

@@ -0,0 +1,3 @@
+class ApplicationRecord < ActiveRecord::Base
+  self.abstract_class = true
+end

data/app/models/compound_form/base.rb

@@ -1,6 +1,6 @@
 # encoding: UTF-8
 
-class CompoundForm::Base < ActiveRecord::Base
+class CompoundForm::Base < ApplicationRecord
   class_attribute :rdf_namespace, :rdf_predicate
   self.rdf_namespace = 'iqvoc'
   self.rdf_predicate = 'compoundFrom'
@@ -10,9 +10,10 @@ class CompoundForm::Base < ActiveRecord::Base
   belongs_to :domain, :class_name => 'Label::Base', :foreign_key => 'domain_id'
 
   has_many :compound_form_contents,
-    :class_name  => 'CompoundForm::Content::Base',
-    :foreign_key => 'compound_form_id',
-    :dependent   => :destroy
+           class_name: 'CompoundForm::Content::Base',
+           foreign_key: 'compound_form_id',
+           dependent: :destroy,
+           inverse_of: :compound_form
 
   def self.published
     includes(:domain).references(:labels).merge(Label::Base.published)
@@ -61,7 +62,9 @@ class CompoundForm::Base < ActiveRecord::Base
   end
 
   def build_rdf(document, subject)
-    subject.send(rdf_namespace).send(rdf_predicate, compound_form_contents.map {|cfc| IqRdf::build_uri(cfc.label.origin) })
+    if compound_form_contents.any?
+      subject.send(rdf_namespace).send(rdf_predicate, compound_form_contents.map {|cfc| IqRdf::build_uri(cfc.label.origin) })
+    end
   end
 
   private

data/app/models/compound_form/content/base.rb

@@ -1,6 +1,6 @@
 # encoding: UTF-8
 
-class CompoundForm::Content::Base < ActiveRecord::Base
+class CompoundForm::Content::Base < ApplicationRecord
 
   self.table_name ='compound_form_contents'
 
@@ -38,7 +38,7 @@ class CompoundForm::Content::Base < ActiveRecord::Base
   end
 
   def self.edit_partial_name(obj)
-    "partials/compound_form/content/base" # Show data only
+    "partials/compound_form/content/base_no_header" # Show data only
   end
 
   def build_rdf(document, subject)

data/app/models/concerns/compound_forms_label_extensions.rb

@@ -29,14 +29,16 @@ module CompoundFormsLabelExtensions
     end
 
     has_many :compound_forms,
-        :class_name  => "CompoundForm::Base",
-        :foreign_key => "domain_id",
-        :dependent   => :destroy
+        class_name: "CompoundForm::Base",
+        foreign_key: "domain_id",
+        dependent: :destroy,
+        inverse_of: :domain
+
 
     has_many :compound_form_contents,
-        :through    => :compound_forms,
-        :class_name => "CompoundForm::Content::Base",
-        :dependent  => :destroy
+        through: :compound_forms,
+        class_name: "CompoundForm::Content::Base",
+        dependent: :destroy
 
     validate :compound_form_contents_size
     validate :compound_form_contents_languages

data/app/views/partials/compound_form/_compound_form.html.erb

@@ -3,7 +3,7 @@
           by_origin(compound_form.compound_form_contents.
               map { |cfc| cfc.label.origin }).load %>
   <% fieldname = "label[inline_compound_form_origins][]" %>
-  <%= f.form_group nil, :label => { :text => t('txt.common.type_to_search') } do %>
+  <%= f.form_group nil, :label => { :text => t('txt.views.labels.compound_from') } do %>
     <%= text_field_tag fieldname, items.map(&:origin).join(InlineDataHelper::JOINER),
           :class => "entity_select",
           :"data-query-url" => labels_path(:format => :json),
@@ -11,7 +11,7 @@
           :"data-entities" => (not compound_form) ? nil : items.
               map { |l| label_widget_data(l) }.to_json %>
 
-              <input type="button" class="btn btn-default add-compound-form" value="<%= t("txt.common.add_note") %>">
-              <input type="button" class="btn btn-default rm-compound-form" value="<%= t("txt.common.delete") %>">
+              <input type="button" class="btn btn-outline-secondary add-compound-form" value="<%= t("txt.common.add_note") %>">
+              <input type="button" class="btn btn-outline-secondary rm-compound-form" value="<%= t("txt.common.delete") %>">
   <% end %>
 </div>

data/app/views/partials/compound_form/content/_base.html.erb

@@ -3,11 +3,11 @@
   <div class="relation-body">
     <% compound_in = label.compound_in %>
     <% if compound_in.any? %>
-      <ol>
+      <ul class="list-unstyled">
         <% compound_in.each do |label| %>
           <li><%= link_to(label.value, label_path(:id => label)) %></li>
         <% end %>
-      </ol>
+      </ul>
     <% end %>
   </div>
 </div>

data/app/views/partials/compound_form/content/_base_no_header.html.erb

@@ -0,0 +1,15 @@
+<% compound_in = label.compound_in %>
+<div class="relation panel">
+  <h2><%= t('txt.views.compound_in') %></h2>
+  <div class="relation-body">
+    <ul>
+      <% if compound_in.any? %>
+        <% compound_in.each do |label| %>
+          <li><%= link_to(label.value, label_path(:id => label)) %></span></li>
+        <% end %>
+      <% else %>
+        <li><%= t('txt.views.labels.no_compound_forms') %></li>
+      <% end %>
+    </ul>
+  </div>
+</div>

data/bin/bundle

@@ -0,0 +1,3 @@
+#!/usr/bin/env ruby
+ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../Gemfile', __dir__)
+load Gem.bin_path('bundler', 'bundle')

data/bin/rails

@@ -1,6 +1,4 @@
 #!/usr/bin/env ruby
-# This command will automatically be run when you run "rails" with Rails 3 gems installed from the root of your application.
-
-APP_PATH = File.expand_path('../../config/application',  __FILE__)
-require File.expand_path('../../config/boot',  __FILE__)
-require 'rails/commands'
+APP_PATH = File.expand_path("../config/application", __dir__)
+require_relative "../config/boot"
+require "rails/commands"

data/bin/rake

@@ -1,3 +1,4 @@
 #!/usr/bin/env ruby
-require 'bundler/setup'
-load Gem.bin_path('rake', 'rake')
+require_relative "../config/boot"
+require "rake"
+Rake.application.run

data/bin/setup

@@ -0,0 +1,33 @@
+#!/usr/bin/env ruby
+require "fileutils"
+
+# path to your application root.
+APP_ROOT = File.expand_path("..", __dir__)
+
+def system!(*args)
+  system(*args) || abort("\n== Command #{args} failed ==")
+end
+
+FileUtils.chdir APP_ROOT do
+  # This script is a way to set up or update your development environment automatically.
+  # This script is idempotent, so that you can run it at any time and get an expectable outcome.
+  # Add necessary setup steps to this file.
+
+  puts "== Installing dependencies =="
+  system! "gem install bundler --conservative"
+  system("bundle check") || system!("bundle install")
+
+  # puts "\n== Copying sample files =="
+  # unless File.exist?("config/database.yml")
+  #   FileUtils.cp "config/database.yml.sample", "config/database.yml"
+  # end
+
+  puts "\n== Preparing database =="
+  system! "bin/rails db:prepare"
+
+  puts "\n== Removing old logs and tempfiles =="
+  system! "bin/rails log:clear tmp:clear"
+
+  puts "\n== Restarting application server =="
+  system! "bin/rails restart"
+end

data/bin/update

@@ -0,0 +1,31 @@
+#!/usr/bin/env ruby
+require 'fileutils'
+include FileUtils
+
+# path to your application root.
+APP_ROOT = File.expand_path('..', __dir__)
+
+def system!(*args)
+  system(*args) || abort("\n== Command #{args} failed ==")
+end
+
+chdir APP_ROOT do
+  # This script is a way to update your development environment automatically.
+  # Add necessary update steps to this file.
+
+  puts '== Installing dependencies =='
+  system! 'gem install bundler --conservative'
+  system('bundle check') || system!('bundle install')
+
+  # Install JavaScript dependencies if using Yarn
+  # system('bin/yarn')
+
+  puts "\n== Updating database =="
+  system! 'bin/rails db:migrate'
+
+  puts "\n== Removing old logs and tempfiles =="
+  system! 'bin/rails log:clear tmp:clear'
+
+  puts "\n== Restarting application server =="
+  system! 'bin/rails restart'
+end

data/bin/yarn

@@ -0,0 +1,17 @@
+#!/usr/bin/env ruby
+APP_ROOT = File.expand_path('..', __dir__)
+Dir.chdir(APP_ROOT) do
+  yarn = ENV["PATH"].split(File::PATH_SEPARATOR).
+    select { |dir| File.expand_path(dir) != __dir__ }.
+    product(["yarn", "yarn.cmd", "yarn.ps1"]).
+    map { |dir, file| File.expand_path(file, dir) }.
+    find { |file| File.executable?(file) }
+
+  if yarn
+    exec yarn, *ARGV
+  else
+    $stderr.puts "Yarn executable was not detected in the system."
+    $stderr.puts "Download Yarn at https://yarnpkg.com/en/docs/install"
+    exit 1
+  end
+end

data/config/application.rb

@@ -1,56 +1,37 @@
-require File.expand_path('../boot', __FILE__)
-
-require 'rails/all'
-
-if defined?(Bundler)
-  # If you precompile assets before deploying to production, use this line
-  Bundler.require *Rails.groups(:assets => %w(development test))
-  # If you want your assets lazily compiled in production, use this line
-  # Bundler.require(:default, :assets, Rails.env)
-end
+require_relative "boot"
+
+# Pick the frameworks you want:
+require "active_model/railtie"
+require "active_job/railtie"
+require "active_record/railtie"
+require "active_storage/engine"
+require "action_controller/railtie"
+require "action_mailer/railtie"
+require "action_mailbox/engine"
+require "action_text/engine"
+require "action_view/railtie"
+require "action_cable/engine"
+# require "sprockets/railtie"
+require "rails/test_unit/railtie"
+
+# Require the gems listed in Gemfile, including any gems
+# you've limited to :test, :development, or :production.
+Bundler.require(*Rails.groups)
 
 module Iqvoc::CompoundForms
   class Application < Rails::Application
+    # Initialize configuration defaults for originally generated Rails version.
+    config.load_defaults 7.0
+
+    # Configuration for the application, engines, and railties goes here.
+    #
+    # These settings can be overridden in specific environments using the files
+    # in config/environments, which are processed later.
+    #
+    # config.time_zone = "Central Time (US & Canada)"
+    # config.eager_load_paths << Rails.root.join("extras")
 
     # This has to be here because iqvoc_compound_forms.rb needs to know if it runs as app or as engine
     require 'iqvoc_compound_forms'
-
-    # Settings in config/environments/* take precedence over those specified here.
-    # Application configuration should go into files in config/initializers
-    # -- all .rb files in that directory are automatically loaded.
-
-    # Custom directories with classes and modules you want to be autoloadable.
-    # config.autoload_paths += %W(#{config.root}/extras)
-
-    # Only load the plugins named here, in the order given (default is alphabetical).
-    # :all can be used as a placeholder for all plugins not explicitly named.
-    # config.plugins = [ :exception_notification, :ssl_requirement, :all ]
-
-    # Activate observers that should always be running.
-    # config.active_record.observers = :cacher, :garbage_collector, :forum_observer
-
-    # Set Time.zone default to the specified zone and make Active Record auto-convert to this zone.
-    # Run "rake -D time" for a list of tasks for finding time zone names. Default is UTC.
-    # config.time_zone = 'Central Time (US & Canada)'
-
-    # The default locale is :en and all translations from config/locales/*.rb,yml are auto loaded.
-    # config.i18n.load_path += Dir[Rails.root.join('my', 'locales', '*.{rb,yml}').to_s]
-    config.i18n.default_locale = :de
-    # config.i18n.available_locales = [:de, :en]
-
-    # JavaScript files you want as :defaults (application.js is always included).
-    # config.action_view.javascript_expansions[:defaults] = %w(jquery rails)
-
-    # Configure the default encoding used in templates for Ruby 1.9.
-    config.encoding = "utf-8"
-
-    # Configure sensitive parameters which will be filtered from the log file.
-    config.filter_parameters += [:password, :password_confirmation]
-
-    # Enable the asset pipeline
-    config.assets.enabled = true
-
-    # Version of your assets, change this if you want to expire all your assets
-    config.assets.version = "1.0.1"
   end
 end

data/config/boot.rb

@@ -1,13 +1,4 @@
-require 'rubygems'
+ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../Gemfile", __dir__)
 
-# Set up gems listed in the Gemfile.
-gemfile = File.expand_path('../../Gemfile', __FILE__)
-begin
-  ENV['BUNDLE_GEMFILE'] = gemfile
-  require 'bundler'
-  Bundler.setup
-rescue Bundler::GemNotFound => e
-  STDERR.puts e.message
-  STDERR.puts "Try running `bundle install`."
-  exit!
-end if File.exist?(gemfile)
+require "bundler/setup" # Set up gems listed in the Gemfile.
+require "bootsnap/setup" # Speed up boot time by caching expensive operations.

data/config/cable.yml

@@ -0,0 +1,10 @@
+development:
+  adapter: async
+
+test:
+  adapter: test
+
+production:
+  adapter: redis
+  url: <%= ENV.fetch("REDIS_URL") { "redis://localhost:6379/1" } %>
+  channel_prefix: iqvoc/compound_forms_production

data/config/database.yml.postgresql

@@ -0,0 +1,26 @@
+development:
+  adapter: postgresql
+  host: localhost
+  encoding: unicode
+  database: <%= ENV["POSTGRES_DB"] || 'iqvoc_compound_forms_development' %>
+  pool: 5
+  username: <%= ENV["POSTGRES_USER"] || 'postgres' %>
+  password: <%= ENV["POSTGRES_PASSWORD"] || 'postgres' %>
+
+test:
+  adapter: postgresql
+  host: localhost
+  encoding: unicode
+  database: <%= ENV["POSTGRES_DB"] || 'iqvoc_compound_forms_test' %>
+  pool: 5
+  username: <%= ENV["POSTGRES_USER"] || 'postgres' %>
+  password: <%= ENV["POSTGRES_PASSWORD"] || 'postgres' %>
+
+production:
+  adapter: postgresql
+  host: localhost
+  encoding: unicode
+  database: <%= ENV["POSTGRES_DB"] || 'iqvoc_compound_forms_production' %>
+  pool: 5
+  username: <%= ENV["POSTGRES_USER"] || 'postgres' %>
+  password: <%= ENV["POSTGRES_PASSWORD"] || 'postgres' %>

data/config/environment.rb

@@ -1,5 +1,5 @@
-# Load the Rails application
-require File.expand_path('../application', __FILE__)
+# Load the Rails application.
+require_relative "application"
 
-# Initialize the Rails application
-Iqvoc::CompoundForms::Application.initialize!
+# Initialize the Rails application.
+Rails.application.initialize!

data/config/initializers/content_security_policy.rb

@@ -0,0 +1,25 @@
+# Be sure to restart your server when you modify this file.
+
+# Define an application-wide content security policy.
+# See the Securing Rails Applications Guide for more information:
+# https://guides.rubyonrails.org/security.html#content-security-policy-header
+
+# Rails.application.configure do
+#   config.content_security_policy do |policy|
+#     policy.default_src :self, :https
+#     policy.font_src    :self, :https, :data
+#     policy.img_src     :self, :https, :data
+#     policy.object_src  :none
+#     policy.script_src  :self, :https
+#     policy.style_src   :self, :https
+#     # Specify URI for violation reports
+#     # policy.report_uri "/csp-violation-report-endpoint"
+#   end
+#
+#   # Generate session nonces for permitted importmap and inline scripts
+#   config.content_security_policy_nonce_generator = ->(request) { request.session.id.to_s }
+#   config.content_security_policy_nonce_directives = %w(script-src)
+#
+#   # Report violations without enforcing the policy.
+#   # config.content_security_policy_report_only = true
+# end

data/config/initializers/filter_parameter_logging.rb

@@ -0,0 +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.
+Rails.application.config.filter_parameters += [
+  :passw, :secret, :token, :_key, :crypt, :salt, :certificate, :otp, :ssn
+]

data/config/initializers/inflections.rb

@@ -0,0 +1,16 @@
+# Be sure to restart your server when you modify this file.
+
+# Add new inflection rules using the following format. Inflections
+# are locale specific, and you may define rules for as many different
+# locales as you wish. All of these examples are active by default:
+# ActiveSupport::Inflector.inflections(:en) do |inflect|
+#   inflect.plural /^(ox)$/i, "\\1en"
+#   inflect.singular /^(ox)en/i, "\\1"
+#   inflect.irregular "person", "people"
+#   inflect.uncountable %w( fish sheep )
+# end
+
+# These inflection rules are supported but not enabled by default:
+# ActiveSupport::Inflector.inflections(:en) do |inflect|
+#   inflect.acronym "RESTful"
+# end

data/config/initializers/permissions_policy.rb

@@ -0,0 +1,11 @@
+# Define an application-wide HTTP permissions policy. For further
+# information see https://developers.google.com/web/updates/2018/06/feature-policy
+#
+# Rails.application.config.permissions_policy do |f|
+#   f.camera      :none
+#   f.gyroscope   :none
+#   f.microphone  :none
+#   f.usb         :none
+#   f.fullscreen  :self
+#   f.payment     :self, "https://secure.example.com"
+# end

data/config/locales/de.yml

@@ -7,6 +7,7 @@ de:
         compound_form_contents_self_reference_error: Eine Zusammensetzung darf nicht auf das Haupt-Label verweisen.
     views:
       labels:
+        no_compound_forms: Nicht in Zusammensetzungen verwendet
         compound_from: Zusammengesetzt aus
         compound_in: Zusammengesetzt in
       widget:
@@ -15,3 +16,4 @@ de:
       layouts:
         sections:
           compound_forms: Zusammensetzungen
+      compound_in: Teil von

data/config/locales/en.yml

@@ -7,6 +7,7 @@ en:
         compound_form_contents_self_reference_error: A composition must not refer the main label.
     views:
       labels:
+        no_compound_forms: "Not used in compound forms"
         compound_from: Compound from
         compound_in: Compound in
       widget:
@@ -15,3 +16,4 @@ en:
       layouts:
         sections:
           compound_forms: Compound Forms
+      compound_in: Part of

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/config.ru

@@ -1,4 +1,6 @@
 # This file is used by Rack-based servers to start the application.
 
-require ::File.expand_path('../config/environment',  __FILE__)
-run Iqvoc::CompoundForms::Application
+require_relative "config/environment"
+
+run Rails.application
+Rails.application.load_server

data/db/migrate/20120112100000_create_compound_forms.rb

@@ -1,4 +1,4 @@
-class CreateCompoundForms < ActiveRecord::Migration
+class CreateCompoundForms < ActiveRecord::Migration[4.2]
 
   def self.up
     unless table_exists? "compound_form_contents"

data/db/migrate/20150108153131_add_fk_constraints_iqvoc_compound_forms.rb

@@ -1,4 +1,4 @@
-class AddFkConstraintsIqvocCompoundForms < ActiveRecord::Migration
+class AddFkConstraintsIqvocCompoundForms < ActiveRecord::Migration[4.2]
   def change
     add_foreign_key :compound_forms, :labels, column: 'domain_id', on_update: :cascade, on_delete: :cascade
     add_foreign_key :compound_form_contents, :compound_forms, column: 'compound_form_id', on_update: :cascade, on_delete: :cascade

data/faucet.config.js

@@ -0,0 +1,49 @@
+module.exports = {
+  js: [
+    {
+      source: "./node_modules/jquery/dist/jquery.js",
+      target: "./public/assets/javascripts/jquery.js",
+      exports: "jQuery",
+      compact: "mangle"
+    },
+    {
+      source: "./app/assets/javascripts/manifest.js",
+      target: "./public/assets/javascripts/manifest.js",
+      externals:  { jquery: "jQuery" },
+    },
+    {
+      source: "./node_modules/bootstrap/dist/js/bootstrap.bundle.min.js",
+      target: "./public/assets/javascripts/bootstrap.bundle.min.js",
+      externals:  { jquery: "jQuery" },
+      compact: "minify"
+    }
+  ],
+  sass: [{
+    source: "./app/assets/stylesheets/manifest.scss",
+    target: "./public/assets/stylesheets/manifest.css"
+  }],
+  static: [{
+    source: "./app/assets/images",
+    target: "./public/assets/images"
+  },
+  {
+    source: "./node_modules/iqvoc/app/assets/images",
+    target: "./public/assets/images"
+  },
+  {
+    source: "./node_modules/iqvoc/app/assets/fonts",
+    target: "./public/assets/fonts"
+  },
+  {
+    source: "./node_modules/font-awesome/fonts",
+    target: "./public/assets/fonts",
+    fingerprint: false
+  }
+],
+  manifest: {
+    target: "./public/assets/manifest.json",
+    key: "short",
+    webRoot: "./public"
+  },
+  watchDirs: ["./app/assets"]
+};

data/iqvoc_compound_forms.gemspec

@@ -15,8 +15,8 @@ Gem::Specification.new do |s|
 
   s.rubyforge_project = 'iqvoc_compound_forms'
 
-  s.add_dependency 'iqvoc', '>= 4.5.0', '~> 4.11'
-  s.add_dependency 'iqvoc_skosxl', '~> 2.9.0'
+  s.add_dependency 'iqvoc', '~> 4.14.4'
+  s.add_dependency 'iqvoc_skosxl', '~> 2.11.3'
 
   s.files = `git ls-files`.split("\n")
   s.test_files = `git ls-files -- {test,spec,features}/*`.split("\n")