iqvoc 3.5.6 → 3.5.7

data/CHANGELOG.md

@@ -1,3 +1,12 @@
+## 3.5.7 (2012-05-24)
+
+  * Rankable (weighted) relations
+  * Counting concept members in collection hierarchy view
+  * Improved heroku support
+  * Bugfixes
+  
+Please note that this is the last tiny release before we hit 4.0.0.
+
 ## 3.5.6 (2012-03-07)
 
   * Refactored origin (URI slug) generation<br>

data/Gemfile

@@ -19,7 +19,7 @@ source 'http://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', '3.2.2'
+gem 'rails', '3.2.3'
 
 group :assets do
   gem 'uglifier', '>= 1.0.3'
@@ -55,7 +55,6 @@ group :development, :test do
 end
 
 group :test do
-  gem 'test-unit'
   gem 'nokogiri', '~> 1.5.0'
   gem 'capybara'
   gem 'capybara-webkit'
@@ -63,6 +62,8 @@ group :test do
   gem 'factory_girl_rails'
   gem 'spork'
   gem 'spork-testunit'
+  gem 'turn'
+  gem 'minitest'
 end
 
 group :production do

data/Gemfile.lock

@@ -1,25 +1,25 @@
 GEM
   remote: http://rubygems.org/
   specs:
-    actionmailer (3.2.2)
-      actionpack (= 3.2.2)
-      mail (~> 2.4.0)
-    actionpack (3.2.2)
-      activemodel (= 3.2.2)
-      activesupport (= 3.2.2)
+    actionmailer (3.2.3)
+      actionpack (= 3.2.3)
+      mail (~> 2.4.4)
+    actionpack (3.2.3)
+      activemodel (= 3.2.3)
+      activesupport (= 3.2.3)
       builder (~> 3.0.0)
       erubis (~> 2.7.0)
       journey (~> 1.0.1)
       rack (~> 1.4.0)
-      rack-cache (~> 1.1)
+      rack-cache (~> 1.2)
       rack-test (~> 0.6.1)
       sprockets (~> 2.1.2)
-    activemodel (3.2.2)
-      activesupport (= 3.2.2)
+    activemodel (3.2.3)
+      activesupport (= 3.2.3)
       builder (~> 3.0.0)
-    activerecord (3.2.2)
-      activemodel (= 3.2.2)
-      activesupport (= 3.2.2)
+    activerecord (3.2.3)
+      activemodel (= 3.2.3)
+      activesupport (= 3.2.3)
       arel (~> 3.0.2)
       tzinfo (~> 0.3.29)
     activerecord-jdbc-adapter (1.2.2)
@@ -30,13 +30,14 @@ GEM
       activerecord-jdbc-adapter (~> 1.2.2)
       jdbc-sqlite3 (~> 3.7.2)
     activerecord-oracle_enhanced-adapter (1.4.1)
-    activeresource (3.2.2)
-      activemodel (= 3.2.2)
-      activesupport (= 3.2.2)
-    activesupport (3.2.2)
+    activeresource (3.2.3)
+      activemodel (= 3.2.3)
+      activesupport (= 3.2.3)
+    activesupport (3.2.3)
       i18n (~> 0.6)
       multi_json (~> 1.0)
-    addressable (2.2.7)
+    addressable (2.2.8)
+    ansi (1.4.2)
     arel (3.0.2)
     authlogic (3.1.0)
       activerecord (>= 3.0.7)
@@ -52,28 +53,28 @@ GEM
       rack-test (>= 0.5.4)
       selenium-webdriver (~> 2.0)
       xpath (~> 0.1.4)
-    capybara-webkit (0.10.0)
+    capybara-webkit (0.12.0)
       capybara (>= 1.0.0, < 1.2)
       json
-    childprocess (0.3.1)
+    childprocess (0.3.2)
       ffi (~> 1.0.6)
-    database_cleaner (0.7.1)
+    database_cleaner (0.7.2)
     erubis (2.7.0)
-    execjs (1.3.0)
+    execjs (1.4.0)
       multi_json (~> 1.0)
-    factory_girl (2.6.0)
-      activesupport (>= 2.3.9)
-    factory_girl_rails (1.7.0)
-      factory_girl (~> 2.6.0)
+    factory_girl (3.3.0)
+      activesupport (>= 3.0.0)
+    factory_girl_rails (3.3.0)
+      factory_girl (~> 3.3.0)
       railties (>= 3.0.0)
-    fastercsv (1.5.4)
+    fastercsv (1.5.5)
     ffi (1.0.11)
     ffi (1.0.11-java)
-    heroku (2.20.1)
+    heroku (2.25.0)
       launchy (>= 0.3.2)
+      netrc (~> 0.7.1)
       rest-client (~> 1.6.1)
       rubyzip
-      term-ansicolor (~> 1.0.5)
     hike (1.2.1)
     i18n (0.6.0)
     iq_rdf (0.1.5)
@@ -84,51 +85,54 @@ GEM
     journey (1.0.3)
     jruby-openssl (0.7.6.1)
       bouncy-castle-java (>= 1.5.0146.1)
-    json (1.6.5)
-    json (1.6.5-java)
-    json_pure (1.6.5)
+    json (1.7.3)
+    json (1.7.3-java)
     kaminari (0.13.0)
       actionpack (>= 3.0.0)
       activesupport (>= 3.0.0)
       railties (>= 3.0.0)
-    launchy (2.0.5)
+    launchy (2.1.0)
       addressable (~> 2.2.6)
-    launchy (2.0.5-java)
+    launchy (2.1.0-java)
       addressable (~> 2.2.6)
       ffi (~> 1.0.9)
       spoon (~> 0.0.1)
     libv8 (3.3.10.4)
-    mail (2.4.1)
+    libwebsocket (0.1.3)
+      addressable
+    mail (2.4.4)
       i18n (>= 0.4.0)
       mime-types (~> 1.16)
       treetop (~> 1.4.8)
-    mime-types (1.17.2)
-    multi_json (1.1.0)
+    mime-types (1.18)
+    minitest (3.0.0)
+    multi_json (1.3.5)
     mysql2 (0.3.11)
-    nokogiri (1.5.0)
-    nokogiri (1.5.0-java)
+    netrc (0.7.1)
+    nokogiri (1.5.2)
+    nokogiri (1.5.2-java)
     pg (0.13.2)
     polyglot (0.3.3)
     rack (1.4.1)
-    rack-cache (1.1)
+    rack-cache (1.2)
       rack (>= 0.4)
     rack-ssl (1.3.2)
       rack
     rack-test (0.6.1)
       rack (>= 1.0)
-    rails (3.2.2)
-      actionmailer (= 3.2.2)
-      actionpack (= 3.2.2)
-      activerecord (= 3.2.2)
-      activeresource (= 3.2.2)
-      activesupport (= 3.2.2)
+    rails (3.2.3)
+      actionmailer (= 3.2.3)
+      actionpack (= 3.2.3)
+      activerecord (= 3.2.3)
+      activeresource (= 3.2.3)
+      activesupport (= 3.2.3)
       bundler (~> 1.0)
-      railties (= 3.2.2)
-    rails_autolink (1.0.5)
+      railties (= 3.2.3)
+    rails_autolink (1.0.7)
       rails (~> 3.1)
-    railties (3.2.2)
-      actionpack (= 3.2.2)
-      activesupport (= 3.2.2)
+    railties (3.2.3)
+      actionpack (= 3.2.3)
+      activesupport (= 3.2.3)
       rack-ssl (~> 1.3.2)
       rake (>= 0.8.7)
       rdoc (~> 3.4)
@@ -138,32 +142,33 @@ GEM
       json (~> 1.4)
     rest-client (1.6.7)
       mime-types (>= 1.16)
-    rubyzip (0.9.6.1)
-    selenium-webdriver (2.13.0)
-      childprocess (>= 0.2.1)
-      ffi (~> 1.0.9)
-      json_pure
+    rubyzip (0.9.8)
+    selenium-webdriver (2.21.2)
+      childprocess (>= 0.2.5)
+      ffi (~> 1.0)
+      libwebsocket (~> 0.1.3)
+      multi_json (~> 1.0)
       rubyzip
     spoon (0.0.1)
-    spork (0.9.0)
+    spork (0.9.2)
     spork-testunit (0.0.8)
       spork (>= 0.6.0)
-    sprockets (2.1.2)
+    sprockets (2.1.3)
       hike (~> 1.2)
       rack (~> 1.0)
       tilt (~> 1.1, != 1.3.0)
-    sqlite3 (1.3.5)
-    term-ansicolor (1.0.7)
-    test-unit (2.4.7)
-    therubyracer (0.9.10)
+    sqlite3 (1.3.6)
+    therubyracer (0.10.1)
       libv8 (~> 3.3.10)
     thor (0.14.6)
     tilt (1.3.3)
     treetop (1.4.10)
       polyglot
       polyglot (>= 0.3.1)
-    tzinfo (0.3.31)
-    uglifier (1.2.3)
+    turn (0.9.5)
+      ansi
+    tzinfo (0.3.33)
+    uglifier (1.2.4)
       execjs (>= 0.3.0)
       multi_json (>= 1.0.2)
     view_marker (1.0.0)
@@ -192,15 +197,16 @@ DEPENDENCIES
   jruby-openssl
   json
   kaminari
+  minitest
   mysql2
   nokogiri (~> 1.5.0)
   pg
-  rails (= 3.2.2)
+  rails (= 3.2.3)
   rails_autolink
   spork
   spork-testunit
   sqlite3
-  test-unit
   therubyracer
+  turn
   uglifier (>= 1.0.3)
   view_marker

data/README.md

@@ -30,12 +30,12 @@ To run iQvoc on heroku do the following:
 
 ```
 bundle install
-heroku create
+bundle exec heroku create --stack bamboo
 bundle exec rake heroku:config
 git push heroku master
-heroku rake db:migrate
-heroku rake db:seed
-heroku restart
+bundle exec heroku rake db:migrate
+bundle exec heroku rake db:seed
+bundle exec heroku restart
 ```
 
 `heroku open` opens your app in the browser.
@@ -95,4 +95,5 @@ iQvoc was originally created and is being maintained by [innoQ Deutschland GmbH]
 ## License
 
 Copyright 2011 innoQ Deutschland GmbH
+
 Licensed under the Apache License, Version 2.0

data/app/assets/javascripts/framework.js

@@ -1,6 +1,6 @@
 //= require jquery-1.7.1
 //= require rails
-//= require jquery-ui-1.8.16.custom
+//= require jquery-ui-1.8.20.custom
 //= require jquery-ui.datepicker-de
 //= require jquery.treeview
 //= require jquery.treeview.async

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

@@ -1,4 +1,4 @@
-/*jslint vars: true, unparam: true */
+/*jslint vars: true, unparam: true, white: true */
 /*global jQuery, IQVOC */
 
 IQVOC.EntitySelector = (function($) {
@@ -6,8 +6,8 @@ IQVOC.EntitySelector = (function($) {
 "use strict";
 
 var EntitySelector = function(node) {
-	if(!(this instanceof EntitySelector)) { // "new" keyword optional
-		return new EntitySelector(node);
+	if(arguments.length === 0) { // subclassing; skip initialization
+		return;
 	}
 	this.el = $(node).hide(); // XXX: rename
 	this.container = $('<div class="entity_select" />').data("widget", this);
@@ -23,15 +23,16 @@ var EntitySelector = function(node) {
 	});
 	selection = $('<ul class="entity_list" />').append(selection);
 
-	var exclude = this.el.data("exclude") || null;
-	var img = $('<img src="<%= asset_path('spinner.gif') %>" class="hidden" />');
+	var exclude = this.el.data("exclude") || null,
+		img = $('<img class="hidden" />').
+			attr("src", "<%= asset_path('spinner.gif') %>");
 	this.input = $("<input />").autocomplete({
 		minLength: 3,
 		source: function(req, callback) {
 			var uri = self.el.data("query-url");
 			$.getJSON(uri, { query: req.term }, function(data, status, xhr) { // TODO: error handling
-				var excludes = self.getSelection()
-						.concat(exclude ? [exclude] : []);
+				var excludes = self.getSelection().
+						concat(exclude ? [exclude] : []);
 				data = $.map(data, function(entity, i) {
 					return $.inArray(entity.id, excludes) !== -1 ? null :
 							{ value: entity.id, label: entity.name };
@@ -46,8 +47,8 @@ var EntitySelector = function(node) {
 		select: this.onSelect
 	});
 
-	this.container.append(this.input).append(img).append(selection)
-		.insertAfter(node).prepend(node);
+	this.container.append(this.input).append(img).append(selection).
+		insertAfter(node).prepend(node);
 
 	if(this.singular && this.entities.length) {
 		this.input.hide();
@@ -55,11 +56,11 @@ var EntitySelector = function(node) {
 };
 $.extend(EntitySelector.prototype, {
 	onSelect: function(ev, ui) {
-		var el = $(this).val("");
-		var widget = el.closest(".entity_select").data("widget");
+		var el = $(this).val(""),
+			widget = el.closest(".entity_select").data("widget");
 		if(widget.add(ui.item.value)) {
-			var entity = widget
-					.createEntity({ id: ui.item.value, name: ui.item.label });
+			var entity = widget.
+					createEntity({ id: ui.item.value, name: ui.item.label });
 			widget.container.find("ul").append(entity);
 			if(widget.singular) {
 				widget.input.hide();
@@ -68,9 +69,9 @@ $.extend(EntitySelector.prototype, {
 		return false;
 	},
 	onDelete: function(ev) {
-		var el = $(this);
-		var entity = el.closest("li");
-		var widget = el.closest(".entity_select").data("widget");
+		var el = $(this),
+			entity = el.closest("li"),
+			widget = el.closest(".entity_select").data("widget");
 		widget.remove(entity.data("id"));
 		entity.remove();
 		if(widget.singular && !widget.entities.length) {
@@ -86,9 +87,9 @@ $.extend(EntitySelector.prototype, {
 		} else {
 			el = $('<span />').text(entity.name);
 		}
-		var btn = $('<a href="javascript:;" class="btn">x</a>') // "btn" to avoid fancy "button" class -- XXX: hacky workaround!?
-			.click(this.onDelete);
-		return $("<li />").data("id", entity.id).append(el).append(btn)[0];
+		var delBtn = $('<a href="javascript:;" class="btn">x</a>'). // "btn" to avoid fancy "button" class -- XXX: hacky workaround!?
+			click(this.onDelete);
+		return $("<li />").data("id", entity.id).append(el).append(delBtn)[0];
 	},
 	add: function(entity) {
 		if($.inArray(entity, this.entities) === -1) {

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

@@ -0,0 +1,45 @@
+// EntitySelector extension for qualified entities
+
+/*jslint vars: true, unparam: true, white: true */
+/*global jQuery, IQVOC */
+
+IQVOC.QualifiedEntitySelector = (function($) {
+
+"use strict";
+
+var QES = function(args) {
+	var res = IQVOC.EntitySelector.apply(this, arguments);
+	if(this.qualified()) {
+		this.container.on("change", "input.qualified", this.onQualify);
+	}
+	return res;
+};
+QES.prototype = new IQVOC.EntitySelector();
+
+QES.prototype.qualified = function() { // TODO: document (NB: doubles as i18n)
+	return this.el.data("qualified") || false;
+};
+QES.prototype.onQualify = function(ev) {
+	var el = $(this),
+		entity = el.closest("li"),
+		widget = el.closest(".entity_select").data("widget"),
+		id = entity.data("id"),
+		value = id + ":" + el.val();
+	widget.remove(id);
+	widget.add(value);
+};
+
+QES.prototype.createEntity = function(entity) {
+	var node = IQVOC.EntitySelector.prototype.createEntity.apply(this, arguments),
+		qualified = this.qualified();
+	if(qualified) {
+		var el = $(node);
+		$('<input class="qualified" />').attr("placeholder", qualified).
+				val(entity[qualified]).insertAfter(el.children(":first"));
+	}
+	return node;
+};
+
+return QES;
+
+}(jQuery));

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

@@ -123,7 +123,7 @@ return {
 jQuery(document).ready(function($) {
 	"use strict";
 
-	var locale = $("head meta[name=i18n-locale]").attr("content");
+	var locale = document.documentElement.getAttribute("lang");
 
 	IQVOC.enhancedDropdown(".menu");
 	IQVOC.dynamicAuth("#auth_controls");
@@ -188,7 +188,7 @@ jQuery(document).ready(function($) {
 
 	// entity selection (edit mode)
 	$("input.entity_select").each(function(i, node) {
-		IQVOC.EntitySelector(node);
+		new IQVOC.QualifiedEntitySelector(node);
 	});
 
 	// hide broader relations for top terms (mutually exclusive in mono hierarchies)

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

@@ -1,3 +1,4 @@
 //= require iqvoc/iqvoc
 //= require iqvoc/langselect
 //= require iqvoc/entityselect
+//= require iqvoc/entityselect_qualified

data/app/assets/stylesheets/framework.css

@@ -1,4 +1,4 @@
 /*
 *= require jquery.treeview
-*= require jquery-ui-1.8.16.custom
+*= require jquery-ui-1.8.20.custom
 */

data/app/assets/stylesheets/iqvoc/iqvoc.css.erb

@@ -8,8 +8,8 @@
 }
 
 #header h1 {
-	color: #000;
-	font-weight: bold;
+  color: #000;
+  font-weight: bold;
 }
 
 ul#navi_main {
@@ -82,40 +82,41 @@ ul.letter_selector { width: 100%; overflow: auto; margin: 0 0 10px; padding: 0;
 /* visualizations */
 
 .sections {
-	overflow: hidden; /* block formatting context */
-	zoom: 1; /* hasLayout */
+  overflow: hidden; /* block formatting context */
+  zoom: 1; /* hasLayout */
 }
 
+.infovis,
 #infovis {
-	float: right;
-	width: 300px;
-	height: 300px;
-	overflow: hidden;
-	margin: 0 0 10px 10px;
-	border: 1px solid #EEE;
+  float: right;
+  width: 300px;
+  height: 300px;
+  overflow: hidden;
+  margin: 0 0 10px 10px;
+  border: 1px solid #EEE;
 }
 
 #infovis .button {
-	float: right;
+  float: right;
 }
 
 #infovis .concept a {
-	color: #000;
+  color: #000;
 }
 
 #infovis.filtered .concept {
-	overflow: visible;
-	color: #111;
+  overflow: visible;
+  color: #111;
 }
 
 #infovis .label {
-	padding: 0 2px;
-	color: #111;
-	background-color: #EEE;
+  padding: 0 2px;
+  color: #111;
+  background-color: #EEE;
 }
 
 #infovis-label .label {
-	font-size: 0.8em;
+  font-size: 0.8em;
 }
 
 /* ######################################## */
@@ -142,7 +143,7 @@ ul.letter_selector { width: 100%; overflow: auto; margin: 0 0 10px; padding: 0;
 }
 
 #controls a {
-	color: #EEE;
+  color: #EEE;
 }
 
 #controls ul {
@@ -155,7 +156,7 @@ ul.letter_selector { width: 100%; overflow: auto; margin: 0 0 10px; padding: 0;
 
 #controls ul a {
   display: inline;
-	color: #000;
+  color: #000;
 }
 
 #controls h3 {
@@ -330,8 +331,8 @@ input[type=submit]:active, button:active, a.button:active {
 }
 
 #abstract_uri img {
-	vertical-align: middle;
-	border: none;
+  vertical-align: middle;
+  border: none;
 }
 
 #untranslated {
@@ -454,6 +455,11 @@ fieldset .note_annotations {
   margin-left: -20px; /* move into adjacent INPUT */
 }
 
+.entity_select input.qualified {
+  width: 5em;
+  margin-left: 0.5em;
+}
+
 tr.hover {
   cursor: pointer;
   background-color: #C0FAB4;

data/app/controllers/collections/hierarchical_controller.rb

@@ -15,7 +15,6 @@
 # limitations under the License.
 
 class Collections::HierarchicalController < CollectionsController
-  skip_before_filter :require_user # This is public for everyone
 
   def index
     authorize! :read, Iqvoc::Collection.base_class
@@ -33,7 +32,8 @@ class Collections::HierarchicalController < CollectionsController
             :id => collection.id,
             :url => collection_path(:id => collection, :format => :html),
             :text => CGI.escapeHTML(collection.pref_label.to_s),
-            :hasChildren => collection.subcollections.any?
+            :hasChildren => collection.subcollections.any?,
+            :additionalText => " (#{collection.additional_info})"
           }
         end
         render :json => children.to_json

data/app/controllers/collections_controller.rb

@@ -15,7 +15,6 @@
 # limitations under the License.
 
 class CollectionsController < ApplicationController
-  skip_before_filter :require_user
 
   def index
     authorize! :read, Iqvoc::Collection.base_class

data/app/controllers/concepts/alphabetical_controller.rb

@@ -15,7 +15,6 @@
 # limitations under the License.
 
 class Concepts::AlphabeticalController < ConceptsController
-  skip_before_filter :require_user
 
   def index
     authorize! :read, Concept::Base

data/app/controllers/concepts/hierarchical_controller.rb

@@ -15,7 +15,6 @@
 # limitations under the License.
 
 class Concepts::HierarchicalController < ConceptsController
-  skip_before_filter :require_user
 
   def index
     authorize! :read, Iqvoc::Concept.base_class

data/app/controllers/concepts/untranslated_controller.rb

@@ -19,7 +19,6 @@
 # controllers is the scope used. Use if statements or published methods instead.
 # "DRYness"
 class Concepts::UntranslatedController < ConceptsController
-  skip_before_filter :require_user
 
   def index
     authorize! :read, Concept::Base

data/app/controllers/concepts_controller.rb

@@ -15,7 +15,6 @@
 # limitations under the License.
 
 class ConceptsController < ApplicationController
-  skip_before_filter :require_user
 
   def index
     authorize! :read, Concept::Base

data/app/controllers/instance_configuration_controller.rb

@@ -79,10 +79,10 @@ class InstanceConfigurationController < ApplicationController
     unless default_value.is_a? Array
       return convert_value(str, default_value.class)
     else
-      return str.blank? ? [] : str.parse_csv.map { |item|
+      return str.blank? ? [] : str.parse_csv.map do |item|
         item.strip!
         convert_value(item, default_value[0].class)
-      }
+      end
     end
   end
 

data/app/controllers/pages_controller.rb

@@ -15,7 +15,6 @@
 # limitations under the License.
 
 class PagesController < ApplicationController
-  skip_before_filter :require_user
 
   # TODO: Some kind of authorization is missing here!
   # (even everybody has the right in the Ability)