iqvoc 4.0.2 → 4.0.3

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+## 4.0.3
+
+  * New frontpage with quick search
+  * SKOS importer now supports blank nodes
+  * Bugfixes
+
 ## 4.0.2
 
   * Support for collections in SKOS importer (@fgimenez)

data/Gemfile.lock

@@ -36,18 +36,16 @@ GEM
     activesupport (3.2.6)
       i18n (~> 0.6)
       multi_json (~> 1.0)
-    addressable (2.2.8)
-    ansi (1.4.2)
+    addressable (2.3.2)
+    ansi (1.4.3)
     arel (3.0.2)
-    authlogic (3.1.2)
+    authlogic (3.1.3)
       activerecord (>= 3.0.0)
-      activerecord (>= 3.0.7)
       activesupport (>= 3.0.0)
-      activesupport (>= 3.0.7)
-    awesome_print (1.0.2)
+    awesome_print (1.1.0)
     bouncy-castle-java (1.5.0146.1)
-    builder (3.0.0)
-    cancan (1.6.7)
+    builder (3.0.3)
+    cancan (1.6.8)
     capybara (1.1.2)
       mime-types (>= 1.16)
       nokogiri (>= 1.3.3)
@@ -55,36 +53,36 @@ GEM
       rack-test (>= 0.5.4)
       selenium-webdriver (~> 2.0)
       xpath (~> 0.1.4)
-    capybara-screenshot (0.1.10)
+    capybara-screenshot (0.2.2)
       capybara (>= 1.0)
     capybara-webkit (0.12.1)
       capybara (>= 1.0.0, < 1.2)
       json
-    childprocess (0.3.2)
-      ffi (~> 1.0.6)
+    childprocess (0.3.5)
+      ffi (~> 1.0, >= 1.0.6)
     database_cleaner (0.8.0)
     erubis (2.7.0)
-    excon (0.14.0)
+    excon (0.16.2)
     execjs (1.4.0)
       multi_json (~> 1.0)
-    factory_girl (3.3.0)
+    factory_girl (4.1.0)
       activesupport (>= 3.0.0)
-    factory_girl_rails (3.3.0)
-      factory_girl (~> 3.3.0)
+    factory_girl_rails (4.1.0)
+      factory_girl (~> 4.1.0)
       railties (>= 3.0.0)
     fastercsv (1.5.5)
-    ffi (1.0.11)
-    ffi (1.0.11-java)
-    heroku (2.26.6)
-      heroku-api (~> 0.2.4)
+    ffi (1.1.5)
+    ffi (1.1.5-java)
+    heroku (2.31.2)
+      heroku-api (~> 0.3.4)
       launchy (>= 0.3.2)
-      netrc (~> 0.7.2)
+      netrc (~> 0.7.7)
       rest-client (~> 1.6.1)
       rubyzip
-    heroku-api (0.2.4)
-      excon (~> 0.14.0)
+    heroku-api (0.3.5)
+      excon (~> 0.16.1)
     hike (1.2.1)
-    i18n (0.6.0)
+    i18n (0.6.1)
     iq_rdf (0.1.5)
       builder
       bundler
@@ -93,33 +91,32 @@ GEM
     journey (1.0.4)
     jruby-openssl (0.7.7)
       bouncy-castle-java (>= 1.5.0146.1)
-    json (1.7.3)
-    json (1.7.3-java)
+    json (1.7.5)
+    json (1.7.5-java)
     kaminari (0.13.0)
       actionpack (>= 3.0.0)
       activesupport (>= 3.0.0)
-      railties (>= 3.0.0)
-    launchy (2.1.0)
-      addressable (~> 2.2.6)
-    launchy (2.1.0-java)
-      addressable (~> 2.2.6)
-      ffi (~> 1.0.9)
+    launchy (2.1.2)
+      addressable (~> 2.3)
+    launchy (2.1.2-java)
+      addressable (~> 2.3)
+      ffi (~> 1.1.1)
       spoon (~> 0.0.1)
     libv8 (3.3.10.4)
-    libwebsocket (0.1.3)
+    libwebsocket (0.1.5)
       addressable
     mail (2.4.4)
       i18n (>= 0.4.0)
       mime-types (~> 1.16)
       treetop (~> 1.4.8)
-    mime-types (1.18)
-    minitest (3.0.1)
+    mime-types (1.19)
+    minitest (3.4.0)
     multi_json (1.3.6)
     mysql2 (0.3.11)
-    netrc (0.7.4)
-    nokogiri (1.5.3)
-    nokogiri (1.5.3-java)
-    pg (0.13.2)
+    netrc (0.7.7)
+    nokogiri (1.5.5)
+    nokogiri (1.5.5-java)
+    pg (0.14.1)
     polyglot (0.3.3)
     rack (1.4.1)
     rack-cache (1.2)
@@ -150,15 +147,14 @@ GEM
       json (~> 1.4)
     rest-client (1.6.7)
       mime-types (>= 1.16)
-    rubyzip (0.9.8)
-    sass (3.1.19)
+    rubyzip (0.9.9)
+    sass (3.2.1)
     sass-rails (3.2.5)
       railties (~> 3.2.0)
       sass (>= 3.1.10)
       tilt (~> 1.3)
-    selenium-webdriver (2.22.1)
+    selenium-webdriver (2.25.0)
       childprocess (>= 0.2.5)
-      ffi (~> 1.0)
       libwebsocket (~> 0.1.3)
       multi_json (~> 1.0)
       rubyzip
@@ -174,19 +170,19 @@ GEM
       rack (~> 1.0)
       tilt (~> 1.1, != 1.3.0)
     sqlite3 (1.3.6)
-    therubyracer (0.10.1)
+    therubyracer (0.10.2)
       libv8 (~> 3.3.10)
-    thor (0.15.3)
+    thor (0.16.0)
     tilt (1.3.3)
     treetop (1.4.10)
       polyglot
       polyglot (>= 0.3.1)
-    turn (0.9.5)
+    turn (0.9.6)
       ansi
     tzinfo (0.3.33)
-    uglifier (1.2.4)
+    uglifier (1.3.0)
       execjs (>= 0.3.0)
-      multi_json (>= 1.0.2)
+      multi_json (~> 1.0, >= 1.0.2)
     view_marker (1.0.0)
       rails
     xpath (0.1.4)

data/app/assets/javascripts/framework.js

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

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

@@ -0,0 +1,19 @@
+/*jslint vars: true, white: true */
+/*global jQuery, IQVOC */
+
+IQVOC.extractConcepts = function(html) {
+  "use strict";
+  var $ = jQuery;
+
+  // disable scripts (adapted from jQuery's `load`)
+  var rscript = /<script\b[^<]*(?:(?!<\/script>)<[^<]*)*<\/script>/gi;
+  html = html.replace(rscript, "");
+
+  var concepts = $("<div />").append(html).find("ul.concepts li");
+  concepts = concepts.map(function(i, node) {
+    var el = $("a", node);
+    return { value: el.attr("href"), label: $.trim(el.text()) };
+  });
+
+  return concepts.length ? Array.prototype.slice.call(concepts, 0) : [];
+};

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

@@ -26,18 +26,18 @@ var createNote = function(ev) {
 
   clone.find("label").each(function(index, element) {
     var el = $(element);
-    if (el.attr("for")) {
+    if(el.attr("for")) {
       el.attr("for", el.attr("for").replace(/_\d+_/, newIdCount));
     }
-  })
+  });
 
   clone.find(inputSelector).each(function(index, element) {
     var el = $(element);
     el.val("");
-    if (el.attr("id")) {
+    if(el.attr("id")) {
       el.attr("id", el.attr("id").replace(/_\d+_/, newIdCount));
     }
-    if (el.attr("name")) {
+    if(el.attr("name")) {
       el.attr("name", el.attr("name").replace(/\[\d+\]/, newNameCount));
     }
   });
@@ -67,15 +67,9 @@ return {
 jQuery(document).ready(function($) {
   "use strict";
 
-  var locale = document.documentElement.getAttribute("lang");
+  IQVOC.quicksearch(".quicksearch");
 
-  if(IQVOC.visualization) {
-    IQVOC.visualization.init("infovis", function(container) {
-      if(IQVOC.Storage.getItem("visualization") === "enlarged") {
-        container.data("widget").toggleSize(true);
-      }
-    });
-  }
+  var locale = document.documentElement.getAttribute("lang");
 
   // language selection
   $("#language_selection .dropdown-toggle").click(function(ev) { // use Bootstrap's Dropwdown, but without the side-effects
@@ -202,4 +196,6 @@ jQuery(document).ready(function($) {
       }
     });
   });
+
+  IQVOC.onebox(".onebox");
 });

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

@@ -1,4 +1,7 @@
 //= require iqvoc/iqvoc
+//= require iqvoc/extract_concepts
+//= require iqvoc/quicksearch
+//= require iqvoc/onebox
 //= require iqvoc/langselect
 //= require iqvoc/entityselect
 //= require iqvoc/entityselect_qualified

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

@@ -0,0 +1,44 @@
+/*jslint vars: true, browser: true, white: true */
+/*global jQuery, IQVOC */
+
+IQVOC.onebox = (function($) {
+
+"use strict";
+
+var renderResults = function(concepts, container) {
+  container.empty();
+  $.each(concepts, function(i, concept) {
+    var link = $("<a />").attr("href", concept.value).text(concept.label);
+    $("<li />").append(link).appendTo(container);
+  });
+};
+
+var getConcepts = function(input, container) {
+  var form = input.closest("form");
+  $.ajax({
+    type: form.attr("method"),
+    url: form.attr("action"),
+    data: form.serialize(),
+    success: function(data, status, xhr) {
+      renderResults(IQVOC.extractConcepts(data), container);
+    }
+  });
+};
+
+return function(selector, options) {
+  var container = $(selector);
+  var input = container.find("input[type=search]");
+  var initialValue = input.val();
+  var resultList = $("<ul />").addClass("results").appendTo(container);
+
+  input.keyup(function() {
+    if (input.val().length == 0) {
+      resultList.empty();
+    }
+    else if (input.val().length > 0 && input.val() != initialValue) {
+      setTimeout(function() { getConcepts(input, resultList) }, 200);
+    }
+  });
+};
+
+}(jQuery));

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

@@ -0,0 +1,41 @@
+/*jslint vars: true, browser: true, white: true */
+/*global jQuery, IQVOC */
+
+IQVOC.quicksearch = (function($) {
+
+"use strict";
+
+var defaults = {
+  minLength: 3,
+  autoFocus: true,
+  source: getConcepts,
+  focus: function(ev, ui) { ev.preventDefault(); },
+  select: onSelect
+};
+
+function onSelect(ev, ui) {
+  if(ui.item.value) {
+    $(ev.target).val(ui.item.label);
+    document.location = ui.item.value;
+  }
+  ev.preventDefault();
+}
+
+function getConcepts(req, callback) {
+  var form = $(this.element).closest("form");
+  $.ajax({
+    type: form.attr("method"),
+    url: form.attr("action"),
+    data: form.serialize(),
+    success: function(data, status, xhr) {
+      callback(IQVOC.extractConcepts(data));
+    }
+  });
+}
+
+return function(selector, options) {
+  options = options ? $.extend(defaults, options) : defaults;
+  $(selector).autocomplete(options);
+};
+
+}(jQuery));

data/app/assets/stylesheets/framework.css

@@ -2,5 +2,5 @@
 *= require bootstrap/bootstrap
 *= require bootstrap/bootstrap-responsive
 *= require jquery.treeview
-*= require jquery-ui-1.8.20.custom
+*= require jquery-ui-1.8.23.custom
 */

data/app/assets/stylesheets/iqvoc/bootstrap_extensions.css.scss

@@ -51,13 +51,6 @@
   }
 }
 
-// Hide search form
-@media (max-width: 1200px) {
-  .navbar-search {
-    display: none;
-  }
-}
-
 // Unify topbar margin on all viewports
 @media (min-width: 980px) {
   .navbar-fixed-top {

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

@@ -1,3 +1,30 @@
+.navbar {
+  .quicksearch {
+  }
+}
+
+.onebox {
+  padding-top: 80px;
+  margin-top: 2em;
+  text-align: center;
+
+  background: asset-data-url("iqvoc_logo.png") top center no-repeat;
+
+  .logo {
+    margin: 2em 0 1em 0;
+  }
+
+  input {
+    min-width: 60%;
+  }
+
+  ul {
+    margin-left: 0;
+    list-style: none;
+    text-align: left;
+  }
+}
+
 tr.highlightable {
   cursor: pointer;
 }
@@ -79,4 +106,3 @@ dt {
     }
   }
 }
-

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

@@ -9,5 +9,4 @@
 *= require iqvoc/note
 *= require iqvoc/entity_select
 *= require iqvoc/hacks
-*= require iqvoc/visualization
 */

data/app/controllers/application_controller.rb

@@ -14,7 +14,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-require "iqvoc/controller_extensions"
+require 'iqvoc/controller_extensions'
 
 class ApplicationController < ActionController::Base
   include Iqvoc::ControllerExtensions

data/app/controllers/concepts/alphabetical_controller.rb

@@ -19,9 +19,13 @@ class Concepts::AlphabeticalController < ConceptsController
   def index
     authorize! :read, Concept::Base
 
+    params[:prefix] = params[:letter] if params[:prefix].nil? # legacy compatibility -- XXX: unnecessary!?
+
+    redirect_to(url_for :prefix => "a") unless params[:prefix]
+
     @pref_labelings = Iqvoc::Concept.pref_labeling_class.
       concept_published.
-      label_begins_with(params[:letter]).
+      label_begins_with(params[:prefix]).
       by_label_language(I18n.locale).
       includes(:target).
       order("LOWER(#{Label::Base.table_name}.value)").

data/app/controllers/concepts/untranslated_controller.rb

@@ -24,7 +24,7 @@ class Concepts::UntranslatedController < ConceptsController
     authorize! :read, Concept::Base
 
     scope = Iqvoc::Concept.pref_labeling_class.label_class.
-      begins_with(params[:letter]).
+      begins_with(params[:prefix]).
       missing_translation(I18n.locale, Iqvoc::Concept.pref_labeling_languages.first)
 
     if I18n.locale.to_s == Iqvoc::Concept.pref_labeling_languages.first # TODO: Should be 404!

data/app/controllers/concepts_controller.rb

@@ -85,6 +85,8 @@ class ConceptsController < ApplicationController
         }
         render :json => concept_data
       end
+      format.ttl
+      format.rdf
     end
   end
 

data/app/controllers/frontpage_controller.rb

@@ -0,0 +1,23 @@
+# encoding: UTF-8
+
+# Copyright 2011 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.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+class FrontpageController < ApplicationController
+
+  def index
+    @suppress_quicksearch = true
+  end
+
+end

data/app/controllers/instance_configuration_controller.rb

@@ -67,7 +67,7 @@ class InstanceConfigurationController < ApplicationController
     Iqvoc::InstanceConfiguration.validate_value(value)
     if default_value.is_a?(Array)
       return value.to_csv.strip
-    else # String, Fixnum / Float
+    else # boolean, String, Fixnum / Float
       return value.to_s
     end
   end
@@ -89,7 +89,15 @@ class InstanceConfigurationController < ApplicationController
   # converts string to given (non-complex) type
   # raises TypeError on failure
   def convert_value(str, type)
-    if type == String
+    if [TrueClass, FalseClass].include?(type)
+      if str == "true"
+        return true
+      elsif str == "false"
+        return false
+      else
+        raise TypeError, "expected boolean"
+      end
+    elsif type == String
       return str
     elsif type == Fixnum
       raise TypeError, "expected integer" unless str =~ /^[-+]?[0-9]+$/

data/app/controllers/pages_controller.rb

@@ -0,0 +1,21 @@
+# encoding: UTF-8
+
+# Copyright 2011 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.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+class PagesController < ApplicationController
+  def help
+    authorize! :read, :help
+  end
+end

data/app/controllers/rdf_controller.rb

@@ -27,25 +27,4 @@ class RdfController < ApplicationController
     end
   end
 
-  def show
-    scope = if params[:published] == "0"
-      Iqvoc::Concept.base_class.unpublished
-    else
-      Iqvoc::Concept.base_class.published
-    end
-    if @concept = scope.by_origin(params[:id]).with_associations.last
-      respond_to do |format|
-        format.html do
-          redirect_to concept_url(:id => @concept.origin, :published => params[:published])
-        end
-        format.any do
-          authorize! :read, @concept
-          render :show_concept
-        end
-      end
-    else
-      raise ActiveRecord::RecordNotFound.new("Concept '#{params[:id]}' not found.")
-    end
-  end
-
 end

data/app/helpers/concepts_helper.rb

@@ -30,7 +30,7 @@ module ConceptsHelper
     content_tag :ul, :class => 'letter-selector unstyled' do
       letters.map do |letter|
         content_tag :li, link_to(letter, yield(letter)),
-          :class => ('active' if params[:letter] == letter.to_s.downcase)
+          :class => ('active' if params[:prefix] == letter.to_s.downcase)
       end.join("").html_safe
     end
   end

data/app/helpers/navigation_helper.rb

@@ -55,14 +55,4 @@ module NavigationHelper
     content_tag :li, content, :class => css_class
   end
 
-  def quick_search_class
-    klass = if Labeling.const_defined?(:SKOSXL)
-      Labeling::SKOSXL::Base
-    else
-      Labeling::SKOS::Base
-    end
-
-    klass.name.parameterize
-  end
-
 end

data/app/helpers/rdf_helper.rb

@@ -25,7 +25,7 @@ module RdfHelper
       hash[c.id] = c.origin
     end
 
-    document << concept.build_rdf_subject(document, controller) do |c|
+    document << concept.build_rdf_subject(document, nil) do |c|
 
       concept.collection_members.each do |collection_member|
         if @rdf_helper_cached_collections[collection_member.collection_id]

data/app/models/concept/base.rb

@@ -449,7 +449,7 @@ class Concept::Base < ActiveRecord::Base
   def ensure_rooted_top_terms
     if @full_validation
       if narrower_relations.includes(:target). # XXX: inefficient?
-          select { |rel| rel.target.top_term? }.any?
+          select { |rel| rel.target && rel.target.top_term? }.any?
         errors.add :base, I18n.t("txt.models.concept.top_term_rooted_error")
       end
     end
@@ -472,7 +472,7 @@ class Concept::Base < ActiveRecord::Base
       send(Iqvoc::Concept.pref_labeling_class_name.to_relation_name).map(&:target) +
       labelings.select{|l| l.is_a?(Iqvoc::Concept.pref_labeling_class)}.map(&:target)
     languages = {}
-    pls.each do |pref_label|
+    pls.compact.each do |pref_label|
       lang = pref_label.language.to_s
       origin = (pref_label.origin || pref_label.id || pref_label.value).to_s
       if (languages.keys.include?(lang) && languages[lang] != origin)

data/app/models/concept/skos/base.rb

@@ -21,7 +21,7 @@ class Concept::SKOS::Base < Concept::Base
 
   def build_rdf_subject(document, controller, &block)
     ns = IqRdf::Namespace.find_namespace_class(self.rdf_namespace)
-    raise "Namespace '#{base_namespace}' is not defined in IqRdf document." unless ns
+    raise "Namespace '#{self.rdf_namespace}' is not defined in IqRdf document." unless ns
     subject = IqRdf.build_uri(self.origin, ns.build_uri(self.rdf_class), &block)
 
     # ensure skos:Concept type is present

data/app/models/label/base.rb

@@ -42,8 +42,11 @@ class Label::Base < ActiveRecord::Base
     end
   end
 
-  def self.begins_with(letter)
-    where("LOWER(SUBSTR(#{Label::Base.table_name}.value, 1, 1)) = :letter", :letter => letter.to_s.downcase)
+  def self.begins_with(prefix)
+    prefix = prefix.to_s
+    table = Label::Base.table_name
+    where("LOWER(SUBSTR(#{table}.value, 1, :length)) = :prefix",
+        :length => prefix.length, :prefix => prefix.downcase)
   end
 
   def self.missing_translation(lang, main_lang)

data/app/models/labeling/base.rb

@@ -45,8 +45,8 @@ class Labeling::Base < ActiveRecord::Base
     includes(:target).merge(Label::Base.published)
   end
 
-  def self.label_begins_with(letter)
-    includes(:target).merge(Label::Base.begins_with(letter))
+  def self.label_begins_with(prefix)
+    includes(:target).merge(Label::Base.begins_with(prefix))
   end
 
   def self.by_label_language(lang)

data/app/models/labeling/skos/base.rb

@@ -83,7 +83,7 @@ class Labeling::SKOS::Base < Labeling::Base
 
   def self.build_from_rdf(subject, predicate, object)
     raise "Labeling::SKOS::Base#build_from_rdf: Subject (#{subject}) must be a Concept." unless subject.is_a?(Concept::Base)
-    raise "Labeling::SKOS::Base#build_from_rdf: Object (#{object}) must be a string literal" unless object =~ /^"(.+)"(@(.+))$/
+    raise "Labeling::SKOS::Base#build_from_rdf: Object (#{object}) must be a string literal" unless object =~ /^"(.+)"(@(.+))?$/
 
     lang = $3
     value = JSON.parse(%Q{["#{$1}"]})[0].gsub("\\n", "\n") # Trick to decode \uHHHHH chars