iqvoc 4.2.0 → 4.3.0

data/app/views/search_results/index.iqrdf

@@ -3,26 +3,26 @@ Iqvoc.default_rdf_namespace_helper_methods.each do |meth|
 end
 
 document.namespaces(
-  :search => url_for(request.query_parameters.merge(:page => @results && @results.current_page, :only_path => false, :anchor => "")),
+  :search => url_for(request.query_parameters.merge(:page => @results && @results.current_page, :lang => nil, :only_path => false, :anchor => "")),
   :sdc => "http://sindice.com/vocab/search#"
 )
 
-document << IqRdf.build_full_uri_subject(URI.parse(url_for(request.query_parameters.merge(:page => nil, :only_path => false))), IqRdf::Sdc::build_uri('Query')) do |query|
+document << IqRdf.build_full_uri_subject(URI.parse(url_for(request.query_parameters.merge(:page => nil, :lang => nil, :only_path => false))), IqRdf::Sdc::build_uri('Query')) do |query|
   query.Sdc::totalResults(@results.total_count)
   query.Sdc::itemsPerPage(@results.limit_value)
   query.Sdc::searchTerms(params[:query])
-  query.Sdc::first(URI.parse(url_for(request.query_parameters.merge(:page => 1, :only_path => false))))
-  query.Sdc::last(URI.parse(url_for(request.query_parameters.merge(:page => @results.num_pages, :only_path => false))))
+  query.Sdc::first(URI.parse(url_for(request.query_parameters.merge(:page => 1, :lang => nil, :only_path => false))))
+  query.Sdc::last(URI.parse(url_for(request.query_parameters.merge(:page => @results.num_pages, :lang => nil, :only_path => false))))
   i = 0
   @results.each do
     query.Sdc::result(IqRdf::Search::build_uri("result#{i+=1}"))
   end
 end
 
-document << IqRdf.build_full_uri_subject(URI.parse(url_for(request.query_parameters.merge(:page => @results.current_page, :only_path => false))), IqRdf::Sdc::build_uri('Page')) do |page|
+document << IqRdf.build_full_uri_subject(URI.parse(url_for(request.query_parameters.merge(:page => @results.current_page, :lang => nil, :only_path => false))), IqRdf::Sdc::build_uri('Page')) do |page|
   page.Sdc::startIndex((@results.current_page - 1) * @results.limit_value + 1)
-  page.Sdc::previous(URI.parse(url_for(request.query_parameters.merge(:page => @results.current_page - 1, :only_path => false)))) if @results.current_page > 1
-  page.Sdc::next(URI.parse(url_for(request.query_parameters.merge(:page => @results.current_page + 1, :only_path => false)))) if @results.current_page < @results.num_pages
+  page.Sdc::previous(URI.parse(url_for(request.query_parameters.merge(:page => @results.current_page - 1, :lang => nil, :only_path => false)))) if @results.current_page > 1
+  page.Sdc::next(URI.parse(url_for(request.query_parameters.merge(:page => @results.current_page + 1, :lang => nil, :only_path => false)))) if @results.current_page < @results.num_pages
 end
 
 i = 0

data/app/views/search_results/sections/_datasets.html.erb

@@ -0,0 +1,17 @@
+<% if @datasets.any? %>
+  <%= input_block :label => t('txt.views.search_results.datasets') do %>
+    <% @datasets.each do |dataset| %>
+      <label class="checkbox inline">
+        <%= check_box_tag "ds[]", dataset.name, search_dataset_selected?(dataset.name) %><%= dataset.name %>
+      </label>
+    <% end %>
+    <div class="btn-group">
+      <button type="button" class="btn btn-mini checkbox-select-all">
+        <%= t('txt.views.search_results.all') %>
+      </button>
+      <button type="button" class="btn btn-mini checkbox-select-none">
+        <%= t('txt.views.search_results.none') %>
+      </button>
+    </div>
+  <% end %>
+<% end %>

data/app/views/search_results/sections/_klass.html.erb

@@ -1,7 +1,7 @@
 <%= input_block :label => t('txt.views.search_results.for'), :id => 't' do %>
   <select name="t" id="t" class="search_type">
-    <%= options_for_select(Iqvoc.searchable_classes.map { |c|
-        [c.model_name.human(:count => 2), c.name.parameterize]
+    <%= options_for_select(Iqvoc.searchable_class_names.map { |klass, identifier|
+        [klass.constantize.model_name.human(:count => 2), identifier]
       }, params[:t]) %>
   </select>
 <% end %>

data/app/views/search_results/sections/_languages.html.erb

@@ -1,14 +1,14 @@
 <%= input_block :label => t('txt.views.search_results.search_languages') do %>
   <% @available_languages.sort.each do |lang_tag, label| %>
     <label for="languages_<%= lang_tag %>" class="checkbox inline">
-      <%= check_box_tag "l[]", lang_tag, select_search_checkbox?(lang_tag), :id => "languages_#{lang_tag}", :class => 'lang_check' %><%= lang_tag %>
+      <%= check_box_tag "l[]", lang_tag, search_language_selected?(lang_tag) %><%= lang_tag %>
     </label>
   <% end %>
   <div class="btn-group">
-    <button type="button" id="language_select_all" class="btn btn-mini">
+    <button type="button" class="btn btn-mini checkbox-select-all">
       <%= t('txt.views.search_results.all') %>
     </button>
-    <button type="button" id="language_select_none" class="btn btn-mini">
+    <button type="button" class="btn btn-mini checkbox-select-none">
       <%= t('txt.views.search_results.none') %>
     </button>
   </div>

data/app/views/users/_sidebar.html.erb

@@ -1,5 +1,5 @@
 <%= sidebar do %>
 <%= sidebar_header 'Links' %>
-<%= sidebar_item :icon => :'th-list', :text => User.model_name.human(:count => 5), :path => users_path, :active => params[:action] == 'index' %>
+<%= sidebar_item :icon => :users, :text => User.model_name.human(:count => 5), :path => users_path, :active => params[:action] == 'index' %>
 <%= sidebar_item :icon => :user, :text => t('txt.views.users.new_link'), :path => new_user_path, :active => params[:action] == 'new' %>
 <% end %>

data/config/application.rb

@@ -62,7 +62,5 @@ module Iqvoc
 
     # Version of your assets, change this if you want to expire all your assets
     config.assets.version = '1.0'
-
-    config.assets.initialize_on_precompile = false
   end
 end

data/config/engine.rb

@@ -13,6 +13,11 @@ require 'sass'
 require 'sass-rails'
 require 'bootstrap-sass'
 require 'protected_attributes'
+require 'font-awesome-rails'
+require 'uglifier'
+require 'apipie-rails'
+require 'database_cleaner'
+require 'delayed_job_active_record'
 
 require 'iqvoc/controller_extensions'
 

data/config/environments/heroku.rb

@@ -16,39 +16,85 @@
 
 if Iqvoc.const_defined?(:Application)
   Iqvoc::Application.configure do
-    # Settings specified here will take precedence over those in config/environment.rb
+    # Settings specified here will take precedence over those in config/application.rb.
 
-    # The production environment is meant for finished, "live" apps.
-    # Code is not reloaded between requests
+    # Code is not reloaded between requests.
     config.cache_classes = true
 
-    # Full error reports are disabled and caching is turned on
+    # Eager load code on boot. This eager loads most of Rails and
+    # your application in memory, allowing both thread web servers
+    # and those relying on copy on write to perform better.
+    # Rake tasks automatically ignore this option for performance.
+    config.eager_load = true
+
+    # Full error reports are disabled and caching is turned on.
     config.consider_all_requests_local       = false
     config.action_controller.perform_caching = true
 
-    # Specifies the header that your server uses for sending files
-    # config.action_dispatch.x_sendfile_header = "X-Sendfile"
+    # Enable Rack::Cache to put a simple HTTP cache in front of your application
+    # Add `rack-cache` to your Gemfile before enabling this.
+    # For large-scale production use, consider using a caching reverse proxy like nginx, varnish or squid.
+    # config.action_dispatch.rack_cache = true
 
-    # Disable Rails's static asset server
-    # In production, Apache or nginx will already do this
+    # Disable Rails's static asset server (Apache or nginx will already do this).
     config.serve_static_assets = true
 
-    # Compress JavaScripts and CSS
-    config.assets.compress = false
+    # Compress JavaScripts and CSS.
+    config.assets.js_compressor = :uglifier
+    # config.assets.css_compressor = :sass
+
+    # Do not fallback to assets pipeline if a precompiled asset is missed.
+    config.assets.compile = false
+
+    # Generate digests for assets URLs.
+    config.assets.digest = true
+
+    # Version of your assets, change this if you want to expire all your assets.
+    config.assets.version = '1.0'
+
+    # Specifies the header that your server uses for sending files.
+    # config.action_dispatch.x_sendfile_header = "X-Sendfile" # for apache
+    # config.action_dispatch.x_sendfile_header = 'X-Accel-Redirect' # for nginx
+
+    # Force all access to the app over SSL, use Strict-Transport-Security, and use secure cookies.
+    # config.force_ssl = true
+
+    # Set to :debug to see everything in the log.
+    config.log_level = :info
 
-    # Don't fallback to assets pipeline if a precompiled asset is missed
-    config.assets.compile = true
+    # Prepend all log lines with the following tags.
+    # config.log_tags = [ :subdomain, :uuid ]
 
-    # Generate digests for assets URLs
-    config.assets.digest = false
+    # Use a different logger for distributed setups.
+    # config.logger = ActiveSupport::TaggedLogging.new(SyslogLogger.new)
+
+    # Use a different cache store in production.
+    # config.cache_store = :mem_cache_store
+
+    # Enable serving of images, stylesheets, and JavaScripts from an asset server.
+    # config.action_controller.asset_host = "http://assets.example.com"
+
+    # Precompile additional assets.
+    # application.js, application.css, and all non-JS/CSS in app/assets folder are already added.
+    # config.assets.precompile += %w( search.js )
+
+    # Ignore bad email addresses and do not raise email delivery errors.
+    # Set this to true and configure the email server for immediate delivery to raise delivery errors.
+    # config.action_mailer.raise_delivery_errors = false
 
     # Enable locale fallbacks for I18n (makes lookups for any locale fall back to
-    # the I18n.default_locale when a translation can not be found)
+    # the I18n.default_locale when a translation can not be found).
     config.i18n.fallbacks = true
 
-    # Send deprecation notices to registered listeners
+    # Send deprecation notices to registered listeners.
     config.active_support.deprecation = :notify
 
+    # Disable automatic flushing of the log to improve performance.
+    # config.autoflush_log = false
+
+    # Use default logging formatter so that PID and timestamp are not suppressed.
+    config.log_formatter = ::Logger::Formatter.new
+
     # 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

data/config/initializers/apipie.rb

@@ -0,0 +1,17 @@
+require "iqvoc/version"
+
+Apipie.configure do |config|
+  config.default_version         = Iqvoc::VERSION
+  config.app_name                = "iQvoc"
+  config.api_base_url            = "/"
+  config.doc_base_url            = "/apidoc"
+  config.api_controllers_matcher = ["#{Iqvoc.root}/app/controllers/*.rb",
+                                    "#{Iqvoc.root}/app/controllers/concepts/*.rb"]
+  config.markup                  = Apipie::Markup::Markdown.new
+  config.validate                = false
+  config.validate_value          = false
+  config.validate_presence       = false
+  config.app_info                = <<-EOF
+iQvoc is a Vocabulary Management System for the Semantic Web.
+EOF
+end

data/config/initializers/secret_token.rb

@@ -1,12 +1,28 @@
-# Be sure to restart your server when you modify this file.
+# encoding: UTF-8
+
+# Copyright 2011-2013 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.
 
-# Your secret key is used for verifying the integrity of signed cookies.
-# If you change this key, all old signed cookies will become invalid!
+# Be sure to restart your server when you modify this file.
 
-# Make sure the secret is at least 30 characters and all random,
-# no regular words or you'll be exposed to dictionary attacks.
-# You can use `rake secret` to generate a secure secret key.
+if Iqvoc.const_defined?(:Application)
+  # Your secret key for verifying the integrity of signed cookies.
+  # If you change this key, all old signed cookies will become invalid!
+  # Make sure the secret is at least 30 characters and all random,
+  # no regular words or you'll be exposed to dictionary attacks.
 
-# Make sure your secret_key_base is kept private
-# if you're sharing your code publicly.
-Iqvoc::Application.config.secret_key_base = '70a015a78b89c42f6ba10794ec6b28c6d1ba64eadbe2deac82a54de42e2ece2e36aa1e3ddf9648ccffa6134512a06d4cfec43ffbcc94388163194708a4529b0e'
+  # Run `rake secret` and uncomment the following line
+  # Replace the secret-placeholder with your generated token
+  Iqvoc::Application.config.secret_key_base = 'cc2b43de90958fd527e34b43ed9649ba062a2b6dae4a5226cd23410c7480c5d0e68a7e5e93e8cbda459ce7011bab0412b7649981ed0fb9232b49f5cf6ed99b58'
+end

data/config/locales/activerecord.de.yml

@@ -139,3 +139,8 @@ de:
         active: "aktiviert"
         role: "Rolle"
         telephone_number: "Telefonnummer"
+      import:
+        user: "Benutzer"
+        created_at: "erstellt"
+        finished_at: "beendet"
+        success: "erfolgreich"

data/config/locales/activerecord.en.yml

@@ -139,3 +139,8 @@ en:
         active: "active"
         role: "Role"
         telephone_number: "Phone number"
+      import:
+        user: "User"
+        created_at: "Created at"
+        finished_at: "Finished at"
+        success: "Success"

data/config/locales/de.yml

@@ -75,6 +75,7 @@ de:
      hint_csv_input: "Mehrere Werte können kommagetrennt eingeben werden."
      form_errors: "Fehler"
      representations: "Repräsentationen"
+     other: "Sonstige"
 
    views:
      layouts:
@@ -96,6 +97,7 @@ de:
          languages: Sprachen
          performance: Performance
          triplestore: Triplestore
+         sources: Verteilte Suche
        settings:
          title: Titel
          languages_notes: Sprachen für Notes
@@ -106,6 +108,7 @@ de:
          triplestore_username: Benutzername für Triplestore
          triplestore_password: Passwort für Triplestore
          triplestore_autosync: automatische Synchronisation mit Triplestore
+         sources_iqvoc: Quellen (iQvoc)
      alphabetical_concepts:
      untranslated_concepts:
        caption: "Fehlende Übersetzungen"
@@ -182,6 +185,7 @@ de:
        no_results: "Keine Ergebnisse"
        search_languages: "Sprachen"
        search_results: "Suchergebnisse"
+       search_results_on: "Suchergebnisse auf %{dataset}"
        results_found:
          one: "Ihre Suche nach <strong>%{query}</strong> lieferte %{count} Ergebnis."
          other: "Ihre Suche nach <strong>%{query}</strong> lieferte %{count} Ergebnisse."
@@ -194,6 +198,7 @@ de:
        none: "keine"
        for: "Nach"
        mode: "Modus"
+       datasets: "Externe Quellen"
      user_sessions:
        header: "Anmelden"
        login: "Anmelden"
@@ -260,11 +265,19 @@ de:
        state: "Status"
        full_rdf_export: Vollständiger RDF Export
        import: Import
+       reset: Thesaurus löschen
+       reset_warning: "Alle Konzepte, Kollektionen und Labels im Thesaurus werden gelöscht."
+       reset_success: "Der Thesaurus wurde gelöscht."
      collections:
        new: "Neue Kollektion"
      triplestore_sync:
        caption: "Sync mit Triplestore"
        start: "Synchronisierung starten"
+     import:
+       title: "Import"
+       file: "NTriples-Datei"
+       namespace: "Standard Namespace"
+       success: "Import-Job wurde erstellt. Seite neu laden, um Status zu aktualisieren."
 
    partials:
      note:
@@ -288,6 +301,7 @@ de:
        invalid_value: "fehlerhafter Wert: %{key} (%{error_message})"
      search_results:
        insufficient_data: "Bitte geben Sie mehr Suchkriterien an."
+       remote_source_error: "Externe Quelle '%{source}' konnte nicht durchsucht werden."
      users:
        successfully_created: "Benutzer wurde erfolgreich erstellt."
        successfully_updated: "Der Benutzer wurde erfolgreich geändert."

data/config/locales/en.yml

@@ -75,6 +75,7 @@ en:
      hint_csv_input: "Multiple values can be entered comma-separated."
      form_errors: "Errors"
      representations: "Representations"
+     other: "Other"
 
    views:
      layouts:
@@ -96,6 +97,7 @@ en:
          languages: languages
          performance: Performance
          triplestore: triplestore
+         sources: Distributed search
        settings:
          title: site title
          languages_notes: languages for notes
@@ -106,6 +108,7 @@ en:
          triplestore_username: username for triplestore
          triplestore_password: password for triplestore
          triplestore_autosync: automatic triplestore synchronization
+         sources_iqvoc: Sources (iQvoc)
      alphabetical_concepts:
      untranslated_concepts:
        caption: "Missing Translations"
@@ -190,6 +193,7 @@ en:
        no_results: "No results"
        search_languages: "Languages"
        search_results: "Search results"
+       search_results_on: "Search results on %{dataset}"
        results_found:
          one: "Your search for <strong>%{query}</strong> yielded the following %{count} result."
          other: "Your search for <strong>%{query}</strong> yielded the following %{count} results."
@@ -202,6 +206,7 @@ en:
        none: "none"
        for: "For"
        mode: "Mode"
+       datasets: "External sources"
      user_sessions:
        header: "Login"
        login: "Login"
@@ -267,11 +272,19 @@ en:
        state: "State"
        full_rdf_export: Complete RDF export
        import: Import
+       reset: Reset Thesaurus
+       reset_warning: "All concepts, collections and labels in the thesaurus will be deleted."
+       reset_success: "Thesaurus has been reset."
      collections:
        new: "New collection"
      triplestore_sync:
        caption: "Sync with Triplestore"
        start: "Start synchronization"
+     import:
+       title: "Import"
+       file: "NTriples file"
+       namespace: "Default namespace"
+       success: "Import job was created. Reload page to see current processing status."
 
    partials:
      note:
@@ -295,6 +308,7 @@ en:
        invalid_value: "unsupported value: %{key} (%{error_message})"
      search_results:
        insufficient_data: "You gave insufficient search data."
+       remote_source_error: "Remote source '%{source}' could not be queried."
      users:
        successfully_created: "User has been successfully created."
        successfully_updated: "User has been successfully updated."

data/config/locales/pt.yml

@@ -75,6 +75,7 @@ pt:
      hint_csv_input: " Vários valores podem ser inseridos separados por vírgula."
      form_errors: "Erros"
      representations: "Representações"
+     other: "Diferente"
 
    views:
      layouts:

data/config/routes.rb

@@ -15,6 +15,7 @@
 # limitations under the License.
 
 Rails.application.routes.draw do
+  apipie
   scope ':lang', :constraints => lambda { |params, req|
     langs = Iqvoc::Concept.pref_labeling_languages.join('|').presence || 'en'
     return params[:lang].to_s =~ /^#{langs}$/
@@ -26,6 +27,7 @@ Rails.application.routes.draw do
     resources :users, :except => [:show]
     resources :concepts
     resources :collections
+    resources :imports, :only => [:index, :show, :create]
 
     get 'scheme' => 'concepts/scheme#show', :as => 'scheme'
     get 'scheme/edit' => 'concepts/scheme#edit', :as => 'edit_scheme'
@@ -50,13 +52,11 @@ Rails.application.routes.draw do
     get 'expired_concepts' => 'concepts/expired#index', :as => 'expired_concepts'
 
     get 'dashboard' => 'dashboard#index', :as => 'dashboard'
+    match 'dashboard/reset' => 'dashboard#reset', :as => 'reset', :via => [:get, :post]
 
     get 'config' => 'instance_configuration#index', :as => 'instance_configuration'
     patch 'config' => 'instance_configuration#update'
 
-    get 'import' => 'import#index', :as => 'import'
-    post 'import' => 'import#import'
-
     get 'search' => 'search_results#index', :as => 'search'
 
     get 'help' => 'pages#help', :as => 'help'
@@ -65,10 +65,13 @@ Rails.application.routes.draw do
     # root :to => 'frontpage#index', :format => nil
   end
 
+  get 'remote_labels' => 'remote_labels#show', :as => 'remote_label'
   get 'schema' => redirect('/'), :as => 'schema'
-
+  get 'dataset' => 'rdf#dataset', :as => 'rdf_dataset'
   get 'scheme' => 'concepts/scheme#show', :as => 'rdf_scheme'
   get 'search' => 'search_results#index', :as => 'rdf_search'
+  get 'hierarchy' => 'hierarchy#index'
+  get 'hierarchy/:root' => 'hierarchy#show'
 
   get ':id' => 'rdf#show', :as => 'rdf'