iqvoc 4.7.0 → 4.8.0

data/test/integration/browse_concepts_and_labels_test.rb

@@ -21,7 +21,7 @@ class BrowseConceptsAndLabelsTest < ActionDispatch::IntegrationTest
     @concepts = %w("Tree"@en "Forest"@en "Baum"@de "Forst"@de).map do |literal|
       concept = Concept::SKOS::Base.new.publish
       concept.save
-      Iqvoc::RDFAPI.devour concept, 'skos:prefLabel', literal
+      RDFAPI.devour concept, 'skos:prefLabel', literal
       concept
     end
   end
@@ -60,7 +60,7 @@ class BrowseConceptsAndLabelsTest < ActionDispatch::IntegrationTest
       concept = Concept::SKOS::Base.create! do |c|
         c.expired_at = 2.days.ago
       end
-      Iqvoc::RDFAPI.devour concept, 'skos:prefLabel', literal
+      RDFAPI.devour concept, 'skos:prefLabel', literal
       concept
     end
 

data/test/integration/collection_circularity_test.rb

@@ -21,18 +21,18 @@ class CollectionCircularityTest < ActionDispatch::IntegrationTest
     login('administrator')
 
     @coll1 = Iqvoc::Collection.base_class.new.lock_by_user(@user.id).tap { |c| c.save }
-    Iqvoc::RDFAPI.devour @coll1, 'skos:prefLabel', '"coll1"@en'
+    RDFAPI.devour @coll1, 'skos:prefLabel', '"coll1"@en'
     @coll2 = Iqvoc::Collection.base_class.new.lock_by_user(@user.id).tap { |c| c.save }
-    Iqvoc::RDFAPI.devour @coll2, 'skos:prefLabel', '"coll2"@en'
+    RDFAPI.devour @coll2, 'skos:prefLabel', '"coll2"@en'
     @coll3 = Iqvoc::Collection.base_class.new.lock_by_user(@user.id).tap { |c| c.save }
-    Iqvoc::RDFAPI.devour @coll3, 'skos:prefLabel', '"coll3"@en'
+    RDFAPI.devour @coll3, 'skos:prefLabel', '"coll3"@en'
 
     @concept1 = Concept::SKOS::Base.new.publish.tap { |c| c.save }
-    Iqvoc::RDFAPI.devour @concept1, 'skos:prefLabel', '"concept1"@en'
+    RDFAPI.devour @concept1, 'skos:prefLabel', '"concept1"@en'
     @concept2 = Concept::SKOS::Base.new.publish.tap { |c| c.save }
-    Iqvoc::RDFAPI.devour @concept2, 'skos:prefLabel', '"concept2"@en'
+    RDFAPI.devour @concept2, 'skos:prefLabel', '"concept2"@en'
     @concept3 = Concept::SKOS::Base.new.publish.tap { |c| c.save }
-    Iqvoc::RDFAPI.devour @concept3, 'skos:prefLabel', '"concept3"@en'
+    RDFAPI.devour @concept3, 'skos:prefLabel', '"concept3"@en'
   end
 
   test 'inline assignments are persisted' do

data/test/integration/concept_scheme_browsing_test.rb

@@ -50,9 +50,9 @@ class ConceptSchemeBrowsingTest < ActionDispatch::IntegrationTest
     assert !page.has_link?('Tree 2', href: 'http://www.example.com/en/concepts/foo_2.html')
 
     concept1 = Concept::SKOS::Base.new(origin: 'foo_1', top_term: false).publish.tap { |c| c.save }
-    Iqvoc::RDFAPI.devour concept1, 'skos:prefLabel', '"Tree 2"@en'
+    RDFAPI.devour concept1, 'skos:prefLabel', '"Tree 2"@en'
     concept2 = Concept::SKOS::Base.new(origin: 'foo_2', top_term: false).publish.tap { |c| c.save }
-    Iqvoc::RDFAPI.devour concept2, 'skos:prefLabel', '"Tree 2"@en'
+    RDFAPI.devour concept2, 'skos:prefLabel', '"Tree 2"@en'
 
     login 'administrator'
     visit edit_scheme_path(lang: :en, format: :html)

data/test/integration/edit_concepts_test.rb

@@ -19,7 +19,7 @@ require File.join(File.expand_path(File.dirname(__FILE__)), '../integration_test
 class EditConceptsTest < ActionDispatch::IntegrationTest
   setup do
     @concept = Concept::SKOS::Base.new.tap do |c|
-      Iqvoc::RDFAPI.devour c, 'skos:prefLabel', '"foo"@en'
+      RDFAPI.devour c, 'skos:prefLabel', '"foo"@en'
       c.publish
       c.save
     end

data/test/integration/export_test.rb

@@ -15,12 +15,13 @@
 # limitations under the License.
 
 require File.join(File.expand_path(File.dirname(__FILE__)), '../integration_test_helper')
-require 'iqvoc/skos_importer'
 
 class ExportTest < ActionDispatch::IntegrationTest
   setup do
     @testdata = File.read(Rails.root.join('test','models', 'testdata.nt')).split("\n")
-    Iqvoc::SkosImporter.new(@testdata, 'http://www.example.com/').run
+    SkosImporter.new(@testdata, 'http://www.example.com/').run
+
+    @worker = Delayed::Worker.new
   end
 
   test 'export privileges' do
@@ -51,7 +52,8 @@ class ExportTest < ActionDispatch::IntegrationTest
     click_link_or_button 'Request Export'
     assert page.has_content? 'Export job was created. Reload page to see current processing status.'
 
-    Delayed::Worker.new.work_off
+    job = Delayed::Job.last
+    @worker.run(job)
 
     visit exports_path(lang: 'en')
     click_link_or_button 'Download'

data/test/integration/import_test.rb

@@ -19,6 +19,7 @@ require File.join(File.expand_path(File.dirname(__FILE__)), '../integration_test
 class ImportTest < ActionDispatch::IntegrationTest
   setup do
     @file = Rails.root.join('data/hobbies.nt')
+    @worker = Delayed::Worker.new
   end
 
   test 'import privileges' do
@@ -49,7 +50,9 @@ class ImportTest < ActionDispatch::IntegrationTest
     click_button('Import')
     assert page.has_content? 'Import job was created. Reload page to see current processing status.'
 
-    Delayed::Worker.new.work_off
+    job = Delayed::Job.last
+    @worker.run(job)
+
     visit imports_path(lang: 'en')
     page.find('table tbody tr[1] td[1] a').click
 

data/test/integration/instance_configuration_browsing_test.rb

@@ -14,8 +14,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-require 'test_helper'
-require 'integration_test_helper'
+require File.join(File.expand_path(File.dirname(__FILE__)), '../integration_test_helper')
 
 class InstanceConfigurationTest < ActionDispatch::IntegrationTest
   test 'configuration privileges' do
@@ -44,6 +43,7 @@ class InstanceConfigurationTest < ActionDispatch::IntegrationTest
   end
 
   test 'modify and persist configuration' do
+    visit root_url
     assert page.find('.navbar-brand').has_content? 'iQvoc'
 
     login 'administrator'

data/test/integration/navigation_test.rb

@@ -18,12 +18,12 @@ require File.join(File.expand_path(File.dirname(__FILE__)), '../integration_test
 
 class NavigationTest < ActionDispatch::IntegrationTest
   test 'extend navigation on root level' do
-    Iqvoc::Navigation.add({
+    Iqvoc::Configuration::Navigation.add({
       text: 'root element 1',
       href: 'http://foo.local/'
     })
 
-    Iqvoc::Navigation.add_grouped({
+    Iqvoc::Configuration::Navigation.add_grouped({
       text: 'extension 1',
       href: 'http://foo.local/'
     })

data/test/integration/note_annotations_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 NoteAnnotationsTest < ActionDispatch::IntegrationTest
   test 'creating and retrieving change notes' do
@@ -54,14 +53,16 @@ class NoteAnnotationsTest < ActionDispatch::IntegrationTest
         gsub(/^ *| *$/, ''). # ignore indentation
         gsub(/\d/, '#').     # neutralize timestamps
         gsub(/#\+#/, '#-#')  # neutralize eventually positive timezone shifts (server time)
+
     assert ttl.include?("skos:changeNote [\n" +
         "rdfs:comment \"lorem ipsum\"@en\n" +
-        ']')
+        ']'), "can't find changeNote 'lorem ipsum'"
+
     assert ttl.include?("skos:changeNote [\n" +
         "rdfs:comment \"dolor sit amet\"@en;\n" +
         "dct:creator \"Test User\";\n" +
         "dct:modified \"####-##-##T##:##:##-##:##\"\n" +
-        ']')
+        ']'), "can't find changeNote 'dolor sit amet'"
 
     visit xml_uri
     xml = page.source.
@@ -83,7 +84,7 @@ class NoteAnnotationsTest < ActionDispatch::IntegrationTest
   end
 
   test 'rdf for localized note annotations' do
-    rdfapi = Iqvoc::RDFAPI
+    rdfapi = RDFAPI
 
     concept = rdfapi.devour *%w(foobar a skos:Concept)
     concept.publish
@@ -97,14 +98,14 @@ class NoteAnnotationsTest < ActionDispatch::IntegrationTest
 
     visit "/#{concept.origin}.ttl"
 
-    ttl = <<RDF
-    rdfs:seeAlso [
-    rdfs:comment "foo"@en;
-    dct:title "Foo Bar"@en;
-    foaf:page <http://google.de/>
+    expected_ttl = <<RDF
+rdfs:seeAlso [
+rdfs:comment "foo"@en;
+dct:title "Foo Bar"@en;
+foaf:page <http://google.de/>
 ].
 RDF
-
-    assert page.body.include?(ttl)
+    ttl = page.source.gsub(/^ *| *$/, '') # ignore indentation
+    assert ttl.include?(expected_ttl), "can't find changeNote 'Foo Bar'"
   end
 end

data/test/integration/reverse_match_job_test.rb

@@ -22,13 +22,13 @@ class ReverseMatchJobTest < ActiveSupport::TestCase
 
   setup do
     @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(origin: 'airsoft').tap do |c|
-      Iqvoc::RDFAPI.devour c, 'skos:prefLabel', '"Airsoft"@en'
+      RDFAPI.devour c, 'skos:prefLabel', '"Airsoft"@en'
       c.publish
       c.save
     end
@@ -45,6 +45,7 @@ class ReverseMatchJobTest < ActiveSupport::TestCase
       .with(:headers => {'Accept' => 'application/json', 'User-Agent' => 'Faraday v0.9.0'})
       .to_return(status: 200, body: body, headers: {})
 
+    @worker = Delayed::Worker.new
     DatabaseCleaner.start
   end
 
@@ -61,8 +62,10 @@ class ReverseMatchJobTest < ActiveSupport::TestCase
     job = @reverse_match_service.build_job(:add_match, 'airsoft', 'http://try.iqvoc.com', 'Match::SKOS::BroadMatch')
     @reverse_match_service.add(job)
 
-    Delayed::Worker.new.work_off
-    assert_equal 0, @airsoft.jobs.size
+    job = Delayed::Job.last
+    @worker.run(job)
+
+    assert_equal 0, @airsoft.job_relations.size
   end
 
   test 'job timeout' do
@@ -72,8 +75,10 @@ class ReverseMatchJobTest < ActiveSupport::TestCase
     job = @reverse_match_service.build_job(:add_match, 'airsoft', 'http://try.iqvoc.com', 'Match::SKOS::BroadMatch')
     @reverse_match_service.add(job)
 
-    Delayed::Worker.new.work_off
-    assert_equal 1, @airsoft.jobs.size
+    job = Delayed::Job.last
+    @worker.run(job)
+
+    assert_equal 1, @airsoft.job_relations.size
 
     job_relation = @airsoft.job_relations.first
     assert_equal 'timeout_error', job_relation.response_error
@@ -86,8 +91,10 @@ class ReverseMatchJobTest < ActiveSupport::TestCase
     job = @reverse_match_service.build_job(:add_match, 'airsoft', 'http://try.iqvoc.com', 'Match::SKOS::BroadMatch')
     @reverse_match_service.add(job)
 
-    Delayed::Worker.new.work_off
-    assert_equal 1, @airsoft.jobs.size
+    job = Delayed::Job.last
+    @worker.run(job)
+
+    assert_equal 1, @airsoft.job_relations.size
 
     job_relation = @airsoft.job_relations.first
     assert_equal 'resource_not_found', job_relation.response_error
@@ -102,8 +109,10 @@ class ReverseMatchJobTest < ActiveSupport::TestCase
     job = @reverse_match_service.build_job(:add_match, 'airsoft', 'http://try.iqvoc.com', 'Match::SKOS::BroadMatch')
     @reverse_match_service.add(job)
 
-    Delayed::Worker.new.work_off
-    assert_equal 1, @airsoft.jobs.size
+    job = Delayed::Job.last
+    @worker.run(job)
+
+    assert_equal 1, @airsoft.job_relations.size
 
     job_relation = @airsoft.job_relations.first
     assert_equal 'unknown_match', job_relation.response_error

data/test/integration/search_test.rb

@@ -21,21 +21,21 @@ class SearchTest < ActionDispatch::IntegrationTest
 
     @concepts = %w("Tree"@en "Forest"@en).map do |literal|
       Concept::SKOS::Base.new.tap do |c|
-        Iqvoc::RDFAPI.devour c, 'skos:prefLabel', literal
+        RDFAPI.devour c, 'skos:prefLabel', literal
         c.publish
         c.save
       end
     end
 
     @collection = Collection::SKOS::Unordered.new.tap do |c|
-      Iqvoc::RDFAPI.devour c, 'skos:prefLabel', '"Alpha"@en'
+      RDFAPI.devour c, 'skos:prefLabel', '"Alpha"@en'
       c.publish
       c.save
     end
 
     # assign concepts to collection
     @concepts.each do |c|
-      Iqvoc::RDFAPI.devour @collection, 'skos:member', c
+      RDFAPI.devour @collection, 'skos:member', c
     end
   end
 
@@ -124,11 +124,11 @@ class SearchTest < ActionDispatch::IntegrationTest
 
   test 'searching specific classes within collections' do
     concept = Concept::SKOS::Base.new.tap do |c|
-      Iqvoc::RDFAPI.devour c, 'skos:definition', '"lorem ipsum"@en'
+      RDFAPI.devour c, 'skos:definition', '"lorem ipsum"@en'
       c.publish
       c.save
     end
-    Iqvoc::RDFAPI.devour @collection, 'skos:member', concept
+    RDFAPI.devour @collection, 'skos:member', concept
 
     visit search_path(lang: 'en', format: 'html')
 
@@ -172,7 +172,7 @@ class SearchTest < ActionDispatch::IntegrationTest
     # create a large number of concepts
     1.upto(12) do |i|
       Concept::SKOS::Base.new.tap do |c|
-        Iqvoc::RDFAPI.devour c, 'skos:prefLabel', "\"sample_#{sprintf('_%04d', i)}\"@en"
+        RDFAPI.devour c, 'skos:prefLabel', "\"sample_#{sprintf('_%04d', i)}\"@en"
         c.publish
         c.save
       end

data/test/integration/tree_test.rb

@@ -19,14 +19,14 @@ require File.join(File.expand_path(File.dirname(__FILE__)), '../integration_test
 class TreeTest < ActionDispatch::IntegrationTest
   test 'browse hierarchical concepts tree' do
     narrower_concept = Concept::SKOS::Base.new.tap do |c|
-      Iqvoc::RDFAPI.devour c, 'skos:prefLabel', '"Narrower"@en'
+      RDFAPI.devour c, 'skos:prefLabel', '"Narrower"@en'
       c.publish
       c.save
     end
 
     concept = Concept::SKOS::Base.new(top_term: true).tap do |c|
-      Iqvoc::RDFAPI.devour c, 'skos:prefLabel', '"Foo"@en'
-      Iqvoc::RDFAPI.devour c, 'skos:narrower', narrower_concept
+      RDFAPI.devour c, 'skos:prefLabel', '"Foo"@en'
+      RDFAPI.devour c, 'skos:narrower', narrower_concept
       c.publish
       c.save
     end

data/test/integration/untranslated_test.rb

@@ -25,7 +25,7 @@ class UntranslatedConceptsTest < ActionDispatch::IntegrationTest
     ].each do |hsh|
       concept = Concept::SKOS::Base.new
       hsh.each do |lang, value|
-        Iqvoc::RDFAPI.devour concept, 'skos:prefLabel', "\"#{value}\"@#{lang}"
+        RDFAPI.devour concept, 'skos:prefLabel', "\"#{value}\"@#{lang}"
       end
       concept.publish.save
     end

data/test/models/concept_test.rb

@@ -15,7 +15,6 @@
 # limitations under the License.
 
 require File.join(File.expand_path(File.dirname(__FILE__)), '../test_helper')
-require 'iqvoc/rdfapi'
 
 class ConceptTest < ActiveSupport::TestCase
   test 'blank concept' do
@@ -42,7 +41,7 @@ class ConceptTest < ActiveSupport::TestCase
   end
 
   test 'concept with no preflabel' do
-    concept = Iqvoc::RDFAPI.devour 'bear', 'a', 'skos:Concept'
+    concept = RDFAPI.devour 'bear', 'a', 'skos:Concept'
 
     assert concept.save
     refute concept.publishable?
@@ -52,15 +51,15 @@ class ConceptTest < ActiveSupport::TestCase
   end
 
   test 'concepts without pref_labels should be saveable but not publishable' do
-    concept =  Iqvoc::RDFAPI.devour 'bear', 'a', 'skos:Concept'
+    concept =  RDFAPI.devour 'bear', 'a', 'skos:Concept'
     assert_equal [], concept.pref_labels
     assert concept.valid?
     refute concept.publishable?
   end
 
   test 'published concept must have a pref_label of the first pref_label language configured (the main language)' do
-    concept = Iqvoc::RDFAPI.devour 'bear', 'a', 'skos:Concept'
-    Iqvoc::RDFAPI.devour concept, 'skos:prefLabel', '"Bear"@en'
+    concept = RDFAPI.devour 'bear', 'a', 'skos:Concept'
+    RDFAPI.devour concept, 'skos:prefLabel', '"Bear"@en'
 
     assert concept.save
 
@@ -74,13 +73,13 @@ class ConceptTest < ActiveSupport::TestCase
 
   test 'one pref label per language' do
     concept = Concept::SKOS::Base.new.tap do |c|
-      Iqvoc::RDFAPI.devour c, 'skos:prefLabel', '"Bear"@en'
+      RDFAPI.devour c, 'skos:prefLabel', '"Bear"@en'
       c.publish
       c.save
     end
 
     assert concept.valid?
-    Iqvoc::RDFAPI.devour concept, 'skos:prefLabel', '"Beaaar"@en'
+    RDFAPI.devour concept, 'skos:prefLabel', '"Beaaar"@en'
     concept.pref_labelings.reload
     assert_equal 2, concept.pref_labelings.count
     assert_equal concept.pref_labelings.first.target.language, concept.pref_labelings.second.target.language
@@ -88,23 +87,23 @@ class ConceptTest < ActiveSupport::TestCase
   end
 
   test 'unique pref label' do
-    bear_one = Iqvoc::RDFAPI.devour 'bear_one', 'a', 'skos:Concept'
-    Iqvoc::RDFAPI.devour bear_one, 'skos:prefLabel', '"Bear"@en'
+    bear_one = RDFAPI.devour 'bear_one', 'a', 'skos:Concept'
+    RDFAPI.devour bear_one, 'skos:prefLabel', '"Bear"@en'
 
     assert bear_one.save
     assert bear_one.publishable?
 
-    bear_two = Iqvoc::RDFAPI.devour 'bear_two', 'a', 'skos:Concept'
-    Iqvoc::RDFAPI.devour bear_two, 'skos:prefLabel', '"Bear"@en'
+    bear_two = RDFAPI.devour 'bear_two', 'a', 'skos:Concept'
+    RDFAPI.devour bear_two, 'skos:prefLabel', '"Bear"@en'
 
     bear_two.save!
     refute bear_two.publishable?
   end
 
   test 'multiple pref labels' do
-    concept = Iqvoc::RDFAPI.devour 'bear', 'a', 'skos:Concept'
-    Iqvoc::RDFAPI.devour concept, 'skos:prefLabel', '"Bear"@en'
-    Iqvoc::RDFAPI.devour concept, 'skos:prefLabel', '"Bär"@de'
+    concept = RDFAPI.devour 'bear', 'a', 'skos:Concept'
+    RDFAPI.devour concept, 'skos:prefLabel', '"Bear"@en'
+    RDFAPI.devour concept, 'skos:prefLabel', '"Bär"@de'
 
     assert concept.save
     concept.reload

data/test/models/inline_data_test.rb

@@ -20,40 +20,40 @@ class InlineDataTest < ActiveSupport::TestCase
   test 'serialization' do
     values = ['foo', 'bar']
     assert_equal 'foo, bar',
-        Iqvoc::InlineDataHelper.generate_inline_values(values)
+        InlineDataHelper.generate_inline_values(values)
 
     values = ['lorem', 'foo, bar', 'ipsum']
     assert_equal 'lorem, "foo, bar", ipsum',
-        Iqvoc::InlineDataHelper.generate_inline_values(values)
+        InlineDataHelper.generate_inline_values(values)
   end
 
   test 'deserialization' do
     inline_values = 'foo, bar'
     assert_equal ['foo', 'bar'],
-        Iqvoc::InlineDataHelper.parse_inline_values(inline_values)
+        InlineDataHelper.parse_inline_values(inline_values)
 
     inline_values = 'lorem, "foo, bar", ipsum'
     assert_equal ['lorem', 'foo, bar', 'ipsum'],
-        Iqvoc::InlineDataHelper.parse_inline_values(inline_values)
+        InlineDataHelper.parse_inline_values(inline_values)
 
     inline_values = 'lorem,"foo, bar",ipsum'
     assert_equal ['lorem', 'foo, bar', 'ipsum'],
-        Iqvoc::InlineDataHelper.parse_inline_values(inline_values)
+        InlineDataHelper.parse_inline_values(inline_values)
 
     inline_values = 'foo, bar,baz' # inconsistent whitespace
     assert_equal ['foo', 'bar', 'baz'],
-        Iqvoc::InlineDataHelper.parse_inline_values(inline_values)
+        InlineDataHelper.parse_inline_values(inline_values)
 
     inline_values = 'lorem,"foo, bar", ipsum' # inconsistent whitespace
     assert_equal ['lorem', 'foo, bar', 'ipsum'],
-        Iqvoc::InlineDataHelper.parse_inline_values(inline_values)
+        InlineDataHelper.parse_inline_values(inline_values)
 
     inline_values = 'lorem, "foo, bar",ipsum' # inconsistent whitespace
     assert_raises(CSV::MalformedCSVError) do
-      Iqvoc::InlineDataHelper.parse_inline_values(inline_values)
+      InlineDataHelper.parse_inline_values(inline_values)
     end
 
     inline_values = ''
-    assert_equal [], Iqvoc::InlineDataHelper.parse_inline_values(inline_values)
+    assert_equal [], InlineDataHelper.parse_inline_values(inline_values)
   end
 end