iqvoc 4.0.6 → 4.0.7

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+## [4.0.7]
+
+  * Added support for Sesame as triplestore synchronization target
+  * Ditched Ruby 1.8 API compatibility; iQvoc now requires Ruby 1.9+
+  * Improved instant search on front page
+
 ## 4.0.6
 
   * Bugfixes for Triplestore Sync and configuration

data/Gemfile.lock

@@ -87,7 +87,7 @@ GEM
     iq_rdf (0.1.8)
       builder
       bundler
-    iq_triplestorage (0.1.4)
+    iq_triplestorage (0.2.2)
     jdbc-mysql (5.1.13)
     jdbc-sqlite3 (3.7.2)
     journey (1.0.4)

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

@@ -1,5 +1,4 @@
 //= require iqvoc/iqvoc
-//= require iqvoc/extract_concepts
 //= require iqvoc/quicksearch
 //= require iqvoc/onebox
 //= require iqvoc/langselect

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

@@ -0,0 +1,81 @@
+/*jslint vars: true, browser: true, white: true */
+/*global jQuery, IQVOC */
+
+IQVOC.onebox = (function($) {
+
+"use strict";
+
+function OneBox(form) {
+  this.form = form.jquery ? form : $(form);
+  this.input = $(".onebox-input", this.form); // TODO: document
+  this.container = this.form.removeClass("onebox").
+      wrap('<div class="onebox" />').parent(); // TODO: document
+  this.results = $('<ol class="results concepts unstyled" />');
+  this.spinner = $("<img />").
+      attr("src", "<%= asset_path('spinner_24x24.gif') %>").
+      appendTo(this.container).hide();
+
+  this.form.on("submit", $.proxy(this, "onSubmit"));
+  this.input.on("keyup", debounce($.proxy(this, "onInput"), 300));
+}
+OneBox.prototype.reset = function() {
+  this.container.children().not(this.form).not(this.spinner).remove();
+};
+OneBox.prototype.renderResults = function(html) {
+  var doc = $("<div />").append(html);
+  var items = $(".concepts > li", doc);
+  var pagination = $(".pagination", doc);
+
+  this.reset();
+  this.results.empty().append(items).appendTo(this.container);
+  pagination.appendTo(this.container);
+};
+OneBox.prototype.onSubmit = function(ev) {
+  ev.preventDefault(); // handled by #onInput
+};
+OneBox.prototype.onInput = function(ev) {
+  var val = this.input.val();
+  this.reset();
+  if(val.length > 0 && val !== this.initialValue) {
+    this.getConcepts();
+  }
+};
+OneBox.prototype.getConcepts = function() {
+  this.spinner.show();
+  $.ajax({
+    type: this.form.attr("method"),
+    url: this.form.attr("action"),
+    data: this.form.serialize(),
+    success: $.proxy(this, "onResults")
+  });
+};
+OneBox.prototype.onResults = function(html, status, xhr) {
+  // disable scripts (adapted from jQuery#load)
+  var rscript = /<script\b[^<]*(?:(?!<\/script>)<[^<]*)*<\/script>/gi;
+  html = html.replace(rscript, "");
+
+  this.spinner.hide();
+  this.renderResults(html);
+};
+
+return function(selector) {
+  return new OneBox(selector); // XXX: returning an instance of a private class seems weird
+};
+
+function debounce(fn, delay) { // TODO: move elsewhere
+  var timer;
+  return function() {
+    var self = this;
+    var args = arguments;
+    if(timer) {
+      clearTimeout(timer);
+      timer = null;
+    }
+    timer = setTimeout(function() {
+      fn.apply(self, args);
+      timer = null;
+    }, delay);
+  };
+}
+
+}(jQuery));

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

@@ -28,11 +28,29 @@ function getConcepts(req, callback) {
     url: form.attr("action"),
     data: form.serialize(),
     success: function(data, status, xhr) {
-      callback(IQVOC.extractConcepts(data));
+      callback(extractConcepts(data));
     }
   });
 }
 
+function extractConcepts(html) {
+  // disable scripts (adapted from jQuery's `load`)
+  var rscript = /<script\b[^<]*(?:(?!<\/script>)<[^<]*)*<\/script>/gi;
+  var html = html.replace(rscript, "");
+
+  var concepts = $("<div />").append(html).find("ol.concepts li");
+  concepts = concepts.map(function(i, node) {
+    var el = $("a", node);
+    return {
+      value: el.attr("href"),
+      label: $.trim(el.parent().text()).replace(/\s+/, " ")
+    };
+  });
+
+  return concepts.length ? Array.prototype.slice.call(concepts, 0) :
+      [{ value: null, label: "no matches" }]; // TODO: i18n
+}
+
 return function(selector, options) {
   options = options ? $.extend(defaults, options) : defaults;
   $(selector).autocomplete(options);

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

@@ -18,11 +18,15 @@
     min-width: 60%;
   }
 
-  ul {
+  ol {
     margin-left: 0;
     list-style: none;
     text-align: left;
   }
+
+  .pagination {
+    text-align: left;
+  }
 }
 
 tr.highlightable {
@@ -61,8 +65,10 @@ img.spinner {
   margin-top: 2px;
 }
 
-dt {
-  margin-top: 10px;
+dl {
+  dt {
+    margin-top: 10px;
+  }
 }
 
 .letter-selector {
@@ -106,3 +112,20 @@ dt {
     }
   }
 }
+
+ol.concepts {
+  li {
+    margin-bottom: 15px;
+    p {
+      margin: 0;
+    }
+    p.term {
+      a {
+        font-weight: bold;
+      }
+    }
+    p.uri {
+      color: green;
+    }
+  }
+}

data/app/controllers/concepts/alphabetical_controller.rb

@@ -35,7 +35,11 @@ class Concepts::AlphabeticalController < ConceptsController
 
     # 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 :-)
-    ActiveRecord::Associations::Preloader.new(@pref_labelings, :owner => Iqvoc::Concept.base_class.default_includes).run
+    includes = Iqvoc::Concept.base_class.default_includes
+    if Iqvoc::Concept.note_classes.include?(Note::SKOS::Definition)
+      includes << Note::SKOS::Definition.name.to_relation_name
+    end
+    ActiveRecord::Associations::Preloader.new(@pref_labelings, :owner => includes).run
   end
 
 end

data/app/controllers/triplestore_sync_controller.rb

@@ -50,12 +50,18 @@ class TriplestoreSyncController < ApplicationController
   def sync
     authorize! :use, :dashboard
 
-    success = triplestore_syncer.all # XXX: long-running
+    flash[:error] = []
+    begin
+      success = triplestore_syncer.all # XXX: long-running
+    rescue => exc
+      success = false
+      flash[:error] << exc.message
+    end
 
     if success
       flash[:success] = I18n.t("txt.controllers.triplestore_sync.success")
     else
-      flash[:error] = I18n.t("txt.controllers.triplestore_sync.error")
+      flash[:error] << I18n.t("txt.controllers.triplestore_sync.error")
     end
 
     redirect_to :action => "index"

data/app/views/concepts/alphabetical/_pref_labeling.html.erb

@@ -1,6 +1,19 @@
 <li>
-  <%= link_to pref_labeling.target.to_s, concept_path(:id => pref_labeling.owner), :alt => pref_labeling.owner.origin %>
-  <%- if pref_labeling.owner.additional_info.present? -%>
-    (<%= pref_labeling.owner.additional_info %>)
-  <%- end -%>
+<p class="term">
+<%= link_to pref_labeling.target.to_s, concept_path(:id => pref_labeling.owner), :alt => pref_labeling.owner.origin %>
+<% if pref_labeling.owner.additional_info.present? %>
+(<%= pref_labeling.owner.additional_info %>)
+<% end %>
+</p>
+
+<p class="uri"><%= rdf_url(:id => pref_labeling.owner.origin, :lang => nil, :format => nil) %></p>
+<% if pref_labeling.owner.respond_to?(Note::SKOS::Definition.name.to_relation_name) &&
+  pref_labeling.owner.send(Note::SKOS::Definition.name.to_relation_name).any? %>
+  <% pref_labeling.owner.send(Note::SKOS::Definition.name.to_relation_name).each do |definition| %>
+    <p class="definition" lang="<%= definition.language %>">
+      <%= pref_labeling.owner.send(Note::SKOS::Definition.name.to_relation_name).first.value %>
+    </p>
+  <% end %>
+<% end %>
+
 </li>

data/app/views/concepts/alphabetical/index.html.erb

@@ -8,9 +8,9 @@
       <% alphabetical_concepts_path(:prefix => letter.to_s.downcase) %>
     <% end %>
   </div>
-  <ul class="concepts">
+  <ol class="concepts unstyled">
     <%= render :partial => 'pref_labeling', :collection => @pref_labelings %>
-  </ul>
+  </dl>
 </div>
 
 <%= paginate @pref_labelings %>

data/app/views/frontpage/index.html.erb

@@ -1,8 +1,7 @@
-<div class="onebox">
-  <%= form_tag alphabetical_concepts_path(:prefix => nil), :method => :get do %>
-    <%= search_field_tag "prefix", nil, :id => nil,
-            :class => "onebox-input",
-            :autofocus => true,
-            :placeholder => t("txt.views.frontpage.type_to_browse") %>
-  <% end %>
-</div>
+<%= form_tag alphabetical_concepts_path(:prefix => nil), :method => :get,
+        :class => "onebox" do %>
+  <%= search_field_tag "prefix", nil, :id => nil,
+          :class => "onebox-input",
+          :autofocus => true,
+          :placeholder => t("txt.views.frontpage.type_to_browse") %>
+<% end %>

data/config/boot.rb

@@ -17,13 +17,6 @@
 require 'rubygems'
 
 # Set up gems listed in the Gemfile.
-gemfile = File.expand_path('../../Gemfile', __FILE__)
-begin
-  ENV['BUNDLE_GEMFILE'] = gemfile
-  require 'bundler'
-  Bundler.setup
-rescue Bundler::GemNotFound => e
-  STDERR.puts e.message
-  STDERR.puts "Try running `bundle install`."
-  exit!
-end if File.exist?(gemfile)
+ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../../Gemfile', __FILE__)
+
+require 'bundler/setup' if File.exists?(ENV['BUNDLE_GEMFILE'])

data/config/engine.rb

@@ -29,6 +29,11 @@ module Iqvoc
     initializer "iqvoc.add_assets_to_precompilation" do |app|
       app.config.assets.precompile += Iqvoc.core_assets
     end
+
+    initializer "iqvoc.load_migrations" do |app|
+      # Pull in all the migrations to the application embedding iqvoc
+      app.config.paths['db/migrate'] += Iqvoc::Engine.paths['db/migrate'].existent
+    end
   end
 
 end

data/db/migrate/20110510162719_use_mono_hierarchy_instead_of_poly_hierarchy.rb

@@ -1,13 +1,13 @@
 class UseMonoHierarchyInsteadOfPolyHierarchy < ActiveRecord::Migration
   def self.up
     ActiveRecord::Base.transaction do
-      Concept::Relation::Base.update_all("type = 'Concept::Relation::SKOS::Broader::Mono'", :type => 'Concept::Relation::SKOS::Broader::Poly')
+      execute "UPDATE concept_relations SET type = 'Concept::Relation::SKOS::Broader::Mono' WHERE type = 'Concept::Relation::SKOS::Broader::Poly'"
     end
   end
 
   def self.down
     ActiveRecord::Base.transaction do
-      Concept::Relation::Base.update_all("type = 'Concept::Relation::SKOS::Broader::Poly'", :type => 'Concept::Relation::SKOS::Broader::Mono')
+      execute "UPDATE concept_relations SET type = 'Concept::Relation::SKOS::Broader::Poly' WHERE type = 'Concept::Relation::SKOS::Broader::Mono'"
     end
   end
 end

data/db/migrate/20110525103100_separate_note_annotation_predicates.rb

@@ -3,35 +3,22 @@ class SeparateNoteAnnotationPredicates < ActiveRecord::Migration
     rename_column :note_annotations, :identifier, :predicate
     add_column :note_annotations, :namespace, :string, :limit => 50
 
-    total = Note::Annotated::Base.count
-    i = 0
+    annotations = select_rows("SELECT id, predicate FROM note_annotations")
 
-    puts "starting #{total} note annotation conversions..."
-    reset = "\r" + "\e[0K" # adapted from http://snippets.dzone.com/posts/show/3760
-
-    Note::Annotated::Base.find_each do |annotation|
-      print "#{reset}#{i += 1} / #{total}"
-
-      old_identifier = annotation.predicate
-      namespace, predicate = old_identifier.split(":", 2)
-      annotation.predicate = predicate
-      annotation.namespace = namespace
-      annotation.save!
-
-      $stdout.flush
+    annotations.each do |annotation|
+      namespace, predicate = annotation[1].split(":", 2)
+      execute "UPDATE note_annotations SET namespace = '#{namespace}', predicate = '#{predicate}' WHERE id = #{annotation[0]}"
     end
-
-    print "#{reset}"
-    $stdout.flush
-    puts "note annotation conversion complete"
   end
 
   def self.down
-    Note::Annotated::Base.find_each do |annotation|
-      identifier = [annotation.namespace, annotation.predicate].join(":")
-      annotation.predicate = identifier
-      annotation.save!
+    annotations = select_rows("SELECT id, predicate, namespace FROM note_annotations")
+
+    annotations.each do |annotation|
+      identifier = [annotation[2], annotation[1]].join(":")
+      execute "UPDATE note_annotations SET predicate = '#{identifier}' WHERE id = #{annotation[0]}"
     end
+
     rename_column :note_annotations, :predicate, :identifier
     remove_column :note_annotations, :namespace
   end

data/db/migrate/20110615134040_change_umt_note_annotations_to_dct.rb

@@ -1,9 +1,9 @@
 class ChangeUmtNoteAnnotationsToDct < ActiveRecord::Migration
   def self.up
-    Note::Annotated::Base.update_all({:namespace => "dct", :predicate => "creator"}, {:namespace => "umt", :predicate => "editor"})
+    execute "UPDATE note_annotations SET namespace = 'dct', predicate = 'creator' WHERE namespace = 'umt' AND predicate = 'editor'"
   end
 
   def self.down
-    Note::Annotated::Base.update_all({:namespace => "umt", :predicate => "editor"}, {:namespace => "dct", :predicate => "creator"})
+    execute "UPDATE note_annotations SET namespace = 'umt', predicate = 'editor' WHERE namespace = 'dct' AND predicate = 'creator'"
   end
 end

data/lib/engine_tasks/db.rake

@@ -1,27 +1,6 @@
 namespace :iqvoc do
   namespace :db do
 
-    desc "Migrate the database through scripts in db/migrate and update db/schema.rb by invoking db:schema:dump. Target specific version with VERSION=x. Turn off output with VERBOSE=false."
-    task :migrate => :environment do
-      ActiveRecord::Migration.verbose = ENV["VERBOSE"] ? ENV["VERBOSE"] == "true" : true
-      ActiveRecord::Migrator.migrate(Iqvoc::Engine.find_root_with_flag("db").join("db/migrate"), ENV["VERSION"] ? ENV["VERSION"].to_i : nil)
-      Rake::Task["db:schema:dump"].invoke if ActiveRecord::Base.schema_format == :ruby
-    end
-
-
-    desc "Migrate the database through all scripts in db/migrate of every engine and update db/schema.rb by invoking db:schema:dump. Target specific version with VERSION=x. Turn off output with VERBOSE=false."
-    task :migrate_all => :environment do
-      ActiveRecord::Migration.verbose = ENV["VERBOSE"] ? ENV["VERBOSE"] == "true" : true
-      paths = Rails.application.config.paths["db/migrate"].existent +
-          Rails.application.railties.engines.
-              map { |e| e.config.paths["db/migrate"] && e.config.paths["db/migrate"].existent }.
-              flatten.compact
-
-      puts "Migrating from: " + paths.join(", ")
-      ActiveRecord::Migrator.migrate(paths, ENV["VERSION"] ? ENV["VERSION"].to_i : nil)
-      Rake::Task["db:schema:dump"].invoke if ActiveRecord::Base.schema_format == :ruby
-    end
-
     desc "Load seeds (task is idempotent)"
     task :seed => :environment do
       Iqvoc::Engine.load_seed

data/lib/iqvoc/rdf_sync.rb

@@ -1,15 +1,27 @@
 # encoding: UTF-8
 
-require 'iq_triplestorage/virtuoso_adaptor'
-
 class Iqvoc::RDFSync
   delegate :url_helpers, :to => "Rails.application.routes"
 
-  def initialize(base_url, target_host, *args)
+  ADAPTORS = { # XXX: inappropriate?
+    "virtuoso" => lambda do  |host_url, options|
+      require 'iq_triplestorage/virtuoso_adaptor'
+      return IqTriplestorage::VirtuosoAdaptor.new(host_url, options)
+    end,
+    "sesame" => lambda do |host_url, options|
+      require 'iq_triplestorage/sesame_adaptor'
+      host_url, _, repo = host_url.rpartition("/repositories/")
+      if host_url.blank? || repo.blank?
+       raise ArgumentError, "missing repository in Sesame URL"
+      end
+      options[:repository] = repo
+      return IqTriplestorage::SesameAdaptor.new(host_url, options)
+    end
+  }
+
+  def initialize(base_url, target_url, options)
     @base_url = base_url
-    @target_host = target_host
-    options = args.extract_options!
-    @target_port = options[:port]
+    @target_url = target_url
     @username = options[:username]
     @password = options[:password]
     @batch_size = options[:batch_size] || 100
@@ -50,8 +62,9 @@ class Iqvoc::RDFSync
       memo
     end
 
-    adaptor = IqTriplestorage::VirtuosoAdaptor.new(@target_host, @target_port,
-        @username, @password)
+    adaptor_type = "sesame" # XXX: hard-coded
+    adaptor = ADAPTORS[adaptor_type].call(@target_url, :username => @username,
+        :password => @password)
     return adaptor.batch_update(data)
   end
 
@@ -97,12 +110,7 @@ module Iqvoc::RDFSync::Helper # TODO: rename -- XXX: does not belong here!?
   def triplestore_syncer
     base_url = root_url(:lang => nil) # XXX: brittle in the face of future changes?
 
-    host = URI.parse(Iqvoc.config["triplestore.url"])
-    port = host.port
-    host.port = 80 # XXX: hack to remove port from serialization
-    host = host.to_s
-
-    return Iqvoc::RDFSync.new(base_url, host, :port => port,
+    return Iqvoc::RDFSync.new(base_url, Iqvoc.config["triplestore.url"],
         :username => Iqvoc.config["triplestore.username"].presence,
         :password => Iqvoc.config["triplestore.password"].presence,
         :view_context => view_context) # fugly, but necessary; cf. RDFSync#serialize

data/lib/iqvoc/version.rb

@@ -15,5 +15,5 @@
 # limitations under the License.
 
 module Iqvoc
-  VERSION = "4.0.6"
+  VERSION = "4.0.7"
 end