iqvoc 4.0.2 → 4.0.3

data/app/models/note/base.rb

@@ -72,12 +72,6 @@ class Note::Base < ActiveRecord::Base
 
   # ********** Methods
 
-  # TODO: This should move to umt because it highly proprietary
-  def self.from_rdf(str)
-    h = Iqvoc::RdfHelper.split_literal(str)
-    self.new(:value => h[:value], :language => h[:language])
-  end
-
   def <=>(other)
     self.to_s.downcase <=> other.to_s.downcase
   end

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

@@ -20,16 +20,28 @@ class Note::SKOS::Base < Note::Base
 
   def self.build_from_rdf(subject, predicate, object)
     unless subject.class.reflections.include?(self.name.to_relation_name)
-      raise "Note::SKOS::Base#build_from_rdf: Subject (#{subject}) must be able to recieve this kind of notes (#{self.class.name} => #{self.class.name.to_relation_name})."
+      raise "Note::SKOS::Base#build_from_rdf: Subject (#{subject}) must be able to receive this kind of note (#{self.class.name} => #{self.class.name.to_relation_name})."
     end
-    unless object =~ /^"(.+)"(@(.+))$/
-      raise "Note::SKOS::Base#build_from_rdf: Object (#{object}) must be a string literal"
-    end
-
-    lang = $3
-    value = JSON.parse(%Q{["#{$1}"]})[0].gsub("\\n", "\n") # Trick to decode \uHHHHH chars
 
-    subject.send(self.name.to_relation_name) << self.new(:value => value, :language => lang)
+    case object
+    when String # Literal
+      unless object =~ /^"(.*)"(@(.+))$/
+        raise "Note::SKOS::Base#build_from_rdf: Object (#{object}) must be a string literal"
+      end
+      lang = $3
+      value = JSON.parse(%Q{["#{$1}"]})[0].gsub("\\n", "\n") # Trick to decode \uHHHHH chars
+      subject.send(self.name.to_relation_name) << self.new(:value => value, :language => lang)
+    when Array # Blank node
+      note = self.create!(:owner => subject)
+      object.each do |annotation|
+        ns, pred = *annotation.first.split(":", 2)
+        note.annotations.create! do |a|
+          a.namespace = ns
+          a.predicate = pred
+          a.value = annotation.last.match(/^"(.+)"$/)[1]
+        end
+      end
+    end
   end
 
   def build_rdf(document, subject)

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

@@ -5,10 +5,10 @@
 <div class="panel">
   <div class="panel-header centered">
     <%= letter_selector do |letter| %>
-      <% alphabetical_concepts_path(:letter => letter.to_s.downcase) %>
+      <% alphabetical_concepts_path(:prefix => letter.to_s.downcase) %>
     <% end %>
   </div>
-  <ul>
+  <ul class="concepts">
     <%= render :partial => 'pref_labeling', :collection => @pref_labelings %>
   </ul>
 </div>

data/app/views/{rdf/show_concept.iqrdf → concepts/show.iqrdf}

@@ -2,4 +2,4 @@ Iqvoc.default_rdf_namespace_helper_methods.each do |meth|
   document.namespaces(self.send(meth))
 end
 
-render_concept(document, @concept)
+render_concept(document, @concept)

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

@@ -14,4 +14,3 @@
 <% end %>
 
 <%= render 'layouts/sections', :sections => Iqvoc::Concept.view_sections, :data => concept_view_data(@concept) %>
-<%#= render 'visualization' %>

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

@@ -39,4 +39,3 @@
 </div>
 
 <%= render 'layouts/sections', :sections => Iqvoc::Concept.view_sections, :data => concept_view_data(@concept) %>
-<%#= render 'visualization' %>

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

@@ -6,13 +6,13 @@
       :active => params[:controller] == 'concepts/hierarchical' %>
   <%= sidebar_item :text => t("txt.views.navigation.alphabetical"),
       :icon => 'list-alt',
-      :path => alphabetical_concepts_path(:letter => 'a'),
+      :path => alphabetical_concepts_path(:prefix => 'a'),
       :active => params[:controller] == 'concepts/alphabetical' %>
   <% if I18n.locale.to_s != Iqvoc::Concept.pref_labeling_languages.first %>
     <%= sidebar_item :icon => 'list-alt',
       :text => t("txt.views.untranslated_concepts.caption"),
-      :path => untranslated_concepts_path(:letter => params[:letter] || 'a'),
+      :path => untranslated_concepts_path(:prefix => params[:prefix] || 'a'),
       :active => params[:controller] == 'concepts/untranslated',
       :id => 'untranslated' %>
   <% end %>
-<% end %>
+<% end %>

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

@@ -1,13 +1,12 @@
 <%- 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_item :icon => 'share', :text => t('txt.models.concept.uri'), :path => rdf_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' %>
-  <%= sidebar_item :icon => 'share', :text => 'RDF/Turtle', :path => rdf_url(concept.origin, :format => :ttl, :published => published_param, :lang => nil), :id => 'rdf_link_ttl' %>
+  <%= sidebar_item :icon => 'share', :text => 'HTML', :path => concept_path(:id => concept, :format => :html, :published => published_param) %>
+  <%= sidebar_item :icon => 'share', :text => 'RDF/XML', :path => concept_path(:id => concept, :format => :rdf, :published => published_param), :id => 'rdf_link_xml' %>
+  <%= sidebar_item :icon => 'share', :text => 'RDF/Turtle', :path => concept_path(:id => concept, :format => :ttl, :published => published_param), :id => 'rdf_link_ttl' %>
   <%= sidebar_header 'Links' %>
-  <%#= sidebar_item :icon => 'zoom-in', :text => 'Visualization', :path => '#visualization', :'data-toggle' => 'modal' %>
   <%= sidebar_item :icon => :edit, :text => t('txt.views.concepts.new', :concept_class_name => Iqvoc::Concept.base_class.model_name.human), :path => new_concept_path,
     :perms => [:create, Iqvoc::Concept.base_class], :active => params[:action] == 'new' %>
 <% end %>

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

@@ -6,7 +6,7 @@
   <div class="panel">
     <div class="panel-header centered">
       <%= letter_selector do |letter| %>
-        <% untranslated_concepts_path(:letter => letter.to_s.downcase) %>
+        <% untranslated_concepts_path(:prefix => letter.to_s.downcase) %>
       <% end %>
     </div>
     <ul>

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

@@ -0,0 +1,8 @@
+<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>

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

@@ -1,11 +1,14 @@
 <%= page_header :title => t("txt.views.instance_configuration.caption").titleize %>
 
 <%= form_tag(instance_configuration_path, :method => :put, :class => "") do %>
-      <% @settings.each do |key, value| %>
-        <label><%= key %></label>
-        <%= text_field_tag "config[#{key}]", value %>
-      <% end %>
+  <% @settings.each do |key, value| %>
+    <label>
+      <%= t("txt.views.instance_configuration.settings.#{key.gsub(".", "_")}") %>
+      (<code><%= key %></code>)
+    </label>
+    <%= text_field_tag "config[#{key}]", value %>
+  <% end %>
   <div class="form-actions">
-    <%= submit_tag t("txt.common.save"), :class => 'btn btn-primary' %>
+    <%= submit_tag t("txt.common.save"), :class => "btn btn-primary" %>
   </div>
 <% end %>

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

@@ -7,21 +7,23 @@
         <span class="icon-bar"></span>
         <span class="icon-bar"></span>
       </a>
-      <%= link_to Iqvoc.config['title'], root_path, :class => 'brand' %></a>
+      <%= link_to Iqvoc.config["title"], root_path, :class => "brand" %></a>
 
       <div class="nav-collapse">
         <ul class="nav">
           <%= nav_items Iqvoc.navigation_items %>
         </ul>
 
-        <%= render 'layouts/controls' %>
+        <%= render "layouts/controls" %>
 
-        <%= form_tag search_path, :method => :get, :class => "navbar-search pull-right" do %>
-          <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 %>">
-          <input type="text" name="q" class="search-query span2" placeholder="<%= t('txt.views.navigation.quick_search') %>">
+        <% unless @suppress_quicksearch %>
+        <%= form_tag alphabetical_concepts_path(:prefix => nil), :method => :get,
+                :class => "navbar-search pull-right" do %>
+          <%= search_field_tag "prefix", nil, :id => nil,
+                  :class => "quicksearch search-query span2",
+                  :autofocus => (autofocus rescue nil),
+                  :placeholder => t("txt.views.navigation.quick_search") %>
+          <% end %>
         <% end %>
       </div>
 

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

@@ -19,16 +19,18 @@
 
 <div class="container">
   <div class="row">
-    <div class="span9" id="content">
+    <div class="<%= content_for?(:sidebar) ? "span9" : "span12" %>" id="content">
       <%= yield :page_header %>
       <% flash.each do |type, msg| %>
         <%= alert(type) { msg } %>
       <% end %>
       <%= yield %>
     </div>
+    <% if content_for?(:sidebar) %>
     <div class="span3" id="sidebar">
       <%= yield :sidebar %>
     </div>
+    <% end %>
   </div>
 </div>
 <script>

data/app/views/pages/help.html.erb

@@ -0,0 +1,75 @@
+<h1>The Structure of Domain Terminologies in iQvoc</h1>
+
+<p>Domain terminologies are implemented based on the
+<a href="http://www.w3.org/TR/skos-reference/">Simple Knowledge Organisation System</a>
+(SKOS), a W3C recommendation.
+
+<p>SKOS distinguishes concepts from lexical labels. A <strong>concept</strong>
+is "an idea or notion; a unit of thought", represented by a globally unique
+identifier (an HTTP URI). A <strong>label</strong> is a term which is used to
+refer to a concept, technically "a string of UNICODE characters, such as
+'romantic love' or 'れんあい', in a given natural language, such as English or
+Japanese". In most cases there are multiple labels denoting the same concept in
+the same language.  One of them is the preferred label, while the others are
+alternative labels. If you have heard about "symmetrical vs. non-symmetrical
+multilingualism" (IFLA Guidelines for Multilingual Thesauri), the basic use case
+described by SKOS is symmetrical (each concept has a preferred label in each
+supported language), but the non-symmetrical approach (there is one concept per
+language with only one preferred label in this language) can be expressed as
+well.</p>
+
+<p>There may also be a formal <strong>notation</strong> identifying a concept in
+some classification system such as the Dewey Decimal Classification. While a
+notation is a string of UNICODE characters just like a label, obviously a
+notation has no specific language. It has been taken from a specific
+classification system instead. There may be multiple notations from different
+systems for a single concept, just like labels from different languages.</p>
+
+<p>Usually concepts will have a lexical <strong>definition</strong>, but this is
+not mandatory. There may also be several annotations, such as a general
+<strong>note</strong>, a change note, editorial note, history note, scope note,
+or an example.  Technically, a lexical definition is just one kind of a
+note.</p>
+
+<p>A more structural definition of a concept is given by its <strong>semantic
+relations</strong> to other concepts. Basically, we have only two types of
+relations in SKOS: hierarchical (<strong>broader<strong>,
+</strong>narrower</strong>) and non-hierarchical (<strong>related</strong>)
+relations. Both types are strictly disjoint: you will have to decide whether a
+relation is hierarchical or not, there must not be both relation types between
+the same two concepts. Some thesauri distinguish different types of hierarchy
+(as defined by Z39-19-2005): generic (a cat is a mammal), instance (Mimi is a
+cat), and whole-part (a cat has claws). SKOS does not follow this distinction,
+"broader" is defined as "more general in meaning", narrower as "more specific".
+Likewise there is no built-in assumption about transitivity of hierarchical
+relations.  Both broader and narrower are not defined to be transitive, but the
+technical vocabulary provides means "to draw inferences about the transitive
+closure of the hierarchical relation".</p>
+
+<p>The non-hierarchical relation is not further specified. This is due to the
+design goal of a simple knowledge organisation system. Any not-so-simple
+application may specialize different types of non-hierarchical relations, such
+as is-caused-by, in-contradiction-to, has-impact-on, or anything else. Doing so
+would exceed the limitations of a simple domain terminology and proceed to a
+more complex ontology. This may be a valid approach, but it is out of scope
+here.</p>
+
+<p>Any set of semantically related concepts as described before can make a
+<strong>concept scheme</strong>. Examples are "thesauri, classification schemes,
+subject heading lists, taxonomies, 'folksonomies', and other types of controlled
+vocabulary", such as different domain terminologies.</p>
+
+<p>Concepts from different concept schemes may have semantic relations as well,
+but these are called <strong>mapping relations</strong>. There are hierarchical
+(<strong>narrowerMatch</strong>, <strong>broaderMatch</strong>) and related
+(<strong>relatedMatch</strong>) mappings just like inside a single concept
+scheme, but there may as well be some equivalence (<strong>exactMatch</strong>)
+or similarity (<strong>closeMatch</strong>).</p>
+
+<p>Finally SKOS defines a second pattern of describing sets of concepts: the
+<strong>collection</strong>. There may be any kind of use case "where a group of
+concepts shares something in common, and it is convenient to group them under a
+common label", but you do not want them to make a concept scheme. In fact a
+collection may even comprise concepts from different concept schemes, and
+collections may be nested, mixing collections and concepts on each level just
+like a file system.</p>

data/app/views/partials/labeling/skos/_base.html.erb

@@ -1,6 +1,7 @@
 <%= content_tag :div, :class => "relation translation panel", :lang => (defined?(concept) ? lang || nil : nil) do %>
   <% if defined?(concept) %>
-    <h2><%= klass.model_name.human(:count => 2) %> <small><%= "#{t("languages.#{lang}", :default => lang.to_s)}" %></small></h2>
+  <% lang_translation = lang.nil? ? t("languages.none") : t("languages.#{lang}") %>
+    <h2><%= klass.model_name.human(:count => 2) %> <small><%= lang_translation %></small></h2>
     <div class="relation-body">
       <%= item_listing(concept.labels_for_labeling_class_and_language(klass, lang)) do |label|
         label.value

data/config/initializers/language.rb

@@ -2,5 +2,5 @@
 # Rails.application.config.i18n.default_locale = Iqvoc::Concept.pref_labeling_languages.first ? Iqvoc::Concept.pref_labeling_languages.first : ""
 
 # # Turn on i18n fallback feature
-# require "i18n/backend/fallbacks"
+# require 'i18n/backend/fallbacks'
 # I18n::Backend::Simple.send(:include, I18n::Backend::Fallbacks)

data/config/locales/de.yml

@@ -87,6 +87,11 @@ de:
          logout: "Abmelden"
      instance_configuration:
        caption: "Instanzkonfiguration"
+       settings:
+         title: Titel
+         available_languages: verfügbare Sprachen
+         languages_pref_labeling: Sprachen für bevorzugte Labels
+         languages_further_labelings_Labeling::SKOS::AltLabel: Sprachen für alternative Labels
      alphabetical_concepts:
      untranslated_concepts:
        caption: "Fehlende Übersetzungen"
@@ -141,6 +146,9 @@ de:
        login: "Login"
        sections: "Bereiche"
        quick_search: "Schnellsuche"
+       help: "Hilfe"
+     frontpage:
+       type_to_browse: "Tippen um Konzepte zu durchsuchen"
      search_results:
        header: "Suche"
        inflectionals: "Schreibweisen"

data/config/locales/en.yml

@@ -87,6 +87,11 @@ en:
          matches: Concept mappings
      instance_configuration:
        caption: "Instance Configuration"
+       settings:
+         title: site title
+         available_languages: available languages
+         languages_pref_labeling: languages for preferred labels
+         languages_further_labelings_Labeling::SKOS::AltLabel: languages for alternative labels
      alphabetical_concepts:
      untranslated_concepts:
        caption: "Missing Translations"
@@ -149,6 +154,9 @@ en:
        login: "Login"
        sections: "Sections"
        quick_search: "Quick search"
+       help: "Help"
+     frontpage:
+       type_to_browse: "Start typing to browse concepts"
      search_results:
        header: "Search"
        inflectionals: "inflectionals"

data/config/routes.rb

@@ -15,7 +15,6 @@
 # limitations under the License.
 
 Rails.application.routes.draw do
-
   match 'schema(.:format)' => 'pages#schema', :as => 'schema'
 
   scope '(:lang)', :constraints => lambda { |params, req|
@@ -31,6 +30,8 @@ Rails.application.routes.draw do
 
     resources :triple_store_syncs, :only => [:new, :create]
 
+    match "/" => "frontpage#index"
+
     match "concepts/:origin/branch(.:format)"      => "concepts/versions#branch",    :as => "concept_versions_branch"
     match "concepts/:origin/merge(.:format)"       => "concepts/versions#merge",     :as => "concept_versions_merge"
     match "concepts/:origin/lock(.:format)"        => "concepts/versions#lock",      :as => "concept_versions_lock"
@@ -38,13 +39,12 @@ Rails.application.routes.draw do
     match "concepts/:origin/to_review(.:format)"   => "concepts/versions#to_review", :as => "concept_versions_to_review"
     match "concepts/:origin/consistency_check(.:format)" => "concepts/versions#consistency_check", :as => "concept_versions_consistency_check"
 
-    match 'alphabetical_concepts/:letter(.:format)'   => 'concepts/alphabetical#index', :as => 'alphabetical_concepts'
-    match 'untranslated_concepts/:letter(.:format)'   => 'concepts/untranslated#index', :as => 'untranslated_concepts'
+    match 'alphabetical_concepts(/:prefix)(.:format)' => 'concepts/alphabetical#index', :as => 'alphabetical_concepts'
+    match 'untranslated_concepts/:prefix(.:format)'   => 'concepts/untranslated#index', :as => 'untranslated_concepts'
     match 'hierarchical_concepts(.:format)' => 'concepts/hierarchical#index', :as => 'hierarchical_concepts'
 
     match 'hierarchical_collections(.:format)' => 'collections/hierarchical#index', :as => 'hierarchical_collections'
 
-    match 'about(.:format)'     => 'pages#about',          :as => 'about'
     match 'dashboard(.:format)' => 'dashboard#index',      :as => 'dashboard'
 
     get 'config(.:format)' => 'instance_configuration#index', :as => 'instance_configuration'
@@ -55,9 +55,11 @@ Rails.application.routes.draw do
 
     match 'search(.:format)' => 'search_results#index', :as => 'search'
 
-    root :to => 'concepts/hierarchical#index', :format => nil
+    get "help" => "pages#help", :as => "help"
+
+    root :to => 'frontpage#index', :format => nil
   end
 
   match '/scheme(.:format)' => 'rdf#scheme', :as => 'scheme'
-  match '/:id(.:format)' => 'rdf#show', :as => 'rdf'
+  match '/:id(.:format)' => 'concepts#show', :as => 'rdf'
 end

data/lib/generators/app/template.rb

@@ -34,7 +34,7 @@ Iqvoc.config do |config|
   })
 end
 
-# Iqvoc::Concept.base_class_name = "#{app_path}"
+# Iqvoc::Concept.base_class_name = "MyConceptClass"
 # Iqvoc::Concept.pref_labeling_class_name = "MyLabelingClass"
 # Iqvoc::Concept.further_relation_class_names << "MyConceptRelationClass"
 # Iqvoc::Concept.note_class_names = []

data/lib/iqvoc/ability.rb

@@ -9,6 +9,9 @@ module Iqvoc
       can :read, ::Collection::Base
       can :read, [::Concept::Base, ::Label::Base], &@@if_published
 
+      # static pages
+      can :read, :help
+
       if user # Every logged in user ...
         can :use, :dashboard
         can :destroy, UserSession

data/lib/iqvoc/configuration/collection.rb

@@ -1,4 +1,4 @@
-require "active_support/concern"
+require 'active_support/concern'
 
 module Iqvoc
   module Configuration
@@ -25,4 +25,4 @@ module Iqvoc
 
     end
   end
-end
+end

data/lib/iqvoc/configuration/concept.rb

@@ -1,4 +1,4 @@
-require "active_support/concern"
+require 'active_support/concern'
 
 module Iqvoc
   module Configuration

data/lib/iqvoc/configuration/core.rb

@@ -1,4 +1,4 @@
-require "active_support/concern"
+require 'active_support/concern'
 
 module Iqvoc
   module Configuration
@@ -42,6 +42,11 @@ module Iqvoc
                 instance_configuration_path },
             :controller => "instance_configuration",
             :authorized? => proc { can? :manage, Iqvoc.config }
+          }, {
+            :content => proc { link_to t("txt.views.navigation.help"), help_path },
+            :controller => "pages",
+            :action => "help",
+            :authorized? => proc { can? :read, :help }
           }, {
             :content => proc { link_to t("txt.views.navigation.about"), "http://iqvoc.net/" }
           }
@@ -53,9 +58,6 @@ module Iqvoc
           bootstrap/bootstrap.css
           bootstrap/bootstrap-responsive.css
           iqvoc/ie_fixes.css
-          excanvas.js
-          jit_rgraph.js
-          iqvoc/visualization.js
           json2.js
           bootstrap/bootstrap.js
           html5.js

data/lib/iqvoc/configuration/label.rb

@@ -1,4 +1,4 @@
-require "active_support/concern"
+require 'active_support/concern'
 
 module Iqvoc
   module Configuration
@@ -20,4 +20,4 @@ module Iqvoc
 
     end
   end
-end
+end

data/lib/iqvoc/controller_extensions.rb

@@ -1,4 +1,4 @@
-require "active_support/concern"
+require 'active_support/concern'
 
 module Iqvoc
   module ControllerExtensions

data/lib/iqvoc/environments/development.rb

@@ -74,6 +74,12 @@ module Iqvoc::Environments
     # Prepend all log lines with the following tags
     # config.log_tags = [ :subdomain, :uuid ]
 
+    # Enforce whitelist mode for mass assignment.
+    # This will create an empty whitelist of attributes available for mass-assignment for all models
+    # in your app. As such, your models will need to explicitly whitelist or blacklist accessible
+    # parameters by using an attr_accessible or attr_protected declaration.
+    config.active_record.whitelist_attributes = false
+
     # The default URI prefix for RDF data. This will be followed by a document
     # specific shnippet like (specimenType) and the id.
 

data/lib/iqvoc/environments/production.rb

@@ -62,6 +62,12 @@ module Iqvoc::Environments
     # Send deprecation notices to registered listeners
     config.active_support.deprecation = :notify
 
+    # Enforce whitelist mode for mass assignment.
+    # This will create an empty whitelist of attributes available for mass-assignment for all models
+    # in your app. As such, your models will need to explicitly whitelist or blacklist accessible
+    # parameters by using an attr_accessible or attr_protected declaration.
+    config.active_record.whitelist_attributes = false
+
     # The JDBC driver URL for the connection to the virtuoso triple store.
     # Login credentials have to be stored here too. See
     # http://docs.openlinksw.com/virtuoso/VirtuosoDriverJDBC.html#jdbcurl4mat for

data/lib/iqvoc/environments/test.rb

@@ -44,6 +44,12 @@ module Iqvoc::Environments
 
     # Print deprecation notices to the stderr
     config.active_support.deprecation = :stderr
+
+    # Enforce whitelist mode for mass assignment.
+    # This will create an empty whitelist of attributes available for mass-assignment for all models
+    # in your app. As such, your models will need to explicitly whitelist or blacklist accessible
+    # parameters by using an attr_accessible or attr_protected declaration.
+    config.active_record.whitelist_attributes = false
   end
 
 end

data/lib/iqvoc/instance_configuration.rb

@@ -103,7 +103,8 @@ module Iqvoc
 
       # cache current settings
       @defaults.each_with_object({}) do |(key, default_value), hsh|
-        @settings[key] = @records[key] || default_value
+        value = @records[key]
+        @settings[key] = value.nil? ? default_value : value
       end
     end
 
@@ -112,7 +113,7 @@ module Iqvoc
       if value == nil
         raise TypeError, "nil values not supported"
       end
-      unless [String, Fixnum, Float, Array].include?(value.class)
+      unless [TrueClass, FalseClass, String, Fixnum, Float, Array].include?(value.class)
         raise TypeError, "complex values not supported"
       end
     end

data/lib/iqvoc/skos_importer.rb

@@ -29,6 +29,7 @@ module Iqvoc
       end
 
       @seen_first_level_objects = {}
+      @blank_nodes = {}
 
       @existing_origins = {} # To prevent the creation of first level objects we already have
       FIRST_LEVEL_OBJECT_CLASSES.each do |klass|
@@ -43,10 +44,17 @@ module Iqvoc
     private
 
     def import(file)
+      # Collect blank nodes
+      file.each do |line|
+        identify_blank_nodes(*extract_triple(line))
+      end
+
+      file.rewind if file.is_a?(IO)
       types = {} # type identifier ("namespace:SomeClass") to Iqvoc class assignment hash
       FIRST_LEVEL_OBJECT_CLASSES.each do |klass|
         types["#{klass.rdf_namespace}:#{klass.rdf_class}"] = klass
       end
+
       file.each do |line|
         import_first_level_objects(types, *extract_triple(line))
       end
@@ -72,6 +80,13 @@ module Iqvoc
 
     end
 
+    def identify_blank_nodes(subject, predicate, object)
+      if blank_node?(subject)
+        @blank_nodes[subject] ||= []
+        @blank_nodes[subject] << [predicate, object]
+      end
+    end
+
     def import_first_level_objects(types, subject, predicate, object)
       @logger.debug "types: #{types}"
       @logger.debug "predicate: #{predicate}"
@@ -114,6 +129,10 @@ module Iqvoc
         end
       end
 
+      if blank_node?(object)
+        object = @blank_nodes[object]
+      end
+
       types[predicate].build_from_rdf(subject, predicate, object)
     end
 
@@ -127,6 +146,10 @@ module Iqvoc
       @seen_first_level_objects[origin]
     end
 
+    def blank_node?(str)
+      str.dup.to_s =~ /^_:.+/
+    end
+
     def extract_triple(line)
       raise "'#{line}' doesn't look like valid ntriples data." unless line =~ /^(.*)\.\w*$/
       line = $1.squish

data/lib/iqvoc/version.rb

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

data/lib/tasks/importer.rake

@@ -6,8 +6,8 @@ namespace :iqvoc do
     task :url => :environment do
       require 'iqvoc/skos_importer'
 
-      raise "You have to specify an url to be import data. Example: rake iqvoc:import:url URL=... NAMESPACE=" unless ENV['URL']
-      raise "You have to specify a default namespace to be import data. Example: rake iqvoc:import:url URL=... NAMESPACE=" unless ENV['NAMESPACE']
+      raise "You have to specify an url for the data file to be imported. Example: rake iqvoc:import:url URL=... NAMESPACE=" unless ENV['URL']
+      raise "You have to specify a default namespace for the data to be imported. Example: rake iqvoc:import:url URL=... NAMESPACE=" unless ENV['NAMESPACE']
       Iqvoc::SkosImporter.new(open(URI.parse(ENV['URL']).to_s), URI.parse(ENV['NAMESPACE']).to_s)
     end