iqvoc 4.10.0 → 4.11.0

data/app/assets/javascripts/iqvoc/onebox.js.erb

@@ -14,7 +14,7 @@ function OneBox(container) {
       appendTo(this.container).hide();
 
   this.form.on("submit", $.proxy(this, "onSubmit"));
-  this.input.on("keyup", debounce($.proxy(this, "onInput"), 300));
+  this.input.on("keyup", IQVOC.debounce($.proxy(this, "onInput"), 300));
 }
 OneBox.prototype.reset = function() {
   this.container.children().not(this.form).not(this.indicator).remove();
@@ -59,20 +59,4 @@ return function(selector) {
   return new OneBox(selector); // XXX: returning an instance of a private class seems weird
 };
 
-function debounce(fn, delay) { // TODO: move elsewhere
-  var timer;
-  return function() {
-    var self = this;
-    var args = arguments;
-    if(timer) {
-      clearTimeout(timer);
-      timer = null;
-    }
-    timer = setTimeout(function() {
-      fn.apply(self, args);
-      timer = null;
-    }, delay);
-  };
-}
-
 }(jQuery));

data/app/controllers/concepts/alphabetical_controller.rb

@@ -24,7 +24,9 @@ class Concepts::AlphabeticalController < ConceptsController
 
     redirect_to(url_for prefix: 'a') unless params[:prefix]
 
-    datasets = init_datasets
+    # only initilaize dataset if dataset param is set
+    # prevent obsolet http request when using matches widget
+    datasets = params[:dataset] ? init_datasets : []
 
     @letters = Label::Base.select("DISTINCT UPPER(SUBSTR(value, 1, 1)) AS letter")
                           .order("letter").map(&:letter)

data/app/controllers/concepts_controller.rb

@@ -15,6 +15,7 @@
 # limitations under the License.
 
 require 'concerns/dataset_initialization'
+require 'reverse_match_job'
 
 class ConceptsController < ApplicationController
   include DatasetInitialization
@@ -25,7 +26,7 @@ class ConceptsController < ApplicationController
     respond_to do |format|
       format.json do # Search for widget
         scope = Iqvoc::Concept.base_class.editor_selectable.with_pref_labels.
-            merge(Label::Base.by_query_value("#{params[:query]}%"))
+            merge(Label::Base.by_query_value("%#{params[:query]}%"))
         scope = scope.where(top_term: false) if params[:exclude_top_terms]
         @concepts = scope.all.map { |concept| concept_widget_data(concept) }
         render json: @concepts
@@ -119,6 +120,16 @@ class ConceptsController < ApplicationController
 
     @concept = Iqvoc::Concept.base_class.new
 
+    # initial created-ChangeNote creation
+    @concept.send(Iqvoc::change_note_class_name.to_relation_name).new do |change_note|
+      change_note.value = I18n.t('txt.views.versioning.initial_version')
+      change_note.language = I18n.locale.to_s
+      change_note.annotations_attributes = [
+        { namespace: 'dct', predicate: 'creator', value: current_user.name },
+        { namespace: 'dct', predicate: 'created', value: DateTime.now.to_s }
+      ]
+    end
+
     Iqvoc::Concept.note_class_names.each do |note_class_name|
       @concept.send(note_class_name.to_relation_name).build if @concept.send(note_class_name.to_relation_name).empty?
     end
@@ -132,7 +143,7 @@ class ConceptsController < ApplicationController
     authorize! :create, Iqvoc::Concept.base_class
 
     @concept = Iqvoc::Concept.base_class.new
-    @concept.reverse_match_service = Services::ReverseMatchService.new(request.host, request.port)
+    @concept.reverse_match_service = Services::ReverseMatchService.new(request.host, request.protocol)
     @concept.assign_attributes(concept_params)
     @datasets = datasets_as_json
 
@@ -170,7 +181,7 @@ class ConceptsController < ApplicationController
   def update
     @concept = Iqvoc::Concept.base_class.by_origin(params[:id]).unpublished.last!
     authorize! :update, @concept
-    @concept.reverse_match_service = Services::ReverseMatchService.new(request.host, request.port)
+    @concept.reverse_match_service = Services::ReverseMatchService.new(request.host, request.protocol)
 
     @datasets = datasets_as_json
 

data/app/controllers/dashboard_controller.rb

@@ -28,8 +28,8 @@ class DashboardController < ApplicationController
     if ['class', 'locking_user', 'follow_up', 'updated_at', 'state'].include?(params[:by])
       @items.sort! do |x, y|
         xval, yval = x.send(params[:by]), y.send(params[:by])
-        xval = xval.to_s.downcase unless xval.is_a?(Date)
-        yval = yval.to_s.downcase unless yval.is_a?(Date)
+        xval = xval.to_s.downcase
+        yval = yval.to_s.downcase
         (xval <=> yval) * factor
       end
     else

data/app/controllers/rdf_controller.rb

@@ -51,8 +51,11 @@ class RdfController < ApplicationController
   end
 
   def dataset
-    respond_to do |format|
-      format.any(:rdf, :ttl, :nt)
+    @title = Iqvoc.config['title']
+    if stale?(etag: @title)
+      respond_to do |format|
+        format.any(:rdf, :ttl, :nt)
+      end
     end
   end
 end

data/app/controllers/reverse_matches_controller.rb

@@ -4,33 +4,36 @@ class ReverseMatchesController < ApplicationController
   skip_before_action :verify_authenticity_token
 
   def add_match
-    begin
-      # NOTE: currently it's only allowed to add matches to published concepts
-      # which are _NOT_ in processing. See older commits how to work with
-      # currently edited concepts
-      matches = @target_match_class.constantize.find_by(concept_id: @published_concept.id, value: @uri)
-      render_response :mapping_exists and return if matches
-      unpublished_concept = @published_concept.branch(@botuser)
-      unpublished_concept.save
-      @target_match_class.constantize.create(concept_id: unpublished_concept.id, value: @uri)
+    # NOTE: currently it's only allowed to add matches to published concepts
+    # which are _NOT_ in processing. See older commits how to work with
+    # currently edited concepts
+    matches = @target_match_class.constantize.find_by(concept_id: @published_concept.id, value: @uri)
+    render_response :mapping_exists and return if matches
+    unpublished_concept = @published_concept.branch(@botuser)
+    unpublished_concept.save!
+    @target_match_class.constantize.create(concept_id: unpublished_concept.id, value: @uri)
+    ActiveRecord::Base.transaction do
+      unpublished_concept.unlock
       unpublished_concept.publish!
-    rescue
-      render_response :server_error and return
+      @published_concept.destroy!
     end
 
     render_response :mapping_added
   end
 
   def remove_match
-    begin
-      unpublished_concept = @published_concept.branch(@botuser)
-      unpublished_concept.save
-      match = @target_match_class.constantize.find_by(concept_id: unpublished_concept.id, value: @uri)
-      render_response :unknown_relation and return if match.nil?
-      match.destroy
+    unpublished_concept = @published_concept.branch(@botuser)
+    unpublished_concept.save!
+    match = @target_match_class.constantize.find_by(concept_id: unpublished_concept.id, value: @uri)
+    if match.nil?
+      Rails.logger.info "Could not remove reverse match - match_class: #{@klass}, target_match_class: #{@target_match_class}, unpublished_concept.id: #{unpublished_concept.id}"
+      render_response :unknown_relation and return
+    end
+    ActiveRecord::Base.transaction do
+      match.destroy!
+      unpublished_concept.unlock
       unpublished_concept.publish!
-    rescue
-      render_response :server_error and return
+      @published_concept.destroy!
     end
 
     render_response :mapping_removed
@@ -49,15 +52,18 @@ class ReverseMatchesController < ApplicationController
 
     match_classes = Iqvoc::Concept.reverse_match_class_names
     render_response :unknown_match and return if match_classes.values.exclude? match_class
-    klass = match_classes.key(match_class)
-    @target_match_class = klass.constantize.reverse_match_class_name
+    @klass = match_classes.key(match_class)
+    @target_match_class = @klass.constantize.reverse_match_class_name
     render_response :unknown_match and return if @target_match_class.nil?
 
     iqvoc_sources = Iqvoc.config['sources.iqvoc'].map{ |s| URI.parse(s) }
     render_response :no_referer and return if request.referer.nil?
-    referer = URI.parse(request.referer)
+    referer = URI.parse(request.referer).to_s
 
-    render_response :unknown_referer and return if iqvoc_sources.exclude? referer
+    unless iqvoc_sources.detect {|url| referer.starts_with?(url.to_s) }
+      Rails.logger.info "Could not create reverse match - unknown referer: #{referer}"
+      render_response :unknown_referer and return
+    end
 
     @botuser = BotUser.instance
     @published_concept = Iqvoc::Concept.base_class.by_origin(origin).published.last

data/app/exceptions/matched_concept_unpublished.rb

@@ -0,0 +1,7 @@
+class MatchedConceptUnpublished < ArgumentError
+  attr_reader :original
+  def initialize(msg, original = $!)
+    super(msg)
+    @original = original;
+  end
+end

data/app/jobs/reverse_match_job.rb

@@ -7,7 +7,9 @@ class ReverseMatchJob < Struct.new(:type, :concept,  :match_class, :subject, :ob
   end
 
   def perform
-    raise 'concept_not_published_yet' if concept.unpublished?
+    if concept.unpublished?
+      raise MatchedConceptUnpublished, "concept_not_published_yet"
+    end
 
     conn = connection(subject, { accept: 'application/json' })
     response = conn.get

data/app/models/collection/base.rb

@@ -75,11 +75,11 @@ class Collection::Base < Concept::Base
   end
 
   def subcollections
-    members.map(&:target).select { |m| m.is_a?(::Collection::Base) }
+    members.map(&:target).compact.select { |m| m.is_a?(::Collection::Base) }
   end
 
   def concepts
-    members.map(&:target).reject { |m| m.is_a?(::Collection::Base) }
+    members.map(&:target).compact.reject { |m| m.is_a?(::Collection::Base) }
   end
 
   def additional_info

data/app/models/concept/base.rb

@@ -112,22 +112,18 @@ class Concept::Base < ActiveRecord::Base
     end
 
     # Process assigned collections
-    if (@assigned_collection_origins ||= {}).any?
-      # Destroy assigned collections
-      existing_collection_origins = concept.collections.map(&:origin).uniq
-      existing_collection_origins.each do |origin|
-        collection = Iqvoc::Collection.base_class.by_origin(origin).published.first
-        relation = Iqvoc::Collection.member_class.find_by(collection: collection, target: concept)
-        relation.destroy! if relation
-      end
-
-      # Rebuild collection relations
-      @assigned_collection_origins.each do |origin|
-        collection = Iqvoc::Collection.base_class.by_origin(origin).published.first
-        if collection
-          Iqvoc::Collection.member_class.create! do |m|
-            m.collection = collection
-            m.target = concept
+    if @assigned_collection_origins
+      transaction do
+        collections.destroy_all
+
+        # Rebuild collection relations
+        @assigned_collection_origins.each do |origin|
+          collection = Iqvoc::Collection.base_class.by_origin(origin).published.first
+          if collection
+            Iqvoc::Collection.member_class.create! do |m|
+              m.collection = collection
+              m.target = concept
+            end
           end
         end
       end

data/app/models/concept/validations.rb

@@ -56,7 +56,9 @@ module Concept
         lang = pref_label.language.to_s
         origin = (pref_label.origin || pref_label.id || pref_label.value).to_s
         if (languages.keys.include?(lang) && languages[lang] != origin)
+          # there are at least two pref labels for one specific language
           errors.add :pref_labelings, I18n.t('txt.models.concept.pref_labels_with_same_languages_error')
+          break
         end
         languages[lang] = origin
       end

data/app/models/dataset/adaptors/iqvoc/alphabetical_search_adaptor.rb

@@ -13,8 +13,7 @@ class Dataset::Adaptors::Iqvoc::AlphabeticalSearchAdaptor < Dataset::Adaptors::I
         fetch_results(more[:href], {})
       end
     rescue Faraday::Error::ConnectionFailed,
-      Faraday::Error::ResourceNotFound,
-      Faraday::Error::TimeoutError => e
+      Faraday::Error::ResourceNotFound => e
         Rails.logger.warn("HTTP error while querying remote source #{url}: #{e.message}")
         return nil
     end
@@ -29,7 +28,8 @@ class Dataset::Adaptors::Iqvoc::AlphabeticalSearchAdaptor < Dataset::Adaptors::I
 
       options = {
         definition: element.at_css('.concept-item-definition').try(:content),
-        definition_language: element.at_css('.concept-item-definition').try(:[], :lang)
+        definition_language: element.at_css('.concept-item-definition').try(:[], :lang),
+        additional_info: element.at_css('.additional_info').try(:content)
       }
 
       result = AlphabeticalSearchResultRemote.new(url, path, label, options)

data/app/models/dataset/adaptors/iqvoc/http_adaptor.rb

@@ -1,11 +1,12 @@
 require 'faraday'
 
 class Dataset::Adaptors::Iqvoc::HTTPAdaptor
+  DEFAULT_TIMEOUT = 5.freeze
   attr_reader :url
 
   def initialize(url)
     @url = url
-    @conn = Faraday.new(url: url) do |conn|
+    @conn = Faraday.new(url: url, request: { timeout: DEFAULT_TIMEOUT }) do |conn|
       #conn.use Faraday::Response::Logger if Rails.env.development?
       conn.adapter Faraday.default_adapter
     end
@@ -15,8 +16,7 @@ class Dataset::Adaptors::Iqvoc::HTTPAdaptor
     begin
       response = @conn.get(path)
     rescue Faraday::Error::ConnectionFailed,
-        Faraday::Error::ResourceNotFound,
-        Faraday::Error::TimeoutError => e
+        Faraday::Error::ResourceNotFound => e
       return failed_request(path)
     end
 

data/app/models/dataset/adaptors/iqvoc/search_adaptor.rb

@@ -25,8 +25,7 @@ class Dataset::Adaptors::Iqvoc::SearchAdaptor < Dataset::Adaptors::Iqvoc::HTTPAd
         fetch_results(more[:href], {})
       end
     rescue Faraday::Error::ConnectionFailed,
-      Faraday::Error::ResourceNotFound,
-      Faraday::Error::TimeoutError => e
+      Faraday::Error::ResourceNotFound => e
         Rails.logger.warn("HTTP error while querying remote source #{path}: #{e.message}")
         return nil
     end

data/app/models/dataset/iqvoc_dataset.rb

@@ -1,11 +1,19 @@
 require 'linkeddata'
+require 'timeout'
 
 class Dataset::IqvocDataset
+  DEFAULT_TIMEOUT = 5.freeze
+
   attr_reader :name, :url
 
   def initialize(url)
     @url = URI.parse(url)
-    @repository = RDF::Repository.load(URI.join(url, 'dataset.rdf').to_s) rescue nil
+    dataset_url = URI.join(@url.to_s + '/', 'dataset.rdf')
+
+    @repository = Timeout::timeout(DEFAULT_TIMEOUT) do
+      RDF::Repository.load(dataset_url)
+    end
+
     @name = fetch_name
   end
 
@@ -27,13 +35,15 @@ class Dataset::IqvocDataset
 
   private
   def fetch_name
-    return 'unknown' if @repository.nil?
+    return @url.to_s if @repository.nil?
 
     void = RDF::Vocabulary.new('http://rdfs.org/ns/void#')
     query = RDF::Query.new({ dataset: { RDF.type => void.Dataset, RDF::DC.title => :title } })
-    results = query.execute(@repository)
+    results = Timeout::timeout(DEFAULT_TIMEOUT) do
+      query.execute(@repository)
+    end
 
-    return 'unknown' if results.empty?
+    return @url.to_s if results.nil? || results.empty?
     results.map { |solution| solution.title.to_s }.first
   end
 end

data/app/models/match/base.rb

@@ -52,4 +52,8 @@ class Match::Base < ActiveRecord::Base
   def self.edit_partial_name(obj)
     'partials/match/edit_base'
   end
+
+  def self.reverse_match_class_name
+    nil
+  end
 end

data/app/models/services/reverse_match_service.rb

@@ -2,17 +2,17 @@ module Services
   class ReverseMatchService
     include Rails.application.routes.url_helpers
 
-    def initialize(host, port)
-      raise ArgumentError if host.empty?
-      raise ArgumentError unless port.is_a?(Integer)
+    def initialize(host, protocol)
+      raise ArgumentError if host.blank?
+      raise ArgumentError if protocol.blank?
       @host = host
-      @port = port
+      @protocol = protocol
     end
 
     def build_job(type, concept, subject, match_class)
-      raise ArgumentError if type.empty? || concept.nil? || subject.empty? || match_class.empty?
-      referer = root_url(host: @host, port: @port)
-      object = rdf_url(concept.origin, host: @host, port: @port)
+      raise ArgumentError if type.empty? || concept.nil? || subject.blank? || match_class.blank?
+      referer = root_url(host: @host, protocol: @protocol)
+      object = rdf_url(concept.origin, host: @host, protocol: @protocol)
       match_classes = Iqvoc::Concept.reverse_match_class_names
       match_class = match_classes[match_class]
       ReverseMatchJob.new(type, concept, match_class, subject, object, referer)

data/app/presenters/alphabetical_search_result_remote.rb

@@ -5,10 +5,15 @@ class AlphabeticalSearchResultRemote < AlphabeticalSearchResult
     @label = label
     @definition = options[:definition]
     @definition_language = options[:definition_language]
+    @additional_info = options[:additional_info]
   end
 
   def label
-    @label
+    if @additional_info.present?
+      "#{@label} #{@additional_info}"
+    else
+      @label
+    end
   end
 
   def path

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

@@ -47,25 +47,29 @@
 
   <!-- Notes -->
   <% Iqvoc::Concept.note_classes.each do |note_class| %>
-    <%= render note_class.edit_partial_name(concept), :owner_klass => concept, :assoc_klass => note_class, :f => f %>
+    <% unless note_class.edit_partial_name(concept).nil? %>
+      <%= render note_class.edit_partial_name(concept), :owner_klass => concept, :assoc_klass => note_class, :f => f %>
+    <% end %>
   <% end %>
   <!-- / Notes -->
 
   <!-- Concept relations -->
   <fieldset>
     <legend><%= Concept::Relation::Base.model_name.human(:count => 2) %></legend>
-    <%- if Iqvoc::Concept.broader_relation_class.narrower_editable -%>
-      <%= render Iqvoc::Concept.broader_relation_class.narrower_class.edit_partial_name(concept),
-        :concept => concept, :klass => Iqvoc::Concept.broader_relation_class.narrower_class, :f => f %>
-    <%- end -%>
+    <% unless Iqvoc::Concept.broader_relation_class.edit_partial_name(concept).nil? %>
+      <%- if Iqvoc::Concept.broader_relation_class.narrower_editable -%>
+        <%= render Iqvoc::Concept.broader_relation_class.narrower_class.edit_partial_name(concept),
+          :concept => concept, :klass => Iqvoc::Concept.broader_relation_class.narrower_class, :f => f %>
+      <%- end -%>
 
-    <%= f.form_group :top_term do %>
-      <%= f.check_box :top_term,
-        :class => ("exclusive" if Iqvoc::Concept.broader_relation_class.singular?) %>
-    <% end %>
+      <%= f.form_group :top_term do %>
+        <%= f.check_box :top_term,
+          :class => ("exclusive" if Iqvoc::Concept.broader_relation_class.singular?) %>
+      <% end %>
 
-    <%= render Iqvoc::Concept.broader_relation_class.edit_partial_name(concept),
-      :concept => concept, :klass => Iqvoc::Concept.broader_relation_class, :f => f %>
+      <%= render Iqvoc::Concept.broader_relation_class.edit_partial_name(concept),
+        :concept => concept, :klass => Iqvoc::Concept.broader_relation_class, :f => f %>
+    <% end %>
 
     <%- Iqvoc::Concept.further_relation_classes.each do |relation_class| -%>
       <%= render relation_class.edit_partial_name(concept),