iqvoc 4.7.0 → 4.8.0

data/lib/iqvoc/environments/test.rb

@@ -16,7 +16,7 @@ module Iqvoc::Environments
     config.eager_load = false
 
     # Configure static asset server for tests with Cache-Control for performance.
-    config.serve_static_assets  = true
+    config.serve_static_files  = true
     config.static_cache_control = 'public, max-age=3600'
 
     # Show full error reports and disable caching.
@@ -34,6 +34,9 @@ module Iqvoc::Environments
     # ActionMailer::Base.deliveries array.
     config.action_mailer.delivery_method = :test
 
+    # Randomize the order test cases are executed
+    config.active_support.test_order = :random
+
     # Print deprecation notices to the stderr.
     config.active_support.deprecation = :stderr
 

data/lib/iqvoc/version.rb

@@ -1,6 +1,6 @@
 # encoding: UTF-8
 
-# Copyright 2011-2013 innoQ Deutschland GmbH
+# Copyright 2011-2015 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.
@@ -15,5 +15,5 @@
 # limitations under the License.
 
 module Iqvoc
-  VERSION = "4.7.0"
+  VERSION = "4.8.0"
 end

data/lib/tasks/exporter.rake

@@ -1,10 +1,7 @@
-require 'multi_logger'
-
 namespace :iqvoc do
 
   desc 'Exports iQvoc data to rdf serialization (turtle, ntriples, rdf/xml)'
   task :export => :environment do
-    require 'iqvoc/skos_exporter'
 
     raise "You have to specify an rdf serialization format (turtle, ntriples or rdf/xml) for the data file to be exported. Example: rake iqvoc:import TYPE=... NAMESPACE=... [FILE=...]" unless ENV['TYPE']
     raise "You have to specify a default namespace for the data to be imported. Example: rake iqvoc:import TYPE=... NAMESPACE=... [FILE=...]" unless ENV['NAMESPACE']
@@ -15,7 +12,7 @@ namespace :iqvoc do
     timestamp = Time.now.strftime("%Y-%m-%d_%H-%M")
     file_path = ENV['FILE'] || Rails.root.join(Iqvoc.export_path, "iqvoc_dump-#{timestamp}.#{ENV['TYPE']}").to_s
 
-    exporter = Iqvoc::SkosExporter.new(file_path, ENV['TYPE'], ENV['NAMESPACE'], MultiLogger.new(stdout_logger, Rails.logger))
+    exporter = SkosExporter.new(file_path, ENV['TYPE'], ENV['NAMESPACE'], MultiLogger.new(stdout_logger, Rails.logger))
     exporter.run
   end
 

data/lib/tasks/importer.rake

@@ -1,13 +1,9 @@
-require 'multi_logger'
-
 namespace :iqvoc do
 
   namespace :import do
 
     desc 'Imports some ntriples data from a given url (URL=...). Use the parameter NAMESPACE=... to define the default namespace used in your data.'
     task :url => :environment do
-      require 'iqvoc/skos_importer'
-
       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']
 
@@ -21,7 +17,7 @@ namespace :iqvoc do
         false
       end
 
-      importer = Iqvoc::SkosImporter.new(ENV['URL'], URI.parse(ENV['NAMESPACE']).to_s, MultiLogger.new(stdout_logger, Rails.logger), publish, debug)
+      importer = SkosImporter.new(ENV['URL'], URI.parse(ENV['NAMESPACE']).to_s, MultiLogger.new(stdout_logger, Rails.logger), publish, debug)
       importer.run
     end
 

data/lib/tasks/sync.rake

@@ -1,7 +1,6 @@
 namespace :sync do
   task :all, [:host] => :environment do |t, args|
     require 'iqvoc'
-    require 'iqvoc/rdf_sync'
 
     if Iqvoc.config["triplestore.url"] == Iqvoc.config.defaults["triplestore.url"] # XXX: duplicates controller
       puts I18n.t("txt.controllers.triplestore_sync.config_warning")
@@ -15,7 +14,7 @@ namespace :sync do
     default_url_options[:host] = ROOT
 
     class FakeController
-      include Iqvoc::RDFSync::Helper
+      include RDFSyncService::Helper
       delegate :url_helpers, :to => "Rails.application.routes"
 
       def root_url(*args)

data/test/controllers/concept_movement_test.rb

@@ -41,18 +41,18 @@ class ConceptMovementTest < ActionController::TestCase
     # + Sports
     #
     @air_sports = Concept::SKOS::Base.new.tap do |c|
-      Iqvoc::RDFAPI.devour c, 'skos:prefLabel', '"Air sports"@en'
+      RDFAPI.devour c, 'skos:prefLabel', '"Air sports"@en'
       c.publish
       c.save
     end
     @achievement_hobbies = Concept::SKOS::Base.new(top_term: true).tap do |c|
-      Iqvoc::RDFAPI.devour c, 'skos:prefLabel', '"Achievement hobbies"@en'
-      Iqvoc::RDFAPI.devour c, 'skos:narrower', @air_sports
+      RDFAPI.devour c, 'skos:prefLabel', '"Achievement hobbies"@en'
+      RDFAPI.devour c, 'skos:narrower', @air_sports
       c.publish
       c.save
     end
     @sports = Concept::SKOS::Base.new(top_term: true).tap do |c|
-      Iqvoc::RDFAPI.devour c, 'skos:prefLabel', '"Sports"@en'
+      RDFAPI.devour c, 'skos:prefLabel', '"Sports"@en'
       c.publish
       c.save
     end
@@ -128,16 +128,16 @@ class ConceptMovementTest < ActionController::TestCase
 
     # create unpublished concepts
     @air_sports = Concept::SKOS::Base.new.tap do |c|
-      Iqvoc::RDFAPI.devour c, 'skos:prefLabel', '"Air sports"@en'
+      RDFAPI.devour c, 'skos:prefLabel', '"Air sports"@en'
       c.save
     end
     @achievement_hobbies = Concept::SKOS::Base.new(top_term: true).tap do |c|
-      Iqvoc::RDFAPI.devour c, 'skos:prefLabel', '"Achievement hobbies"@en'
-      Iqvoc::RDFAPI.devour c, 'skos:narrower', @air_sports
+      RDFAPI.devour c, 'skos:prefLabel', '"Achievement hobbies"@en'
+      RDFAPI.devour c, 'skos:narrower', @air_sports
       c.save
     end
     @sports = Concept::SKOS::Base.new(top_term: true).tap do |c|
-      Iqvoc::RDFAPI.devour c, 'skos:prefLabel', '"Sports"@en'
+      RDFAPI.devour c, 'skos:prefLabel', '"Sports"@en'
       c.save
     end
 
@@ -182,8 +182,8 @@ class ConceptMovementTest < ActionController::TestCase
   test 'top term movement' do
     UserSession.create(@admin)
 
-    assert_equal @achievement_hobbies.top_term, true
-    assert_equal @sports.top_term, true
+    assert_equal @achievement_hobbies.top_term?, true
+    assert_equal @sports.top_term?, true
 
     # move achievement_hobbies (includung childs) to sports
     patch :move,
@@ -204,7 +204,7 @@ class ConceptMovementTest < ActionController::TestCase
     refute @achievement_hobbies_version.published?
 
     # is not a top_term anymore
-    assert_equal @achievement_hobbies_version.top_term, false
+    assert_equal @achievement_hobbies_version.top_term?, false
 
     # test relations
     assert_equal 1, @sports_version.narrower_relations.size

data/test/controllers/hierarchy_test.rb

@@ -67,26 +67,26 @@ boot:
 
   test 'permission handling' do
     get :show, lang: 'en', format: 'html', root: 'root'
-    entries = get_entries('ul.concept-hierarchy li')
-    assert_equal entries, ['Root']
-    entries = get_entries('ul.concept-hierarchy li li')
-    assert_equal entries, ['Foo', 'Bar']
-    entries = get_entries('ul.concept-hierarchy li li li')
-    assert_equal entries, ['Alpha', 'Bravo']
-    entries = get_entries('ul.concept-hierarchy li li li li')
-    assert_equal entries, ['Uno', 'Dos']
-    entries = css_select('ul.concept-hierarchy li li li li li')
-    assert_equal entries.length, 0 # exceeded default depth
+    entries = get_entries('ul.concept-hierarchy > li')
+    assert_equal ['Root'], entries
+    entries = get_entries('ul.concept-hierarchy > li > ul > li')
+    assert_equal ['Bar', 'Foo'], entries
+    entries = get_entries('ul.concept-hierarchy > li > ul > li > ul > li')
+    assert_equal ['Alpha', 'Bravo'], entries
+    entries = get_entries('ul.concept-hierarchy > li > ul > li > ul > li > ul > li')
+    assert_equal ['Dos', 'Uno'], entries
+    entries = css_select('ul.concept-hierarchy > li > ul > li > ul > li > ul > li > ul > li')
+    assert_equal 0, entries.length # exceeded default depth
 
     @concepts['bar'].update_attribute('published_at', nil)
 
     get :show, lang: 'en', format: 'html', root: 'root'
-    entries = get_entries('ul.concept-hierarchy li')
-    assert_equal entries, ['Root']
-    entries = get_entries('ul.concept-hierarchy li li')
-    assert_equal entries, ['Foo']
-    entries = get_entries('ul.concept-hierarchy li li li')
-    assert_equal entries.length, 0
+    entries = get_entries('ul.concept-hierarchy > li')
+    assert_equal ['Root'], entries
+    entries = get_entries('ul.concept-hierarchy > li > ul > li')
+    assert_equal ['Foo'], entries
+    entries = get_entries('ul.concept-hierarchy li > ul > li > ul > li')
+    assert_equal 0, entries.length
   end
 
   test 'caching' do
@@ -223,125 +223,129 @@ boot:
 
     get :show, lang: 'en', format: 'html', root: 'N/A'
     assert_response 404
-    assert_equal flash[:error], 'no concept matching root parameter'
+    assert_equal 'no concept matching root parameter', flash[:error]
     entries = css_select('ul.concept-hierarchy li')
-    assert_equal entries.length, 0
+    assert_equal 0, entries.length
 
     get :show, lang: 'en', format: 'html', root: 'root'
     assert_response 200
-    assert_equal flash[:error], nil
-    entries = get_entries('ul.concept-hierarchy li')
-    assert_equal entries.length, 1
-    assert_equal entries[0], 'Root'
+    assert_nil flash[:error]
+    entries = get_entries('ul.concept-hierarchy > li')
+    assert_equal 1, entries.length
+    assert_equal 'Root', entries[0]
 
     get :show, lang: 'en', format: 'html', root: 'root'
-    entries = get_entries('ul.concept-hierarchy li')
-    assert_equal entries, ['Root']
-    entries = get_entries('ul.concept-hierarchy li li')
-    assert_equal entries, ['Foo', 'Bar']
-    entries = get_entries('ul.concept-hierarchy li li li')
-    assert_equal entries, ['Alpha', 'Bravo']
-    entries = get_entries('ul.concept-hierarchy li li li li')
-    assert_equal entries, ['Uno', 'Dos']
-    entries = css_select('ul.concept-hierarchy li li li li li')
-    assert_equal entries.length, 0 # exceeded default depth
+    entries = get_entries('ul.concept-hierarchy > li')
+    assert_equal ['Root'], entries
+    entries = get_entries('ul.concept-hierarchy > li > ul > li')
+    assert_equal ['Bar', 'Foo'], entries
+    entries = get_entries('ul.concept-hierarchy > li > ul > li > ul > li')
+    assert_equal ['Alpha', 'Bravo'], entries
+    entries = get_entries('ul.concept-hierarchy li > ul > li > ul > li > ul > li')
+    assert_equal ['Dos', 'Uno'], entries
+    entries = css_select('ul.concept-hierarchy > li > ul > li > ul > li > ul > li > ul > li')
+    assert_equal 0, entries.length # exceeded default depth
 
     get :show, lang: 'en', format: 'html', root: 'bravo'
-    entries = get_entries('ul.concept-hierarchy li')
-    assert_equal entries, ['Bravo']
-    entries = get_entries('ul.concept-hierarchy li li')
-    assert_equal entries, ['Uno', 'Dos']
-    entries = get_entries('ul.concept-hierarchy li li li')
-    assert_equal entries, ['Lorem', 'Ipsum']
-    entries = css_select('ul.concept-hierarchy li li li li')
-    assert_equal entries.length, 0
+    entries = get_entries('ul.concept-hierarchy > li')
+    assert_equal ['Bravo'], entries
+    entries = get_entries('ul.concept-hierarchy > li > ul > li')
+    assert_equal ['Dos', 'Uno'], entries
+    entries = get_entries('ul.concept-hierarchy > li > ul > li > ul > li')
+    assert_equal ['Ipsum', 'Lorem'], entries
+    entries = css_select('ul.concept-hierarchy > li > ul > li > ul > li > ul > li')
+    assert_equal 0, entries.length
 
     get :show, lang: 'en', format: 'html', root: 'lorem'
-    entries = get_entries('ul.concept-hierarchy li')
-    assert_equal entries, ['Lorem']
-    entries = css_select('ul.concept-hierarchy li li')
-    assert_equal entries.length, 0
+    entries = get_entries('ul.concept-hierarchy > li')
+    assert_equal ['Lorem'], entries
+    entries = css_select('ul.concept-hierarchy > li > ul > li')
+    assert_equal 0, entries.length
   end
 
   test 'depth handling' do
-    selector = 'ul.concept-hierarchy li li li li li'
+    selector = 'ul.concept-hierarchy > li > ul > li > ul > li > ul > li > ul > li'
 
     get :show, lang: 'en', format: 'html', root: 'root'
     entries = css_select(selector)
-    assert_equal entries.length, 0 # default depth is 3
+    assert_equal 0, entries.length # default depth is 3
 
     get :show, lang: 'en', format: 'html', root: 'root', depth: 4
     entries = css_select(selector)
-    assert_equal entries.length, 2
+    assert_equal 2, entries.length
 
     get :show, lang: 'en', format: 'html', root: 'root', depth: 1
-    entries = get_entries('ul.concept-hierarchy li')
-    assert_equal entries, ['Root']
-    entries = get_entries('ul.concept-hierarchy li li')
-    assert_equal entries, ['Foo', 'Bar']
-    entries = css_select('ul.concept-hierarchy li li li')
-    assert_equal entries.length, 0
-
+    entries = get_entries('ul.concept-hierarchy > li')
+    assert_equal ['Root'], entries
+    entries = get_entries('ul.concept-hierarchy > li > ul > li')
+    assert_equal ['Bar', 'Foo'], entries
+    entries = css_select('ul.concept-hierarchy > li > ul > li > ul > li')
+    assert_equal 0, entries.length
+
+    old_config_value = Iqvoc.config['performance.unbounded_hierarchy']
+    Iqvoc.config['performance.unbounded_hierarchy'] = false
     get :show, lang: 'en', format: 'html', root: 'root', depth: 5
     assert_response 403
-    assert_equal flash[:error], 'excessive depth'
+    assert_equal 'excessive depth', flash[:error]
+    Iqvoc.config['performance.unbounded_hierarchy'] = old_config_value
 
     get :show, lang: 'en', format: 'html', root: 'root', depth: 'invalid'
     assert_response 400
-    assert_equal flash[:error], 'invalid depth parameter'
+    assert_equal 'invalid depth parameter', flash[:error]
   end
 
   test 'direction handling' do
     get :show, lang: 'en', format: 'html', root: 'root'
-    entries = get_entries('ul.concept-hierarchy li')
-    assert_equal entries, ['Root']
-    entries = get_entries('ul.concept-hierarchy li li li li')
-    assert_equal entries, ['Uno', 'Dos']
+    entries = get_entries('ul.concept-hierarchy > li')
+    assert_equal ['Root'], entries
+    entries = get_entries('ul.concept-hierarchy > li > ul > li > ul > li > ul > li')
+    assert_equal ['Dos', 'Uno'], entries
 
     get :show, lang: 'en', format: 'html', root: 'root', dir: 'up'
     entries = get_entries('ul.concept-hierarchy li')
-    assert_equal entries, ['Root']
+    assert_equal ['Root'], entries
     entries = css_select('ul.concept-hierarchy li li')
-    assert_equal entries.length, 0
+    assert_equal 0, entries.length
 
     get :show, lang: 'en', format: 'html', root: 'lorem'
     entries = get_entries('ul.concept-hierarchy li')
-    assert_equal entries, ['Lorem']
+    assert_equal ['Lorem'], entries
     entries = css_select('ul.concept-hierarchy li li')
-    assert_equal entries.length, 0
+    assert_equal 0, entries.length
 
     get :show, lang: 'en', format: 'html', root: 'lorem', dir: 'up'
-    entries = get_entries('ul.concept-hierarchy li')
-    assert_equal entries, ['Lorem']
-    entries = get_entries('ul.concept-hierarchy li li li li')
-    assert_equal entries, ['Bar']
-    entries = css_select('ul.concept-hierarchy li li li li li')
-    assert_equal entries.length, 0
+    entries = get_entries('ul.concept-hierarchy > li')
+    assert_equal ['Lorem'], entries
+    entries = get_entries('ul.concept-hierarchy li > ul > li > ul > li > ul > li')
+    assert_equal ['Bar'], entries
+    entries = css_select('ul.concept-hierarchy li > ul > li > ul > li > ul > li > ul > li')
+    assert_equal 0, entries.length
 
     get :show, lang: 'en', format: 'html', root: 'lorem', dir: 'up', depth: 4
     page.all('ul.concept-hierarchy li').
         map { |node| node.native.children.first.text }
-    entries = get_entries('ul.concept-hierarchy li li li li li')
-    assert_equal entries, ['Root']
+    entries = get_entries('ul.concept-hierarchy > li > ul > li > ul > li > ul > li > ul > li')
+    assert_equal ['Root'], entries
   end
 
   test 'siblings handling' do
     get :show, lang: 'en', format: 'html', root: 'foo'
     entries = get_all_entries('ul.concept-hierarchy li')
-    assert_equal entries, ['Foo']
+    assert_equal ['Foo'], entries
 
     get :show, lang: 'en', format: 'html', root: 'foo', siblings: 'true'
     entries = get_all_entries('ul.concept-hierarchy li')
-    assert_equal entries, ['Foo', 'Bar']
+    # binding.pry
+    assert_equal ['Bar', 'Foo'], entries
 
     get :show, lang: 'en', format: 'html', root: 'lorem'
     entries = get_all_entries('ul.concept-hierarchy li')
-    assert_equal entries, ['Lorem']
+    assert_equal ['Lorem'], entries
 
     get :show, lang: 'en', format: 'html', root: 'lorem', dir: 'up',
         siblings: 'true'
     entries = get_all_entries('ul.concept-hierarchy li')
-    assert_equal entries.length, 8
+    assert_equal 8, entries.length
     ['Lorem', 'Ipsum', 'Uno', 'Dos', 'Alpha', 'Bravo', 'Bar', 'Foo'].each do |name|
       assert entries.include?(name), "missing entry: #{name}"
     end
@@ -349,7 +353,7 @@ boot:
     get :show, lang: 'en', format: 'html', root: 'lorem', dir: 'up',
         siblings: '1', depth: 4
     entries = get_all_entries('ul.concept-hierarchy li')
-    assert_equal entries.length, 9
+    assert_equal 9, entries.length
     ['Lorem', 'Ipsum', 'Uno', 'Dos', 'Alpha', 'Bravo', 'Bar', 'Foo', 'Root'].each do |name|
       assert entries.include?(name), "missing entry: #{name}"
     end
@@ -358,7 +362,7 @@ boot:
   test 'avoid duplication' do # in response to a bug report
     get :show, lang: 'en', format: 'ttl', root: 'uno', dir: 'up'
     assert_response 200
-    assert_equal @response.content_type, 'text/turtle'
+    assert_equal 'text/turtle', @response.content_type
     assert @response.body.include?(<<-EOS)
 :bravo a skos:Concept;
        skos:prefLabel "Bravo"@en;
@@ -379,7 +383,7 @@ boot:
     return Capybara::Node::Simple.new(@response.body)
   end
 
-  def create_hierarchy(hash, rel_class, memo=nil, parent=nil)
+  def create_hierarchy(hash, rel_class, memo = nil, parent =nil)
     hash.each do |origin, children|
       concept = create_concept(origin, origin.capitalize, 'en')
       memo[origin] = concept if memo

data/test/controllers/reverse_match_test.rb

@@ -34,13 +34,13 @@ class ReverseMatchTest < ActionController::TestCase
     Iqvoc.config['sources.iqvoc'] = ['http://try.iqvoc.net']
 
     @achievement_hobbies = Concept::SKOS::Base.new.tap do |c|
-      Iqvoc::RDFAPI.devour c, 'skos:prefLabel', '"Achievement hobbies"@en'
+      RDFAPI.devour c, 'skos:prefLabel', '"Achievement hobbies"@en'
       c.publish
       c.save
     end
 
     @airsoft = Concept::SKOS::Base.new.tap do |c|
-      Iqvoc::RDFAPI.devour c, 'skos:prefLabel', '"Airsoft"@en'
+      RDFAPI.devour c, 'skos:prefLabel', '"Airsoft"@en'
       c.publish
       c.save
       new_version = c.branch @admin

data/test/integration/alphabetical_test.rb

@@ -15,7 +15,6 @@
 # limitations under the License.
 
 require File.join(File.expand_path(File.dirname(__FILE__)), '../integration_test_helper')
-require 'iqvoc/rdfapi'
 
 class AlphabeticalConceptsTest < ActionDispatch::IntegrationTest
   setup do
@@ -25,10 +24,10 @@ class AlphabeticalConceptsTest < ActionDispatch::IntegrationTest
     ]
 
     data.each_with_index do |hsh, i|
-      concept = Iqvoc::RDFAPI.devour "concept_#{i}", 'a', 'skos:Concept'
+      concept = RDFAPI.devour "concept_#{i}", 'a', 'skos:Concept'
       labelings = []
       hsh.each do |lang, val|
-        Iqvoc::RDFAPI.devour concept, 'skos:prefLabel', "\"#{val}\"@#{lang}"
+        RDFAPI.devour concept, 'skos:prefLabel', "\"#{val}\"@#{lang}"
       end
       concept.publish.save
     end