iqvoc 4.0.1 → 4.0.2

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+## 4.0.2
+
+  * Support for collections in SKOS importer (@fgimenez)
+  * Bugfixes
+
 ## 4.0.1 (2012-06-20)
 
   * Rails application template

data/README.md

@@ -48,7 +48,7 @@ in the Gemfile and Cedar does not support a custom `BUNDLE_WITHOUT` config like
 
 ### Custom
 
-We recommend running [iQvoc as a Rails engine](https://github.com/innoq/iqvoc/wiki/iQvoc-as-a-Rails-Engine). 
+We recommend running [iQvoc as a Rails engine](https://github.com/innoq/iqvoc/wiki/iQvoc-as-a-Rails-Engine).
 Running the cloned source code is possible but any modifications would require a fork.
 
 1. Configure your database via `config/database.template.yml`. Don't forget to rename it to `database.yml`

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

@@ -2,6 +2,12 @@ tr.highlightable {
   cursor: pointer;
 }
 
+table.dashboard {
+  th {
+    white-space: nowrap;
+  }
+}
+
 .alert {
   p {
     margin: 0 0 10px 0;

data/app/controllers/concepts_controller.rb

@@ -64,19 +64,22 @@ class ConceptsController < ApplicationController
       format.json do
         # 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(@concept,
-          [:labels,
-          { :relations => { :target => [:labelings, :relations] } }]).run
+        ActiveRecord::Associations::Preloader.new(@concept, [:labels,
+            { :relations => { :target => [:labelings, :relations] } }]).run
 
+        published_relations = lambda { |concept|
+          return concept.relations.includes(:target).
+              merge(Iqvoc::Concept.base_class.published)
+        }
         concept_data = {
           :origin => @concept.origin,
           :labels => @concept.labelings.map { |ln| labeling_as_json(ln) },
-          :relations => @concept.relations.map { |relation|
+          :relations => published_relations.call(@concept).map { |relation|
             concept = relation.target
             {
               :origin => concept.origin,
               :labels => concept.labelings.map { |ln| labeling_as_json(ln) },
-              :relations => concept.relations.length
+              :relations => published_relations.call(concept).count
             }
           }
         }

data/app/helpers/concepts_helper.rb

@@ -84,7 +84,11 @@ module ConceptsHelper
   # Renders a partial taken from the .partial_name method of the objects
   # associated to the concept.
   def render_concept_association(hash, concept, association_class, further_options = {})
-    html = render(association_class.partial_name(concept), further_options.merge(:concept => concept, :klass => association_class))
+    html = if association_class.respond_to?(:hidden?) && association_class.hidden?(concept)
+      ""
+    else
+      render(association_class.partial_name(concept), further_options.merge(:concept => concept, :klass => association_class))
+    end
     # Convert the already safely buffered string back to a regular one
     # in order to be able to modify it with squish
     if String.new(html).squish.present?

data/app/helpers/dashboard_helper.rb

@@ -18,9 +18,9 @@ module DashboardHelper
 
   def sorting_controls_for(name)
     content_tag :span, :class => "sorting-controls" do
-      link_to(image_tag("arrow_down.gif", :class => "arrow_down"),
+      link_to(image_tag("arrow_up.gif", :class => "arrow_up"),
         dashboard_path(:order => "asc", :by => name.to_s)) +
-        link_to(image_tag("arrow_up.gif", :class => "arrow_up"),
+        link_to(image_tag("arrow_down.gif", :class => "arrow_down"),
         dashboard_path(:order => "desc", :by => name.to_s))
     end
   end

data/app/helpers/navigation_helper.rb

@@ -55,4 +55,14 @@ 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/models/collection/member/base.rb

@@ -18,6 +18,11 @@ class Collection::Member::Base < ActiveRecord::Base
 
   self.table_name = 'collection_members'
 
+  class_attribute :rdf_namespace, :rdf_predicate
+  self.rdf_namespace = nil
+  self.rdf_predicate = nil
+
   belongs_to :collection, :class_name => 'Collection::Base'
+  belongs_to :target, :class_name => 'Concept::Base'
 
 end

data/app/models/collection/member/skos/base.rb

@@ -0,0 +1,37 @@
+# encoding: UTF-8
+
+# Copyright 2012 Hola, S.L.
+#
+# 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 Collection::Member::SKOS::Base < Collection::Member::Base
+
+  self.rdf_namespace = "skos"
+  self.rdf_predicate = "member"
+
+  def self.build_from_rdf(subject, predicate, object)
+    raise "Labeling::SKOS::Base#build_from_rdf: Subject (#{subject}) must be a Collection." unless subject.is_a?(Collection::Base)
+    raise "Labeling::SKOS::Base#build_from_rdf: Object (#{object}) must be a Collection or Concept." unless object.is_a?(Collection::Base) or object.is_a?(Concept::Base)
+
+    if subject.send(:members).select{|rel| rel.collection_id == subject.id || rel.target == object}.empty?
+      subject.send(:members) << self.new(:target => object)
+      if object.is_a?(Collection::Base)
+        subject.send(:subcollections) << object
+      end
+    end
+
+    if object.send(:collections).select{|coll| coll.id == subject.id}.empty?
+      object.send(:collections) << subject
+    end
+  end
+end

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

@@ -0,0 +1,35 @@
+# encoding: UTF-8
+
+# Copyright 2012 Hola, S.L.
+#
+# 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 Collection::SKOS::Base < Collection::Base
+
+  self.rdf_namespace = "skos"
+  self.rdf_class = "Collection"
+
+  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
+    subject = IqRdf.build_uri(self.origin, ns.build_uri(self.rdf_class), &block)
+
+    # ensure skos:Collection type is present
+    unless self.rdf_namespace == "skos" && self.rdf_class == "Collection"
+      subject.Rdf.build_predicate("type", IqRdf::Skos.build_uri("Collection"))
+    end
+
+    return subject
+  end
+
+end

data/app/models/collection/unordered.rb

@@ -14,5 +14,5 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-class Collection::Unordered < Collection::Base
+class Collection::Unordered < Collection::SKOS::Base
 end

data/app/views/collections/_form.html.erb

@@ -7,7 +7,9 @@
 <%= simple_form_for collection, :as => :concept, :url => collection.new_record? ? collections_path : collection_path(collection), :html => { :class => 'form-horizontal' } do |f| %>
 <fieldset>
   <legend><%= t 'txt.views.layouts.sections.labels' %></legend>
-  <p><%= t 'txt.common.hint_csv_input' %></p>
+  <% if not Iqvoc.const_defined?(:SKOSXL) %>
+    <p><%= t 'txt.common.hint_csv_input' %></p>
+  <% end %>
     <%- Iqvoc::Concept.labeling_classes.each do |labeling_class, languages| -%>
       <%- languages.each do |language| -%>
         <%= render labeling_class.edit_partial_name(@collection), :f => f,

data/app/views/concepts/_form.html.erb

@@ -18,7 +18,9 @@
   <!-- Labelings -->
   <fieldset>
     <legend><%= Labeling::Base.model_name.human(:count => 2) %></legend>
-    <p><%= t 'txt.common.hint_csv_input' %></p>
+    <% if not Iqvoc.const_defined?(:SKOSXL) %>
+      <p><%= t 'txt.common.hint_csv_input' %></p>
+    <% end %>
     <%- Iqvoc::Concept.labeling_classes.each do |labeling_class, languages| -%>
       <%- languages.each do |language| -%>
         <%= render labeling_class.edit_partial_name(concept), :f => f,

data/app/views/concepts/sidebars/_singular.html.erb

@@ -1,6 +1,7 @@
 <%- published_param = concept.published? ? nil : "0" -%>
 
 <%= sidebar do %>
+  <%= sidebar_item :icon => 'share', :text => t('txt.models.concept.uri'), :path => concept_url(concept.origin, :format => nil, :published => published_param, :lang => nil) %>
   <%= sidebar_header t('txt.common.representations') %>
   <%= sidebar_item :icon => 'share', :text => 'HTML', :path => rdf_url(concept.origin, :format => :html, :published => published_param, :lang => nil) %>
   <%= sidebar_item :icon => 'share', :text => 'RDF/XML', :path => rdf_url(concept.origin, :format => :rdf, :published => published_param, :lang => nil), :id => 'rdf_link_xml' %>

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

@@ -1,6 +1,6 @@
 <%= page_header :title => 'Dashboard' %>
 
-<table class="table">
+<table class="table dashboard">
   <thead>
     <tr>
       <th><%= t("txt.views.dashboard.type") %><%= sorting_controls_for(:class) %></th>
@@ -38,4 +38,4 @@
 </table>
 
 <%= paginate @items %>
-<%= render 'sidebar' %>
+<%= render 'dashboard/sidebar' %>

data/app/views/errors/not_found.html.erb

@@ -1,8 +1,5 @@
-<h2><strong><%= t("txt.views.errors.not_found.header") %></strong></h2>
+<h1><%= t("txt.views.errors.not_found.header") %></h1>
 
 <p><em><%= @exception.message %></em></p>
 
-<p><%= t("txt.views.errors.not_found.tip") %></p>
-<div class="embedded_form">
-  <%= render :file => 'search_results/index' %>
-</div>
+<p><%= raw t("txt.views.errors.not_found.tip", :link => link_to(t("txt.views.navigation.search"), search_path)) %></p>

data/app/views/layouts/_navigation.html.erb

@@ -17,7 +17,7 @@
         <%= render 'layouts/controls' %>
 
         <%= form_tag search_path, :method => :get, :class => "navbar-search pull-right" do %>
-          <input type="hidden" name="t" value="labeling-skos-base">
+          <input type="hidden" name="t" value="<%= quick_search_class %>">
           <input type="hidden" name="qt" value="exact">
           <input type="hidden" name="for" value="all">
           <input type="hidden" name="l[]" value="<%= I18n.locale %>">

data/config/locales/de.yml

@@ -93,7 +93,7 @@ de:
        unavailable: "Fehlende Übersetzungen für die Hauptsprache nicht verfügbar."
      hierarchical_concepts:
      concepts:
-       expired_at: "Abgelaufen am %{date}"
+       expired_at: "abgelaufen am %{date}"
        select: "Bitte wählen Sie ein %{concept_class_name} aus der unten aufgeführten Liste."
        new: "Neues %{concept_class_name}"
        pref_label: "Bevorzugtes Label"
@@ -108,7 +108,7 @@ de:
        versionview: "Versionsansicht für Label"
        follow_up: "Wiedervorlage"
        endings: "Endungen"
-       expired_at: "Abgelaufen am"
+       expired_at: "abgelaufen am"
        label_already_exists: "Es gibt bereits ein Label mit der eingegebenen Vorlageform"
        edit:
          header: "Bearbeitung von Label"
@@ -197,7 +197,7 @@ de:
          message: "Ihr Benutzerkonto besitzt keine ausreichenden Rechte, um diese Seite anzuzeigen."
        not_found:
          header: "Nicht gefunden"
-         tip: "Nutzen Sie die Suchfunktion, um Inhalte zu finden:"
+         tip: "Nutzen Sie die %{link}, um Inhalte zu finden."
      versioning:
        edit_mode: "Bearbeitung fortsetzen"
        to_edit_mode: "In Bearbeitung versetzen"
@@ -326,6 +326,7 @@ de:
        version_error: "Es existieren schon zwei Versionen dieses Labels"
        value_error: "Die Vorlageform muss ausgefüllt sein!"
      concept:
+       uri: "Konzept-URI"
        origin_error: "Origin ungültig!"
        version_error: "Es existieren schon zwei Versionen dieses Konzepts"
        no_pref_label_error: "Es muss mindestens ein bevorzugtes Label angegeben werden."

data/config/locales/en.yml

@@ -116,7 +116,7 @@ en:
        versionview: "Version display of Label"
        follow_up: "Follow up"
        endings: "Endings"
-       expired_at: "Expired at"
+       expired_at: "expired at"
        label_already_exists: "There already exists a label with the value"
        edit:
          header: "Editing of label"
@@ -205,7 +205,7 @@ en:
          message: "Your user account has insufficient permissions to display this page."
        not_found:
          header: "Not found"
-         tip: "You may want to use the search function to find content:"
+         tip: "You may want to use %{link} to find content."
      versioning:
        edit_mode: "Continue editing"
        to_edit_mode: "Start editing"
@@ -333,6 +333,7 @@ en:
        version_error: "New Label version already exists."
        value_error: "Literal form must be given."
      concept:
+       uri: "Concept URI"
        origin_error: "Invalid origin."
        version_error: "New Concept version already exists."
        no_pref_label_error: "At least one preferred label must be specified."

data/db/schema.rb

@@ -11,7 +11,7 @@
 #
 # It's strongly recommended to check this file into your version control system.
 
-ActiveRecord::Schema.define(:version => 20120601094501) do
+ActiveRecord::Schema.define(:version => 20120326102037) do
 
   create_table "collection_members", :force => true do |t|
     t.integer "collection_id"
@@ -117,15 +117,6 @@ ActiveRecord::Schema.define(:version => 20120601094501) do
   add_index "notes", ["owner_id", "owner_type", "type"], :name => "ix_notes_fk_type"
   add_index "notes", ["type"], :name => "ix_notes_on_type"
 
-  create_table "page_requests", :force => true do |t|
-    t.string   "path"
-    t.float    "page_duration"
-    t.float    "view_duration"
-    t.float    "db_duration"
-    t.datetime "created_at",    :null => false
-    t.datetime "updated_at",    :null => false
-  end
-
   create_table "users", :force => true do |t|
     t.string   "forename"
     t.string   "surname"

data/lib/iqvoc/configuration/collection.rb

@@ -6,15 +6,21 @@ module Iqvoc
       extend ActiveSupport::Concern
 
       included do
-        mattr_accessor :base_class_name
+        mattr_accessor :base_class_name, :member_class_names
 
         self.base_class_name = 'Collection::Unordered'
+
+        self.member_class_names  = ['Collection::Member::SKOS::Base']
       end
 
       module ClassMethods
         def base_class
           base_class_name.constantize
         end
+
+        def member_classes
+          member_class_names.map(&:constantize)
+        end
       end
 
     end

data/lib/iqvoc/skos_importer.rb

@@ -1,11 +1,12 @@
 module Iqvoc
   class SkosImporter
 
-    FIRST_LEVEL_OBJECT_CLASSES = [Iqvoc::Concept.base_class]
+    FIRST_LEVEL_OBJECT_CLASSES = [Iqvoc::Concept.base_class, Iqvoc::Collection.base_class]
     SECOND_LEVEL_OBJECT_CLASSES = Iqvoc::Concept.labeling_classes.keys +
       Iqvoc::Concept.note_classes +
       Iqvoc::Concept.relation_classes +
-      Iqvoc::Concept.match_classes
+      Iqvoc::Concept.match_classes +
+      Iqvoc::Collection.member_classes
 
     def initialize(file, default_namespace_url, logger = Rails.logger)
 
@@ -72,6 +73,9 @@ module Iqvoc
     end
 
     def import_first_level_objects(types, subject, predicate, object)
+      @logger.debug "types: #{types}"
+      @logger.debug "predicate: #{predicate}"
+      @logger.debug "subject: #{subject}"
       if (predicate == "rdf:type" && types[object] && subject =~ /^:(.+)$/)
         # We've found a subject definition with a class we know and which is in our responsibility (":")
         origin = $1
@@ -86,6 +90,7 @@ module Iqvoc
           @seen_first_level_objects[origin] = types[object].create!(:origin => origin)
         end
       end
+
     end
 
     def import_second_level_objects(types, subject, predicate, object)

data/lib/iqvoc/version.rb

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

data/test/unit/hygiene_test.rb

@@ -21,7 +21,7 @@ class HygieneTest < ActiveSupport::TestCase
   end
 
   test "mixed whitespace" do
-    tab = "	"
+    tab = "\t"
     space = " "
     assert_no_occurrence "#{space}#{tab}\|#{tab}#{space}", "mixed whitespace", true
   end

data/test/unit/skos_import_test.rb

@@ -97,5 +97,72 @@ class SkosImportTest < ActiveSupport::TestCase
     assert_nil Iqvoc::Concept.base_class.by_origin("1").last
     assert_not_nil Iqvoc::Concept.base_class.by_origin("_1").last
   end
+end
 
+class SkosCollectionImportTest < ActiveSupport::TestCase
+  setup do
+    Iqvoc::Concept.pref_labeling_class_name = 'Labeling::SKOS::PrefLabel'
+
+    Iqvoc.config.register_setting("languages.pref_labeling", ["de", "en"])
+    Iqvoc.config.register_setting("languages.further_labelings.Labeling::SKOS::AltLabel", ["de", "en"])
+  end
+
+  TEST_DATA = (<<-DATA
+<http://www.example.com/land-animal> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://www.w3.org/2008/05/skos#Collection> .
+<http://www.example.com/land-animal> <http://www.w3.org/2008/05/skos#prefLabel> "Landtier"@de .
+<http://www.example.com/land-animal> <http://www.w3.org/2008/05/skos#prefLabel> "Land animal"@en .
+<http://www.example.com/legged-animal> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://www.w3.org/2008/05/skos#Collection> .
+<http://www.example.com/legged-animal> <http://www.w3.org/2008/05/skos#prefLabel> "Vierbeinige Tier"@de .
+<http://www.example.com/legged-animal> <http://www.w3.org/2008/05/skos#prefLabel> "Four legged animal"@en .
+<http://www.example.com/cow> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://www.w3.org/2008/05/skos#Concept> .
+<http://www.example.com/cow> <http://www.w3.org/2008/05/skos#prefLabel> "Kuh"@de .
+<http://www.example.com/cow> <http://www.w3.org/2008/05/skos#prefLabel> "Cow"@en .
+<http://www.example.com/snake> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://www.w3.org/2008/05/skos#Concept> .
+<http://www.example.com/snake> <http://www.w3.org/2008/05/skos#prefLabel> "Schlange"@de .
+<http://www.example.com/snake> <http://www.w3.org/2008/05/skos#prefLabel> "Snake"@en .
+<http://www.example.com/donkey> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://www.w3.org/2008/05/skos#Concept> .
+<http://www.example.com/donkey> <http://www.w3.org/2008/05/skos#prefLabel> "Esel"@de .
+<http://www.example.com/donkey> <http://www.w3.org/2008/05/skos#prefLabel> "Donkey"@en .
+<http://www.example.com/legged-animal> <http://www.w3.org/2004/02/skos/core#member> <http://www.example.com/cow> .
+<http://www.example.com/legged-animal> <http://www.w3.org/2004/02/skos/core#member> <http://www.example.com/donkey> .
+<http://www.example.com/land-animal> <http://www.w3.org/2004/02/skos/core#member> <http://www.example.com/legged-animal> .
+<http://www.example.com/land-animal> <http://www.w3.org/2004/02/skos/core#member> <http://www.example.com/snake> .
+     DATA
+    ).split("\n")
+
+  test "basic importer functionality" do
+    assert_difference('Collection::Base.count', 2) do
+      Iqvoc::SkosImporter.new(TEST_DATA, "http://www.example.com/")
+    end
+    concepts = {}
+    ["cow", "donkey", "snake"].each do |origin|
+      concepts[origin] = Iqvoc::Concept.base_class.by_origin(origin).last
+      assert_not_nil(concepts[origin], "Couldn't find concept '#{origin}'.")
+      assert concepts[origin].published?, "Concept '#{origin}' wasn't published."
+    end
+
+    collections = {}
+    ["land-animal", "legged-animal"].each do |origin|
+      collections[origin] = Iqvoc::Collection.base_class.by_origin(origin).last
+      assert_not_nil(collections[origin], "Couldn't find collections '#{origin}'.")
+      assert collections[origin].published?, "collections '#{origin}' wasn't published."
+    end
+
+    collection_with_member = concepts["cow"].collections.first
+    assert_not_nil collection_with_member
+
+    concept_member = collections["land-animal"].members.first
+    assert_not_nil concept_member
+  end
+
+  test "subcollections importer functionality" do
+    assert_difference('Collection::Base.count', 2) do
+      Iqvoc::SkosImporter.new(TEST_DATA, "http://www.example.com/")
+    end
+
+    collection_with_subcollections = Iqvoc::Collection.base_class.by_origin("land-animal").last
+    assert_not_nil collection_with_subcollections
+    assert_not_nil collection_with_subcollections.subcollections.first
+  end
 end
+