iqvoc 4.5.2 → 4.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 569a8652741d4a11f2df0ef4fe6dabb2c76a2ad7
-  data.tar.gz: f19d3d903c0e86c6159ab22abd3839402d271fdb
+  metadata.gz: 5e268fe56c175a3458dac065834dd636bf052d8d
+  data.tar.gz: 2a5ca97086c34db6276438289449944b8d14b74a
 SHA512:
-  metadata.gz: 75190fbfccdf51804212b097546544701fa7d4b9d3db32a75b32fb9a45130a44631c5331fb83f55e34f3d6c94cb07fd8d997a275127b3f097fb8213569ea4090
-  data.tar.gz: 980f75345702dba667cee813517af867b294a96454a977bc37c256e14d6484c42d04eee8336740f056b74b208184ff4eea807715b384558d49a38fb40e330aa0
+  metadata.gz: 6cd9c600d8a7239a853edcb2289c6b5eae38c7abce5eea6be58ab7eab964c2d67594f1b09a5416d75fb95b760d8d9f2eaf9582607830971fec3d371c5479bbab
+  data.tar.gz: 9b78e701c581c5e483620338e2faf769702b351ed881455663d90b4a08e04496b130259c4289fa4ac05893818d57963fcf550f591b47691f02205c43308da023

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+## [4.6.0]
+
+  * [Reverse matches](https://github.com/innoq/iqvoc/wiki/Interconnecting-iQvoc#reverse-matches)
+  * Bugfixes
+
 ## [4.5.2]
 
 Another patch release before 4.6.0.

data/Gemfile

@@ -30,6 +30,7 @@ gem 'json'
 gem 'rails_autolink'
 gem 'jruby-openssl', platforms: :jruby
 gem 'faraday'
+gem 'faraday_middleware'
 gem 'nokogiri', '~> 1.6.0'
 gem 'linkeddata'
 gem 'uglifier'

data/Gemfile.lock

@@ -21,13 +21,13 @@ GEM
       activemodel (= 4.1.3)
       activesupport (= 4.1.3)
       arel (~> 5.0.0)
-    activerecord-jdbc-adapter (1.3.7)
+    activerecord-jdbc-adapter (1.3.9)
       activerecord (>= 2.2)
-    activerecord-jdbcmysql-adapter (1.3.7)
-      activerecord-jdbc-adapter (~> 1.3.7)
+    activerecord-jdbcmysql-adapter (1.3.9)
+      activerecord-jdbc-adapter (~> 1.3.9)
       jdbc-mysql (>= 5.1.22)
-    activerecord-jdbcsqlite3-adapter (1.3.7)
-      activerecord-jdbc-adapter (~> 1.3.7)
+    activerecord-jdbcsqlite3-adapter (1.3.9)
+      activerecord-jdbc-adapter (~> 1.3.9)
       jdbc-sqlite3 (~> 3.7.2)
     activesupport (4.1.3)
       i18n (~> 0.6, >= 0.6.9)
@@ -36,9 +36,8 @@ GEM
       thread_safe (~> 0.1)
       tzinfo (~> 1.1)
     addressable (2.3.6)
-    apipie-rails (0.1.3)
+    apipie-rails (0.2.2)
       json
-      rails (>= 3.0.10)
     arel (5.0.1.20140414130214)
     authlogic (3.4.2)
       activerecord (>= 3.2)
@@ -50,16 +49,15 @@ GEM
       erubis (>= 2.6.6)
     binding_of_caller (0.7.2)
       debug_inspector (>= 0.0.1)
-    bootstrap-sass (3.1.1.0)
+    bootstrap-sass (3.1.1.1)
       sass (~> 3.2)
     bootstrap_form (2.1.1)
-    bouncy-castle-java (1.5.0147)
     builder (3.2.2)
     byebug (1.8.2)
       columnize (~> 0.3.6)
       debugger-linecache (~> 1.2.0)
-    cancancan (1.8.2)
-    cane (2.6.1)
+    cancancan (1.9.1)
+    cane (2.6.2)
       parallel
     capybara (2.2.1)
       mime-types (>= 1.16)
@@ -77,48 +75,50 @@ GEM
     columnize (0.3.6)
     crack (0.4.2)
       safe_yaml (~> 1.0.0)
-    database_cleaner (1.2.0)
+    database_cleaner (1.3.0)
     debug_inspector (0.0.2)
     debugger-linecache (1.2.0)
-    delayed_job (4.0.1)
+    delayed_job (4.0.2)
       activesupport (>= 3.0, < 4.2)
     delayed_job_active_record (4.0.1)
       activerecord (>= 3.0, < 4.2)
       delayed_job (>= 3.0, < 4.1)
-    ebnf (0.3.5)
-      rdf
-      sxp
-    equivalent-xml (0.4.2)
+    ebnf (0.3.6)
+      haml (~> 4.0)
+      rdf (~> 1.1)
+      sxp (~> 0.1, >= 0.1.3)
+    equivalent-xml (0.5.1)
       nokogiri (>= 1.4.3)
     erubis (2.7.0)
-    execjs (2.0.2)
+    execjs (2.2.1)
     faraday (0.9.0)
       multipart-post (>= 1.2, < 3)
-    font-awesome-rails (4.0.3.1)
+    faraday_middleware (0.9.1)
+      faraday (>= 0.7.4, < 0.10)
+    font-awesome-rails (4.1.0.0)
       railties (>= 3.2, < 5.0)
     haml (4.0.5)
       tilt
     hike (1.2.3)
-    hirb (0.7.1)
+    hirb (0.7.2)
     hirb-unicode (0.0.5)
       hirb (~> 0.5)
       unicode-display_width (~> 0.1.1)
-    htmlentities (4.3.1)
+    htmlentities (4.3.2)
     i18n (0.6.11)
     iq_rdf (0.1.15)
       activesupport
       builder
       bundler
     iq_triplestorage (0.2.2)
-    jdbc-mysql (5.1.30)
+    jdbc-mysql (5.1.31)
     jdbc-sqlite3 (3.7.2.1)
-    jruby-openssl (0.9.4)
-      bouncy-castle-java (>= 1.5.0147)
+    jruby-openssl (0.9.5-java)
     json (1.8.1)
     json (1.8.1-java)
-    json-ld (1.1.2)
-      rdf (~> 1.1)
-    kaminari (0.15.1)
+    json-ld (1.1.6)
+      rdf (~> 1.1, >= 1.1.4)
+    kaminari (0.16.1)
       actionpack (>= 3.0.0)
       activesupport (>= 3.0.0)
     kaminari-bootstrap (3.0.1)
@@ -144,22 +144,21 @@ GEM
     mail (2.5.4)
       mime-types (~> 1.16)
       treetop (~> 1.4.8)
-    maruku (0.7.1)
+    maruku (0.7.2)
     method_source (0.8.2)
     mime-types (1.25.1)
-    mini_portile (0.5.3)
+    mini_portile (0.6.0)
     minitest (5.4.0)
     multi_json (1.10.1)
     multipart-post (2.0.0)
     mysql2 (0.3.13)
-    net-http-persistent (2.9.4)
-    nokogiri (1.6.1)
-      mini_portile (~> 0.5.0)
-    nokogiri (1.6.1-java)
-      mini_portile (~> 0.5.0)
-    parallel (1.0.0)
+    net-http-persistent (1.9)
+    nokogiri (1.6.3.1)
+      mini_portile (= 0.6.0)
+    nokogiri (1.6.3.1-java)
+    parallel (1.1.2)
     pg (0.17.1)
-    poltergeist (1.5.0)
+    poltergeist (1.5.1)
       capybara (~> 2.1)
       cliver (~> 0.3.1)
       multi_json (~> 1.0)
@@ -174,7 +173,7 @@ GEM
       pry (~> 0.9.12)
     pry-rails (0.3.2)
       pry (>= 0.9.10)
-    quiet_assets (1.0.2)
+    quiet_assets (1.0.3)
       railties (>= 3.1, < 5.0)
     rack (1.5.2)
     rack-test (0.6.2)
@@ -192,7 +191,7 @@ GEM
     rails_12factor (0.0.2)
       rails_serve_static_assets
       rails_stdout_logging
-    rails_autolink (1.1.5)
+    rails_autolink (1.1.6)
       rails (> 3.1)
     rails_serve_static_assets (0.0.2)
     rails_stdout_logging (0.0.3)
@@ -202,63 +201,61 @@ GEM
       rake (>= 0.8.7)
       thor (>= 0.18.1, < 2.0)
     rake (10.3.2)
-    rdf (1.1.3)
+    rdf (1.1.4.2)
     rdf-aggregate-repo (1.1.0)
       rdf (>= 1.1)
     rdf-isomorphic (1.1.0)
       rdf (>= 1.1)
     rdf-json (1.1.0)
       rdf (>= 1.1.0)
-    rdf-microdata (1.1.1)
-      htmlentities (>= 4.3.0)
-      nokogiri (>= 1.6.1)
-      rdf (>= 1.1.0)
-      rdf-xsd (>= 1.1.0)
-    rdf-n3 (1.1.0)
-      rdf (>= 1.1)
-    rdf-rdfa (1.1.3)
+    rdf-microdata (1.1.1.3)
+      htmlentities (~> 4.3)
+      nokogiri (~> 1.6)
+      rdf (~> 1.1)
+      rdf-xsd (~> 1.1)
+    rdf-n3 (1.1.1)
+      rdf (~> 1.1, >= 1.1.4)
+    rdf-rdfa (1.1.3.2)
       haml (~> 4.0)
       htmlentities (~> 4.3)
       rdf (~> 1.1)
       rdf-xsd (~> 1.1)
-    rdf-rdfxml (1.1.0)
-      rdf (>= 1.1)
-      rdf-rdfa (>= 1.1)
-      rdf-xsd (>= 1.1)
-    rdf-trig (1.1.3)
-      ebnf (>= 0.3.5)
+    rdf-rdfxml (1.1.0.1)
+      rdf (~> 1.1)
+      rdf-rdfa (~> 1.1)
+      rdf-xsd (~> 1.1)
+    rdf-trig (1.1.3.1)
+      ebnf (~> 0.3, >= 0.3.5)
       rdf (~> 1.1, >= 1.1.2.1)
       rdf-turtle (~> 1.1, >= 1.1.3)
     rdf-trix (1.1.0)
       rdf (>= 1.1)
-    rdf-turtle (1.1.3)
-      ebnf (>= 0.3.5)
-      rdf (~> 1.1, >= 1.1.2.1)
-    rdf-xsd (1.1.0)
-      rdf (>= 1.1)
-    request_store (1.0.5)
-    safe_yaml (1.0.2)
+    rdf-turtle (1.1.4)
+      ebnf (~> 0.3, >= 0.3.6)
+      rdf (~> 1.1, >= 1.1.4)
+    rdf-xsd (1.1.1)
+      rdf (~> 1.1)
+    request_store (1.0.7)
+    safe_yaml (1.0.3)
     sass (3.2.19)
     sass-rails (4.0.3)
       railties (>= 4.0.0, < 5.0)
       sass (~> 3.2.0)
       sprockets (~> 2.8, <= 2.11.0)
       sprockets-rails (~> 2.0)
-    slop (3.5.0)
-    sparql (1.1.2.1)
-      builder (>= 3.0)
-      ebnf (>= 0.3.2)
-      json (>= 1.7)
-      rdf (>= 1.1.0)
-      rdf-aggregate-repo (>= 1.1.0)
-      rdf-xsd (>= 1.0.2)
-      sparql-client (>= 1.1)
-      sxp (>= 0.1.3)
-    sparql-client (1.1.1)
-      json (>= 1.8)
-      net-http-persistent (>= 1.4)
-      rdf (>= 1.1)
-    spring (1.1.2)
+    slop (3.6.0)
+    sparql (1.1.4)
+      builder (~> 3.0)
+      ebnf (~> 0.3, >= 0.3.5)
+      rdf (~> 1.1, >= 1.1.4)
+      rdf-aggregate-repo (~> 1.1, >= 1.1.0)
+      rdf-xsd (~> 1.1)
+      sparql-client (~> 1.1)
+      sxp (~> 0.1)
+    sparql-client (1.1.2)
+      net-http-persistent (~> 1.4)
+      rdf (~> 1.1)
+    spring (1.1.3)
     sprockets (2.11.0)
       hike (~> 1.2)
       multi_json (~> 1.0)
@@ -279,17 +276,17 @@ GEM
       polyglot (>= 0.3.1)
     tzinfo (1.2.1)
       thread_safe (~> 0.1)
-    uglifier (2.5.0)
+    uglifier (2.5.3)
       execjs (>= 0.3.0)
       json (>= 1.8.0)
     unicode-display_width (0.1.1)
     view_marker (1.0.0)
       rails
-    webmock (1.17.4)
-      addressable (>= 2.2.7)
+    webmock (1.18.0)
+      addressable (>= 2.3.6)
       crack (>= 0.3.2)
-    websocket-driver (0.3.2)
-    websocket-driver (0.3.2-java)
+    websocket-driver (0.3.4)
+    websocket-driver (0.3.4-java)
     xpath (2.0.0)
       nokogiri (~> 1.3)
 
@@ -314,6 +311,7 @@ DEPENDENCIES
   database_cleaner
   delayed_job_active_record (~> 4.0.1)
   faraday
+  faraday_middleware
   font-awesome-rails
   hirb-unicode
   iq_rdf (>= 0.1.15)

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

@@ -22,14 +22,22 @@ function ConceptMapper(selector) {
 
   this.container = $("<div />").addClass("concept-mapper control-group");
 
-  this.input = $("<input />").attr("type", "text").addClass("form-control").
-      prependTo(this.container);
+  this.bootstrapInputGroup = $('<div class="input-group" />');
+  this.indicatorWrapper = $('<span class="input-group-addon" />');
+
+  this.input = this.bootstrapInputGroup
+                  .append($("<input />").attr("type", "text").addClass("form-control"))
+                  .append(this.indicatorWrapper)
+                  .prependTo(this.container);
+
   $("<button />").addClass("btn btn-default fa fa-plus").
       insertAfter(this.input).click($.proxy(this, "onConfirm"));
-  this.matchType = $("<select />").addClass("form-control").
-      append(matchOptions).insertAfter(this.input);
 
-  this.container.prependTo(this.root);
+  this.matchType = $("<select />").addClass("form-control")
+                    .append(matchOptions)
+                    .insertAfter(this.input);
+
+  this.container.appendTo(this.root);
 }
 ConceptMapper.prototype.delimiter = ", ";
 ConceptMapper.prototype.onConfirm = function(ev) {
@@ -39,11 +47,11 @@ ConceptMapper.prototype.onConfirm = function(ev) {
   var textArea = document.getElementsByName(textAreaName)[0];
   textArea = $(textArea);
 
-  var newURI = this.input.val();
+  var newURI = this.input.find('input').val();
   var newValue = $.trim(textArea.val() + this.delimiter + newURI);
 
   textArea.val(newValue);
-  this.input.val("");
+  this.input.find('input').val("");
   this.root.trigger("concept-mapped", {
     uri: newURI,
     matchType: this.matchTypes[textAreaName]

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

@@ -21,6 +21,11 @@ var EntitySelector = function(node) {
   this.entities = this.getSelection();
   this.uriTemplate = this.el.data("entity-uri");
 
+  this.noResultsMsg = {
+    label: this.el.data("no-results-msg"),
+    value: ''
+  };
+
   var self = this;
 
   this.indicator.css("visibility", "hidden");
@@ -35,7 +40,12 @@ var EntitySelector = function(node) {
     source: $.proxy(this, "onInput"), // XXX: discards original `this` context
     search: function(ev, ui) { self.indicator.css("visibility", "visible"); },
     focus: function(ev, ui) { return false; },
-    select: this.onSelect
+    select: this.onSelect,
+    response: function(ev, ui) {
+      if (!ui.content.length) {
+        ui.content.push(self.noResultsMsg);
+      }
+    }
   });
 
   // jQuery UI does not add a type attribute

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

@@ -11,6 +11,11 @@ var baseClass = IQVOC.ConceptMapper;
 function FederatedConceptMapper(selector) {
   baseClass.apply(this, arguments);
 
+  this.noResultsMsg = {
+    label: this.root.data("no-results-msg"),
+    value: ''
+  };
+
   var sources = this.root.data("datasets");
   if(!sources) { // fall back to non-federated base class only
     return;
@@ -23,22 +28,24 @@ function FederatedConceptMapper(selector) {
   this.source = $("<select />").addClass("form-control").append(sources).
       insertBefore(this.input);
 
-  this.indicator = $("<i />").
-      addClass("concept-mapper-indicator hidden fa fa-refresh fa-spin").
-      insertAfter(this.input);
+  this.indicator = $("<i />").addClass("spinner fa fa-refresh fa-spin").css("visibility", "hidden");
+  this.indicatorWrapper.append(this.indicator);
 
   var self = this;
-  this.input.autocomplete({ // TODO: extract autocomplete extension into subclass
+  this.input.find('input').autocomplete({ // TODO: extract autocomplete extension into subclass
     source: $.proxy(this, "onChange"),
     search: function(ev, ui) {
       if(self.source.val() === "_custom") {
         return false;
       } else {
-        self.indicator.removeClass("hidden");
+        self.indicator.css("visibility", "visible");
       }
     },
     response: function(ev, ui) {
-      self.indicator.addClass("hidden");
+      if (!ui.content.length) {
+        ui.content.push(self.noResultsMsg);
+      }
+      self.indicator.css("visibility", "hidden");
     },
     minLength: 2
   });

data/app/assets/stylesheets/iqvoc/components/_components.css.scss

@@ -183,9 +183,20 @@ tr.highlightable {
 }
 
 .concept-mapper {
-  margin-bottom: 25px;
+  margin: 25px 0;
   > * { margin-right: 10px; }
 
+  .input-group {
+      display: inline-table;
+      vertical-align: middle;
+
+      .input-group-addon,
+      .input-group-btn,
+      .form-control {
+          width: auto !important;
+      }
+  }
+
   .form-control {
     width: auto;
     display: inline-block;