iqvoc 4.12.0 → 4.13.2

data/app/views/users/index.html.erb

@@ -4,8 +4,7 @@
     <thead>
       <tr>
         <th><%= t('txt.views.users.name') %></th>
-        <th><%= t('txt.views.users.email') %></th>
-        <th><%= t('txt.views.users.telephone_number') %></th>
+        <th><%= t('txt.views.users.contact_info') %></th>
         <th><%= t('txt.views.users.role') %></th>
         <th><%= t('txt.views.users.active') %></th>
         <th></th>
@@ -15,12 +14,16 @@
       <% @users.each do |user| %>
         <tr class="users-table-row">
           <td><%= user.name %></td>
-          <td><%= user.email %></td>
-          <td><%= user.telephone_number %></td>
+          <td class="text-nowrap">
+            <div><%= icon(:envelope) %> <%= mail_to user.email %></div>
+            <% if user.telephone_number.present? %>
+              <div><%= icon(:phone) %> <%= user.telephone_number %></div>
+            <% end %>
+          </td>
           <td><%= user.role.humanize %></td>
           <td><%= icon(:check) if user.active? %></td>
           <td class="text-nowrap">
-            <%= link_to t('txt.views.users.edit_link'), edit_user_path(id: user), class: 'btn btn-default' %>
+            <%= link_to t('txt.views.users.edit_link'), edit_user_path(id: user), class: 'btn btn-outline-secondary' %>
             <%= link_to t('txt.views.users.destroy_link'), user_path(id: user), data: { confirm: t('txt.views.users.sure')}, method: :delete, class: "btn btn-danger" %>
           </td>
         </tr>

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/delayed_job

@@ -0,0 +1,5 @@
+#!/usr/bin/env ruby
+
+require File.expand_path(File.join(File.dirname(__FILE__), '..', 'config', 'environment'))
+require 'delayed/command'
+Delayed::Command.new(ARGV).daemonize

data/bin/rails

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

data/bin/rake

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

data/bin/setup

@@ -0,0 +1,36 @@
+#!/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')
+
+  # Install JavaScript dependencies
+  system! 'bin/yarn'
+
+  # 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,22 +1,18 @@
-# encoding: UTF-8
-
-# Copyright 2011-2014 innoQ Deutschland GmbH
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-require File.expand_path('../boot', __FILE__)
-
-require 'rails/all'
+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" # Disable sprockets in favor of faucet
+require "rails/test_unit/railtie"
 
 # Require the gems listed in Gemfile, including any gems
 # you've limited to :test, :development, or :production.
@@ -24,19 +20,15 @@ Bundler.require(*Rails.groups)
 
 module Iqvoc
   class Application < Rails::Application
-    # 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.
-
-    # 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
-
-    # Do not swallow errors in after_commit/after_rollback callbacks.
-    config.active_record.raise_in_transactional_callbacks = true
+    # Initialize configuration defaults for originally generated Rails version.
+    config.load_defaults 6.1
+
+    # 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")
   end
 end

data/config/boot.rb

@@ -1,19 +1,4 @@
-# encoding: UTF-8
+ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../Gemfile', __dir__)
 
-# Copyright 2011-2013 innoQ Deutschland GmbH
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../../Gemfile', __FILE__)
-
-require 'bundler/setup' # Set up gems listed in the 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_production

data/config/database.template.yml

@@ -1,6 +1,6 @@
 development:
   adapter: mysql2
-  encoding: utf8
+  encoding: utf8mb4
   reconnect: false
   database: iqvoc_development
   pool: 5
@@ -10,7 +10,7 @@ development:
 
 test:
   adapter: mysql2
-  encoding: utf8
+  encoding: utf8mb4
   reconnect: false
   database: iqvoc_test
   pool: 5
@@ -20,7 +20,7 @@ test:
 
 production:
   adapter: mysql2
-  encoding: utf8
+  encoding: utf8mb4
   reconnect: false
   database: iqvoc_production
   pool: 5

data/config/database.yml

@@ -1,29 +1,20 @@
-development:
-  adapter: mysql2
+default: &default
+  adapter: postgresql
   encoding: utf8
-  reconnect: false
-  database: iqvoc_development
-  pool: 5
-  username: root
-  password:
-  host: 127.0.0.1
+  host: <%= ENV['DB_HOST'] || 'localhost' %>
+  username: <%= ENV['DB_USERNAME'] || 'mjansing' %>
+  password: <%= ENV['DB_PASSWORD'] || '' %>
+  port: 5432
+  pool: <%= ENV["DB_POOL"] || ENV['RAILS_MAX_THREADS'] || 5 %>
+
+development:
+  <<: *default
+  database: <%= ENV['DB_NAME'].presence || 'iqvoc_development' %>
 
 test:
-  adapter: mysql2
-  encoding: utf8
-  reconnect: false
-  database: iqvoc_test
-  pool: 5
-  username: root
-  password:
-  host: 127.0.0.1
+  <<: *default
+  database: <%= ENV['DB_NAME'].presence || 'iqvoc_test' %>
 
 production:
-  adapter: mysql2
-  encoding: utf8
-  reconnect: false
-  database: iqvoc_production
-  pool: 5
-  username: root
-  password:
-  host: 127.0.0.1
+  <<: *default
+  database: <%= ENV['DB_NAME'].presence || 'iqvoc_development' %>

data/config/database.yml.mysql

@@ -1,6 +1,6 @@
 development:
   adapter: mysql2
-  encoding: utf8
+  encoding: utf8mb4
   reconnect: false
   database: iqvoc_development
   pool: 5
@@ -10,7 +10,7 @@ development:
 
 test:
   adapter: mysql2
-  encoding: utf8
+  encoding: utf8mb4
   reconnect: false
   database: iqvoc_test
   pool: 5
@@ -20,10 +20,10 @@ test:
 
 production:
   adapter: mysql2
-  encoding: utf8
+  encoding: utf8mb4
   reconnect: false
-  database: iqvoc_production
+  database: <%= ENV["DB_NAME"] %>
   pool: 5
-  username: root
-  password:
-  host: 127.0.0.1
+  username: <%= ENV["DB_USER"] %>
+  password: <%= ENV["DB_PW"] %>
+  host: <%= ENV["DB_HOST"] %>

data/config/database.yml.postgresql

@@ -1,23 +1,26 @@
 development:
   adapter: postgresql
+  host: localhost
   encoding: unicode
-  database: iqvoc_development
+  database: <%= ENV["POSTGRES_DB"] || 'iqvoc_development' %>
   pool: 5
-  username: root
-  password:
+  username: <%= ENV["POSTGRES_USER"] || 'postgres' %>
+  password: <%= ENV["POSTGRES_PASSWORD"] || 'postgres' %>
 
 test:
   adapter: postgresql
+  host: localhost
   encoding: unicode
-  database: iqvoc_test
+  database: <%= ENV["POSTGRES_DB"] || 'iqvoc_test' %>
   pool: 5
-  username: root
-  password:
+  username: <%= ENV["POSTGRES_USER"] || 'postgres' %>
+  password: <%= ENV["POSTGRES_PASSWORD"] || 'postgres' %>
 
 production:
   adapter: postgresql
+  host: localhost
   encoding: unicode
-  database: iqvoc_production
+  database: <%= ENV["POSTGRES_DB"] || 'iqvoc_production' %>
   pool: 5
-  username: root
-  password:
+  username: <%= ENV["POSTGRES_USER"] || 'postgres' %>
+  password: <%= ENV["POSTGRES_PASSWORD"] || 'postgres' %>

data/config/engine.rb

@@ -4,24 +4,21 @@ require 'rails'
 # want the applications to have to do that.
 require 'cancan'
 require 'authlogic'
+require 'scrypt'
 require 'kaminari'
-require 'kaminari-bootstrap'
 require 'iq_rdf'
+require 'deep_cloneable'
 require 'json'
 require 'rails_autolink'
-require 'sass'
-require 'sass-rails'
-require 'bootstrap-sass'
 require 'bootstrap_form'
-require 'font-awesome-rails'
-require 'uglifier'
 require 'apipie-rails'
 require 'database_cleaner'
 require 'delayed_job_active_record'
 require 'carrierwave'
-require 'autoprefixer-rails'
 require 'faraday'
 require 'faraday_middleware'
+require 'rack-mini-profiler'
+require 'faucet_pipeline_rails'
 
 module Iqvoc
   class Engine < Rails::Engine
@@ -33,10 +30,6 @@ module Iqvoc
       end
     end
 
-    initializer 'iqvoc.add_assets_to_precompilation' do |app|
-      app.config.assets.precompile += Iqvoc.core_assets
-    end
-
     initializer 'iqvoc.load_migrations' do |app|
       # Pull in all the migrations to the application embedding iqvoc
       app.config.paths['db/migrate'].concat(Iqvoc::Engine.paths['db/migrate'].existent)

data/config/environment.rb

@@ -1,21 +1,5 @@
-# encoding: UTF-8
+# Load the Rails application.
+require_relative "application"
 
-# Copyright 2011-2013 innoQ Deutschland GmbH
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-# Load the rails application
-require File.expand_path('../application', __FILE__)
-
-# Initialize the rails application
-Iqvoc::Application.initialize!
+# Initialize the Rails application.
+Rails.application.initialize!

data/config/environments/heroku.rb

@@ -39,19 +39,6 @@ if Iqvoc.const_defined?(:Application)
     # Disable Rails's static asset server (Apache or nginx will already do this).
     config.serve_static_files = true
 
-    # Compress JavaScripts and CSS.
-    config.assets.js_compressor = :uglifier
-    # config.assets.css_compressor = :sass
-
-    # Do not fallback to assets pipeline if a precompiled asset is missed.
-    config.assets.compile = false
-
-    # Generate digests for assets URLs.
-    config.assets.digest = true
-
-    # Version of your assets, change this if you want to expire all your assets.
-    config.assets.version = '1.0'
-
     # 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

data/config/initializers/apipie.rb

@@ -12,6 +12,8 @@ Apipie.configure do |config|
   config.validate                = false
   config.validate_value          = false
   config.validate_presence       = false
+  config.translate               = false
+  config.default_locale          = nil
   config.app_info                = <<-EOF
 iQvoc is a Vocabulary Management System for the Semantic Web.
 EOF

data/config/initializers/application_controller_renderer.rb

@@ -0,0 +1,8 @@
+# Be sure to restart your server when you modify this file.
+
+# ActiveSupport::Reloader.to_prepare do
+#   ApplicationController.renderer.defaults.merge!(
+#     http_host: 'example.org',
+#     https: false
+#   )
+# end

data/config/initializers/backtrace_silencers.rb

@@ -1,23 +1,8 @@
-# encoding: UTF-8
-
-# Copyright 2011-2013 innoQ Deutschland GmbH
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
 # Be sure to restart your server when you modify this file.
 
 # You can add backtrace silencers for libraries that you're using but don't wish to see in your backtraces.
-# Rails.backtrace_cleaner.add_silencer { |line| line =~ /my_noisy_library/ }
+# Rails.backtrace_cleaner.add_silencer { |line| /my_noisy_library/.match?(line) }
 
-# You can also remove all the silencers if you're trying to debug a problem that might stem from framework code.
-# Rails.backtrace_cleaner.remove_silencers!
+# You can also remove all the silencers if you're trying to debug a problem that might stem from framework code
+# by setting BACKTRACE=1 before calling your invocation, like "BACKTRACE=1 ./bin/rails runner 'MyClass.perform'".
+Rails.backtrace_cleaner.remove_silencers! if ENV["BACKTRACE"]

data/config/initializers/content_security_policy.rb

@@ -0,0 +1,30 @@
+# Be sure to restart your server when you modify this file.
+
+# Define an application-wide content security policy
+# For further information see the following documentation
+# https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Content-Security-Policy
+
+# Rails.application.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
+#   # If you are using webpack-dev-server then specify webpack-dev-server host
+#   policy.connect_src :self, :https, "http://localhost:3035", "ws://localhost:3035" if Rails.env.development?
+
+#   # Specify URI for violation reports
+#   # policy.report_uri "/csp-violation-report-endpoint"
+# end
+
+# If you are using UJS then enable automatic nonce generation
+# Rails.application.config.content_security_policy_nonce_generator = -> request { SecureRandom.base64(16) }
+
+# Set the nonce only to specific directives
+# Rails.application.config.content_security_policy_nonce_directives = %w(script-src)
+
+# Report CSP violations to a specified URI
+# For further information see the following documentation:
+# https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Content-Security-Policy-Report-Only
+# Rails.application.config.content_security_policy_report_only = true

data/config/initializers/cookies_serializer.rb

@@ -1,3 +1,5 @@
 # Be sure to restart your server when you modify this file.
 
+# Specify a serializer for the signed and encrypted cookie jars.
+# Valid options are :json, :marshal, and :hybrid.
 Rails.application.config.action_dispatch.cookies_serializer = :json

data/config/initializers/delayed_job.rb

@@ -1,4 +1,3 @@
 # keep failed delayed jobs
 Delayed::Worker.destroy_failed_jobs = false
-Delayed::Worker.logger = Logger.new(File.join(Rails.root, 'log', 'delayed_job.log'))
 Delayed::Worker.max_run_time = 2.days

data/config/initializers/filter_parameter_logging.rb

@@ -1,4 +1,6 @@
 # Be sure to restart your server when you modify this file.
 
 # Configure sensitive parameters which will be filtered from the log file.
-Rails.application.config.filter_parameters += [:password]
+Rails.application.config.filter_parameters += [
+  :password, :passw, :secret, :token, :_key, :crypt, :salt, :certificate, :otp, :ssn
+]

data/config/initializers/inflections.rb

@@ -1,19 +1,3 @@
-# encoding: UTF-8
-
-# Copyright 2011-2013 innoQ Deutschland GmbH
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
 # Be sure to restart your server when you modify this file.
 
 # Add new inflection rules using the following format. Inflections

data/config/initializers/iqvoc.rb

@@ -17,8 +17,6 @@
 require 'iqvoc'
 require 'iqvoc/version'
 
-ActiveRecord::Base.send :include, DeepCloning
-
 ##### INSTANCE SETTINGS #####
 
 # initialize non-dynamic settings below

data/config/initializers/linked_data.rb

@@ -0,0 +1,5 @@
+require 'linkeddata'
+
+# use faraday as http adapter in linked data gem instead of net/http. (e.g. RDF::Repository.load)
+# Linkeddata net/http fallback strategy does not use existing http_proxy configuration
+RDF::Util::File.http_adapter = RDF::Util::File::FaradayAdapter

data/config/initializers/mime_types.rb

@@ -1,19 +1,3 @@
-# encoding: UTF-8
-
-# Copyright 2011-2013 innoQ Deutschland GmbH
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
 # Be sure to restart your server when you modify this file.
 
 # Add new mime types for use in respond_to blocks:

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