iqvoc 3.2.11 → 3.3.0

data/Gemfile

@@ -19,18 +19,18 @@ 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.0.10'
+gem 'rails', '3.1.3'
+
+group :assets do
+  gem 'uglifier'
+end
 
 gem 'kaminari'
 gem 'authlogic'
 gem 'cancan'
-gem 'iq_rdf', '~> 0.0.15'
+gem 'iq_rdf'# , :path => "~/github/iq_rdf" #, '~> 0.0.15'
 gem 'json'
-
-# Hotfix for the problem of engine/plugin helpers not being mixed in.
-# https://rails.lighthouseapp.com/projects/8994/tickets/1905-apphelpers-within-plugin-not-being-mixed-in
-# http://github.com/drogus/rails_helpers_fix
-gem 'rails_helpers_fix'
+gem 'rails_autolink'
 
 group :development do
   gem 'awesome_print'
@@ -41,7 +41,7 @@ end
 
 group :development, :test do
   platforms :ruby do
-    gem 'mysql2', '0.2.7'
+    gem 'mysql2'
     gem 'sqlite3'
   end
   
@@ -52,7 +52,7 @@ group :development, :test do
 end
 
 group :test do
-  gem 'nokogiri', '1.5.0'
+  gem 'nokogiri', '~> 1.5.0'
   gem 'capybara'
   gem 'capybara-webkit'
   gem 'database_cleaner'

data/Gemfile.lock

@@ -1,49 +1,42 @@
 GEM
   remote: http://rubygems.org/
   specs:
-    abstract (1.0.0)
-    actionmailer (3.0.10)
-      actionpack (= 3.0.10)
-      mail (~> 2.2.19)
-    actionpack (3.0.10)
-      activemodel (= 3.0.10)
-      activesupport (= 3.0.10)
-      builder (~> 2.1.2)
-      erubis (~> 2.6.6)
-      i18n (~> 0.5.0)
-      rack (~> 1.2.1)
-      rack-mount (~> 0.6.14)
-      rack-test (~> 0.5.7)
-      tzinfo (~> 0.3.23)
-    activemodel (3.0.10)
-      activesupport (= 3.0.10)
-      builder (~> 2.1.2)
-      i18n (~> 0.5.0)
-    activerecord (3.0.10)
-      activemodel (= 3.0.10)
-      activesupport (= 3.0.10)
-      arel (~> 2.0.10)
-      tzinfo (~> 0.3.23)
-    activerecord-jdbc-adapter (1.2.0)
-    activerecord-jdbcmysql-adapter (1.2.0)
-      activerecord-jdbc-adapter (~> 1.2.0)
-      jdbc-mysql (~> 5.1.0)
-    activerecord-jdbcsqlite3-adapter (1.2.0)
-      activerecord-jdbc-adapter (~> 1.2.0)
-      jdbc-sqlite3 (~> 3.7.2)
-    activerecord-oracle_enhanced-adapter (1.4.0)
-    activeresource (3.0.10)
-      activemodel (= 3.0.10)
-      activesupport (= 3.0.10)
-    activesupport (3.0.10)
-    ansi (1.3.0)
-    arel (2.0.10)
-    authlogic (3.0.3)
+    actionmailer (3.1.3)
+      actionpack (= 3.1.3)
+      mail (~> 2.3.0)
+    actionpack (3.1.3)
+      activemodel (= 3.1.3)
+      activesupport (= 3.1.3)
+      builder (~> 3.0.0)
+      erubis (~> 2.7.0)
+      i18n (~> 0.6)
+      rack (~> 1.3.5)
+      rack-cache (~> 1.1)
+      rack-mount (~> 0.8.2)
+      rack-test (~> 0.6.1)
+      sprockets (~> 2.0.3)
+    activemodel (3.1.3)
+      activesupport (= 3.1.3)
+      builder (~> 3.0.0)
+      i18n (~> 0.6)
+    activerecord (3.1.3)
+      activemodel (= 3.1.3)
+      activesupport (= 3.1.3)
+      arel (~> 2.2.1)
+      tzinfo (~> 0.3.29)
+    activeresource (3.1.3)
+      activemodel (= 3.1.3)
+      activesupport (= 3.1.3)
+    activesupport (3.1.3)
+      multi_json (~> 1.0)
+    ansi (1.4.1)
+    arel (2.2.1)
+    authlogic (3.1.0)
       activerecord (>= 3.0.7)
       activerecord (>= 3.0.7)
-    awesome_print (0.4.0)
-    builder (2.1.2)
-    cancan (1.6.5)
+    awesome_print (1.0.2)
+    builder (3.0.0)
+    cancan (1.6.7)
     capistrano (2.9.0)
       highline
       net-scp (>= 1.0.0)
@@ -52,98 +45,111 @@ GEM
       net-ssh-gateway (>= 1.1.0)
     capistrano-ext (1.2.1)
       capistrano (>= 1.0.0)
-    capybara (1.0.1)
+    capybara (1.1.2)
       mime-types (>= 1.16)
       nokogiri (>= 1.3.3)
       rack (>= 1.0.0)
       rack-test (>= 0.5.4)
       selenium-webdriver (~> 2.0)
       xpath (~> 0.1.4)
-    capybara-webkit (0.6.1)
-      capybara (~> 1.0.0)
-    childprocess (0.2.2)
+    capybara-webkit (0.7.2)
+      capybara (>= 1.0.0, < 1.2)
+    childprocess (0.2.8)
       ffi (~> 1.0.6)
-    database_cleaner (0.6.7)
-    erubis (2.6.6)
-      abstract (>= 1.0.0)
-    factory_girl (2.1.0)
-    factory_girl_rails (1.2.0)
-      factory_girl (~> 2.1.0)
+    database_cleaner (0.7.0)
+    erubis (2.7.0)
+    execjs (1.2.13)
+      multi_json (~> 1.0)
+    factory_girl (2.3.2)
+      activesupport
+    factory_girl_rails (1.4.0)
+      factory_girl (~> 2.3.0)
       railties (>= 3.0.0)
-    ffi (1.0.9)
-    ffi (1.0.9-java)
-    highline (1.6.2)
-    i18n (0.5.0)
+    ffi (1.0.11)
+    highline (1.6.9)
+    hike (1.2.1)
+    i18n (0.6.0)
     iq_rdf (0.0.15)
       builder
       bundler
-    jdbc-mysql (5.1.13)
-    jdbc-sqlite3 (3.7.2)
-    json (1.6.1)
-    json (1.6.1-java)
-    json_pure (1.6.1)
-    kaminari (0.12.4)
-      rails (>= 3.0.0)
-    mail (2.2.19)
-      activesupport (>= 2.3.6)
+    json (1.6.4)
+    kaminari (0.13.0)
+      actionpack (>= 3.0.0)
+      activesupport (>= 3.0.0)
+      railties (>= 3.0.0)
+    mail (2.3.0)
       i18n (>= 0.4.0)
       mime-types (~> 1.16)
       treetop (~> 1.4.8)
     memory_test_fix (0.2.0)
-    mime-types (1.16)
-    mysql2 (0.2.7)
+    mime-types (1.17.2)
+    multi_json (1.0.4)
+    mysql2 (0.3.11)
     net-scp (1.0.4)
       net-ssh (>= 1.99.1)
     net-sftp (2.0.5)
       net-ssh (>= 2.0.9)
-    net-ssh (2.2.1)
+    net-ssh (2.2.2)
     net-ssh-gateway (1.1.0)
       net-ssh (>= 1.99.1)
     nokogiri (1.5.0)
-    nokogiri (1.5.0-java)
-    polyglot (0.3.2)
-    rack (1.2.4)
-    rack-mount (0.6.14)
+    polyglot (0.3.3)
+    rack (1.3.6)
+    rack-cache (1.1)
+      rack (>= 0.4)
+    rack-mount (0.8.3)
       rack (>= 1.0.0)
-    rack-test (0.5.7)
+    rack-ssl (1.3.2)
+      rack
+    rack-test (0.6.1)
       rack (>= 1.0)
-    rails (3.0.10)
-      actionmailer (= 3.0.10)
-      actionpack (= 3.0.10)
-      activerecord (= 3.0.10)
-      activeresource (= 3.0.10)
-      activesupport (= 3.0.10)
+    rails (3.1.3)
+      actionmailer (= 3.1.3)
+      actionpack (= 3.1.3)
+      activerecord (= 3.1.3)
+      activeresource (= 3.1.3)
+      activesupport (= 3.1.3)
       bundler (~> 1.0)
-      railties (= 3.0.10)
-    rails_helpers_fix (0.1.1)
-    railties (3.0.10)
-      actionpack (= 3.0.10)
-      activesupport (= 3.0.10)
+      railties (= 3.1.3)
+    rails_autolink (1.0.4)
+      rails (>= 3.1.0)
+    railties (3.1.3)
+      actionpack (= 3.1.3)
+      activesupport (= 3.1.3)
+      rack-ssl (~> 1.3.2)
       rake (>= 0.8.7)
       rdoc (~> 3.4)
-      thor (~> 0.14.4)
-    rake (0.9.2)
-    rdoc (3.9.4)
-    rubyzip (0.9.4)
+      thor (~> 0.14.6)
+    rake (0.9.2.2)
+    rdoc (3.12)
+      json (~> 1.4)
+    rubyzip (0.9.5)
     rvm (1.9.2)
-    selenium-webdriver (2.6.0)
-      childprocess (>= 0.2.1)
-      ffi (>= 1.0.7)
-      json_pure
+    selenium-webdriver (2.16.0)
+      childprocess (>= 0.2.5)
+      ffi (~> 1.0.9)
+      multi_json (~> 1.0.4)
       rubyzip
-    sqlite3 (1.3.4)
+    sprockets (2.0.3)
+      hike (~> 1.2)
+      rack (~> 1.0)
+      tilt (~> 1.1, != 1.3.0)
+    sqlite3 (1.3.5)
     thor (0.14.6)
+    tilt (1.3.3)
     treetop (1.4.10)
       polyglot
       polyglot (>= 0.3.1)
-    turn (0.8.2)
-      ansi (>= 1.2.2)
-    tzinfo (0.3.29)
+    turn (0.8.3)
+      ansi
+    tzinfo (0.3.31)
+    uglifier (1.2.1)
+      execjs (>= 0.3.0)
+      multi_json (>= 1.0.2)
     xpath (0.1.4)
       nokogiri (~> 1.3)
 
 PLATFORMS
-  java
   ruby
 
 DEPENDENCIES
@@ -159,14 +165,15 @@ DEPENDENCIES
   capybara-webkit
   database_cleaner
   factory_girl_rails
-  iq_rdf (~> 0.0.15)
+  iq_rdf
   json
   kaminari
   memory_test_fix
-  mysql2 (= 0.2.7)
-  nokogiri (= 1.5.0)
-  rails (= 3.0.10)
-  rails_helpers_fix
+  mysql2
+  nokogiri (~> 1.5.0)
+  rails (= 3.1.3)
+  rails_autolink
   rvm
   sqlite3
   turn
+  uglifier

data/app/assets/javascripts/framework.js

@@ -0,0 +1,7 @@
+//= require jquery-1.7.1
+//= require rails
+//= require jquery-ui-1.8.16.custom
+//= require jquery-ui.datepicker-de
+//= require jquery.treeview
+//= require jquery.treeview.async
+//= require storage

data/{public/javascripts/iqvoc/entityselect.js → app/assets/javascripts/iqvoc/entityselect.js.erb}

@@ -24,7 +24,7 @@ var EntitySelector = function(node) {
 	selection = $('<ul class="entity_list" />').append(selection);
 
 	var exclude = this.el.data("exclude") || null;
-	var img = $('<img src="/images/iqvoc/spinner.gif" class="hidden" />');
+	var img = $('<img src="<%= asset_path('spinner.gif') %>" class="hidden" />');
 	this.input = $("<input />").autocomplete({
 		minLength: 3,
 		source: function(req, callback) {

data/{public/javascripts/iqvoc/application.js → app/assets/javascripts/iqvoc/iqvoc.js}

@@ -1,5 +1,121 @@
 /*jslint vars: true, unparam: true, browser: true */
-/*global jQuery, IQVOC */
+/*global jQuery */
+
+var IQVOC = (function($) {
+
+"use strict";
+
+var dynamicAuth = function(container) {
+	container = container.nodeType ? container : $(container)[0];
+	var authLink = $("a", container),
+		uri = authLink.attr("href");
+	if(uri.indexOf("/new.html") !== -1) {
+		var menu = $("ul", container),
+			label = authLink.text() + " ▼";
+		authLink.click(function(ev) {
+			authLink.html(label);
+			menu.removeClass("hidden").slideDown()
+				.find("li").load(uri + " #new_user_session");
+			ev.preventDefault();
+		});
+	}
+};
+
+var collapseDropdown = function(node) {
+	var el = $(node || this);
+	el.find("ul").slideUp(function() {
+		el.removeClass("hover");
+	});
+};
+
+// augments Son of Suckerfish drop-down menus
+var enhancedDropdown = function(container) {
+	container = container.jquery ? container : $(container);
+	var menuItems = $("> li", container),
+		ddtimer;
+	menuItems.find("ul").hide();
+	menuItems.live({
+		mouseenter: function(ev) {
+			clearTimeout(ddtimer);
+			menuItems.not(this).filter(".hover").each(function(i, node) {
+				collapseDropdown(node);
+			});
+			$(this).addClass("hover")
+				.find("ul").not(".hidden").slideDown();
+		},
+		mouseleave: function(ev) {
+			clearTimeout(ddtimer);
+			ddtimer = setTimeout(jQuery.proxy(collapseDropdown, this), 600);
+		}
+	});
+};
+
+var createNote = function(ev) {
+	var container = $(this).closest("fieldset"),
+		source = $("ol li:last-child", container);
+
+	// special case for usage notes
+	// a usage note contains a select box instead of a textarea
+	// FIXME: Hardcoded UMT stuff
+	var isUsageNote = source.find("label:first")[0].getAttribute("for");
+	isUsageNote = isUsageNote ? isUsageNote.match(/^concept_note_umt_usage_notes/) : false;
+
+	if(source.is(":hidden")) {
+		source.show();
+		return false;
+	}
+
+	var clone = source.clone();
+
+	var count = source.find(isUsageNote ? "select" : "textarea")[0].id
+			.match(/_(\d+)_/)[1];
+	count = String(parseInt(count, 10) + 1);
+	var newIdCount = "_" + count + "_",
+		newNameCount = "[" + count + "]";
+
+	clone.find("label")[0]
+		.setAttribute("for", (source.find("label")[0].getAttribute("for") || "")
+				.replace(/_\d+_/, newIdCount));
+
+	// clone.find("input")
+	// .attr("id", source.find("input[type=hidden]").attr("id").replace(/_\d+_/, newIdCount))
+	// .attr("name", source.find("input[type=hidden]").attr("name").replace(/\[\d+\]/, newNameCount));
+
+	var src, el;
+	if(!isUsageNote) {
+		src = source.find("textarea")[0];
+		el = clone.find("textarea").val("")[0];
+		el.id = src.id.replace(/_\d+_/, newIdCount);
+		el.name = src.name.replace(/\[\d+\]/, newNameCount);
+	}
+	src = source.find("select")[0];
+	el = clone.find("select")[0];
+	el.id = src.id.replace(/_\d+_/, newIdCount);
+	el.name = src.name.replace(/\[\d+\]/, newNameCount);
+
+	clone.addClass("new");
+	$("ol", container).append(clone);
+
+	return false;
+};
+
+// work around apparent capybara-webkit issue:
+// https://github.com/thoughtbot/capybara-webkit/issues/43
+var Storage = localStorage || null;
+if(Storage === null) {
+	Storage = {};
+	Storage.getItem = function() { return null; };
+	Storage.setItem = $.noop;
+}
+
+return {
+	Storage: Storage,
+	dynamicAuth: dynamicAuth,
+	enhancedDropdown: enhancedDropdown,
+	createNote: createNote
+};
+
+}(jQuery));
 
 jQuery(document).ready(function($) {
 	"use strict";
@@ -131,3 +247,4 @@ jQuery(document).ready(function($) {
 		});
 	});
 });
+

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

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

data/app/assets/javascripts/manifest.js

@@ -0,0 +1,2 @@
+//= require framework
+//= require iqvoc/manifest

data/app/assets/stylesheets/framework.css

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

data/{public/stylesheets/iqvoc/forms.css → app/assets/stylesheets/iqvoc/forms.css.erb}

@@ -63,7 +63,7 @@ form.form textarea {
 }
 
 form.form span.fieldWithErrors {
-  background: url("../../images/iqvoc/red_arrow.png");
+  background: url(<%= asset_data_uri 'red_arrow.png' %>);
   width: 20px;
   height: 20px;
   display: inline-block;

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

@@ -0,0 +1,6 @@
+/* Internet Explorer Bugfixes */
+
+.sections .entity_list li.last-child:after,
+.relation-body .entity_list li.last-child:after {
+  content: "";
+}

data/{public/stylesheets/iqvoc/iqvoc.css → app/assets/stylesheets/iqvoc/iqvoc.css.erb}

@@ -4,7 +4,7 @@
 #header {
   height: 85px;
   padding: 9px 1em 1em 160px;
-  background: url('../../images/iqvoc/header_long.png') no-repeat;
+  background: url(<%= asset_data_uri 'header_long.png' %>) no-repeat;
 }
 
 #header h1 {
@@ -46,7 +46,7 @@ a.unpublished {
 }
 
 a.back {
-  background: url('images/back.png') 0 50% no-repeat;
+  background: url(<%= asset_data_uri 'back.png' %>) 0 50% no-repeat;
   padding-left: 20px;
 }
 
@@ -248,7 +248,7 @@ ul#navi_main li {
 }
 
 #footer {
-  background: url('../../images/iqvoc/footer.png') no-repeat top right;
+  background: url(<%= asset_data_uri 'footer.png' %>) no-repeat top right;
   height: 43px;
   margin-top: 15px;
   padding-top: 10px;

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

@@ -0,0 +1,5 @@
+/*
+*= require iqvoc/iqvoc
+*= require iqvoc/forms
+*= require iqvoc/widgets
+*/

data/app/assets/stylesheets/manifest.css

@@ -0,0 +1,4 @@
+/*
+*= require framework
+*= require iqvoc/manifest
+*/

data/app/controllers/collections_controller.rb

@@ -29,7 +29,7 @@ class CollectionsController < ApplicationController
 
         # When in single query mode, AR handles ALL includes to be loaded by that
         # one query. We don't want that! So let's do it manually :-)
-        Iqvoc::Collection.base_class.send(:preload_associations, @collections, [:subcollections])
+        ActiveRecord::Associations::Preloader.new(@collections, [:subcollections]).run
       end
       format.json do # For the widget
         @collections = Iqvoc::Collection.base_class.with_pref_labels.merge(Label::Base.by_query_value("#{params[:query]}%"))
@@ -48,7 +48,10 @@ class CollectionsController < ApplicationController
 
     # When in single query mode, AR handles ALL includes to be loaded by that
     # one query. We don't want that! So let's do it manually :-)
-    Iqvoc::Collection.base_class.send(:preload_associations, @collection, [:pref_labels, {:subcollections => [:pref_labels, :subcollections]}, {:concepts => [:pref_labels] + Iqvoc::Concept.base_class.default_includes}])
+    ActiveRecord::Associations::Preloader.new(@collection, 
+      [:pref_labels, 
+      {:subcollections => [:pref_labels, :subcollections]},
+      {:concepts => [:pref_labels] + Iqvoc::Concept.base_class.default_includes}]).run
   end
 
   def new
@@ -80,8 +83,11 @@ class CollectionsController < ApplicationController
 
     # When in single query mode, AR handles ALL includes to be loaded by that
     # one query. We don't want that! So let's do it manually :-)
-    Iqvoc::Collection.base_class.send(:preload_associations, @collection, [:pref_labels, {:subcollections => :pref_labels}, {:concepts => [:pref_labels] + Iqvoc::Concept.base_class.default_includes}])
-
+    ActiveRecord::Associations::Preloader.new(@collection, [
+      :pref_labels, 
+      {:subcollections => :pref_labels}, 
+      {:concepts => [:pref_labels] + Iqvoc::Concept.base_class.default_includes}]).run
+      
     build_note_relations
   end