iqvoc 4.5.2 → 4.6.0

data/app/models/services/reverse_match_service.rb

@@ -0,0 +1,25 @@
+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)
+      @host = host
+      @port = port
+    end
+
+    def build_job(type, origin, subject, match_class)
+      raise ArgumentError if type.empty? || origin.empty? || subject.empty? || match_class.empty?
+      referer = root_url(host: @host, port: @port)
+      object = rdf_url(origin, host: @host, port: @port)
+      match_classes = Iqvoc::Concept.reverse_match_class_names
+      match_class = match_classes[match_class]
+      ReverseMatchJob.new(type, match_class, subject, object, referer, origin)
+    end
+
+    def add(job)
+      Delayed::Job.enqueue(job, queue: 'reverse_matches')
+    end
+  end
+end

data/app/models/user.rb

@@ -1,49 +1,6 @@
-# encoding: UTF-8
+class User < AbstractUser
+  ROLES = ['reader', 'editor', 'publisher', 'administrator']
 
-# 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.
-
-class User < ActiveRecord::Base
-  ROLES = [
-    'reader', 'editor', 'publisher', 'administrator'
-  ]
-
-  validates_length_of :forename, :surname, within: 2..255
   validates_inclusion_of :role, in: ROLES
-  validates_presence_of :email
-  validates_uniqueness_of :email
-  # validates_format_of :email, with: /\A([^@\s]+)@((?:[-a-z0-9]+\.)+[a-z]{2,})\Z/i
-
-  acts_as_authentic do |config|
-    config.validate_email_field = false
-    config.maintain_sessions = false
-    config.crypto_provider = Authlogic::CryptoProviders::Sha512 # use authlogic's old crypto provider
-  end
-
-  def self.default_role
-    'reader'
-  end
-
-  def name
-    "#{forename} #{surname}"
-  end
-
-  def owns_role?(name)
-    self.role == name.to_s
-  end
-
-  def to_s
-    self.name.to_s
-  end
+  validates_length_of :forename, :surname, within: 2..255
 end

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

@@ -61,8 +61,13 @@
   <!-- / Concept relations -->
 
   <!-- Matches -->
-  <fieldset class="matches" data-datasets="<%= @datasets %>" data-remote-proxy-url="<%= alphabetical_concepts_path %>" data-translation-other="<%= t('txt.common.other') %>">
+  <fieldset <%= 'disabled' unless @concept.published_version.present? %> class="matches" data-datasets="<%= @datasets %>" data-remote-proxy-url="<%= alphabetical_concepts_path %>" data-translation-other="<%= t('txt.common.other') %>" data-no-results-msg="<%= t('txt.views.search_results.no_results') %>">
     <legend><%= Match::Base.model_name.human(:count => 2) %></legend>
+    <% unless @concept.published_version.present? %>
+      <%= alert :info do %>
+        <%= t('txt.views.concepts.disabled_matches_form_message') %>
+      <% end %>
+    <% end %>
     <% Iqvoc::Concept.match_classes.each do |match_class| %>
       <%= render match_class.edit_partial_name(concept), :owner_klass => concept, :assoc_klass => match_class, :f => f %>
     <% end %>

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

@@ -2,6 +2,9 @@
 <%= render 'concepts/sidebars/singular', :concept => @concept %>
 
 <% if @new_concept_version.blank? && can?(:branch, @concept) %>
+  <% if @jobs.any? %>
+    <%= render partial: 'partials/concept/reverse_match_notice', locals: {concept: @concept, jobs: @jobs} %>
+  <% end %>
     <div class="editing_versioning_toolbar well">
       <%= button_to t("txt.views.versioning.versioning_mode"),
         concept_versions_branch_path(:origin => @concept.origin), :class => "btn btn-default" %>

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

@@ -8,6 +8,10 @@
   <% end %>
 <% end %>
 
+<% if @jobs.any? %>
+  <%= render partial: 'partials/concept/reverse_match_notice', locals: {concept: @concept, jobs: @jobs} %>
+<% end %>
+
 <div class="editing_versioning_toolbar well">
   <% if (not @concept.locked?) || @concept.locked_by == @current_user.id %>
     <%= button_to t("txt.views.versioning.publishing"),

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

@@ -0,0 +1,25 @@
+<%# binding.pry %>
+<%= alert :warning, :header => t('txt.views.concepts.pending_jobs_header') + "." do %>
+  <%= t("txt.views.concepts.pending_jobs_message") %>
+  <ol>
+    <% jobs.each do |j| %>
+      <li>
+        <% if j[:type] == :remove_match %>
+          <%= t("txt.views.concepts.remove_match") %>
+        <% else %>
+          <%= t("txt.views.concepts.add_match") %>
+        <% end %>
+
+        <%= t("txt.views.concepts.job_detail",
+            match_class: j[:match_class],
+            subject: link_to(j[:subject], j[:subject], class: 'unlabeled'),
+            target: link_to(concept, concept_path(concept))
+          ).html_safe
+        %>
+        <% if j[:response_error] %>
+          <%= t("txt.views.concepts.job_state", state: j[:response_error]) %>
+        <% end %>
+      </li>
+    <% end %>
+  </ol>
+<% end %>

data/app/views/partials/concept/relation/_edit_base.html.erb

@@ -7,5 +7,7 @@
     :exclude_top_terms => klass != Iqvoc::Concept.broader_relation_class || nil),
     :"data-entity-uri" => concept_path("{id}"),
     :"data-singular" => klass.singular? || nil,
-    :"data-entities" => widget_entities(concept, klass) %>
+    :"data-entities" => widget_entities(concept, klass),
+    :'data-no-results-msg' => t('txt.views.search_results.no_results')
+     %>
 <% end %>

data/app/views/partials/concept/relation/_edit_ranked.html.erb

@@ -8,5 +8,7 @@
     :"data-entity-uri" => concept_path("{id}"),
     :"data-singular" => klass.singular? || nil,
     :"data-entities" => widget_entities_ranked(concept, klass),
-    :"data-qualified" => "rank" %>
+    :"data-qualified" => "rank",
+    :'data-no-results-msg' => t('txt.views.search_results.no_results')
+  %>
 <% end %>

data/app/views/partials/note/_search_result.html.erb

@@ -6,6 +6,6 @@
   <% end %>
   <dl class="search-result-meta">
     <dt class="search-result-key"><%= t('txt.views.search_results.type') %></dt>
-    <dd class="search-result-value"><%= result.class.model_name.human %></dd>
+    <dd class="search-result-value"><%= result.model_name.human %></dd>
   </dl>
 </li>

data/config/locales/de.yml

@@ -45,6 +45,7 @@ de:
   txt:
    common:
      iqvoc_title: "iQvoc Vocabulary Management System"
+     concept: "Konzept"
      pref_label: "Bevorzugtes Label"
      edit: "Bearbeiten"
      value: "Wert"
@@ -126,6 +127,13 @@ de:
        new: "Neues %{concept_class_name}"
        pref_label: "Bevorzugtes Label"
        classifiers: "Umweltklassen"
+       pending_jobs_header: "Austehende Jobs"
+       pending_jobs_message: "Zu diesem Konzept existieren noch austehende Jobs."
+       disabled_matches_form_message: "Matches können erst nach Veröffentlichung eines Konzepts angelegt werden."
+       add_match: "Anlage:"
+       remove_match: "Löschung:"
+       job_detail: "%{match_class}-Beziehung von Konzept %{subject} aus entfernter Ontologie auf %{target} austehend."
+       job_state: "(Status: %{state})"
      labels:
        new: "Neues Label"
        template_form: "Vorlageform"

data/config/locales/en.yml

@@ -45,6 +45,7 @@ en:
   txt:
    common:
      iqvoc_title: "iQvoc Vocabulary Management System"
+     concept: "Concept"
      pref_label: "Preferred label"
      edit: "Edit"
      value: "Value"
@@ -128,6 +129,13 @@ en:
        pref_label: "PrefLabel"
        close_match: "CloseMatch"
        classifiers: "Environment classes"
+       pending_jobs_header: "Pending jobs"
+       pending_jobs_message: "There are pending jobs for this concept."
+       disabled_matches_form_message: "A concept have to be published before you can assign mapping properties."
+       add_match: "Creation:"
+       remove_match: "Deletion:"
+       job_detail: "%{match_class}-Relation of concept %{subject} from remote ontology to %{target} pending."
+       job_state: "(State: %{state})"
      labels:
        new: "New Label"
        template_form: "Literal form"

data/config/routes.rb

@@ -52,7 +52,7 @@ Rails.application.routes.draw do
     post 'concepts/:origin/to_review'   => 'concepts/versions#to_review', as: 'concept_versions_to_review'
     get 'concepts/:origin/consistency_check' => 'concepts/versions#consistency_check', as: 'concept_versions_consistency_check'
 
-    patch 'concepts/:origin/move'       => 'concepts#move', as: 'move_concept'
+    patch 'concepts/:origin/move'        => 'concepts#move',               as: 'move_concept'
 
     post 'collections/:origin/branch'      => 'collections/versions#branch',    as: 'collection_versions_branch'
     post 'collections/:origin/merge'       => 'collections/versions#merge',     as: 'collection_versions_merge'
@@ -80,6 +80,9 @@ Rails.application.routes.draw do
     # root to: 'frontpage#index', format: nil
   end
 
+  patch ':origin/add_match' => 'reverse_matches#add_match', as: 'add_match'
+  patch ':origin/remove_match' => 'reverse_matches#remove_match', as: 'remove_match'
+
   get 'remote_labels' => 'remote_labels#show', as: 'remote_label'
   get 'schema' => redirect('/'), as: 'schema'
   get 'dataset' => 'rdf#dataset', as: 'rdf_dataset'

data/db/migrate/20140730132113_add_type_to_users.rb

@@ -0,0 +1,5 @@
+class AddTypeToUsers < ActiveRecord::Migration
+  def change
+    add_column :users, :type, :string
+  end
+end

data/db/migrate/20140807072457_create_job_relations.rb

@@ -0,0 +1,11 @@
+class CreateJobRelations < ActiveRecord::Migration
+  def change
+    create_table :job_relations do |t|
+      t.string :type
+      t.string :owner_reference
+      t.string :job_id
+
+      t.timestamps
+    end
+  end
+end

data/db/migrate/20140807123413_add_response_error_to_job_relation.rb

@@ -0,0 +1,5 @@
+class AddResponseErrorToJobRelation < ActiveRecord::Migration
+  def change
+    add_column :job_relations, :response_error, :string
+  end
+end

data/iqvoc.gemspec

@@ -23,6 +23,7 @@ Gem::Specification.new do |s|
   s.add_dependency 'json'
   s.add_dependency 'rails_autolink'
   s.add_dependency 'faraday'
+  s.add_dependency 'faraday_middleware'
   s.add_dependency 'sass-rails', '~> 4.0.2'
   s.add_dependency 'bootstrap-sass', '~> 3.1.1.0'
   s.add_dependency 'bootstrap_form', '~> 2.1.1'

data/lib/iqvoc/ability.rb

@@ -24,6 +24,14 @@ module Iqvoc
           can :branch, [::Concept::Base, ::Collection::Base, ::Label::Base], &@@if_published
         end
 
+        if user.owns_role?(:match_editor)
+          can :read, ::Concept::Base
+          can :create, ::Concept::Base
+          can [:update, :lock], ::Concept::Base, locked_by: user.id, published_at: nil
+          can :lock, ::Concept::Base, locked_by: nil, published_at: nil
+          can :branch, ::Concept::Base, &@@if_published
+        end
+
         if user.owns_role?(:publisher) || user.owns_role?(:administrator) # Publishers and above ...
           can :merge, [::Concept::Base, ::Collection::Base, ::Label::Base], published_at: nil
         end

data/lib/iqvoc/configuration/concept.rb

@@ -127,6 +127,13 @@ module Iqvoc
           match_class_names.map(&:constantize)
         end
 
+        def reverse_match_class_names
+          match_class_names.inject({}) do |result, element|
+             result[element] = element.parameterize.underscore
+             result
+          end
+        end
+
         def notation_classes
           notation_class_names.map(&:constantize)
         end

data/lib/iqvoc/version.rb

@@ -15,5 +15,5 @@
 # limitations under the License.
 
 module Iqvoc
-  VERSION = "4.5.2"
+  VERSION = "4.6.0"
 end

data/lib/tasks/matches.rake

@@ -0,0 +1,51 @@
+namespace :iqvoc do
+  namespace :matches do
+    stdout_logger = Logger.new(STDOUT)
+    stdout_logger.level = Logger::INFO
+
+    desc 'Create reverse matches jobs for already known matches'
+    task :create_jobs => :environment do
+      raise "You have to specify the host of the current iqvoc instance. Example: rake iqvoc:matches:create_jobs HOST='http://try.iqvoc.com' PORT='80'" unless ENV['HOST']
+      raise "You have to specify the host of the current iqvoc instance. Example: rake iqvoc:matches:create_jobs HOST='http://try.iqvoc.com' PORT='80'" unless ENV['PORT']
+
+      raise "Error: there are pending reverse match jobs. Clear or process them before." if Delayed::Job.where(queue: 'reverse_matches').any?
+
+      iqvoc_sources = Iqvoc.config['sources.iqvoc'].map { |s| URI.parse(s) }
+      host = ENV['HOST']
+      port = ENV['PORT'].to_i
+
+      reverse_match_service = Services::ReverseMatchService.new(host, port)
+
+      Match::Base.includes(:concept).find_each do |m|
+        target_base_uri = base_uri(m.value)
+
+        # create jobs if target_base_uri is in iqvoc_sources
+        if iqvoc_sources.include?(target_base_uri)
+          job = reverse_match_service.build_job(:add_match, m.concept.origin, m.value, m.type)
+          reverse_match_service.add(job)
+
+          stdout_logger.info "Create #{job.match_class}-job: #{job.subject} => #{job.object}"
+        else
+          stdout_logger.info "#{m.value}: is not a known iQvoc source"
+        end
+      end
+    end
+
+    desc 'Delete all reverse matches jobs and job relations'
+    task :delete_jobs => :environment do
+      JobRelation.find_each do |jr|
+        jr.job.destroy!
+        jr.destroy!
+      end
+      stdout_logger.info "Cleared Jobs and JobRelations"
+    end
+
+    private
+
+    def base_uri(url_string)
+      target_uri = URI.parse(url_string)
+      base_uri = URI.parse("#{target_uri.scheme}://#{target_uri.host}:#{target_uri.port}")
+    end
+
+  end
+end

data/test/controllers/concept_movement_test.rb

@@ -27,7 +27,7 @@ class ConceptMovementTest < ActionController::TestCase
     @admin = User.create! do |u|
       u.forename = 'Test'
       u.surname = 'User'
-      u.email = 'testuser@iqvoc.local'
+      u.email = 'admin@iqvoc'
       u.password = 'omgomgomg'
       u.password_confirmation = 'omgomgomg'
       u.role = 'administrator'

data/test/controllers/reverse_match_test.rb

@@ -0,0 +1,146 @@
+# 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.join(File.expand_path(File.dirname(__FILE__)), '../test_helper')
+
+class ReverseMatchTest < ActionController::TestCase
+
+  setup do
+    @controller = ReverseMatchesController.new
+
+    @admin = User.create! do |u|
+      u.forename = 'Test'
+      u.surname = 'User'
+      u.email = 'admin@iqvoc'
+      u.password = 'omgomgomg'
+      u.password_confirmation = 'omgomgomg'
+      u.role = 'administrator'
+      u.active = true
+    end
+
+    Iqvoc.config['sources.iqvoc'] = ['http://try.iqvoc.net']
+
+    @achievement_hobbies = Concept::SKOS::Base.new.tap do |c|
+      Iqvoc::RDFAPI.devour c, 'skos:prefLabel', '"Achievement hobbies"@en'
+      c.publish
+      c.save
+    end
+
+    @airsoft = Concept::SKOS::Base.new.tap do |c|
+      Iqvoc::RDFAPI.devour c, 'skos:prefLabel', '"Airsoft"@en'
+      c.publish
+      c.save
+      new_version = c.branch @admin
+      new_version.save
+    end
+
+    @request.env['HTTP_ACCEPT'] = 'application/json'
+    @request.env['HTTP_REFERER'] = 'http://try.iqvoc.net'
+  end
+
+  teardown do
+    Iqvoc.config['sources.iqvoc'] = []
+  end
+
+  test 'remove non existing match' do
+    m = Match::SKOS::NarrowMatch.create concept_id: @achievement_hobbies.id, value: 'http://iqvoc.net'
+    patch :remove_match,
+          origin: @achievement_hobbies.origin,
+          match_class: 'match_skos_relatedmatch',
+          uri: 'http://iqvoc.net'
+    assert_response 400
+    body = JSON.parse response.body
+    assert_equal body['type'], "unknown_relation"
+  end
+
+  test 'remove match' do
+    m = Match::SKOS::NarrowMatch.create concept_id: @achievement_hobbies.id, value: 'http://iqvoc.net'
+    patch :remove_match,
+          origin: @achievement_hobbies.origin,
+          match_class: 'match_skos_broadmatch',
+          uri: 'http://iqvoc.net'
+    assert_response 200
+    body = JSON.parse response.body
+    assert_equal body['type'], 'mapping_removed'
+
+    new_concept_version = Iqvoc::Concept.base_class.by_origin(@achievement_hobbies.origin).last
+    assert_equal 2, new_concept_version.rev
+  end
+
+  test 'add match' do
+    patch :add_match,
+          origin: @achievement_hobbies.origin,
+          match_class: 'match_skos_broadmatch',
+          uri: 'http://google.de'
+    assert_response 200
+    body = JSON.parse response.body
+    assert_equal body['type'], 'mapping_added'
+
+    new_concept_version = Iqvoc::Concept.base_class.by_origin(@achievement_hobbies.origin).last
+    assert_equal 2, new_concept_version.rev
+  end
+
+  test 'no referer' do
+    @request.env['HTTP_REFERER'] = nil
+    patch :add_match,
+          origin: @achievement_hobbies.origin,
+          match_class: 'match_skos_broadmatch',
+          uri: 'http://google.de'
+    assert_response 400
+    body = JSON.parse response.body
+    assert_equal body['type'], "no_referer"
+  end
+
+  test 'unknown match class' do
+    patch :add_match,
+          origin: @achievement_hobbies.origin,
+          match_class: 'UnknownMatch',
+          uri: 'http://google.de'
+    assert_response 400
+    body = JSON.parse response.body
+    assert_equal body['type'], "unknown_match"
+  end
+
+  test 'unknown referer' do
+    @request.env['HTTP_REFERER'] = 'http://iqvoc.net'
+    patch :add_match,
+          origin: @achievement_hobbies.origin,
+          match_class: 'match_skos_broadmatch',
+          uri: 'http://iqvoc.net'
+    assert_response 403
+    body = JSON.parse response.body
+    assert_equal body['type'], "unknown_referer"
+  end
+
+  test 'concept with a version' do
+    patch :add_match,
+          origin: @airsoft.origin,
+          match_class: 'match_skos_broadmatch',
+          uri: 'http://iqvoc.net'
+    assert_response 403
+    body = JSON.parse response.body
+    assert_equal body['type'], "in_processing"
+  end
+
+  test 'missing parameter' do
+    patch :add_match,
+          origin: @achievement_hobbies.origin,
+          uri: 'http://google.de'
+    assert_response 400
+    body = JSON.parse response.body
+    assert_equal body['type'], "parameter_missing"
+  end
+end