iqvoc 3.5.3 → 3.5.4

data/app/models/user.rb

@@ -15,7 +15,7 @@
 # limitations under the License.
 
 class User < ActiveRecord::Base
-  
+
   ROLES = [
     "reader", "editor", "publisher", "administrator"
   ]

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

@@ -45,6 +45,14 @@
           :concept => @concept, :klass => Iqvoc::Concept.broader_relation_class.narrower_class %>
       <%- end -%>
 
+      <li>
+        <label>
+          <%= f.check_box "top_term",
+                  :class => ("exclusive" if Iqvoc::Concept.broader_relation_class.singular?) %>
+          <%= f.object.class.human_attribute_name("top_term") %>
+        </label>
+      </li>
+
       <%= render Iqvoc::Concept.broader_relation_class.edit_partial_name(@concept),
         :concept => @concept, :klass => Iqvoc::Concept.broader_relation_class %>
 

data/app/views/concepts/index.iqrdf

@@ -7,22 +7,22 @@ while true
   # The following code doesn't have much to do with MVC programming. Due to the
   # fact you can't render a view from a controller multiple times we had to
   # move the logic to the view.
-  
+
   concepts = Iqvoc::Concept.base_class.published.order("id").limit(100).offset(offset).all
   break if concepts.size == 0
 
   # 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(concepts, 
+  ActiveRecord::Associations::Preloader.new(concepts,
     Iqvoc::Concept.base_class.default_includes + [
-      :matches, 
-      :collection_members, 
+      :matches,
+      :collection_members,
       {:relations => :target, :labelings => :target, :notes => :annotations}]).run
 
   concepts.each do |concept|
     render_concept(document, concept)
   end
-  
+
   offset+= concepts.size # Size is important!
 
 end

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

@@ -25,7 +25,9 @@
     <div class="container">
       <div id="header" class="span-24 last">
         <%= render :partial => 'layouts/header' %>
-        <%= render :partial => 'layouts/navigation' %>
+        <ul id="navi_main">
+          <%= nav_items(Iqvoc.navigation_items) %>
+        </ul>
       </div>
 
       <div id="navi_sub" class="span-24 last">

data/app/views/partials/concept/relation/_edit_base.html.erb

@@ -5,10 +5,10 @@
     concept.concept_relations_by_id(klass.name.to_relation_name),
     :id => klass.name.to_relation_name,
     :class => "entity_select",
-    :"data-query-url" => concepts_path(:format => :json),
+    :"data-query-url" => concepts_path(:format => :json, :exclude_top_terms => true),
     :"data-entity-uri" => concept_path("{id}"),
     :"data-singular" => klass.singular? || nil,
-    :"data-entities" => Concept::Base.editor_selectable.
+    :"data-entities" => Iqvoc::Concept.base_class.editor_selectable.
     by_origin(concept.concept_relations_by_id(klass.name.to_relation_name).
       split(Iqvoc::InlineDataHelper::Splitter)).
     map { |c| concept_widget_data(c) }.to_json %>

data/app/views/partials/concept/relation/skos/broader/_mono.html.erb

@@ -1,6 +1,9 @@
 <div class="relation">
   <h4><%= Iqvoc::Concept.broader_relation_class.model_name.human(:count => 2) %></h4>
   <div class="relation-body block">
+    <% if concept.top_term? %>
+      <strong><%= concept.class.human_attribute_name("top_term") %></strong>
+    <% end %>
 
     <%-
     only_published = params[:published] != "0"
@@ -21,7 +24,7 @@
           render concept.class.inline_partial_name, :concept => concept
         }.join(" &laquo; ").html_safe %>
       </div>
-    <% else %>
+    <% elsif not concept.top_term? %>
       <p>-</p>
     <% end %>
   </div>

data/app/views/partials/concept/relation/skos/broader/_poly.html.erb

@@ -1,13 +1,17 @@
 <div class="relation">
   <h4><%= Iqvoc::Concept.broader_relation_class.model_name.human(:count => 2) %></h4>
   <div class="relation-body block">
+    <% if concept.top_term? %>
+      <strong><%= concept.class.human_attribute_name("top_term") %></strong>
+    <% end %>
+
     <% if concept.related_concepts_for_relation_class(
         Iqvoc::Concept.broader_relation_class, params[:published] != "0").
         length > 0 %>
       <div class="selector">
         <%= treeview(@concept.broader_relations.map { |rel| rel.target }, true) %>
       </div>
-    <% else %>
+    <% elsif not concept.top_term? %>
       <p>-</p>
     <% end %>
   </div>

data/app/views/rdf/scheme.iqrdf

@@ -0,0 +1,9 @@
+Iqvoc.default_rdf_namespace_helper_methods.each do |meth|
+  document.namespaces(self.send(meth))
+end
+
+document << Iqvoc::Concept.root_class.instance.build_rdf_subject(document, controller) do |scheme|
+  @top_concepts.each do |top_concept|
+    scheme.Skos::hasTopConcept IqRdf.build_uri(top_concept.origin)
+  end
+end

data/config/application.rb

@@ -59,7 +59,7 @@ module Iqvoc
 
     # Configure sensitive parameters which will be filtered from the log file.
     config.filter_parameters += [:password, :password_confirmation]
-    
+
     # Enable the asset pipeline
     config.assets.enabled = true
 

data/config/engine.rb

@@ -12,19 +12,19 @@ require 'rails_autolink'
 require 'iqvoc/controller_extensions'
 
 module Iqvoc
-  
+
   class Engine < Rails::Engine
     paths["lib/tasks"] << "lib/engine_tasks"
-    
+
     initializer "iqvoc.mixin_controller_extensions" do |app|
       if Kernel.const_defined?(:ApplicationController)
         ApplicationController.send(:include, Iqvoc::ControllerExtensions)
       end
     end
-    
+
     initializer "iqvoc.add_assets_to_precompilation" do |app|
       app.config.assets.precompile += Iqvoc.core_assets
     end
   end
-  
+
 end

data/config/initializers/secret_token_configurator.rb

@@ -17,7 +17,7 @@
 # Be sure to restart your server when you modify this file.
 
 if Iqvoc.const_defined?(:Application)
-  
+
   if ENV['HEROKU']
     puts 'heroku app detected; using session secret from config vars...'
     Rails.application.config.secret_token = ENV['SECRET_TOKEN']
@@ -25,5 +25,5 @@ if Iqvoc.const_defined?(:Application)
     system "bundle exec rake setup:generate_secret_token"
     require Rails.root.join('config', 'initializers', 'secret_token.rb')
   end
-  
+
 end

data/config/locales/activerecord.de.yml

@@ -20,6 +20,12 @@ de:
       concept/base:
         one: "Konzept"
         other: "Konzepte"
+      concept/relation/base:
+        one:   "Relation"
+        other: "Relations"
+      concept/relation/skos/base:
+        one:   "Relation"
+        other: "Relations"
       concept/relation/skos/broader/mono:
         one:   "Allgemeinerer Begriff"
         other: "Allgemeinere Begriffe"
@@ -47,6 +53,12 @@ de:
       labeling/skos/alt_label:
         one:   "Alternatives Label"
         other: "Alternative Labels"
+      match/base:
+        one:   "Match"
+        other: "Matches"
+      match/skos/base:
+        one:   "Match"
+        other: "Matches"
       match/skos/broad_match:
         one:   "Broader Match"
         other: "Broader Matches"
@@ -100,6 +112,7 @@ de:
       concept/base:
         follow_up: "Wiedervorlage"
         expired_at: "Abgelaufen am"
+        top_term: "Top Term"
       label/base:
         follow_up: "Wiedervorlage"
         expired_at: "Abgelaufen am"

data/config/locales/activerecord.en.yml

@@ -20,6 +20,12 @@ en:
       concept/base:
         one:   "Concept"
         other: "Concepts"
+      concept/relation/base:
+        one:   "Relation"
+        other: "Relations"
+      concept/relation/skos/base:
+        one:   "Relation"
+        other: "Relations"
       concept/relation/skos/broader/mono:
         one:   "Broader term"
         other: "Broader terms"
@@ -47,6 +53,12 @@ en:
       labeling/skos/alt_label:
         one:   "Alternative label"
         other: "Alternative labels"
+      match/base:
+        one:   "Match"
+        other: "Matches"
+      match/skos/base:
+        one:   "Match"
+        other: "Matches"
       match/skos/broad_match:
         one:   "Broader Match"
         other: "Broader Matches"
@@ -100,6 +112,7 @@ en:
       concept/base:
         follow_up: "Reminder"
         expired_at: "Expired at"
+        top_term: "Top Term"
       label/base:
         follow_up: "Reminder"
         expired_at: "Expired at"

data/config/locales/de.yml

@@ -325,6 +325,9 @@ de:
        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."
+       orphan_error: "Es muss ein allgemeinerer Begriff oder Top Term zugewiesen werden."
+       top_term_exclusive_error: "Einem Top Term darf kein allgemeinerer Begriff zugewiesen werden."
+       top_term_rooted_error: "Top Terms dürfen nicht als spezifischere Begriffe verwendet werden."
        main_pref_label_language_missing_error: "Es muss mindestens ein bevorzugtes Label in der Hauptsprache des Thesaurus existieren."
        pref_labels_with_same_languages_error: "Es darf nur jeweils ein bevorzugtes Label zu einer Sprache geben."
        association_pref_labels_unpublished: "Das bevorzugte Label muss veröffentlicht sein."

data/config/locales/en.yml

@@ -331,6 +331,9 @@ en:
        origin_error: "Invalid origin."
        version_error: "New Concept version already exists."
        no_pref_label_error: "At least one preferred label must be specified."
+       orphan_error: "Missing broader term or Top Term assignment."
+       top_term_exclusive_error: "A Top Term must not have any broader terms."
+       top_term_rooted_error: "Top Terms must not be used as narrower terms."
        main_pref_label_language_missing_error: "There has to be one preferred Label in the main language of the thesaurus."
        pref_labels_with_same_languages_error: "There must be only one preferred Label per language."
        association_pref_labels_unpublished: "The preferred Label has to be published."

data/config/routes.rb

@@ -20,7 +20,7 @@ Rails.application.routes.draw do
 
   scope '(:lang)', :constraints => lambda { |params, req|
     lang = params[:lang]
-    return lang.nil? || lang.to_s =~ /#{Iqvoc::Concept.pref_labeling_languages.join("|").presence || " "}/
+    return lang.nil? || lang.to_s =~ /^#{Iqvoc::Concept.pref_labeling_languages.join("|").presence || " "}$/
   } do
 
     resource  :user_session, :only => [:new, :create, :destroy]
@@ -57,6 +57,7 @@ Rails.application.routes.draw do
 
     root :to => 'concepts/hierarchical#index', :format => nil
   end
-
+  
+  match '/scheme(.:format)' => 'rdf#scheme', :as => 'scheme'
   match '/:id(.:format)' => 'rdf#show', :as => 'rdf'
 end

data/db/migrate/20120201120736_add_top_term_to_concepts.rb

@@ -0,0 +1,7 @@
+class AddTopTermToConcepts < ActiveRecord::Migration
+
+  def change
+    add_column :concepts, :top_term, :boolean, :default => false
+  end
+
+end

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 => 20120119000000) do
+ActiveRecord::Schema.define(:version => 20120201120736) do
 
   create_table "collection_members", :force => true do |t|
     t.integer "collection_id"
@@ -44,6 +44,7 @@ ActiveRecord::Schema.define(:version => 20120119000000) do
     t.date     "rdf_updated_at"
     t.datetime "created_at"
     t.datetime "updated_at"
+    t.boolean  "top_term",                             :default => false
   end
 
   add_index "concepts", ["origin"], :name => "ix_concepts_on_origin", :length => {"origin"=>255}

data/iqvoc.gemspec

@@ -21,7 +21,7 @@ Gem::Specification.new do |s|
   s.add_dependency 'json'
   s.add_dependency 'rails_autolink'
 
-  s.files = %w(LICENSE README.md CHANGELOG.md Gemfile Gemfile.lock Rakefile iqvoc.gemspec) + 
+  s.files = %w(LICENSE README.md CHANGELOG.md Gemfile Gemfile.lock Rakefile iqvoc.gemspec) +
     Dir.glob("{app,config,db,public,lib,test,vendor}/**/*")
   s.test_files = Dir.glob("{test}/**/*")
   s.executables = Dir.glob("{bin}/**/*")

data/lib/debug.rb

@@ -1,14 +1,40 @@
 # encoding: UTF-8
 
-def dbg(*args)
-  prefix = "#{args.shift} " if [String, Symbol].include?(args.first.class)
+# prints arguments to STDOUT or log depending on context
+# optional block should return an array of values; the resulting output is then
+# wrapped in separator lines
+# the last argument may be an options hash with members :inspect and/or :tag
+#
+# examples:
+#   dbg("IMPORTANT", foo, bar)
+#   dbg { [lipsum] }
+#   dbg(foo, bar, :inspect => false, :tag => false) do |args|
+#      args << lorem
+#      args << ipsum
+#   end
+def dbg(*args, &block)
+  defaults = { :inspect => true, :tag => true }
+  options = args.last.is_a?(Hash) && (defaults.keys & args.last.keys).any?
+  options = defaults.merge(options ? args.pop : {})
 
-  msg = args.map(&:inspect).join(" | ")
-  msg = "#{prefix}#{msg}"
+  tty = defined?(Rails::Console) || Rails.env.test? # STDOUT is usually available here
+  meth = tty ? method(:puts) : Rails.logger.method(:debug)
 
-  if defined?(Rails::Console) || Rails.env.test? # STDOUT is usually available here
-    puts "[DEBUG] #{msg}"
-  else
-    Rails.logger.tagged("DEBUG") { Rails.logger.debug msg }
+  if block
+    meth.call "=" * 80
+    block_args = yield [] # XXX: ideally we'd pass the `dbg` method itself here, but the need for `.call` makes for a weird API
+    block_args << options
+    dbg(*block_args)
+    meth.call "-" * 80
+    return unless args.length > 0
   end
+
+  prefix = "#{args.shift} " if [String, Symbol].include?(args.first.class) # XXX: undocumented and unexpected
+
+  serializer = options[:inspect] ? :inspect : :to_s
+  msg = args.map(&serializer).join(" | ")
+  msg = "#{prefix}#{msg}"
+  msg = "[DEBUG] #{msg}" if options[:tag]
+
+  meth.call msg
 end

data/lib/iqvoc/ability.rb

@@ -5,9 +5,8 @@ module Iqvoc
     @@if_published = lambda { |o| o.published? }
 
     def initialize(user = nil)
-
+      can :read, Iqvoc::Concept.root_class.instance
       can :read, ::Collection::Base
-
       can :read, [::Concept::Base, ::Label::Base], &@@if_published
 
       if user # Every logged in user ...

data/lib/iqvoc/configuration/collection.rb

@@ -4,13 +4,13 @@ module Iqvoc
   module Configuration
     module Collection
       extend ActiveSupport::Concern
-      
+
       included do
         mattr_accessor :base_class_name
 
         self.base_class_name = 'Collection::Unordered'
       end
-      
+
       module ClassMethods
         def base_class
           base_class_name.constantize

data/lib/iqvoc/configuration/concept.rb

@@ -4,11 +4,11 @@ module Iqvoc
   module Configuration
     module Concept
       extend ActiveSupport::Concern
-      
+
       included do
         Iqvoc.first_level_class_configuration_modules << self
 
-        mattr_accessor :base_class_name,
+        mattr_accessor :base_class_name, :root_class_name,
         :broader_relation_class_name, :further_relation_class_names,
         :pref_labeling_class_name,
         :match_class_names,
@@ -18,6 +18,7 @@ module Iqvoc
         :include_module_names
 
         self.base_class_name              = 'Concept::SKOS::Base'
+        self.root_class_name              = 'Concept::SKOS::Scheme'
 
         self.broader_relation_class_name  = 'Concept::Relation::SKOS::Broader::Mono'
         self.further_relation_class_names = [ 'Concept::Relation::SKOS::Related' ]
@@ -47,7 +48,7 @@ module Iqvoc
 
         self.include_module_names = []
       end
-      
+
       module ClassMethods
         def pref_labeling_languages
           # FIXME: mutable object; needs custom array setters to guard against
@@ -61,6 +62,10 @@ module Iqvoc
           base_class_name.constantize
         end
 
+        def root_class
+          root_class_name.constantize
+        end
+
         def pref_labeling_class
           pref_labeling_class_name.constantize
         end
@@ -130,7 +135,7 @@ module Iqvoc
         def include_modules
           include_module_names.map(&:constantize)
         end
-      
+
         # @deprecated
         def pref_labeling_languages=(value)
           ActiveSupport::Deprecation.warn "pref_labeling_languages has been moved into instance configuration", caller
@@ -149,4 +154,4 @@ module Iqvoc
 
     end
   end
-end
+end

data/lib/iqvoc/configuration/core.rb

@@ -4,7 +4,7 @@ module Iqvoc
   module Configuration
     module Core
       extend ActiveSupport::Concern
-      
+
       included do
         mattr_accessor :searchable_class_names,
           :unlimited_search_results,
@@ -13,8 +13,45 @@ module Iqvoc
           :change_note_class_name,
           :first_level_class_configuration_modules,
           :ability_class_name,
+          :navigation_items,
           :core_assets
 
+        self.navigation_items = [
+          {
+            :content => proc { link_to "Dashboard", dashboard_path },
+            :controller => "dashboard",
+            :authorized? => proc { can? :use, :dashboard }
+          }, {
+            :content => proc { link_to t("txt.views.navigation.hierarchical"),
+                hierarchical_concepts_path },
+            :controller => "concepts/hierarchical"
+          }, {
+            :content => proc { link_to t("txt.views.navigation.alphabetical"),
+                alphabetical_concepts_path(:letter => "a") },
+            :controller => "concepts/alphabetical"
+          }, {
+            :content => proc { link_to t("txt.views.navigation.collections"),
+                collections_path },
+            :controller => "collections"
+          }, {
+            :content => proc { link_to t("txt.views.navigation.search"), search_path },
+            :controller => "search_results"
+          }, {
+            :content => proc { link_to t("txt.views.navigation.users"), users_path },
+            :controller => "users",
+            :authorized? => proc { can? :manage, User }
+          }, {
+            :content => proc { link_to t("txt.views.navigation.instance_configuration"),
+                instance_configuration_path },
+            :controller => "instance_configuration",
+            :authorized? => proc { can? :manage, Iqvoc.config }
+          }, {
+            :content => proc { link_to t("txt.views.navigation.about"), about_path },
+            :active? => proc { params[:controller] == "pages" &&
+                params[:action] == "about" }
+          }
+        ]
+
         self.core_assets = %w(
           manifest.css
           manifest.js
@@ -51,7 +88,7 @@ module Iqvoc
         self.first_level_class_configuration_modules = [] # Will be set in the modules
 
         self.ability_class_name = 'Iqvoc::Ability'
-        
+
         # initialize
         self.config.register_settings({
           "title" => "iQvoc",
@@ -61,7 +98,7 @@ module Iqvoc
         })
         self.config.initialize_cache
       end
-      
+
       module ClassMethods
         def generate_secret_token
           require 'securerandom'
@@ -92,7 +129,7 @@ module Iqvoc
             return cfg
           end
         end
-      
+
         def change_note_class
           change_note_class_name.constantize
         end
@@ -108,7 +145,7 @@ module Iqvoc
         def ability_class
           ability_class_name.constantize
         end
-      
+
         def title
           return config["title"]
         end
@@ -116,7 +153,7 @@ module Iqvoc
         def available_languages
           return config["available_languages"]
         end
-      
+
         # @deprecated
         def title=(value)
           ActiveSupport::Deprecation.warn "title has been moved into instance configuration", caller
@@ -129,7 +166,7 @@ module Iqvoc
           self.config.register_setting("available_languages", value)
         end
       end
-      
+
     end
   end
-end
+end

data/lib/iqvoc/configuration/label.rb

@@ -4,7 +4,7 @@ module Iqvoc
   module Configuration
     module Label
       extend ActiveSupport::Concern
-      
+
       included do
         mattr_accessor :base_class_name
         self.base_class_name        = 'Label::SKOS::Base'

data/lib/iqvoc/controller_extensions.rb

@@ -3,7 +3,7 @@ require "active_support/concern"
 module Iqvoc
   module ControllerExtensions
     extend ActiveSupport::Concern
-    
+
     included do
       prepend_before_filter :set_locale
       before_filter :ensure_extension
@@ -48,6 +48,7 @@ module Iqvoc
 
       respond_to do |format|
         format.html { render :template => 'errors/not_found', :status => :not_found }
+        format.any { head :not_found }
       end
     end
 
@@ -110,6 +111,6 @@ module Iqvoc
         return false
       end
     end
-    
+
   end
 end

data/lib/iqvoc/version.rb

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

data/lib/iqvoc.rb

@@ -25,7 +25,7 @@ module Iqvoc
   unless Iqvoc.const_defined?(:Application)
     require File.join(File.dirname(__FILE__), '../config/engine')
   end
-  
+
   include Iqvoc::Configuration::Core
 
   module Concept

data/lib/tasks/heroku.rake

@@ -1,14 +1,14 @@
 namespace :heroku do
   task :config do
     require 'securerandom'
-    
+
     HEROKU_CONFIG = %W(
       HEROKU=true
       RACK_ENV=heroku
       RAILS_ENV=heroku
       SECRET_TOKEN=#{SecureRandom.hex(64)}
     )
-    
+
     system "heroku config:add #{HEROKU_CONFIG.join(' ')}"
   end
 end

data/test/factories.rb

@@ -18,6 +18,7 @@ FactoryGirl.define do
   factory :concept, :class => Iqvoc::Concept.base_class do |c|
     c.sequence(:origin) { |n| "_000000#{n}" }
     c.published_at 3.days.ago
+    c.top_term true
     c.pref_labelings { |pref_labelings| [pref_labelings.association(:pref_labeling)] }
     c.narrower_relations { |narrower_relations| [narrower_relations.association(:narrower_relation)] }
   end
@@ -33,7 +34,7 @@ FactoryGirl.define do
 
   factory :narrower_relation, :class => Iqvoc::Concept.broader_relation_class.narrower_class do |rel|
     rel.target {|target|
-      target.association(:concept, :broader_relations => [], :narrower_relations => [], :pref_labelings => [
+      target.association(:concept, :top_term => false, :broader_relations => [], :narrower_relations => [], :pref_labelings => [
           FactoryGirl.create(:pref_labeling, :target => FactoryGirl.create(:pref_label, :value => 'Some narrower relation'))
         ])
     }