iqvoc_inflectionals 2.9.0 → 2.11.3

data/README.md

@@ -1,4 +1,4 @@
-[![Build Status](https://travis-ci.org/innoq/iqvoc_inflectionals.svg?branch=master)](https://travis-ci.org/innoq/iqvoc_inflectionals)
+![CI](https://github.com/innoq/iqvoc_inflectionals/workflows/CI/badge.svg)
 
 Inflectionals for iQvoc
 

data/app/assets/javascripts/manifest.js

@@ -0,0 +1,3 @@
+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';

data/app/assets/stylesheets/manifest.scss

@@ -0,0 +1,3 @@
+@import 'iqvoc/app/assets/stylesheets/iqvoc/settings/manifest';
+@import 'iqvoc/app/assets/stylesheets/framework';
+@import 'iqvoc/app/assets/stylesheets/iqvoc/_manifest';

data/app/models/concerns/inflectionable.rb

@@ -8,9 +8,19 @@ module Inflectionable
     after_save :create_default_inflectional
 
     has_many :inflectionals,
-             :class_name => "Inflectional::Base",
-             :foreign_key => "label_id",
-             :dependent => :destroy
+             class_name: "Inflectional::Base",
+             foreign_key: "label_id",
+             dependent: :destroy,
+             inverse_of: :label
+
+    # overwrite class method to query labels by all existing inflectionals
+    # instead of basic xl-label value attribute
+    def self.by_query_value(query)
+      Iqvoc::XLLabel.base_class
+                    .references(:inflectionals)
+                    .joins(:inflectionals)
+                    .where('inflectionals.value ILIKE ?', query.mb_chars.downcase.to_s)
+    end
   end
 
   def endings
@@ -52,7 +62,7 @@ module Inflectionable
 
   def create_default_inflectional
     # ensure a matching inflectional exists
-    if value && inflectionals.where(:value => value).none?
+    if value && inflectionals.empty?
       inflectionals.create(:value => value)
     end
   end

data/app/models/inflectional/base.rb

@@ -38,7 +38,7 @@ class Inflectional::Base < ActiveRecord::Base
   end
 
   def self.by_query_value(query)
-    where(["LOWER(#{table_name}.value) LIKE ?", query.to_s.downcase])
+    where(["#{table_name}.value ILIKE ?", query.to_s.downcase])
   end
 
   MAPPINGS = {
@@ -286,29 +286,14 @@ class Inflectional::Base < ActiveRecord::Base
     end
   end
 
-  def self.forces_multi_query?
-    true
-  end
-
   def self.single_query(params = {})
     query_str = build_query_string(params)
 
     scope = by_query_value(query_str).includes(:label)
-    scope = scope.references(:labels).merge(Iqvoc::XLLabel.base_class.by_language(params[:languages].to_a).published.order("LOWER(#{Label::Base.table_name}.value)"))
+    scope = scope.references(:labels).merge(Iqvoc::XLLabel.base_class.by_language(params[:languages].to_a).published.order("LENGTH(#{Label::Base.table_name}.value)"))
     scope.map { |result| SearchResult.new(result) }
   end
 
-  # def self.single_query(params = {})
-  #   query_str = build_query_string(params)
-  #
-  #   Label::UMT::Base.select("DISTINCT #{Label::UMT::Base.table_name}.*").
-  #                    joins(:inflectionals).
-  #                    where(Inflectional::Base.by_query_value(query_str)).
-  #                    by_language(params[:languages].to_a).
-  #                    published.
-  #                    order("LOWER(#{Inflectional::Base.table_name}.value)")
-  # end
-
   def self.search_result_partial_name
     'partials/inflectional/search_result'
   end
@@ -323,11 +308,11 @@ class Inflectional::Base < ActiveRecord::Base
   end
 
   def self.view_section(obj)
-    "inflectionals"
+    "main"
   end
 
   def self.view_section_sort_key(obj)
-    200
+    300
   end
 
   def self.partial_name(obj)

data/app/views/partials/inflectional/_base.html.erb

@@ -2,13 +2,7 @@
   <h2><%= t("txt.views.labels.inflectionals") %></h2>
   <% labels_inflectionals_values = label.send(klass.name.to_relation_name).map(&:value) %>
 
-  <% if labels_inflectionals_values.any? %>
-    <ul>
-      <% labels_inflectionals_values.each do |inf| %>
-        <li><%= inf %></li>
-      <% end %>
-    </ul>
-  <% end %>
+  <%= labels_inflectionals_values.join(', ') %>
 
   <%
     all_inflectionals = Inflectional::Base.where(:value => labels_inflectionals_values).all
@@ -18,10 +12,6 @@
 
   <% if inflectionals_labels.present? %>
     <p><%= t("txt.views.labels.inflectionals_used_in") %></p>
-    <ul>
-      <% inflectionals_labels.each do |inf| %>
-        <li><%= link_to inf.value, label_path(:published => inf.published? ? nil : 0, :id => inf) %></li>
-      <% end %>
-    </ul>
+    <%= inflectionals_labels.map { |inf| link_to inf.value, label_path(:published => inf.published? ? nil : 0, :id => inf) }.join(', ').html_safe %>
   <% end %>
 </div>

data/app/views/partials/inflectional/_edit_base.html.erb

@@ -3,6 +3,8 @@
     value: label.send(klass.name.to_relation_name).map(&:value).join("\n"),
     rows: 10,
     cols: 80,
+    autocorrect: 'off',
+    autocapitalize: 'off',
     data: {
       generated_inflectionals: label.candidates.to_json
     }

data/bin/bundle

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

data/bin/rails

@@ -1,4 +1,4 @@
 #!/usr/bin/env ruby
-APP_PATH = File.expand_path('../../config/application', __FILE__)
-require_relative '../config/boot'
-require 'rails/commands'
+APP_PATH = File.expand_path("../config/application", __dir__)
+require_relative "../config/boot"
+require "rails/commands"

data/bin/rake

@@ -1,4 +1,4 @@
 #!/usr/bin/env ruby
-require_relative '../config/boot'
-require 'rake'
+require_relative "../config/boot"
+require "rake"
 Rake.application.run

data/bin/setup

@@ -1,29 +1,33 @@
 #!/usr/bin/env ruby
-require 'pathname'
+require "fileutils"
 
 # path to your application root.
-APP_ROOT = Pathname.new File.expand_path('../../',  __FILE__)
+APP_ROOT = File.expand_path("..", __dir__)
 
-Dir.chdir APP_ROOT do
-  # This script is a starting point to setup your application.
-  # Add necessary setup steps to this file:
+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 || bundle install"
+  system! "gem install bundler --conservative"
+  system("bundle check") || system!("bundle install")
 
   # puts "\n== Copying sample files =="
   # unless File.exist?("config/database.yml")
-  #   system "cp config/database.yml.sample config/database.yml"
+  #   FileUtils.cp "config/database.yml.sample", "config/database.yml"
   # end
 
   puts "\n== Preparing database =="
-  system "bin/rake db:setup"
+  system! "bin/rails db:prepare"
 
   puts "\n== Removing old logs and tempfiles =="
-  system "rm -f log/*"
-  system "rm -rf tmp/cache"
+  system! "bin/rails log:clear tmp:clear"
 
   puts "\n== Restarting application server =="
-  system "touch tmp/restart.txt"
+  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,38 @@
-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::Inflectionals
   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_inflectionals.rb needs to know if it runs as app or as engine
     require 'iqvoc_inflectionals'
-
-    # 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.0"
   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/inflectionals_production

data/config/database.yml.postgresql

@@ -0,0 +1,26 @@
+development:
+  adapter: postgresql
+  host: localhost
+  encoding: unicode
+  database: <%= ENV["POSTGRES_DB"] || 'iqvoc_inflectionals_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_inflectionals_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_inflectionals_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::Inflectionals::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/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::Inflectionals::Application
+require_relative "config/environment"
+
+run Rails.application
+Rails.application.load_server

data/db/migrate/20120109143704_create_inflectionals.rb

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

data/db/migrate/20150108155020_add_fk_constraints_iqvoc_inflectionals.rb

@@ -1,4 +1,4 @@
-class AddFkConstraintsIqvocInflectionals < ActiveRecord::Migration
+class AddFkConstraintsIqvocInflectionals < ActiveRecord::Migration[4.2]
   def change
     add_foreign_key :inflectionals, :labels, column: 'label_id', on_update: :cascade, on_delete: :cascade
   end

data/db/migrate/20160127131143_add_inflectional_attributes_to_label.rb

@@ -1,4 +1,4 @@
-class AddInflectionalAttributesToLabel < ActiveRecord::Migration
+class AddInflectionalAttributesToLabel < ActiveRecord::Migration[4.2]
   def change
     add_column :labels, :base_form, :string  unless column_exists?(:labels, :base_form)
     add_column :labels, :inflectional_code, :string unless column_exists?(:labels, :inflectional_code)

data/db/migrate/20160331092532_change_inflectional_value_collation.rb

@@ -1,4 +1,4 @@
-class ChangeInflectionalValueCollation < ActiveRecord::Migration
+class ChangeInflectionalValueCollation < ActiveRecord::Migration[4.2]
   def up
     if ActiveRecord::Base.connection.adapter_name == 'Mysql2'
       execute("ALTER TABLE inflectionals MODIFY value varchar(4000) CHARACTER SET utf8 COLLATE utf8_bin;")

data/db/migrate/20200901140019_add_inflectionals_index.rb

@@ -0,0 +1,5 @@
+class AddInflectionalsIndex < ActiveRecord::Migration[5.2]
+  def change
+    add_index :inflectionals, :value
+  end
+end

data/faucet.config.js

@@ -0,0 +1,46 @@
+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: "./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_inflectionals.gemspec

@@ -15,8 +15,8 @@ Gem::Specification.new do |s|
 
   s.rubyforge_project = 'iqvoc_inflectionals'
 
-  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")

data/lib/iqvoc/inflectionals/version.rb

@@ -1,5 +1,5 @@
 module Iqvoc
   module Inflectionals
-    VERSION = "2.9.0"
+    VERSION = "2.11.3"
   end
 end