iqvoc 4.6.0 → 4.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5e268fe56c175a3458dac065834dd636bf052d8d
-  data.tar.gz: 2a5ca97086c34db6276438289449944b8d14b74a
+  metadata.gz: 132a0771d607c401f8087bcab326829c6cd5d2af
+  data.tar.gz: 5009421fd2fd764c13ef72b863431ad3df2363ff
 SHA512:
-  metadata.gz: 6cd9c600d8a7239a853edcb2289c6b5eae38c7abce5eea6be58ab7eab964c2d67594f1b09a5416d75fb95b760d8d9f2eaf9582607830971fec3d371c5479bbab
-  data.tar.gz: 9b78e701c581c5e483620338e2faf769702b351ed881455663d90b4a08e04496b130259c4289fa4ac05893818d57963fcf550f591b47691f02205c43308da023
+  metadata.gz: 8eea3290093190f8a3879501f72fb14291635ee0abac756fb5f15c31cc43424af6c3ffee8a41a35ef8fecf6712014ae23182d5eeea44b8734e9f10c16a899f02
+  data.tar.gz: 62625006312569ee9b214fd7475b9d7db70e5607019bd934e1ce186cbbd54d097c01548938869b0818882fff847825918822cb9f973dc83f31a6bf62200cacec

data/CHANGELOG.md

@@ -1,3 +1,15 @@
+## [4.6.1]
+
+We're planning to release 4.7.0 shortly after this patch release:
+
+  * Fixed: users were prevented from logging in
+  * Fixed: collections lost their concepts after saving
+  * Fixed: search for notes didn't yield results when filtered for a certain
+    collection
+  * Fixed: right click was disabled on tree elements
+  * Fixed: several visual glitches in date pickers and autocomplete lists
+  * Bugfixes
+
 ## [4.6.0]
 
   * [Reverse matches](https://github.com/innoq/iqvoc/wiki/Interconnecting-iQvoc#reverse-matches)

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.1.3'
+gem 'rails', '4.1.8'
 gem 'kaminari'
 gem 'kaminari-bootstrap', '~> 3.0.1'
 gem 'authlogic', '~> 3.4.2'
@@ -35,8 +35,8 @@ gem 'nokogiri', '~> 1.6.0'
 gem 'linkeddata'
 gem 'uglifier'
 gem 'sass-rails', '~> 4.0.3'
-gem 'bootstrap-sass', '~> 3.1.1.0'
-gem 'bootstrap_form', '~> 2.1.1'
+gem 'bootstrap-sass', '~> 3.3.1.0'
+gem 'bootstrap_form', '~> 2.2.0'
 gem 'font-awesome-rails'
 gem 'apipie-rails'
 gem 'maruku', require: false
@@ -59,6 +59,7 @@ group :development, :test do
     gem 'sqlite3'
     gem 'spring'
     gem 'pry-rails'
+    gem 'pry-remote'
     gem 'hirb-unicode'
     gem 'cane'
   end
@@ -75,6 +76,7 @@ group :test do
   gem 'capybara', '~> 2.2.1'
   gem 'poltergeist', '~> 1.5.0'
   gem 'webmock'
+  gem 'simplecov'
 end
 
 group :production do

data/Gemfile.lock

@@ -1,25 +1,25 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    actionmailer (4.1.3)
-      actionpack (= 4.1.3)
-      actionview (= 4.1.3)
-      mail (~> 2.5.4)
-    actionpack (4.1.3)
-      actionview (= 4.1.3)
-      activesupport (= 4.1.3)
+    actionmailer (4.1.8)
+      actionpack (= 4.1.8)
+      actionview (= 4.1.8)
+      mail (~> 2.5, >= 2.5.4)
+    actionpack (4.1.8)
+      actionview (= 4.1.8)
+      activesupport (= 4.1.8)
       rack (~> 1.5.2)
       rack-test (~> 0.6.2)
-    actionview (4.1.3)
-      activesupport (= 4.1.3)
+    actionview (4.1.8)
+      activesupport (= 4.1.8)
       builder (~> 3.1)
       erubis (~> 2.7.0)
-    activemodel (4.1.3)
-      activesupport (= 4.1.3)
+    activemodel (4.1.8)
+      activesupport (= 4.1.8)
       builder (~> 3.1)
-    activerecord (4.1.3)
-      activemodel (= 4.1.3)
-      activesupport (= 4.1.3)
+    activerecord (4.1.8)
+      activemodel (= 4.1.8)
+      activesupport (= 4.1.8)
       arel (~> 5.0.0)
     activerecord-jdbc-adapter (1.3.9)
       activerecord (>= 2.2)
@@ -29,7 +29,7 @@ GEM
     activerecord-jdbcsqlite3-adapter (1.3.9)
       activerecord-jdbc-adapter (~> 1.3.9)
       jdbc-sqlite3 (~> 3.7.2)
-    activesupport (4.1.3)
+    activesupport (4.1.8)
       i18n (~> 0.6, >= 0.6.9)
       json (~> 1.7, >= 1.7.7)
       minitest (~> 5.1)
@@ -49,9 +49,9 @@ GEM
       erubis (>= 2.6.6)
     binding_of_caller (0.7.2)
       debug_inspector (>= 0.0.1)
-    bootstrap-sass (3.1.1.1)
+    bootstrap-sass (3.3.1.0)
       sass (~> 3.2)
-    bootstrap_form (2.1.1)
+    bootstrap_form (2.2.0)
     builder (3.2.2)
     byebug (1.8.2)
       columnize (~> 0.3.6)
@@ -83,6 +83,7 @@ GEM
     delayed_job_active_record (4.0.1)
       activerecord (>= 3.0, < 4.2)
       delayed_job (>= 3.0, < 4.1)
+    docile (1.1.5)
     ebnf (0.3.6)
       haml (~> 4.0)
       rdf (~> 1.1)
@@ -141,14 +142,13 @@ GEM
       rdf-turtle (>= 1.1.2)
       sparql (>= 1.1.2)
       sparql-client (>= 1.1.1)
-    mail (2.5.4)
-      mime-types (~> 1.16)
-      treetop (~> 1.4.8)
+    mail (2.6.3)
+      mime-types (>= 1.16, < 3)
     maruku (0.7.2)
     method_source (0.8.2)
-    mime-types (1.25.1)
+    mime-types (2.4.3)
     mini_portile (0.6.0)
-    minitest (5.4.0)
+    minitest (5.4.3)
     multi_json (1.10.1)
     multipart-post (2.0.0)
     mysql2 (0.3.13)
@@ -163,7 +163,6 @@ GEM
       cliver (~> 0.3.1)
       multi_json (~> 1.0)
       websocket-driver (>= 0.2.0)
-    polyglot (0.3.5)
     pry (0.9.12.6)
       coderay (~> 1.0)
       method_source (~> 0.8)
@@ -173,20 +172,23 @@ GEM
       pry (~> 0.9.12)
     pry-rails (0.3.2)
       pry (>= 0.9.10)
+    pry-remote (0.1.8)
+      pry (~> 0.9)
+      slop (~> 3.0)
     quiet_assets (1.0.3)
       railties (>= 3.1, < 5.0)
     rack (1.5.2)
     rack-test (0.6.2)
       rack (>= 1.0)
-    rails (4.1.3)
-      actionmailer (= 4.1.3)
-      actionpack (= 4.1.3)
-      actionview (= 4.1.3)
-      activemodel (= 4.1.3)
-      activerecord (= 4.1.3)
-      activesupport (= 4.1.3)
+    rails (4.1.8)
+      actionmailer (= 4.1.8)
+      actionpack (= 4.1.8)
+      actionview (= 4.1.8)
+      activemodel (= 4.1.8)
+      activerecord (= 4.1.8)
+      activesupport (= 4.1.8)
       bundler (>= 1.3.0, < 2.0)
-      railties (= 4.1.3)
+      railties (= 4.1.8)
       sprockets-rails (~> 2.0)
     rails_12factor (0.0.2)
       rails_serve_static_assets
@@ -195,12 +197,12 @@ GEM
       rails (> 3.1)
     rails_serve_static_assets (0.0.2)
     rails_stdout_logging (0.0.3)
-    railties (4.1.3)
-      actionpack (= 4.1.3)
-      activesupport (= 4.1.3)
+    railties (4.1.8)
+      actionpack (= 4.1.8)
+      activesupport (= 4.1.8)
       rake (>= 0.8.7)
       thor (>= 0.18.1, < 2.0)
-    rake (10.3.2)
+    rake (10.4.0)
     rdf (1.1.4.2)
     rdf-aggregate-repo (1.1.0)
       rdf (>= 1.1)
@@ -243,6 +245,11 @@ GEM
       sass (~> 3.2.0)
       sprockets (~> 2.8, <= 2.11.0)
       sprockets-rails (~> 2.0)
+    simplecov (0.9.1)
+      docile (~> 1.1.0)
+      multi_json (~> 1.0)
+      simplecov-html (~> 0.8.0)
+    simplecov-html (0.8.0)
     slop (3.6.0)
     sparql (1.1.4)
       builder (~> 3.0)
@@ -261,20 +268,17 @@ GEM
       multi_json (~> 1.0)
       rack (~> 1.0)
       tilt (~> 1.1, != 1.3.0)
-    sprockets-rails (2.1.3)
+    sprockets-rails (2.2.1)
       actionpack (>= 3.0)
       activesupport (>= 3.0)
-      sprockets (~> 2.8)
+      sprockets (>= 2.8, < 4.0)
     sqlite3 (1.3.9)
     sxp (0.1.5)
     thor (0.19.1)
     thread_safe (0.3.4)
     thread_safe (0.3.4-java)
     tilt (1.4.1)
-    treetop (1.4.15)
-      polyglot
-      polyglot (>= 0.3.1)
-    tzinfo (1.2.1)
+    tzinfo (1.2.2)
       thread_safe (~> 0.1)
     uglifier (2.5.3)
       execjs (>= 0.3.0)
@@ -302,8 +306,8 @@ DEPENDENCIES
   awesome_print
   better_errors
   binding_of_caller
-  bootstrap-sass (~> 3.1.1.0)
-  bootstrap_form (~> 2.1.1)
+  bootstrap-sass (~> 3.3.1.0)
+  bootstrap_form (~> 2.2.0)
   cancancan
   cane
   capybara (~> 2.2.1)
@@ -328,11 +332,13 @@ DEPENDENCIES
   poltergeist (~> 1.5.0)
   pry-byebug (~> 1.1.2)
   pry-rails
+  pry-remote
   quiet_assets
-  rails (= 4.1.3)
+  rails (= 4.1.8)
   rails_12factor
   rails_autolink
   sass-rails (~> 4.0.3)
+  simplecov
   spring
   sqlite3
   uglifier

data/README.md

@@ -86,7 +86,7 @@ overview of the possibilities.
 
 ## Documentation
 
-Documentation resources can be found in the [wiki](https://github.com/innoq/iqvoc/wiki/_pages).
+Documentation resources can be found in the [wiki](https://github.com/innoq/iqvoc/wiki).
 
 ## Versioning
 

data/app/assets/javascripts/framework.js

@@ -1,6 +1,6 @@
 //= require jquery-1.7.1
 //= require rails
-//= require jquery-ui.custom
+//= require jquery-ui
 //= require jquery-ui.datepicker-de
 //= require tree.jquery.js
 //= require URI.js

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

@@ -21,16 +21,13 @@ 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;
+  var noResultsMsg = this.el.data("no-results-msg");
 
   this.indicator.css("visibility", "hidden");
 
-  var selection = $.map(this.el.data("entities"), function(entity, i) {
+  var selection = this.el.data("entities") || [];
+  selection = $.map(selection, function(entity, i) {
     return self.createEntity(entity);
   });
   selection = $('<ul class="entity_list" />').append(selection);
@@ -42,15 +39,17 @@ var EntitySelector = function(node) {
     focus: function(ev, ui) { return false; },
     select: this.onSelect,
     response: function(ev, ui) {
-      if (!ui.content.length) {
-        ui.content.push(self.noResultsMsg);
+      if(!ui.content.length && noResultsMsg) {
+        ui.content.push({ label: noResultsMsg, value: "" });
       }
     }
+  }).on("keydown", function(ev){
+    if(ev.which === 13) { // Enter; prevent form submission
+      ev.preventDefault();
+    }
   });
 
-  // jQuery UI does not add a type attribute
-  // Bootstrap expects it to be there
-  this.input.attr('type', 'text').addClass('form-control');
+  this.input.attr("type", "text").addClass("form-control"); // for Bootstrap
 
   this.container.append(this.bootstrapInputGroup.append(this.input).append(this.indicatorWrapper.append(this.indicator))).
     append(selection).insertAfter(node).prepend(node);
@@ -80,14 +79,6 @@ EntitySelector.sourceSelectors = {
   "default": function(callback) {
     var uri = this.el.data("query-url");
     callback(uri);
-  },
-  "dummy-prompt": function(callback) {
-    var uri = this.el.data("query-url");
-    var sources = { iQvoc: "hello", GEMET: "world" };
-    var params = $.map(sources, function(id, name) {
-      return confirm("include " + name) ? 'source=' + id : null;
-    }).join("&");
-    callback(uri + "?" + params);
   }
 };
 $.extend(EntitySelector.prototype, {
@@ -112,7 +103,13 @@ $.extend(EntitySelector.prototype, {
     if(widget.add(ui.item.value)) {
       var entity = widget.
           createEntity({ id: ui.item.value, name: ui.item.label });
-      widget.container.find("ul").append(entity);
+      var list = widget.container.find("ul").append(entity);
+      // force redraw to work around Safari rendering bug -- FIXME: crude and uninformed
+      list.css("overflow", "auto");
+      setTimeout(function() {
+        list.css("overflow", "");
+      }, 1);
+
       if(widget.singular) {
         widget.input.hide();
         widget.indicatorWrapper.hide();

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

@@ -165,10 +165,10 @@ jQuery(document).ready(function($) {
 
   // Search
   $(".checkbox-select-all").click(function() {
-    $(this).closest('.controls').find("input:checkbox").attr("checked", true);
+    $(this).closest('.language-controls').find("input:checkbox").attr("checked", true);
   });
   $(".checkbox-select-none").click(function() {
-    $(this).closest('.controls').find("input:checkbox").attr("checked", false);
+    $(this).closest('.language-controls').find("input:checkbox").attr("checked", false);
   });
   $("select.search_type").change(function() {
     var result_type_filter = $(".result_type_filter");

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

@@ -38,6 +38,7 @@ function Treeview(container) {
       dragAndDrop: dragabbleSupport ? true : false,
       autoEscape: false,
       selectable: false,
+      useContextMenu: false,
       closedIcon: $('<i class="fa fa-plus-square-o"></i>'),
       openedIcon: $('<i class="fa fa-minus-square-o"></i>'),
       data: data,

data/app/assets/stylesheets/framework.css.scss

@@ -1,4 +1,6 @@
-@import 'jquery-ui-1.10.3.custom';
+@import 'jquery-ui';
+@import 'jquery-ui.structure';
+@import 'jquery-ui.theme';
 
 @import 'bootstrap';
 body {

data/app/assets/stylesheets/iqvoc/components/_treeview.css.scss.erb

@@ -68,7 +68,7 @@ ul.jqtree-tree {
   }
 
   .jqtree-toggler {
-    background-color: #fff;
+    position: absolute;
     border-bottom: 0;
     color: #333;
     cursor: pointer;

data/app/assets/stylesheets/iqvoc/hacks/_jquery-ui_extensions.css.scss

@@ -7,3 +7,8 @@
     font-size: inherit;
   }
 }
+
+.datepicker {
+  position: relative;
+  z-index: $zindex-modal;
+}

data/app/concerns/reverse_match_errors.rb

@@ -12,6 +12,7 @@ module ReverseMatchErrors
       unknown_match:    { status: 400, json: { type: 'unknown_match', message: 'Unknown match class.' } },
       no_referer:       { status: 400, json: { type: 'no_referer', message: 'Referer is not set.' } },
       unknown_referer:  { status: 403, json: { type: 'unknown_referer', message: 'Unknown referer.' } },
+      mapping_exists:   { status: 409, json: { type: 'mapping_exists', message: 'Concept mapping exists.'} },
       in_processing:    { status: 403, json: { type: 'in_processing', message: 'Concept in processing' } },
       server_error:     { status: 500, json: {} }
     }

data/app/controllers/reverse_matches_controller.rb

@@ -7,6 +7,8 @@ class ReverseMatchesController < ApplicationController
       # 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)

data/app/helpers/concepts_helper.rb

@@ -17,7 +17,7 @@
 module ConceptsHelper
   # if `broader` is supplied, the tree's direction is reversed (descendants represent broader relations)
   def treeview(concepts, broader = false, dragabble = false)
-    render "concepts/hierarchical/treeview", concepts: concepts, broader: broader, dragabble: false
+    render "concepts/hierarchical/treeview", concepts: concepts, broader: broader, dragabble: dragabble
   end
 
   # turns a hash of concept/relations pairs of arbitrary nesting depth into the

data/app/jobs/reverse_match_job.rb

@@ -11,10 +11,18 @@ class ReverseMatchJob < Struct.new(:type, :match_class, :subject, :object, :refe
     request_method = link['method']
 
     conn = connection(request_url, { content_type: 'application/json', referer: referer })
-    response = conn.send(request_method) do |req|
-      req.params['match_class'] = match_class
-      req.params['uri'] = object
+
+    begin
+      response = conn.send(request_method) do |req|
+        req.params['match_class'] = match_class
+        req.params['uri'] = object
+      end
+    rescue Faraday::ClientError => e
+      if e.response.nil? || response[:status] != 409
+        raise e
+      end
     end
+
   end
 
   def error(job, exception)