iqvoc 4.14.5 → 4.15.0

data/app/models/note/rdfs/see_also.rb

@@ -14,7 +14,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-class Note::RDFS::SeeAlso < Note::SKOS::Base
+class Note::Rdfs::SeeAlso < Note::Skos::Base
   self.rdf_namespace = 'rdfs'
   self.rdf_predicate = 'seeAlso'
 end

data/app/models/note/skos/base.rb

@@ -14,7 +14,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-class Note::SKOS::Base < Note::Base
+class Note::Skos::Base < Note::Base
   self.rdf_namespace = 'skos'
 
   def self.build_from_rdf(rdf_subject, rdf_predicate, rdf_object)
@@ -23,10 +23,10 @@ class Note::SKOS::Base < Note::Base
       raise "#{self.name}#build_from_rdf: Subject (#{rdf_subject}) must be able to receive this kind of note (#{self.name} => #{self.name.to_relation_name.to_s})."
     end
 
-    target_class = RDFAPI::PREDICATE_DICTIONARY[rdf_predicate] || self
+    target_class = RdfApi::PREDICATE_DICTIONARY[rdf_predicate] || self
     case rdf_object
     when String # Literal
-      unless rdf_object =~ RDFAPI::LITERAL_REGEXP
+      unless rdf_object =~ RdfApi::LITERAL_REGEXP
         raise "#{self.name}#build_from_rdf: Object (#{rdf_object}) must be a string literal"
       end
       lang = $3
@@ -53,7 +53,7 @@ class Note::SKOS::Base < Note::Base
         blank_node.Rdfs::comment(value, lang: language || nil) if value
         annotations.order(:namespace, :predicate).each do |annotation|
           if IqRdf::Namespace.find_namespace_class(annotation.namespace)
-            val = if annotation.value =~ RDFAPI::URI_REGEXP
+            val = if annotation.value =~ RdfApi::URI_REGEXP
               # Fall back to plain value literal if URI is not parseable
               URI.parse(annotation.value) rescue annotation.value
             else

data/app/models/note/skos/change_note.rb

@@ -14,7 +14,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-class Note::SKOS::ChangeNote < Note::SKOS::Base
+class Note::Skos::ChangeNote < Note::Skos::Base
   self.rdf_predicate = 'changeNote'
 
   def self.edit_partial_name(obj)
@@ -40,7 +40,7 @@ class Note::SKOS::ChangeNote < Note::SKOS::Base
         if (IqRdf::Namespace.find_namespace_class(annotation.namespace))
           blank_node.send(annotation.namespace.camelcase).send(annotation.predicate, annotation.value.nil? ? '' : annotation.value)
         else
-          raise "Note::SKOS::ChangeNote#build_rdf: couldn't find Namespace '#{annotation.namespace}'."
+          raise "Note::Skos::ChangeNote#build_rdf: couldn't find Namespace '#{annotation.namespace}'."
         end
       end
     end

data/app/models/note/skos/definition.rb

@@ -14,7 +14,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-class Note::SKOS::Definition < Note::SKOS::Base
+class Note::Skos::Definition < Note::Skos::Base
   self.rdf_predicate = 'definition'
 
   def self.view_section(obj)

data/app/models/note/skos/editorial_note.rb

@@ -14,6 +14,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-class Note::SKOS::EditorialNote < Note::SKOS::Base
+class Note::Skos::EditorialNote < Note::Skos::Base
   self.rdf_predicate = 'editorialNote'
 end

data/app/models/note/skos/example.rb

@@ -14,6 +14,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-class Note::SKOS::Example < Note::SKOS::Base
+class Note::Skos::Example < Note::Skos::Base
   self.rdf_predicate = 'example'
 end

data/app/models/note/skos/history_note.rb

@@ -14,6 +14,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-class Note::SKOS::HistoryNote < Note::SKOS::Base
+class Note::Skos::HistoryNote < Note::Skos::Base
   self.rdf_predicate = 'historyNote'
 end

data/app/models/note/skos/scope_note.rb

@@ -14,6 +14,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-class Note::SKOS::ScopeNote < Note::SKOS::Base
+class Note::Skos::ScopeNote < Note::Skos::Base
   self.rdf_predicate = 'scopeNote'
 end

data/app/presenters/alphabetical_search_result.rb

@@ -18,12 +18,12 @@ class AlphabeticalSearchResult
   end
 
   def definition?
-    relation_name = Note::SKOS::Definition.name.to_relation_name
+    relation_name = Note::Skos::Definition.name.to_relation_name
     @labeling.owner.respond_to?(relation_name) && @labeling.owner.send(relation_name).any?
   end
 
   def definition
-    relation_name = Note::SKOS::Definition.name.to_relation_name
+    relation_name = Note::Skos::Definition.name.to_relation_name
     @labeling.owner.send(relation_name).first
   end
 

data/app/services/rdf_sync_service.rb

@@ -112,6 +112,6 @@ module RdfSyncService::Helper # TODO: rename -- XXX: does not belong here!?
     return RdfSyncService.new(base_url, Iqvoc.config['triplestore.url'],
         username: Iqvoc.config['triplestore.username'].presence,
         password: Iqvoc.config['triplestore.password'].presence,
-        view_context: view_context) # fugly, but necessary; cf. RDFSync#serialize
+        view_context: view_context) # fugly, but necessary; cf. RdfSync#serialize
   end
 end

data/app/uploaders/base.rb

@@ -4,11 +4,11 @@ class Base < CarrierWave::Uploader::Base
   storage :file
 
   def store_dir
-    Iqvoc.upload_path.join(model.class.to_s.downcase)
+    Iqvoc.upload_path.join(self.model.class.to_s.downcase)
   end
 
   def filename
-    "#{secure_token}.#{file.extension}" if original_filename.present?
+    "#{self.secure_token}.#{file.extension}"
   end
 
   protected
@@ -16,6 +16,7 @@ class Base < CarrierWave::Uploader::Base
   # https://github.com/jnicklas/carrierwave/wiki/How-to%3A-Create-random-and-unique-filenames-for-all-versioned-files
   def secure_token
     var = :"@#{mounted_as}_secure_token"
-    model.instance_variable_get(var) or model.instance_variable_set(var, SecureRandom.hex)
+
+    self.model.instance_variable_get(var) or self.model.instance_variable_set(var, SecureRandom.hex)
   end
 end

data/app/view_models/concept_view.rb

@@ -35,7 +35,7 @@ class ConceptView
 
   # returns a string
   def definition
-    @definition ||= @concept.notes_for_class(Note::SKOS::Definition)
+    @definition ||= @concept.notes_for_class(Note::Skos::Definition)
       .first # FIXME: hard-coded class, arbitrary pick
       .try(:value)
   end

data/app/views/collections/_data.html.erb

@@ -9,7 +9,7 @@
 <% end %>
 
 <div class="relation panel">
-  <h2><%= Note::SKOS::Definition.model_name.human(:count => 2) %></h2>
+  <h2><%= Note::Skos::Definition.model_name.human(:count => 2) %></h2>
   <ul>
     <% collection.note_skos_definitions.each do |definition| %>
       <li><%= definition.value %> (<%= definition.language %>)</li>

data/app/views/collections/_form.html.erb

@@ -4,10 +4,22 @@
 # migrations to update existing data.
 -%>
 
-<%= bootstrap_form_for collection, :as => :concept, :url => collection.new_record? ? collections_path : collection_path(collection, :published => 0), :layout => :horizontal, :label_col => 'col-sm-3', :control_col => 'col-sm-9' do |f| %>
+<%= bootstrap_form_for collection,
+                       as: :concept,
+                       url: collection.new_record? ? collections_path : collection_path(collection, published: 0),
+                       layout: :horizontal,
+                       label_col: 'col-sm-3',
+                       control_col: 'col-sm-9' do |f| %>
+
+  <fieldset>
+    <legend><%= t('txt.common.attributes') %></legend>
+    <%= f.text_field :follow_up, :class => 'datepicker' %>
+    <%= f.text_field :expired_at, :class => 'datepicker' %>
+  </fieldset>
+
 <fieldset>
   <legend><%= t 'txt.views.layouts.sections.labels' %></legend>
-  <% if not Iqvoc.const_defined?(:SKOSXL) %>
+  <% if not Iqvoc.const_defined?(:Skosxl) %>
     <p><%= t 'txt.common.hint_csv_input' %></p>
   <% end %>
     <%- Iqvoc::Concept.labeling_classes.each do |labeling_class, languages| -%>

data/app/views/collections/alphabetical/_search_result.html.erb

@@ -0,0 +1,17 @@
+<li class="concept-item">
+  <p>
+    <%= link_to result.label.to_s, rdf_path(result.concept, lang: nil, format: nil),
+      alt: result.concept.origin, data: { 'resource-path': result.path, 'resource-url': rdf_url(result.concept, lang: nil, format: nil) }, class: 'concept-item-link' %>
+    <% if Iqvoc.concept_modal_preview_enabled? %>
+      <a href="<%= glance_concept_url(result.concept, format: :html) %>" class="dashboard-glance-link"><i class="fa fa-search-plus"></i></a>
+    <% end %>
+
+    <% if result.concept.additional_info.present? %>
+      <span class="additional_info">(<%= result.concept.additional_info %>)</span>
+    <% end %>
+  </p>
+
+  <p class="concept-item-uri">
+    <%= rdf_url(id: result.concept.origin, lang: nil, format: nil) %>
+  </p>
+</li>

data/app/views/collections/alphabetical/_search_result_remote.html.erb

@@ -0,0 +1,14 @@
+<li class="concept-item">
+  <p>
+    <%= link_to result.label, result.path,
+      :data => { 'resource-url' => result.url },
+      :class => 'concept-item-link' %>
+  </p>
+
+  <p class="concept-item-uri"><%= result.url %></p>
+  <% if result.definition? %>
+    <p class="concept-item-definition" lang="<%= result.definition_language %>">
+      <%= result.definition %>
+    </p>
+  <% end %>
+</li>

data/app/views/collections/alphabetical/index.html.erb

@@ -0,0 +1,23 @@
+<%
+  subtitle = t('txt.views.navigation.alphabetical')
+  if can?(:update, Iqvoc::Collection.base_class)
+    subtitle += " (#{number_with_delimiter(Iqvoc::Collection.base_class.published.not_expired.size)})"
+  end
+%>
+<%= page_header title: Iqvoc::Collection.base_class.model_name.human(:count => 2), desc: subtitle %>
+<%= render 'collections/sidebars/plural' %>
+
+<div class="panel">
+  <div class="panel-header centered">
+    <%= letter_selector(@letters) do |letter| %>
+      <% alphabetical_collections_path(prefix: letter.to_s.downcase) %>
+    <% end %>
+  </div>
+  <ol class="concept-items list-unstyled">
+    <% @search_results.each do |result| %>
+      <%= render partial: result.partial_name, locals: { result: result } %>
+    <% end %>
+  </ol>
+</div>
+
+<%= paginate @search_results %>

data/app/views/collections/edit.html.erb

@@ -2,4 +2,4 @@
 <%= error_messages_for @collection %>
 
 <%= render 'form', :collection => @collection %>
-<%= render 'sidebar', :collection => @collection %>
+<%= render 'collections/sidebars/singular', :collection => @collection %>

data/app/views/collections/expired/index.html.erb

@@ -0,0 +1,23 @@
+<%
+  subtitle = t('txt.views.navigation.expired')
+  if can?(:update, Iqvoc::Collection.base_class)
+    subtitle += " (#{number_with_delimiter(Iqvoc::Collection.base_class.published.expired.size)})"
+  end
+%>
+<%= page_header :title => Iqvoc::Collection.base_class.model_name.human(:count => 2), desc: subtitle %>
+<%= render 'collections/sidebars/plural' %>
+
+<div class="panel">
+  <div class="panel-header centered">
+    <%= letter_selector(@letters) do |letter| %>
+      <% expired_collections_path(prefix: letter.to_s.downcase) %>
+    <% end %>
+  </div>
+  <ol class="concept-items list-unstyled">
+    <% @search_results.each do |result| %>
+      <%= render partial: result.partial_name, locals: { result: result } %>
+    <% end %>
+  </ol>
+</div>
+
+<%= paginate @search_results %>

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

@@ -4,4 +4,4 @@
   <%= render :partial => 'collection', :collection => @top_collections %>
 </ul>
 
-<%= render 'sidebar' %>
+<%= render 'collections/sidebars/plural' %>

data/app/views/collections/new.html.erb

@@ -3,4 +3,4 @@
 <%= error_messages_for @collection %>
 
 <%= render 'form', :collection => @collection %>
-<%= render 'sidebar' %>
+<%= render 'collections/sidebars/singular' %>

data/app/views/collections/show_published.html.erb

@@ -1,5 +1,5 @@
 <%= render 'header', :collection => @collection %>
-<%= render 'sidebar', :collection => @collection %>
+<%= render 'collections/sidebars/singular', :collection => @collection %>
 
 <% if @new_collection_version.blank? && can?(:branch, @collection) %>
     <div class="editing_versioning_toolbar">

data/app/views/collections/show_unpublished.html.erb

@@ -1,5 +1,5 @@
 <%= render 'header', :collection => @collection %>
-<%= render 'sidebar', :collection => @collection %>
+<%= render 'collections/sidebars/singular', :collection => @collection %>
 
 <%= alert :info, :header => t('txt.common.unpublished_version') + "." do %>
   <%= t("txt.views.versioning.current_revision", :rev => @collection.rev) %>

data/app/views/collections/sidebars/_plural.html.erb

@@ -0,0 +1,28 @@
+<%= sidebar do %>
+  <%= sidebar_header t('txt.views.navigation.sections') %>
+
+  <%= sidebar_item text: t("txt.views.navigation.hierarchical"),
+                   icon: 'list-alt',
+                   path: collections_path,
+                   active: params[:controller] == 'collections' && params[:published] != '0' %>
+
+  <%= sidebar_item text: t("txt.views.navigation.alphabetical"),
+                   icon: 'list-alt',
+                   path: alphabetical_collections_path,
+                   active: (params[:controller] == 'collections/alphabetical') %>
+
+  <%= sidebar_item text: t("txt.views.navigation.expired"),
+                   icon: 'list-alt',
+                   path: expired_collections_path,
+                   active: (params[:controller] == 'collections/expired') %>
+<% end %>
+
+<%= sidebar do %>
+  <% if can?(:create, Iqvoc::Collection.base_class) %>
+    <%= sidebar_header 'Links'%>
+    <% (Iqvoc.first_level_classes - [Iqvoc::Concept.base_class]).each do |klass| %>
+      <%= sidebar_item { render(klass.new_link_partial_name) } %>
+    <% end %>
+  <% end %>
+<% end %>
+

data/app/views/collections/sidebars/_singular.html.erb

@@ -0,0 +1,22 @@
+<%- published_param = collection.published? ? nil : "0" if defined?(collection) -%>
+
+<%= sidebar do %>
+  <% if defined?(collection) %>
+    <%= sidebar_header t('txt.common.representations') %>
+    <%= sidebar_item icon: 'share', text: 'HTML', path: collection_url(collection.origin, :format => :html) %>
+    <%= sidebar_item icon: 'share', text: 'RDF/XML', path: rdf_url(collection.origin, format: :rdf, lang: nil), id: 'rdf_link_xml' %>
+    <%= sidebar_item icon: 'share', text: 'RDF/Turtle', path: rdf_url(collection.origin, format: :ttl, lang: nil), id: 'rdf_link_ttl' %>
+    <%= sidebar_item icon: 'share', text: 'RDF/NTriples', path: rdf_url(collection.origin, format: :nt, lang: nil), id: 'rdf_link_nt' %>
+  <% end %>
+<% end %>
+
+<%= sidebar do %>
+  <%= sidebar_header 'Links' %>
+  <% if defined?(collection) %>
+    <%= sidebar_item icon: 'link', text: t('txt.models.collection.uri'), path: rdf_url(collection.origin, format: nil, published: published_param, lang: nil) %>
+  <% end %>
+
+  <% (Iqvoc.first_level_classes - [Iqvoc::Concept.base_class]).each do |klass| %>
+    <%= sidebar_item { render(klass.new_link_partial_name) } %>
+  <% end %>
+<% end %>

data/app/views/concepts/_form.html.erb

@@ -19,7 +19,7 @@
   <!-- Labelings -->
   <fieldset>
     <legend><%= Labeling::Base.model_name.human(:count => 2) %></legend>
-    <% unless Iqvoc.const_defined?(:SKOSXL) %>
+    <% unless Iqvoc.const_defined?(:Skosxl) %>
       <p><%= t 'txt.common.hint_csv_input' %></p>
     <% end %>
     <%- Iqvoc::Concept.labeling_classes.each do |labeling_class, languages| -%>

data/app/views/concepts/alphabetical/index.html.erb

@@ -1,7 +1,7 @@
 <%
   subtitle = t('txt.views.navigation.alphabetical')
   if can?(:update, Iqvoc::Concept.base_class)
-    subtitle += " (#{number_with_delimiter(Iqvoc::Concept.base_class.not_expired.size)})"
+    subtitle += " (#{number_with_delimiter(Iqvoc::Concept.base_class.published.not_expired.size)})"
   end
 %>
 <%= page_header :title => Iqvoc::Concept.base_class.model_name.human(:count => 2), desc: subtitle %>

data/app/views/concepts/expired/index.html.erb

@@ -1,7 +1,7 @@
 <%
   subtitle = t('txt.views.navigation.expired')
   if can?(:update, Iqvoc::Concept.base_class)
-    subtitle += " (#{number_with_delimiter(Iqvoc::Concept.base_class.expired.size)})"
+    subtitle += " (#{number_with_delimiter(Iqvoc::Concept.base_class.published.expired.size)})"
   end
 %>
 <%= page_header :title => Iqvoc::Concept.base_class.model_name.human(:count => 2), desc: subtitle %>

data/app/views/concepts/glance.html.erb

@@ -16,7 +16,7 @@
       <% end %>
       <% if @view.definition %>
       <div>
-        <h2><%= Note::SKOS::Definition.model_name.human %></h2>
+        <h2><%= Note::Skos::Definition.model_name.human %></h2>
         <p><%= @view.definition %></p>
       </div>
       <% end %>

data/app/views/concepts/scheme/edit.html.erb

@@ -4,7 +4,7 @@
 <%= bootstrap_form_for @scheme, :as => :concept, :url => scheme_path, :layout => :horizontal do |f| %>
   <fieldset>
     <legend><%= t 'txt.views.layouts.sections.labels' %></legend>
-    <% unless Iqvoc.const_defined?(:SKOSXL) %>
+    <% unless Iqvoc.const_defined?(:Skosxl) %>
       <p><%= t 'txt.common.hint_csv_input' %></p>
     <% end %>
     <%- Iqvoc::Concept.labeling_classes.each do |labeling_class, languages| -%>

data/app/views/concepts/sidebars/_plural.html.erb

@@ -30,7 +30,7 @@
 <%= sidebar do %>
   <% if can?(:create, Iqvoc::Concept.base_class) %>
     <%= sidebar_header 'Links'%>
-    <% (Iqvoc.first_level_classes - [Collection::SKOS::Unordered]).each do |klass| %>
+    <% (Iqvoc.first_level_classes - [Iqvoc::Collection.base_class]).each do |klass| %>
       <%= sidebar_item { render(klass.new_link_partial_name) } %>
     <% end %>
   <% end %>

data/app/views/concepts/sidebars/_singular.html.erb

@@ -16,7 +16,7 @@
     <%= sidebar_item :icon => 'link', :text => t('txt.models.concept.uri'), :path => rdf_url(concept.origin, :format => nil, :published => published_param, :lang => nil) %>
   <% end %>
 
-  <% (Iqvoc.first_level_classes - [Collection::SKOS::Unordered]).each do |klass| %>
+  <% (Iqvoc.first_level_classes - [Iqvoc::Collection.base_class]).each do |klass| %>
     <%= sidebar_item { render(klass.new_link_partial_name) } %>
   <% end %>
 <% end %>

data/app/views/dashboard/glance.html.erb

@@ -9,7 +9,7 @@
       </button>
     </div>
     <div class="modal-body concept-teaser-body">
-      <h2><%= Note::SKOS::EditorialNote.model_name.human(count: 2) %></h2>
+      <h2><%= Note::Skos::EditorialNote.model_name.human(count: 2) %></h2>
       <% if @editorial_notes.empty? %>
         <div class="alert alert-warning" role="alert">
           <%= t('txt.views.dashboard.no_editorial_notes') %>

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

@@ -32,7 +32,11 @@
       <td><%= t("txt.common.rdf_serialization.#{export.file_type}") %></td>
       <td><%= l(export.created_at, :format => :short) %></td>
       <td><%= export.finished_at? ? l(export.finished_at, :format => :short) : icon(:cog, 'fa-spin') %></td>
-      <td><%= link_to('Download', export_download_url(export), :class => 'btn btn-primary btn-xs') if export.success? %></td>
+      <td>
+        <%= link_to('Download', export_download_url(export), class: 'btn btn-primary btn-sm') if export.success? %>
+
+        <%= link_to(t('txt.common.delete'), export_url(export), data: { confirm: t('txt.views.export.delete_confirm')}, method: :delete, class: 'btn btn-danger btn-sm')  %>
+      </td>
     </tr>
   <% end %>
   </tbody>

data/app/views/exports/show.html.erb

@@ -3,5 +3,5 @@
 
 <div class="panel">
   <h2><%= t('txt.views.export.output') %></h2>
-  <pre><%= @export.output %></pre>
+  <pre class="log"><%= @export.output %></pre>
 </div>

data/app/views/partials/collection/_inline_base.html.erb

@@ -0,0 +1,4 @@
+<%= link_to(concept.pref_label, collection_path(id: concept, published: ((!concept.published? && !concept.published_version_id) ? 0 : nil)), class: concept.published? ? '' : 'unpublished') %>
+<%- if concept.additional_info -%>
+  (<%= concept.additional_info %>)
+<%- end -%>

data/app/views/search_results/_sidebar.html.erb

@@ -9,7 +9,7 @@
 
 <%= sidebar do %>
   <%= sidebar_header 'Links' if can?(:create, Iqvoc::Concept.base_class) %>
-  <% (Iqvoc.first_level_classes - [Collection::SKOS::Unordered]).each do |klass| %>
+  <% (Iqvoc.first_level_classes - [Iqvoc::Collection.base_class]).each do |klass| %>
     <%= sidebar_item { render(klass.new_link_partial_name) } %>
   <% end %>
 <% end %>

data/config/application.rb

@@ -4,7 +4,7 @@ require_relative "boot"
 require "active_model/railtie"
 require "active_job/railtie"
 require "active_record/railtie"
-require "active_storage/engine"
+# require "active_storage/engine"
 require "action_controller/railtie"
 require "action_mailer/railtie"
 require "action_mailbox/engine"
@@ -21,7 +21,12 @@ Bundler.require(*Rails.groups)
 module Iqvoc
   class Application < Rails::Application
     # Initialize configuration defaults for originally generated Rails version.
-    config.load_defaults 7.0
+    config.load_defaults 8.1
+
+    # Please, add to the `ignore` list any other `lib` subdirectories that do
+    # not contain `.rb` files, or that should not be reloaded or eager loaded.
+    # Common ones are `templates`, `generators`, or `middleware`, for example.
+    config.autoload_lib(ignore: %w(assets tasks generators))
 
     # Configuration for the application, engines, and railties goes here.
     #

data/config/ci.rb

@@ -0,0 +1,20 @@
+# Run using bin/ci
+
+CI.run do
+  step "Setup", "bin/setup --skip-server"
+
+  # step "Security: Importmap vulnerability audit", "bin/importmap audit"
+  step "Tests: Rails", "bin/rails test"
+  step "Tests: Seeds", "env RAILS_ENV=test bin/rails db:seed:replant"
+
+  # Optional: Run system tests
+  step "Tests: System", "bin/rails test:system"
+
+  # Optional: set a green GitHub commit status to unblock PR merge.
+  # Requires the `gh` CLI and `gh extension install basecamp/gh-signoff`.
+  # if success?
+  #   step "Signoff: All systems go. Ready for merge and deploy.", "gh signoff"
+  # else
+  #   failure "Signoff: CI failed. Do not merge or deploy.", "Fix the issues and try again."
+  # end
+end

data/config/database.yml

@@ -1,26 +1,20 @@
-development:
+default: &default
   adapter: postgresql
-  host: localhost
-  encoding: unicode
-  database: <%= ENV["POSTGRES_DB"] || 'iqvoc_development' %>
-  pool: 5
-  username: <%= ENV["POSTGRES_USER"] || 'postgres' %>
-  password: <%= ENV["POSTGRES_PASSWORD"] || 'postgres' %>
+  encoding: utf8
+  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: postgresql
-  host: localhost
-  encoding: unicode
-  database: <%= ENV["POSTGRES_DB"] || 'iqvoc_test' %>
-  pool: 5
-  username: <%= ENV["POSTGRES_USER"] || 'postgres' %>
-  password: <%= ENV["POSTGRES_PASSWORD"] || 'postgres' %>
+  <<: *default
+  database: <%= ENV['DB_NAME'].presence || 'iqvoc_test' %>
 
 production:
-  adapter: postgresql
-  host: <%= ENV["POSTGRES_HOST"] || 'localhost' %>
-  encoding: unicode
-  database: <%= ENV["POSTGRES_DB"] || 'iqvoc_production' %>
-  pool: 5
-  username: <%= ENV["POSTGRES_USER"] || 'postgres' %>
-  password: <%= ENV["POSTGRES_PASSWORD"] || 'postgres' %>
+  <<: *default
+  database: <%= ENV['DB_NAME'].presence || 'iqvoc_development' %>

data/config/database.yml.postgresql

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

data/config/engine.rb

@@ -9,6 +9,7 @@ require 'kaminari'
 require 'iq_rdf'
 require 'deep_cloneable'
 require 'json'
+require 'csv'
 require 'rails_autolink'
 require 'bootstrap_form'
 require 'apipie-rails'