iqvoc 4.3.3 → 4.4.0

data/db/seeds.rb

@@ -14,7 +14,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-if User.where(:email => 'admin@iqvoc').none?
+if User.where(email: 'admin@iqvoc').none?
   User.create! do |user|
     user.forename = 'Admin'
     user.surname  = 'Istrator'
@@ -22,11 +22,11 @@ if User.where(:email => 'admin@iqvoc').none?
     user.password = 'admin'
     user.password_confirmation = 'admin'
     user.active = true
-    user.role = "administrator"
+    user.role = 'administrator'
   end
 end
 
-if User.where(:email => 'demo@iqvoc').none?
+if User.where(email: 'demo@iqvoc').none?
   User.create! do |user|
     user.forename = 'Demo'
     user.surname  = 'User'
@@ -34,6 +34,6 @@ if User.where(:email => 'demo@iqvoc').none?
     user.password = 'cooluri'
     user.password_confirmation = 'cooluri'
     user.active = true
-    user.role = "reader"
+    user.role = 'reader'
   end
 end

data/iqvoc.gemspec

@@ -1,44 +1,45 @@
 # -*- encoding: utf-8 -*-
-$:.push File.expand_path("../lib", __FILE__)
+$:.push File.expand_path('../lib', __FILE__)
 require 'iqvoc/version'
 
 Gem::Specification.new do |s|
-  s.name        = "iqvoc"
+  s.name        = 'iqvoc'
   s.version     = Iqvoc::VERSION
   s.platform    = Gem::Platform::RUBY
-  s.authors     = ["Robert Glaser", "Till Schulte-Coerne", "Frederik Dohr"]
-  s.email       = ["robert.glaser@innoq.com", "till.schulte-coerne@innoq.com", "frederik.dohr@innoq.com"]
-  s.homepage    = "http://github.com/innoq/iqvoc"
-  s.summary     = "iQvoc"
-  s.description = "iQvoc - a SKOS(-XL) vocabulary management system built on the Semantic Web"
-  s.license     = "Apache License 2.0"
+  s.authors     = ['Robert Glaser', 'Till Schulte-Coerne', 'Frederik Dohr']
+  s.email       = ['robert.glaser@innoq.com', 'till.schulte-coerne@innoq.com', 'frederik.dohr@innoq.com']
+  s.homepage    = 'http://github.com/innoq/iqvoc'
+  s.summary     = 'iQvoc'
+  s.description = 'iQvoc - a SKOS(-XL) vocabulary management system built on the Semantic Web'
+  s.license     = 'Apache License 2.0'
 
-  s.add_dependency 'rails', '~> 4.0.0'
+  s.add_dependency 'rails', '~> 4.1.0'
   s.add_dependency 'bundler'
-  s.add_dependency 'kaminari', '0.13.0'
-  s.add_dependency 'authlogic'
-  s.add_dependency 'cancan'
-  s.add_dependency 'iq_rdf', '>= 0.1.13'
+  s.add_dependency 'kaminari'
+  s.add_dependency 'kaminari-bootstrap', '~> 3.0.1'
+  s.add_dependency 'authlogic', '~> 3.4.2'
+  s.add_dependency 'cancancan'
+  s.add_dependency 'iq_rdf', '>= 0.1.15'
   s.add_dependency 'json'
   s.add_dependency 'rails_autolink'
   s.add_dependency 'faraday'
-  s.add_dependency 'simple_form'
-  s.add_dependency 'sass-rails', '~> 4.0.0'
-  s.add_dependency 'bootstrap-sass', '~> 2.3.1.3'
+  s.add_dependency 'sass-rails', '~> 4.0.2'
+  s.add_dependency 'bootstrap-sass', '~> 3.1.1.0'
+  s.add_dependency 'bootstrap_form', '~> 2.1.1'
   s.add_dependency 'iq_triplestorage'
   s.add_dependency 'nokogiri'
   s.add_dependency 'linkeddata'
-  s.add_dependency 'protected_attributes', '>= 1.0.5'
   s.add_dependency 'font-awesome-rails'
   s.add_dependency 'uglifier', '>= 1.3.0'
   s.add_dependency 'apipie-rails'
   s.add_dependency 'maruku'
   s.add_dependency 'database_cleaner'
-  s.add_dependency 'delayed_job_active_record', '~> 4.0.0'
+  s.add_dependency 'delayed_job_active_record', '~> 4.0.1'
+  s.add_dependency 'carrierwave'
 
   s.files = %w(LICENSE README.md CHANGELOG.md Gemfile Gemfile.lock Rakefile iqvoc.gemspec) +
-    Dir.glob("{app,config,db,public,lib,test,vendor}/**/*")
+    Dir.glob('{app,config,db,public,lib,test,vendor}/**/*')
   s.test_files = s.files.grep(%r{^test/})
   s.executables = s.files.grep(%r{^bin/}) { |f| File.basename(f) }
-  s.require_paths = ["lib"]
+  s.require_paths = ['lib']
 end

data/lib/engine_tasks/db.rake

@@ -8,10 +8,11 @@ namespace :iqvoc do
 
     desc "Load seeds from all engines (db/seed tasks should be idempotent)"
     task :seed_all => :environment do
-      engines = Rails.application.railties.engines.select { |e|
-        e.config.paths["db/seeds.rb"] &&
+      engines = Rails.application.railties.select do |e|
+        e.config.respond_to?(:paths) &&
+          e.config.paths["db/seeds.rb"] &&
           e.config.paths["db/seeds.rb"].existent.any?
-      }
+      end
 
       engines.select{|e| e.engine_name !~ /^iqvoc_/}.each do |engine|
         puts "There is a non-iQvoc engine (#{engine.engine_name}) having seeds. These seeds are not necessarily idempotent."

data/lib/generators/app/template.rb

@@ -1,20 +1,19 @@
-namespaced_app_name = app_path.gsub("_", "/").camelize
+namespaced_app_name = app_path.gsub('_', '/').camelize
 
 gem 'iqvoc'
 
-["config/application.rb",
- "config/environment.rb",
- "config/initializers/secret_token.rb",
- "config/initializers/session_store.rb",
- "config.ru",
- "Rakefile"].each do |file|
+['config/application.rb',
+ 'config/environment.rb',
+ 'config/initializers/session_store.rb',
+ 'config.ru',
+ 'Rakefile'].each do |file|
   gsub_file file, app_const_base, namespaced_app_name
 end
 
-gsub_file "config/application.rb", /filter_parameters .*:password\b/,
+gsub_file 'config/application.rb', /filter_parameters .*:password\b/,
     '\0, :password_confirmation'
 
-gsub_file "config/routes.rb", "#{app_const_base}::Application", "Rails.application"
+gsub_file 'config/routes.rb', "#{app_const_base}::Application", 'Rails.application'
 
 %w(development test production).each do |env|
   remove_file "config/environments/#{env}.rb"
@@ -41,13 +40,13 @@ end
 # Iqvoc::Concept.pref_labeling_class_name = "MyLabelingClass"
 # Iqvoc::Concept.further_relation_class_names << "MyConceptRelationClass"
 # Iqvoc::Concept.note_class_names = []
-# Iqvoc.default_rdf_namespace_helper_methods << :my_namespace
+# Iqvoc.default_rdf_namespace_helper_modules << MyModule
 
 # Iqvoc.core_assets += []
 EOF
 
-remove_file "app/assets/javascripts/application.js"
-create_file "app/assets/javascripts/manifest.js", <<-EOF
+remove_file 'app/assets/javascripts/application.js'
+create_file 'app/assets/javascripts/manifest.js', <<-EOF
 //= require framework
 //= require iqvoc/manifest
 
@@ -55,8 +54,8 @@ create_file "app/assets/javascripts/manifest.js", <<-EOF
 EOF
 create_file "app/assets/javascripts/#{app_path}/manifest.js"
 
-remove_file "app/assets/stylesheets/application.css"
-create_file "app/assets/stylesheets/manifest.css", <<-EOF
+remove_file 'app/assets/stylesheets/application.css'
+create_file 'app/assets/stylesheets/manifest.css', <<-EOF
 /*
 *= require framework
 *= require iqvoc/manifest
@@ -66,10 +65,10 @@ create_file "app/assets/stylesheets/manifest.css", <<-EOF
 EOF
 create_file "app/assets/stylesheets/#{app_path}/manifest.css"
 
-remove_file "public/index.html"
-remove_file "app/controllers/application_controller.rb"
-remove_file "app/helpers/application_helper.rb"
-remove_file "app/views/layouts/application.html.erb"
+remove_file 'public/index.html'
+remove_file 'app/controllers/application_controller.rb'
+remove_file 'app/helpers/application_helper.rb'
+remove_file 'app/views/layouts/application.html.erb'
 
-remove_file "Gemfile"
-create_file "Gemfile", "source 'http://rubygems.org'\n\ngem 'iqvoc'"
+remove_file 'Gemfile'
+create_file 'Gemfile', "source 'http://rubygems.org'\n\ngem 'iqvoc'"

data/lib/iqvoc.rb

@@ -44,7 +44,6 @@ module Iqvoc
   module Sync
     include Iqvoc::Configuration::Sync
   end
-
 end
 
 # FIXME: For reasons yet unknown, the load hook is executed twice

data/lib/iqvoc/ability.rb

@@ -7,7 +7,7 @@ module Iqvoc
     def initialize(user = nil)
       can :read, Iqvoc::Concept.root_class.instance
       can :read, ::Collection::Base
-      can :read, [::Concept::Base, ::Label::Base], &@@if_published
+      can :read, [::Concept::Base, ::Collection::Base, ::Label::Base], &@@if_published
 
       # static pages
       can :read, :help
@@ -17,28 +17,27 @@ module Iqvoc
         can :destroy, UserSession
 
         if user.owns_role?(:editor) || user.owns_role?(:publisher) || user.owns_role?(:administrator) # Editors and above ...
-          can :manage, ::Collection::Base
-
-          can :read, [::Concept::Base, ::Label::Base]
-          can :create, [::Concept::Base, ::Label::Base]
-          can [:update, :destroy, :unlock], [::Concept::Base, ::Label::Base], :locked_by => user.id, :published_at => nil
-          can :lock, [::Concept::Base, ::Label::Base], :locked_by => nil, :published_at => nil
-          can [:check_consistency, :send_to_review], [::Concept::Base, ::Label::Base], :published_at => nil
-          can :branch, [::Concept::Base, ::Label::Base], &@@if_published
+          can :read, [::Concept::Base, ::Collection::Base, ::Label::Base]
+          can :create, [::Concept::Base, ::Collection::Base, ::Label::Base]
+          can [:update, :destroy, :unlock], [::Concept::Base, ::Collection::Base, ::Label::Base], locked_by: user.id, published_at: nil
+          can :lock, [::Concept::Base, ::Collection::Base, ::Label::Base], locked_by: nil, published_at: nil
+          can [:check_consistency, :send_to_review], [::Concept::Base, ::Collection::Base, ::Label::Base], published_at: nil
+          can :branch, [::Concept::Base, ::Collection::Base, ::Label::Base], &@@if_published
         end
 
         if user.owns_role?(:publisher) || user.owns_role?(:administrator) # Publishers and above ...
-          can :merge, [::Concept::Base, ::Label::Base], :published_at => nil
+          can :merge, [::Concept::Base, ::Collection::Base, ::Label::Base], published_at: nil
         end
 
         if user.owns_role?(:administrator)
-          can [:update, :destroy, :unlock], [::Concept::Base, ::Label::Base], :published_at => nil # Mustn't be locked by myself
+          can [:update, :destroy, :unlock], [::Concept::Base, ::Label::Base], published_at: nil # Mustn't be locked by myself
 
           can :manage, User
           can :manage, Iqvoc.config
 
           can :full_export, ::Concept::Base
           can :import, ::Concept::Base
+          can :export, ::Concept::Base
 
           can :update, Iqvoc::Concept.root_class.instance
 
@@ -49,8 +48,6 @@ module Iqvoc
       else # no user
         can :create, UserSession
       end
-
     end
-
   end
 end

data/lib/iqvoc/configuration/collection.rb

@@ -6,6 +6,8 @@ module Iqvoc
       extend ActiveSupport::Concern
 
       included do
+        Iqvoc.first_level_class_configuration_modules << self
+
         mattr_accessor :base_class_name, :member_class_name, :note_class_names
 
         self.base_class_name = 'Collection::SKOS::Unordered'
@@ -28,7 +30,6 @@ module Iqvoc
           note_class_names.map(&:constantize)
         end
       end
-
     end
   end
 end

data/lib/iqvoc/configuration/concept.rb

@@ -49,7 +49,7 @@ module Iqvoc
 
         self.additional_association_class_names = {}
 
-        self.view_sections = ["main", "labels", "relations", "notes", "notations", "matches"]
+        self.view_sections = ['main', 'labels', 'relations', 'notes', 'notations', 'matches']
 
         self.include_module_names = []
       end
@@ -58,7 +58,7 @@ module Iqvoc
         def pref_labeling_languages
           # FIXME: mutable object; needs custom array setters to guard against
           # modification (to highlight deprecated usage)
-          return Iqvoc.config["languages.pref_labeling"]
+          return Iqvoc.config['languages.pref_labeling']
         end
 
         # Do not use the following method in models. This will probably cause a
@@ -93,7 +93,7 @@ module Iqvoc
           # FIXME: mutable object; needs custom hash setters to guard against
           # modification of languages arrays (to highlight deprecated usage)
           return Iqvoc.config.defaults.each_with_object({}) do |(key, default_value), hsh|
-            prefix = "languages.further_labelings."
+            prefix = 'languages.further_labelings.'
             if key.start_with? prefix
               class_name = key[prefix.length..-1]
               hsh[class_name] = Iqvoc.config[key]
@@ -147,20 +147,19 @@ module Iqvoc
 
         # @deprecated
         def pref_labeling_languages=(value)
-          ActiveSupport::Deprecation.warn "pref_labeling_languages has been moved into instance configuration", caller
-          Iqvoc.config.register_setting("languages.pref_labeling", value)
+          ActiveSupport::Deprecation.warn 'pref_labeling_languages has been moved into instance configuration', caller
+          Iqvoc.config.register_setting('languages.pref_labeling', value)
         end
 
         # @deprecated
         def further_labeling_class_names=(hsh)
-          ActiveSupport::Deprecation.warn "further_labeling_class_names has been moved into instance configuration", caller
-          prefix = "languages.further_labelings."
+          ActiveSupport::Deprecation.warn 'further_labeling_class_names has been moved into instance configuration', caller
+          prefix = 'languages.further_labelings.'
           hsh.each do |class_name, value|
             Iqvoc.config.register_setting(prefix + class_name, value.map(&:to_s))
           end
         end
       end
-
     end
   end
 end

data/lib/iqvoc/configuration/core.rb

@@ -8,6 +8,7 @@ module Iqvoc
       included do
         mattr_accessor :searchable_class_names,
           :unlimited_search_results,
+          :default_rdf_namespace_helper_modules,
           :default_rdf_namespace_helper_methods,
           :rdf_namespaces,
           :change_note_class_name,
@@ -16,7 +17,10 @@ module Iqvoc
           :ability_class_name,
           :localized_routes,
           :core_assets,
-          :search_sections
+          :search_sections,
+          :export_path,
+          :upload_path,
+          :truncation_blacklist
 
         self.localized_routes = [] # routing extensibility hook
 
@@ -39,128 +43,118 @@ module Iqvoc
         )
 
         self.navigation_items = [{
-          :text => "Dashboard",
-          :href => proc { dashboard_path },
-          :controller => "dashboard",
+          text: 'Dashboard',
+          href: proc { dashboard_path },
+          controller: 'dashboard',
           :authorized? => proc { can? :use, :dashboard }
         }, {
-          :text => "Scheme",
-          :href => proc { scheme_path },
-          :controller => "concepts/scheme",
+          text: 'Scheme',
+          href: proc { scheme_path },
+          controller: 'concepts/scheme',
           :authorized? => proc { can? :read, Iqvoc::Concept.root_class.instance }
         }, {
-          :text => proc { ::Concept::Base.model_name.human(:count => 2) },
-          :href => proc { hierarchical_concepts_path },
-          :controller => "concepts/hierarchical",
+          text: proc { ::Concept::Base.model_name.human(count: 2) },
+          href: proc { hierarchical_concepts_path },
+          controller: 'concepts/hierarchical',
           :active? => proc {
             %w(concepts/hierarchical concepts/alphabetical concepts/untranslated).
                 include?(params[:controller])
           }
         }, {
-          :text => proc { t("txt.views.navigation.collections") },
-          :href => proc { collections_path },
-          :controller => "collections"
+          text: proc { t('txt.views.navigation.collections') },
+          href: proc { collections_path },
+          controller: 'collections'
         }, {
-          :text => proc { t("txt.views.navigation.search") },
-          :href => proc { search_path },
-          :controller => "search_results"
+          text: proc { t('txt.views.navigation.search') },
+          href: proc { search_path },
+          controller: 'search_results'
         }, {
-          :text => proc { t("txt.views.navigation.administration") },
+          text: proc { t('txt.views.navigation.administration') },
           :authorized? => proc { can? :use, :administration },
-          :items => [{
-            :text => proc { t("txt.views.navigation.users") },
-            :href => proc { users_path },
-            :controller => "users",
+          items: [{
+            text: proc { t('txt.views.navigation.users') },
+            href: proc { users_path },
+            controller: 'users',
             :authorized? => proc { can? :manage, User }
           }, {
-            :text => proc { t("txt.views.navigation.instance_configuration") },
-            :href => proc { instance_configuration_path },
-            :controller => "instance_configuration",
+            text: proc { t('txt.views.navigation.instance_configuration') },
+            href: proc { instance_configuration_path },
+            controller: 'instance_configuration',
             :authorized? => proc { can? :manage, Iqvoc.config }
           }]
         }, {
-          :text => proc { t("txt.views.navigation.help") },
-          :items => [{
-            :text => proc { t("txt.views.navigation.help") },
-            :href => proc { help_path },
-            :controller => "pages",
-            :action => "help",
+          text: proc { t('txt.views.navigation.help') },
+          items: [{
+            text: proc { t('txt.views.navigation.help') },
+            href: proc { help_path },
+            controller: 'pages',
+            action: 'help',
             :authorized? => proc { can? :read, :help }
           }, {
-            :text => proc { t("txt.views.navigation.about") },
-            :href => "http://iqvoc.net/"
+            text: proc { t('txt.views.navigation.about') },
+            href: 'http://iqvoc.net/'
           }]
         }]
 
         self.searchable_class_names = {
-          "Labeling::SKOS::Base" => "labels",
-          "Labeling::SKOS::PrefLabel" => "pref_labels",
-          "Note::Base" => "notes"
+          'Labeling::SKOS::Base' => 'labels',
+          'Labeling::SKOS::PrefLabel' => 'pref_labels',
+          'Note::Base' => 'notes'
         }
 
         self.unlimited_search_results = false
 
+        self.default_rdf_namespace_helper_modules = []
         self.default_rdf_namespace_helper_methods = [:iqvoc_default_rdf_namespaces]
 
         self.rdf_namespaces = {
-          :rdf  => "http://www.w3.org/1999/02/22-rdf-syntax-ns#",
-          :rdfs => "http://www.w3.org/2000/01/rdf-schema#",
-          :owl  => "http://www.w3.org/2002/07/owl#",
-          :skos => "http://www.w3.org/2004/02/skos/core#",
-          :dct  => "http://purl.org/dc/terms/",
-          :foaf => "http://xmlns.com/foaf/spec/",
-          :void => "http://rdfs.org/ns/void#",
-          :iqvoc => "http://try.iqvoc.net/schema#"
+          rdf: 'http://www.w3.org/1999/02/22-rdf-syntax-ns#',
+          rdfs: 'http://www.w3.org/2000/01/rdf-schema#',
+          owl: 'http://www.w3.org/2002/07/owl#',
+          skos: 'http://www.w3.org/2004/02/skos/core#',
+          dct: 'http://purl.org/dc/terms/',
+          foaf: 'http://xmlns.com/foaf/spec/',
+          void: 'http://rdfs.org/ns/void#',
+          iqvoc: 'http://try.iqvoc.net/schema#'
         }
 
         # The class to use for automatic generation of change notes on every save
-        self.change_note_class_name = "Note::SKOS::ChangeNote"
+        self.change_note_class_name = 'Note::SKOS::ChangeNote'
 
         self.first_level_class_configuration_modules = [] # Will be set in the modules
 
-        self.ability_class_name = "Iqvoc::Ability"
+        self.ability_class_name = 'Iqvoc::Ability'
 
         self.search_sections = [
-          "klass",
-          "mode",
-          "terms",
-          "type",
-          "collection",
-          "languages",
-          "datasets"
+          'klass',
+          'mode',
+          'terms',
+          'type',
+          'collection',
+          'languages',
+          'datasets'
+        ]
+
+        # ignored database tables during thesaurus truncation
+        self.truncation_blacklist = [
+          'schema_migrations',
+          'users',
+          'exports',
+          'imports'
         ]
 
         # initialize
         self.config.register_settings({
-          "title" => "iQvoc",
-          "languages.pref_labeling" => ["en", "de"],
-          "languages.further_labelings.Labeling::SKOS::AltLabel" => ["en", "de"],
-          "languages.notes" => ["en", "de"],
-          "performance.unbounded_hierarchy" => false,
-          "sources.iqvoc" => [""]
+          'title' => 'iQvoc',
+          'languages.pref_labeling' => ['en', 'de'],
+          'languages.further_labelings.Labeling::SKOS::AltLabel' => ['en', 'de'],
+          'languages.notes' => ['en', 'de'],
+          'performance.unbounded_hierarchy' => false,
+          'sources.iqvoc' => ['']
         })
       end
 
       module ClassMethods
-        def generate_secret_token
-          require 'securerandom'
-
-          template = Rails.root.join("config", "initializers", "secret_token.rb.template")
-          raise "File not found: #{template}" unless File.exist?(template)
-
-          file_name = "config/initializers/secret_token.rb"
-
-          token = SecureRandom.hex(64)
-          txt = File.read(template)
-          txt.gsub!("S-E-C-R-E-T", token)
-
-          File.open(file_name, "w") do |f|
-            f.write txt
-          end
-
-          puts "Secret token configuration has been created in #{file_name}."
-        end
-
         # ************** instance configuration **************
 
         def config(&block)
@@ -189,11 +183,11 @@ module Iqvoc
         end
 
         def title
-          config["title"]
+          config['title']
         end
 
         def note_languages
-          config["languages.notes"]
+          config['languages.notes']
         end
 
         # returns a list of all languages selectable for labels and/or notes
@@ -205,8 +199,8 @@ module Iqvoc
 
         # @deprecated
         def title=(value)
-          ActiveSupport::Deprecation.warn "title has been moved into instance configuration", caller
-          self.config.register_setting("title", value)
+          ActiveSupport::Deprecation.warn 'title has been moved into instance configuration', caller
+          self.config.register_setting('title', value)
         end
 
         def root
@@ -216,8 +210,14 @@ module Iqvoc
             Rails.root
           end
         end
-      end
 
+        def routing_constraint
+          lambda do |params, req|
+            langs = Iqvoc::Concept.pref_labeling_languages.join('|').presence || 'en'
+            return params[:lang].to_s =~ /^#{langs}$/
+          end
+        end
+      end
     end
   end
 end