iqvoc 4.7.0 → 4.8.0

data/app/models/concerns/first_level_object_scopes.rb

@@ -0,0 +1,9 @@
+module FirstLevelObjectScopes
+  extend ActiveSupport::Concern
+
+  module ClassMethods
+    def ordered_by_pref_label
+      includes(:pref_labels).order('labels.value ASC')
+    end
+  end
+end

data/app/{concerns → models/concerns}/first_level_object_validations.rb

@@ -5,6 +5,13 @@ module FirstLevelObjectValidations
 
   included do
     validate :distinct_versions, on: :create # FIXME: on: :create?
+    validate :origin_has_to_be_escaped
+  end
+
+  def origin_has_to_be_escaped
+    unless Origin.new(origin).valid?
+      errors.add :origin, I18n.t('txt.models.concept.origin_error')
+    end
   end
 
   def distinct_versions
@@ -13,8 +20,8 @@ module FirstLevelObjectValidations
     if existing_total >= 2
       errors.add :base, I18n.t('txt.models.concept.version_error', origin: origin)
     elsif existing_total == 1
-      unless (query.published.count == 0 and published?) or
-             (query.published.count == 1 and not published?)
+      unless (query.published.count == 0 && published?) or
+             (query.published.count == 1 && !published?)
         errors.add :base, I18n.t('txt.models.concept.version_error', origin: origin)
       end
     end

data/app/models/concerns/rankable.rb

@@ -0,0 +1,31 @@
+require 'active_support/concern'
+
+module Rankable
+  extend ActiveSupport::Concern
+
+  def build_rdf(document, subject, suppress_extra_labels = false)
+    super
+    if self.class.rankable?
+      predicate = "ranked#{rdf_predicate.titleize}"
+
+      subject.Schema.build_predicate(predicate) do |blank_node|
+        blank_node.Schema.relationWeight(rank)
+        blank_node.Schema.relationTarget(IqRdf.build_uri(target.origin))
+      end
+    end
+  end
+
+  module ClassMethods
+    def rankable?
+      true
+    end
+
+    def partial_name(obj)
+      'partials/concept/relation/ranked'
+    end
+
+    def edit_partial_name(obj)
+      'partials/concept/relation/edit_ranked'
+    end
+  end
+end

data/app/{concerns → models/concerns}/versioning.rb

@@ -96,12 +96,6 @@ module Versioning
     new_version.increment(:rev)
     new_version.published_version_id = self.id
     new_version.unpublish
-    new_version.send(:"#{Iqvoc.change_note_class_name.to_relation_name}").build(
-      language: I18n.locale.to_s,
-      annotations_attributes: [
-        { namespace: 'dct', predicate: 'creator', value: user.name },
-        { namespace: 'dct', predicate: 'modified', value: DateTime.now.to_s }
-      ])
     new_version
   end
 

data/app/models/configuration_setting.rb

@@ -14,7 +14,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-# NB: not to be used directly, but only through Iqvoc::InstanceConfiguration
+# NB: not to be used directly, but only through InstanceConfiguration
 class ConfigurationSetting < ActiveRecord::Base # TODO: make private, somehow?
   validates :key, uniqueness: true
 end

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

@@ -94,7 +94,7 @@ class Labeling::SKOS::Base < Labeling::Base
       raise "#{self.name}#build_from_rdf: Subject (#{rdf_subject}) must be a Concept."
     end
 
-    unless rdf_object =~ Iqvoc::RDFAPI::LITERAL_REGEXP
+    unless rdf_object =~ RDFAPI::LITERAL_REGEXP
       raise InvalidStringLiteralError, "#{self.name}#build_from_rdf: Object (#{rdf_object}) must be a string literal"
     end
 
@@ -105,7 +105,7 @@ class Labeling::SKOS::Base < Labeling::Base
       $1
     end
 
-    predicate_class = Iqvoc::RDFAPI::PREDICATE_DICTIONARY[rdf_predicate] || self
+    predicate_class = RDFAPI::PREDICATE_DICTIONARY[rdf_predicate] || self
     predicate_class.new(target: self.label_class.new(value: value, language: lang)).tap do |labeling|
       rdf_subject.send(predicate_class.name.to_relation_name) << labeling
     end

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

@@ -18,11 +18,11 @@ class Match::SKOS::Base < Match::Base
   self.rdf_namespace = 'skos'
 
   def self.build_from_rdf(rdf_subject, rdf_predicate, rdf_object)
-    raise "#{self.class}#build_from_rdf: Subject (#{rdf_subject}) must be able to receive this kind of match (#{self.name} => #{self.name.to_relation_name})." unless rdf_subject.class.reflections.include?(self.name.to_relation_name)
+    raise "#{self.class}#build_from_rdf: Subject (#{rdf_subject}) must be able to receive this kind of match (#{self.name} => #{self.name.to_relation_name})." unless rdf_subject.class.reflections.include?(self.name.to_relation_name.to_s)
     raise "#{self.class}#build_from_rdf: Object (#{rdf_object}) must be a URI" unless rdf_object =~ /^<(.+)>$/ # XXX: this assumes nt-format, right?
     uri = $1
 
-    match_class = Iqvoc::RDFAPI::PREDICATE_DICTIONARY[rdf_predicate] || self
+    match_class = RDFAPI::PREDICATE_DICTIONARY[rdf_predicate] || self
     match_class.new(value: uri).tap do |match|
       rdf_subject.send(self.name.to_relation_name) << match
     end

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

@@ -18,14 +18,15 @@ class Note::SKOS::Base < Note::Base
   self.rdf_namespace = 'skos'
 
   def self.build_from_rdf(rdf_subject, rdf_predicate, rdf_object)
-    unless rdf_subject.class.reflections.include?(self.name.to_relation_name)
-      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})."
+    # https://github.com/rails/rails/issues/16928
+    unless rdf_subject.class.reflections.include?(self.name.to_relation_name.to_s)
+      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 = Iqvoc::RDFAPI::PREDICATE_DICTIONARY[rdf_predicate] || self
+    target_class = RDFAPI::PREDICATE_DICTIONARY[rdf_predicate] || self
     case rdf_object
     when String # Literal
-      unless rdf_object =~ Iqvoc::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
@@ -50,9 +51,9 @@ class Note::SKOS::Base < Note::Base
     if annotations.any?
       subject.send(rdf_namespace).build_predicate(rdf_predicate) do |blank_node|
         blank_node.Rdfs::comment(value, lang: language || nil) if value
-        annotations.each do |annotation|
+        annotations.order(:namespace, :predicate).each do |annotation|
           if IqRdf::Namespace.find_namespace_class(annotation.namespace)
-            val = if annotation.value =~ Iqvoc::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

@@ -36,7 +36,7 @@ class Note::SKOS::ChangeNote < Note::SKOS::Base
   def build_rdf(document, subject)
     subject.send(self.rdf_namespace).build_predicate(self.rdf_predicate) do |blank_node|
       blank_node.Rdfs::comment(self.value, lang: self.language || nil) if self.value
-      self.annotations.each do |annotation|
+      self.annotations.order(:namespace, :predicate).each do |annotation|
         if (IqRdf::Namespace.find_namespace_class(annotation.namespace))
           blank_node.send(annotation.namespace.camelcase).send(annotation.predicate, annotation.value)
         else

data/{lib/iqvoc/rdf_sync.rb → app/services/rdf_sync_service.rb}

@@ -1,6 +1,6 @@
 # encoding: UTF-8
 
-class Iqvoc::RDFSync
+class RDFSyncService
   delegate :url_helpers, to: 'Rails.application.routes'
 
   ADAPTORS = { # XXX: inappropriate?
@@ -105,11 +105,11 @@ class Iqvoc::RDFSync
   end
 end
 
-module Iqvoc::RDFSync::Helper # TODO: rename -- XXX: does not belong here!?
+module RDFSyncService::Helper # TODO: rename -- XXX: does not belong here!?
   def triplestore_syncer
     base_url = root_url(lang: nil) # XXX: brittle in the face of future changes?
 
-    return Iqvoc::RDFSync.new(base_url, Iqvoc.config['triplestore.url'],
+    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

data/app/view_models/concept_view.rb

@@ -30,7 +30,7 @@ class ConceptView
   end
 
   def no_content?
-    definition.blank? || alt_labels.none? || related.none? || collections.none?
+    definition.blank? && alt_labels.none? && related.none? && collections.none?
   end
 
   # returns a string

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

@@ -25,7 +25,7 @@
 <fieldset>
   <legend><%= Iqvoc::Concept.base_class.model_name.human(:count => 2) %></legend>
   <%= f.form_group :inline_member_concept_origins, :label => {:text => t('txt.common.type_to_search')} do %>
-    <%= text_field_tag "concept[inline_member_concept_origins]", @collection.inline_member_concept_origins.join(Iqvoc::InlineDataHelper::JOINER),
+    <%= text_field_tag "concept[inline_member_concept_origins]", @collection.inline_member_concept_origins.join(InlineDataHelper::JOINER),
       :class => "entity_select",
       :"data-query-url" => concepts_path(:format => :json),
       :"data-entity-uri" => concept_path(:id => "{id}"),
@@ -37,7 +37,7 @@
 <fieldset>
   <legend><%= Iqvoc::Collection.base_class.model_name.human(:count => 2) %></legend>
   <%= f.form_group :inline_member_concept_origins, :label => {:text => t('txt.common.type_to_search')} do %>
-    <%= text_field_tag "concept[inline_member_collection_origins]", @collection.inline_member_collection_origins.join(Iqvoc::InlineDataHelper::JOINER),
+    <%= text_field_tag "concept[inline_member_collection_origins]", @collection.inline_member_collection_origins.join(InlineDataHelper::JOINER),
       :class => "entity_select",
       :"data-query-url" => collections_path(:format => :json),
       :"data-entity-uri" => collection_path(:id => "{id}"),

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

@@ -17,7 +17,7 @@
   <fieldset>
     <legend><%= Iqvoc::Concept.base_class.model_name.human(:count => 2) %></legend>
     <%= f.form_group :inline_top_concept_origins, :label => { :text => t('txt.common.type_to_search') } do %>
-      <%= text_field_tag "concept[inline_top_concept_origins]", @scheme.inline_top_concept_origins.join(Iqvoc::InlineDataHelper::JOINER),
+      <%= text_field_tag "concept[inline_top_concept_origins]", @scheme.inline_top_concept_origins.join(InlineDataHelper::JOINER),
       :class => "entity_select",
       :"data-query-url" => concepts_path(:format => :json),
       :"data-entity-uri" => concept_path(:id => "{id}"),

data/app/views/pages/components.html.erb

@@ -0,0 +1,45 @@
+<%= page_header :title => "iQvoc Front-end Components" %>
+
+<h2>Entity Selector</h2>
+
+<p>multi-selection with auto-completion</p>
+
+<p>
+  the selection is transmitted as comma-separated values via the original
+  <code class="language-html">input</code> field
+</p>
+
+<p>typically used for choosing associated concepts from the thesaurus</p>
+
+<input type="text" class="entity_select"
+    data-query-url="<%= @concepts_uri %>"
+    data-entity-uri="<%= @concept_uri %>"
+    data-entities="<%= [{ id: "foo", name: "Foo" }, { id: "bar", name: "Bar" }].to_json %>"
+    data-no-results-msg="No results">
+
+<p>
+  <code class="language-html">data-singular="true"</code> restricts selection to
+  a single item single item (e.g. for choosing a parent within mono hierarchies)
+</p>
+
+<input type="text" class="entity_select"
+    data-query-url="<%= @concepts_uri %>"
+    data-entity-uri="<%= @concept_uri %>"
+    data-singular="true"
+    data-no-results-msg="No results">
+
+<p>
+  <code class="language-html">data-qualified="rank"</code> (with "rank" being an
+  arbitrary identifier) can be used to add an additional qualifier to selected
+  items, typically for ordering - these qualifiers are appended to the
+  respective value with a colon
+</p>
+
+<p>NB: requires <code class="language-javascript">QualifiedEntitySelector</code></p>
+
+<input type="text" class="entity_select"
+    data-query-url="<%= @concepts_uri %>"
+    data-entity-uri="<%= @concept_uri %>"
+    data-entities="<%= [{ id: "foo", name: "Foo", rank: 100 }].to_json %>"
+    data-qualified="rank"
+    data-no-results-msg="No results">

data/app/views/pages/version.html.erb

@@ -0,0 +1,6 @@
+<pre>
+  Iqvoc <%= Iqvoc::VERSION %>
+  <% if Iqvoc.host_version %>
+  <%= "#{Iqvoc.host_namespace} #{Iqvoc.host_version}" %>
+  <% end %>
+</pre>

data/app/views/partials/concept/_reverse_match_notice.html.erb

@@ -1,4 +1,3 @@
-<%# binding.pry %>
 <%= alert :warning, :header => t('txt.views.concepts.pending_jobs_header') + "." do %>
   <%= t("txt.views.concepts.pending_jobs_message") %>
   <ol>

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

@@ -1,8 +1,8 @@
 <% if results %>
   <%= sidebar do %>
     <%= sidebar_header t('txt.common.representations') %>
-    <%= sidebar_item :icon => 'link', :text => 'RDF/XML', :path => rdf_search_path(request.query_parameters.merge(:format => :rdf, :lang => nil, :page => results.current_page, :only_path => false)), :id => 'rdf_link_xml' %>
-    <%= sidebar_item :icon => 'link', :text => 'RDF/Turtle', :path => rdf_search_path(request.query_parameters.merge(:format => :ttl, :lang => nil, :page => @results.current_page, :only_path => false)), :id => 'rdf_link_ttl' %>
-    <%= sidebar_item :icon => 'link', :text => 'RDF/NTriples', :path => rdf_search_path(request.query_parameters.merge(:format => :nt, :lang => nil, :page => @results.current_page, :only_path => false)), :id => 'rdf_link_nt' %>
+    <%= sidebar_item :icon => 'link', :text => 'RDF/XML', :path => rdf_search_path({:lang => nil, :page => results.current_page, :format => :rdf}.merge(request.query_parameters)), :id => 'rdf_link_xml' %>
+    <%= sidebar_item :icon => 'link', :text => 'RDF/Turtle', :path => rdf_search_path({:lang => nil, :page => @results.current_page, :format => :ttl}.merge(request.query_parameters)), :id => 'rdf_link_ttl' %>
+    <%= sidebar_item :icon => 'link', :text => 'RDF/NTriples', :path => rdf_search_path({:lang => nil, :page => @results.current_page, :format => :nt}.merge(request.query_parameters)), :id => 'rdf_link_nt' %>
   <% end %>
 <% end %>

data/config/application.rb

@@ -1,6 +1,6 @@
 # encoding: UTF-8
 
-# Copyright 2011-2013 innoQ Deutschland GmbH
+# 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.
@@ -35,5 +35,8 @@ module Iqvoc
     # 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
   end
 end

data/config/boot.rb

@@ -14,7 +14,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-# Set up gems listed in the Gemfile.
 ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../../Gemfile', __FILE__)
 
-require 'bundler/setup' if File.exist?(ENV['BUNDLE_GEMFILE'])
+require 'bundler/setup' # Set up gems listed in the Gemfile.

data/config/database.yml.postgresql

@@ -0,0 +1,23 @@
+development:
+  adapter: postgresql
+  encoding: unicode
+  database: iqvoc_development
+  pool: 5
+  username: root
+  password:
+
+test:
+  adapter: postgresql
+  encoding: unicode
+  database: iqvoc_test
+  pool: 5
+  username: root
+  password:
+
+production:
+  adapter: postgresql
+  encoding: unicode
+  database: iqvoc_production
+  pool: 5
+  username: root
+  password:

data/config/engine.rb

@@ -20,8 +20,6 @@ require 'database_cleaner'
 require 'delayed_job_active_record'
 require 'carrierwave'
 
-require 'iqvoc/controller_extensions'
-
 module Iqvoc
   class Engine < Rails::Engine
     paths['lib/tasks'] << 'lib/engine_tasks'

data/config/environments/heroku.rb

@@ -37,7 +37,7 @@ if Iqvoc.const_defined?(:Application)
     # config.action_dispatch.rack_cache = true
 
     # Disable Rails's static asset server (Apache or nginx will already do this).
-    config.serve_static_assets = true
+    config.serve_static_files = true
 
     # Compress JavaScripts and CSS.
     config.assets.js_compressor = :uglifier

data/config/initializers/inflections.rb

@@ -16,11 +16,17 @@
 
 # Be sure to restart your server when you modify this file.
 
-# Add new inflection rules using the following format
-# (all these examples are active by default):
-# ActiveSupport::Inflector.inflections do |inflect|
+# 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/iqvoc.rb

@@ -15,15 +15,9 @@
 # limitations under the License.
 
 require 'iqvoc'
-require 'iqvoc/origin'
-require 'iqvoc/inline_data_helper'
 require 'iqvoc/version'
-require 'iqvoc/deep_cloning'
-require 'iqvoc/rankable'
-require 'iqvoc/ability'
-require 'iqvoc/navigation'
 
-ActiveRecord::Base.send :include, Iqvoc::DeepCloning
+ActiveRecord::Base.send :include, DeepCloning
 
 ##### INSTANCE SETTINGS #####
 

data/config/initializers/mime_types.rb

@@ -18,7 +18,6 @@
 
 # Add new mime types for use in respond_to blocks:
 # Mime::Type.register "text/richtext", :rtf
-# Mime::Type.register_alias "text/html", :iphone
 
 Mime::Type.register 'application/rdf+xml', :rdf
 Mime::Type.register 'text/turtle', :ttl

data/config/locales/de.yml

@@ -182,7 +182,8 @@ de:
        draft: "Bearbeitung"
        expired: "Abgelaufene"
        search: "Suche"
-       about: "Über"
+       about: "Über iQvoc"
+       version: "Version"
        users: "Benutzer"
        collections: "Kollektionen"
        login: "Login"

data/config/locales/en.yml

@@ -106,15 +106,15 @@ en:
          triplestore: triplestore
          sources: Federation
        settings:
-         title: site title
-         languages_notes: languages for notes
-         languages_pref_labeling: languages for preferred labels
-         languages_further_labelings_Labeling::SKOS::AltLabel: languages for alternative labels
-         performance_unbounded_hierarchy: unlimited hierarchy depth
-         triplestore_url: triplestore URL
-         triplestore_username: username for triplestore
-         triplestore_password: password for triplestore
-         triplestore_autosync: automatic triplestore synchronization
+         title: Site title
+         languages_notes: Languages for notes
+         languages_pref_labeling: Languages for preferred labels
+         languages_further_labelings_Labeling::SKOS::AltLabel: Languages for alternative labels
+         performance_unbounded_hierarchy: Unlimited hierarchy depth
+         triplestore_url: Triplestore URL
+         triplestore_username: Username for triplestore
+         triplestore_password: Password for triplestore
+         triplestore_autosync: Automatic triplestore synchronization
          sources_iqvoc: Sources (iQvoc)
      alphabetical_concepts:
      untranslated_concepts:
@@ -190,7 +190,8 @@ en:
        draft: "Draft"
        expired: "Expired"
        search: "Search"
-       about: "About"
+       about: "About iQvoc"
+       version: "Version"
        users: "Users"
        collections: "Collections"
        login: "Login"