iqvoc 4.10.0 → 4.11.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e1475e23fc06bf41a94bb3ceda90957f083638e0
-  data.tar.gz: f1974964f991cb31e0e4b78bd89a842fd9e2ec70
+  metadata.gz: 143155042a4ee4fd4b764ea25a0edd6c5c17ba5f
+  data.tar.gz: 26ec5fff04dd0df5036b5fb58bc8faa04b9e89ba
 SHA512:
-  metadata.gz: 161ed636284243cd11817ef5dd04e11745572b726b394f55956a7eed52307358cbe401fd7ce6bfdc7b6a87b39a436867cf59f19a7ea16badd2088686cc9f573f
-  data.tar.gz: cfa95b56a8f5c3509b2c2bf1cfa4ffdca881f9582dfb0d3b796ba6f3aee3dd4929c70680efe7426cd5a6aad3333e5f5502f4c49e45bf062f015e10cb31e6037b
+  metadata.gz: 85cd36d2c1f28d17c208a565c5177fabe8dd25b553162b90a8127bd66a2b16f55d4bb72870f65977834025d5f2d81ad753691b4ce6761f7e1860bde104b7d5fc
+  data.tar.gz: bf28fee39986a75999a53631ef9d781d86ad73955300bb1ecf14e51b5bbfdec7be4c7134ba1cd780a8a59399792b0c650731c7634041a520cd35bd75bac0369e

data/CHANGELOG.md

@@ -1,3 +1,11 @@
+## [4.11.0]
+
+  * Added: render additional concept info in remote alphabetical search results (federated concept mapper)
+  * Fixed: duplicate concept collection assignment bug
+  * Fixed: optimize label search in concept creation/editing (contains)
+  * Fixed: some things related to reverse-matches mirroring
+  * Fixed: initial created change note creation
+
 ## [4.10.0]
 
   * Fixed: several bugs (i18n, sorting)

data/Gemfile

@@ -19,7 +19,7 @@ source 'https://rubygems.org'
 # TODO: The following dependencies could be included by the "gemspec" command.
 # There is only one problem: gemspec puts the dependencies automatically to a
 # group (:development by default). This is not what we need.
-gem 'rails', '~> 4.2.4'
+gem 'rails', '~> 4.2.8'
 gem 'kaminari'
 gem 'kaminari-bootstrap', '~> 3.0.1'
 gem 'authlogic', '~> 3.4.2'
@@ -39,9 +39,9 @@ gem 'font-awesome-rails', '~> 4.3.0'
 gem 'apipie-rails', '~> 0.3.5'
 gem 'maruku', require: false
 gem 'database_cleaner'
-gem 'delayed_job_active_record', '~> 4.0.1'
+gem 'delayed_job_active_record', '~> 4.1.1'
 gem 'carrierwave'
-gem 'autoprefixer-rails', '~> 5.1.8'
+gem 'autoprefixer-rails', '~> 6.5.1.1'
 
 # database adapters
 # comment out those you do don't need or use a different Gemfile

data/Gemfile.lock

@@ -1,34 +1,34 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    actionmailer (4.2.4)
-      actionpack (= 4.2.4)
-      actionview (= 4.2.4)
-      activejob (= 4.2.4)
+    actionmailer (4.2.8)
+      actionpack (= 4.2.8)
+      actionview (= 4.2.8)
+      activejob (= 4.2.8)
       mail (~> 2.5, >= 2.5.4)
       rails-dom-testing (~> 1.0, >= 1.0.5)
-    actionpack (4.2.4)
-      actionview (= 4.2.4)
-      activesupport (= 4.2.4)
+    actionpack (4.2.8)
+      actionview (= 4.2.8)
+      activesupport (= 4.2.8)
       rack (~> 1.6)
       rack-test (~> 0.6.2)
       rails-dom-testing (~> 1.0, >= 1.0.5)
       rails-html-sanitizer (~> 1.0, >= 1.0.2)
-    actionview (4.2.4)
-      activesupport (= 4.2.4)
+    actionview (4.2.8)
+      activesupport (= 4.2.8)
       builder (~> 3.1)
       erubis (~> 2.7.0)
       rails-dom-testing (~> 1.0, >= 1.0.5)
-      rails-html-sanitizer (~> 1.0, >= 1.0.2)
-    activejob (4.2.4)
-      activesupport (= 4.2.4)
+      rails-html-sanitizer (~> 1.0, >= 1.0.3)
+    activejob (4.2.8)
+      activesupport (= 4.2.8)
       globalid (>= 0.3.0)
-    activemodel (4.2.4)
-      activesupport (= 4.2.4)
+    activemodel (4.2.8)
+      activesupport (= 4.2.8)
       builder (~> 3.1)
-    activerecord (4.2.4)
-      activemodel (= 4.2.4)
-      activesupport (= 4.2.4)
+    activerecord (4.2.8)
+      activemodel (= 4.2.8)
+      activesupport (= 4.2.8)
       arel (~> 6.0)
     activerecord-jdbc-adapter (1.3.14)
       activerecord (>= 2.2)
@@ -41,29 +41,27 @@ GEM
     activerecord-jdbcsqlite3-adapter (1.3.14)
       activerecord-jdbc-adapter (~> 1.3.14)
       jdbc-sqlite3 (>= 3.7.2, < 3.9)
-    activesupport (4.2.4)
+    activesupport (4.2.8)
       i18n (~> 0.7)
-      json (~> 1.7, >= 1.7.7)
       minitest (~> 5.1)
       thread_safe (~> 0.3, >= 0.3.4)
       tzinfo (~> 1.1)
     addressable (2.3.7)
     apipie-rails (0.3.5)
       json
-    arel (6.0.3)
+    arel (6.0.4)
     authlogic (3.4.5)
       activerecord (>= 3.2)
       activesupport (>= 3.2)
       request_store (~> 1.0)
       scrypt (~> 1.2)
-    autoprefixer-rails (5.1.8)
+    autoprefixer-rails (6.5.1.1)
       execjs
-      json
     awesome_print (1.6.1)
     binding_of_caller (0.7.3.pre1)
       debug_inspector (>= 0.0.1)
     bootstrap_form (2.2.0)
-    builder (3.2.2)
+    builder (3.2.3)
     byebug (1.8.2)
       columnize (~> 0.3.6)
       debugger-linecache (~> 1.2.0)
@@ -84,16 +82,18 @@ GEM
     cliver (0.3.2)
     coderay (1.1.0)
     columnize (0.3.6)
+    concurrent-ruby (1.0.5)
+    concurrent-ruby (1.0.5-java)
     crack (0.4.2)
       safe_yaml (~> 1.0.0)
     database_cleaner (1.4.0)
     debug_inspector (0.0.2)
     debugger-linecache (1.2.0)
-    delayed_job (4.0.6)
-      activesupport (>= 3.0, < 5.0)
-    delayed_job_active_record (4.0.3)
-      activerecord (>= 3.0, < 5.0)
-      delayed_job (>= 3.0, < 4.1)
+    delayed_job (4.1.2)
+      activesupport (>= 3.0, < 5.1)
+    delayed_job_active_record (4.1.1)
+      activerecord (>= 3.0, < 5.1)
+      delayed_job (>= 3.0, < 5)
     docile (1.1.5)
     ebnf (0.3.6)
       haml (~> 4.0)
@@ -114,7 +114,7 @@ GEM
       rake
     font-awesome-rails (4.3.0.0)
       railties (>= 3.2, < 5.0)
-    globalid (0.3.6)
+    globalid (0.3.7)
       activesupport (>= 4.1.0)
     haml (4.0.6)
       tilt
@@ -123,7 +123,7 @@ GEM
       hirb (~> 0.5)
       unicode-display_width (~> 0.1.1)
     htmlentities (4.3.3)
-    i18n (0.7.0)
+    i18n (0.8.1)
     iq_rdf (0.1.15)
       activesupport
       builder
@@ -132,8 +132,8 @@ GEM
     jdbc-mysql (5.1.33)
     jdbc-postgres (9.4.1200)
     jdbc-sqlite3 (3.8.7)
-    json (1.8.3)
-    json (1.8.3-java)
+    json (2.0.3)
+    json (2.0.3-java)
     json-ld (1.1.8)
       rdf (~> 1.1, >= 1.1.7)
     kaminari (0.16.3)
@@ -163,22 +163,24 @@ GEM
       sparql-client (~> 1.1, >= 1.1.3)
     loofah (2.0.3)
       nokogiri (>= 1.5.9)
-    mail (2.6.3)
-      mime-types (>= 1.16, < 3)
+    mail (2.6.4)
+      mime-types (>= 1.16, < 4)
     maruku (0.7.2)
     method_source (0.8.2)
-    mime-types (2.6.1)
-    mini_portile (0.6.2)
-    minitest (5.8.0)
+    mime-types (3.1)
+      mime-types-data (~> 3.2015)
+    mime-types-data (3.2016.0521)
+    mini_portile2 (2.1.0)
+    minitest (5.10.1)
     multi_json (1.11.2)
     multipart-post (2.0.0)
     mysql2 (0.3.18)
     net-http-persistent (2.9.4)
-    nokogiri (1.6.6.2)
-      mini_portile (~> 0.6.0)
-    nokogiri (1.6.6.2-java)
+    nokogiri (1.6.8.1)
+      mini_portile2 (~> 2.1.0)
+    nokogiri (1.6.8.1-java)
     parallel (1.4.1)
-    pg (0.18.1)
+    pg (0.19.0)
     poltergeist (1.6.0)
       capybara (~> 2.1)
       cliver (~> 0.3.1)
@@ -203,27 +205,27 @@ GEM
       slop (~> 3.0)
     quiet_assets (1.1.0)
       railties (>= 3.1, < 5.0)
-    rack (1.6.4)
+    rack (1.6.5)
     rack-test (0.6.3)
       rack (>= 1.0)
-    rails (4.2.4)
-      actionmailer (= 4.2.4)
-      actionpack (= 4.2.4)
-      actionview (= 4.2.4)
-      activejob (= 4.2.4)
-      activemodel (= 4.2.4)
-      activerecord (= 4.2.4)
-      activesupport (= 4.2.4)
+    rails (4.2.8)
+      actionmailer (= 4.2.8)
+      actionpack (= 4.2.8)
+      actionview (= 4.2.8)
+      activejob (= 4.2.8)
+      activemodel (= 4.2.8)
+      activerecord (= 4.2.8)
+      activesupport (= 4.2.8)
       bundler (>= 1.3.0, < 2.0)
-      railties (= 4.2.4)
+      railties (= 4.2.8)
       sprockets-rails
     rails-deprecated_sanitizer (1.0.3)
       activesupport (>= 4.2.0.alpha)
-    rails-dom-testing (1.0.7)
+    rails-dom-testing (1.0.8)
       activesupport (>= 4.2.0.beta, < 5.0)
-      nokogiri (~> 1.6.0)
+      nokogiri (~> 1.6)
       rails-deprecated_sanitizer (>= 1.0.1)
-    rails-html-sanitizer (1.0.2)
+    rails-html-sanitizer (1.0.3)
       loofah (~> 2.0)
     rails_12factor (0.0.3)
       rails_serve_static_assets
@@ -232,12 +234,12 @@ GEM
       rails (> 3.1)
     rails_serve_static_assets (0.0.4)
     rails_stdout_logging (0.0.3)
-    railties (4.2.4)
-      actionpack (= 4.2.4)
-      activesupport (= 4.2.4)
+    railties (4.2.8)
+      actionpack (= 4.2.8)
+      activesupport (= 4.2.8)
       rake (>= 0.8.7)
       thor (>= 0.18.1, < 2.0)
-    rake (10.4.2)
+    rake (12.0.0)
     rdf (1.1.9)
       link_header (~> 0.0, >= 0.0.8)
     rdf-aggregate-repo (1.1.0)
@@ -310,17 +312,18 @@ GEM
       rdf (~> 1.1)
     spoon (0.0.4)
       ffi
-    sprockets (3.3.4)
-      rack (~> 1.0)
-    sprockets-rails (2.3.3)
-      actionpack (>= 3.0)
-      activesupport (>= 3.0)
-      sprockets (>= 2.8, < 4.0)
+    sprockets (3.7.1)
+      concurrent-ruby (~> 1.0)
+      rack (> 1, < 3)
+    sprockets-rails (3.2.0)
+      actionpack (>= 4.0)
+      activesupport (>= 4.0)
+      sprockets (>= 3.0.0)
     sqlite3 (1.3.10)
     sxp (0.1.5)
-    thor (0.19.1)
-    thread_safe (0.3.5)
-    thread_safe (0.3.5-java)
+    thor (0.19.4)
+    thread_safe (0.3.6)
+    thread_safe (0.3.6-java)
     tilt (2.0.1)
     tzinfo (1.2.2)
       thread_safe (~> 0.1)
@@ -356,7 +359,7 @@ DEPENDENCIES
   activerecord-jdbcsqlite3-adapter
   apipie-rails (~> 0.3.5)
   authlogic (~> 3.4.2)
-  autoprefixer-rails (~> 5.1.8)
+  autoprefixer-rails (~> 6.5.1.1)
   awesome_print
   binding_of_caller (= 0.7.3.pre1)
   bootstrap_form (~> 2.2.0)
@@ -365,7 +368,7 @@ DEPENDENCIES
   capybara (~> 2.4.0)
   carrierwave
   database_cleaner
-  delayed_job_active_record (~> 4.0.1)
+  delayed_job_active_record (~> 4.1.1)
   faraday (= 0.9.0)
   faraday_middleware
   font-awesome-rails (~> 4.3.0)
@@ -385,7 +388,7 @@ DEPENDENCIES
   pry-rails
   pry-remote
   quiet_assets
-  rails (~> 4.2.4)
+  rails (~> 4.2.8)
   rails_12factor
   rails_autolink
   sass-rails (~> 5.0.0)
@@ -397,4 +400,4 @@ DEPENDENCIES
   webmock
 
 BUNDLED WITH
-   1.10.6
+   1.14.4

data/LICENSE

@@ -1,4 +1,4 @@
-Copyright 2011-2014 innoQ Deutschland GmbH
+Copyright 2011-2016 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.

data/app/aides/rdfapi.rb

@@ -35,6 +35,7 @@ class RDFAPI
   end
 
   URI_REGEXP = /^https?:\/\/[^\s]+$/
+  URI_LITERAL_REGEXP = /^<(https?:\/\/[^\s]+)>$/
   LITERAL_REGEXP = /^"(.+)"(@(.+))?$/
   BLANK_NODE_REGEXP = /^_:(.+)/
 

data/app/assets/javascripts/framework.js

@@ -6,6 +6,4 @@
 //= require typeahead.js/dist/typeahead.jquery.js
 //= require URIjs/src/URI.js
 //= require storage
-//= require bootstrap-sass/assets/javascripts/bootstrap/collapse
-//= require bootstrap-sass/assets/javascripts/bootstrap/tab
-//= require bootstrap-sass/assets/javascripts/bootstrap/modal
+//= require bootstrap-sass/assets/javascripts/bootstrap-sprockets

data/app/assets/javascripts/iqvoc/federated_concept_mapper.js

@@ -28,7 +28,7 @@ function FederatedConceptMapper(selector) {
   var self = this;
   var input = this.input.find("input")
 
-  IQVOC.autocomplete(input, $.proxy(this, "onChange"), {
+  IQVOC.autocomplete(input, IQVOC.debounce($.proxy(this, "onChange"), 500), {
     noResultsMsg: this.root.data("no-results-msg"),
   });
 

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

@@ -48,6 +48,22 @@ var createNote = function(ev) {
   return false;
 };
 
+var debounce = function(fn, delay) {
+  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);
+  };
+};
+
 // work around apparent capybara-webkit issue:
 // https://github.com/thoughtbot/capybara-webkit/issues/43
 var Storage = localStorage || null;
@@ -59,7 +75,8 @@ if(Storage === null) {
 
 return {
   Storage: Storage,
-  createNote: createNote
+  createNote: createNote,
+  debounce: debounce
 };
 
 }(jQuery));
@@ -69,10 +86,6 @@ jQuery(document).ready(function($) {
 
   var locale = document.documentElement.getAttribute("lang");
 
-  // language selection
-  $(".dropdown-toggle").click(function(ev) { // use Bootstrap's Dropwdown, but without the side-effects
-    $(this).closest(".dropdown").toggleClass("open");
-  });
   var langWidget = $("ul.lang-widget")[0];
   // primary language (converting links to radio buttons)
   $("a", langWidget).each(function(i, node) {

data/app/assets/javascripts/iqvoc/label_resolver.js

@@ -9,16 +9,18 @@ return function(context) {
 function retrieveLabel(conceptURL, el, callback) {
   var datasets = $("body").data("datasets");
   var proxy = $("body").data("remote-label-path");
+	var matchedDatasets = Object.keys(datasets).filter(function(datasetURL) {
+		return conceptURL.indexOf(datasetURL, 0) === 0;
+	});
 
-	var conceptBaseURL = getBaseURI(conceptURL);
-
-	// try to get remote label if conceptBaseURL is a iqvoc instance
-	if(conceptBaseURL in datasets) {
-		$.get(proxy, { concept_url: conceptURL }, function(data, status, xhr) {
-			el.text(data.label);
-			el.removeClass("unlabeled");
-		});
+	if (matchedDatasets.length === 0) {
+		return false;
 	}
+
+	$.get(proxy, { concept_url: conceptURL }, function(data, status, xhr) {
+		el.text(data.label);
+		el.removeClass("unlabeled");
+	});
 }
 
 function processNode(i, node) {
@@ -27,13 +29,4 @@ function processNode(i, node) {
 	retrieveLabel(uri, el);
 }
 
-function getBaseURI(url) {
-	var uri = new URI(url);
-	var parts = {
-		protocol: uri.protocol(),
-		hostname: uri.host()
-	};
-	return URI.build(parts);
-}
-
 }(jQuery));