iqvoc 4.10.0 → 4.11.0

data/test/integration/concept_collection_assignment_test.rb

@@ -0,0 +1,78 @@
+# encoding: UTF-8
+
+# Copyright 2011-2016 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.
+
+require File.join(File.expand_path(File.dirname(__FILE__)), '../integration_test_helper')
+
+class ConceptCollectionAssignmentTest < ActionDispatch::IntegrationTest
+  setup do
+    login 'administrator'
+
+    @sports_coll = Iqvoc::Collection.base_class.new.tap do |c|
+      RDFAPI.devour c, 'skos:prefLabel', '"Sports"@en'
+      c.publish
+      c.save
+    end
+
+    @hobbies_coll = Iqvoc::Collection.base_class.new.tap do |c|
+      RDFAPI.devour c, 'skos:prefLabel', '"Hobbies"@en'
+      c.publish
+      c.save
+    end
+  end
+
+  test 'concept collection assignment' do
+    concept = Concept::SKOS::Base.new.tap do |c|
+      RDFAPI.devour c, 'skos:prefLabel', '"Testcollection"@en'
+      c.publish
+      c.save
+    end
+
+    visit concept_path(concept, lang: 'en', format: 'html')
+
+    click_link_or_button 'Create new version'
+    assert page.has_content? 'Instance copy has been created and locked.'
+    collection_origins = [@sports_coll, @hobbies_coll].map(&:origin).join(', ')
+    fill_in 'concept_assigned_collection_origins', with: collection_origins
+    click_link_or_button 'Save'
+
+    within('#assigned_collections') do |ref|
+      assert page.has_content? 'Sports'
+      assert page.has_content? 'Hobbies'
+    end
+
+    # remove hobbies collection
+    click_link_or_button 'Continue editing'
+    fill_in 'concept_assigned_collection_origins', with: @sports_coll.origin
+    click_link_or_button 'Save'
+
+    within('#assigned_collections') do |ref|
+      assert page.has_content? 'Sports'
+      refute page.has_content? 'Hobbies'
+    end
+
+    # remove sports collection, no collection after this
+    click_link_or_button 'Continue editing'
+    fill_in 'concept_assigned_collection_origins', with: ''
+    click_link_or_button 'Save'
+
+    within('#assigned_collections') do |ref|
+      refute page.has_content?('Sports'), 'Sports should be removed'
+      refute page.has_content?('Hobbies'), 'Hobbies should be removed'
+    end
+
+  end
+
+end

data/test/integration/note_annotations_test.rb

@@ -29,6 +29,9 @@ class NoteAnnotationsTest < ActionDispatch::IntegrationTest
 
     assert page.has_content? I18n.t('txt.controllers.versioned_concept.success')
 
+    # has initial created note
+    assert page.has_css?('dl.note_annotations', count: 1)
+
     click_link_or_button I18n.t('txt.views.versioning.publishing')
     assert page.has_content? I18n.t('txt.controllers.versioning.published')
 
@@ -37,11 +40,12 @@ class NoteAnnotationsTest < ActionDispatch::IntegrationTest
         with: 'dolor sit amet'
     click_button 'Save'
 
-    assert page.has_css?('dl.note_annotations', count: 1)
+    # initial created note and modified note
+    assert page.has_css?('dl.note_annotations', count: 2)
 
     click_link_or_button I18n.t('txt.views.versioning.publishing')
     assert page.has_content? I18n.t('txt.controllers.versioning.published')
-    assert page.has_css?('dl.note_annotations', count: 1)
+    assert page.has_css?('dl.note_annotations', count: 2)
 
     # TTL & RDF/XML
 
@@ -55,7 +59,9 @@ class NoteAnnotationsTest < ActionDispatch::IntegrationTest
         gsub(/#\+#/, '#-#')  # neutralize eventually positive timezone shifts (server time)
 
     assert ttl.include?("skos:changeNote [\n" +
-        "rdfs:comment \"lorem ipsum\"@en\n" +
+        "rdfs:comment \"lorem ipsum\"@en;\n" +
+        "dct:created \"####-##-##T##:##:##-##:##\";\n" +
+        "dct:creator \"Test User\"\n" +
         ']'), "can't find changeNote 'lorem ipsum'"
 
     assert ttl.include?("skos:changeNote [\n" +
@@ -69,9 +75,12 @@ class NoteAnnotationsTest < ActionDispatch::IntegrationTest
         gsub(/^ *| *$/, ''). # ignore indentation
         gsub(/\d/, '#').     # neutralize timestamps
         gsub(/#\+#/, '#-#')  # neutralize eventually positive timezone shifts (server time)
+
     assert xml.include?("<skos:changeNote>\n" +
         "<rdf:Description>\n" +
         "<rdfs:comment xml:lang=\"en\">lorem ipsum</rdfs:comment>\n" +
+        "<dct:created>####-##-##T##:##:##-##:##</dct:created>\n" +
+        "<dct:creator>Test User</dct:creator>\n" +
         "</rdf:Description>\n" +
         '</skos:changeNote>')
     assert xml.include?("<skos:changeNote>\n" +

data/test/integration/reverse_match_job_test.rb

@@ -33,7 +33,7 @@ class ReverseMatchJobTest < ActiveSupport::TestCase
       c.save
     end
 
-    @reverse_match_service = Services::ReverseMatchService.new('http://try.iqvoc.com', 80)
+    @reverse_match_service = Services::ReverseMatchService.new('try.iqvoc.com', 'http://')
 
     body = {links: [
       { rel: 'self', href: 'http://0.0.0.0:3000/en/concepts/airsoft', method: 'get' },

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: iqvoc
 version: !ruby/object:Gem::Version
-  version: 4.10.0
+  version: 4.11.0
 platform: ruby
 authors:
 - Robert Glaser
@@ -11,22 +11,28 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-19 00:00:00.000000000 Z
+date: 2017-03-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 4.2.0
+        version: 4.2.8
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '5.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 4.2.0
+        version: 4.2.8
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '5.0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -227,30 +233,30 @@ dependencies:
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.6.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.6.0
 - !ruby/object:Gem::Dependency
   name: linkeddata
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.1.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.1.2
 - !ruby/object:Gem::Dependency
   name: font-awesome-rails
   requirement: !ruby/object:Gem::Requirement
@@ -327,14 +333,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.0.1
+        version: 4.1.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.0.1
+        version: 4.1.1
 - !ruby/object:Gem::Dependency
   name: carrierwave
   requirement: !ruby/object:Gem::Requirement
@@ -355,14 +361,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 5.1.8
+        version: 6.5.1.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 5.1.8
+        version: 6.5.1.1
 description: iQvoc - a SKOS(-XL) vocabulary management system built on the Semantic
   Web
 email:
@@ -491,6 +497,7 @@ files:
 - app/controllers/user_sessions_controller.rb
 - app/controllers/users_controller.rb
 - app/exceptions/invalid_string_literal_error.rb
+- app/exceptions/matched_concept_unpublished.rb
 - app/helpers/application_helper.rb
 - app/helpers/concepts_helper.rb
 - app/helpers/dashboard_helper.rb
@@ -799,6 +806,7 @@ files:
 - public/422.html
 - public/500.html
 - public/export/10158182088297730056267397735998168332.nt
+- public/export/10192805148978885837967844546781669290.nt
 - public/export/10293.nt
 - public/export/10355040109890452208129529415338468156.ttl
 - public/export/10365.nt
@@ -810,6 +818,7 @@ files:
 - public/export/11021.nt
 - public/export/110912185041074063490387054266296215226.nt
 - public/export/11187.nt
+- public/export/116918272411112416290066634905903813354.nt
 - public/export/117847551547122078510708470877132805985.nt
 - public/export/118103962177408721707929575729081494395.nt
 - public/export/120970282668580446407680120374839093474.nt
@@ -826,7 +835,9 @@ files:
 - public/export/135608311512803354903797293147209573688.nt
 - public/export/135722566885940224110801255385500618104.nt
 - public/export/137287705501981466637927873193647255895.nt
+- public/export/13837.nt
 - public/export/1396.nt
+- public/export/1417.nt
 - public/export/141764860031047043043974016152358317161.nt
 - public/export/1420.nt
 - public/export/14610.nt
@@ -836,6 +847,8 @@ files:
 - public/export/149603213673793551377622671217172624343.nt
 - public/export/150139498963062024848273903714544194830.nt
 - public/export/15316.nt
+- public/export/153275568579348383693796155341871693100.nt
+- public/export/15332.nt
 - public/export/15412.nt
 - public/export/15447.nt
 - public/export/156970680970033710816543819314498193917.nt
@@ -855,6 +868,7 @@ files:
 - public/export/18568.nt
 - public/export/186167758354016160061051942216737239930.nt
 - public/export/18691370562573626405322536758281327051.nt
+- public/export/19005675879943976619209658028974932617.nt
 - public/export/19084.nt
 - public/export/19294.nt
 - public/export/19348.nt
@@ -870,6 +884,7 @@ files:
 - public/export/20615.nt
 - public/export/207752382127301320557558677406014305633.nt
 - public/export/207915524512289475621257575466768897802.nt
+- public/export/208299769475402765740883052440976216922.nt
 - public/export/20905.nt
 - public/export/21128.nt
 - public/export/21339.nt
@@ -878,6 +893,7 @@ files:
 - public/export/217298949825310134484245506318404724340.nt
 - public/export/220757420981122769566521259515119787266.nt
 - public/export/22330.nt
+- public/export/22367.nt
 - public/export/22493.nt
 - public/export/22831.nt
 - public/export/228686568701989066971611496838516248366.nt
@@ -888,8 +904,10 @@ files:
 - public/export/238296123368175695476336025648621152983.nt
 - public/export/238748613185944587355157720783500018880.nt
 - public/export/2398.nt
+- public/export/239842039859946079048284298581204422602.nt
 - public/export/24154.nt
 - public/export/24453.nt
+- public/export/24489.nt
 - public/export/248824582869005094796757796982726190611.nt
 - public/export/249181243272996686855538181507933173508.nt
 - public/export/253582497035603303866078761322036162874.nt
@@ -904,11 +922,13 @@ files:
 - public/export/26244.nt
 - public/export/26260.nt
 - public/export/26329.nt
+- public/export/263331012556698690896467806067510942801.nt
 - public/export/26420.nt
 - public/export/265769856284889293029535135434272902519.nt
 - public/export/26742.nt
 - public/export/27047.nt
 - public/export/27081.nt
+- public/export/270933597086710360561526644701101107992.nt
 - public/export/271248022528338833394320330267545874930.nt
 - public/export/272241410544406589494837867241403236083.nt
 - public/export/27459.nt
@@ -930,9 +950,12 @@ files:
 - public/export/30183.nt
 - public/export/30317.nt
 - public/export/304213352782651661049169435507171939143.nt
+- public/export/30428904238451414062970608699950348184.nt
+- public/export/30747.nt
 - public/export/309236399351032059155111017983706239964.nt
 - public/export/310047931031467714359244603163170450252.nt
 - public/export/310068563626547921367603963199358485602.nt
+- public/export/31194.nt
 - public/export/313475272922839789677545656129659556680.nt
 - public/export/316022382649834543003583156554502604559.nt
 - public/export/31643.nt
@@ -983,6 +1006,7 @@ files:
 - public/export/37687357862944733731237338243666999173.nt
 - public/export/37849330793704327758529891524887236412.ttl
 - public/export/38277.nt
+- public/export/38674.nt
 - public/export/38788.nt
 - public/export/39528.nt
 - public/export/40110.nt
@@ -995,6 +1019,7 @@ files:
 - public/export/41747.nt
 - public/export/41772.nt
 - public/export/41812198660826269011267187122822598028.nt
+- public/export/41895.nt
 - public/export/42511.nt
 - public/export/4252.nt
 - public/export/42776.nt
@@ -1003,6 +1028,7 @@ files:
 - public/export/43123.nt
 - public/export/43467.nt
 - public/export/43984.nt
+- public/export/44382.nt
 - public/export/44681271240138431736054468888279011559.nt
 - public/export/45050.nt
 - public/export/45295.nt
@@ -1023,12 +1049,14 @@ files:
 - public/export/47990.nt
 - public/export/48378.nt
 - public/export/48517.nt
+- public/export/48640.nt
 - public/export/49234.nt
 - public/export/50376.nt
 - public/export/50454.nt
 - public/export/51034.nt
 - public/export/5104.nt
 - public/export/5135.nt
+- public/export/51540.nt
 - public/export/5162.nt
 - public/export/51721.nt
 - public/export/51995.nt
@@ -1046,6 +1074,7 @@ files:
 - public/export/54743.nt
 - public/export/54831.nt
 - public/export/55091.nt
+- public/export/55305.nt
 - public/export/55436.nt
 - public/export/5571.nt
 - public/export/55762.nt
@@ -1063,6 +1092,7 @@ files:
 - public/export/58535.nt
 - public/export/58623483227513279091270922289844563103.ttl
 - public/export/59053.nt
+- public/export/59453.nt
 - public/export/59512.nt
 - public/export/59825.nt
 - public/export/59961.nt
@@ -1095,6 +1125,7 @@ files:
 - public/export/6484.nt
 - public/export/65135.nt
 - public/export/65459.nt
+- public/export/65515.nt
 - public/export/6599.nt
 - public/export/6679.nt
 - public/export/70092841793149790468015562652881798960.nt
@@ -1112,6 +1143,7 @@ files:
 - public/export/8658395739200600067868671630649943363.nt
 - public/export/8719.nt
 - public/export/8756536634842579424962922974968892253.nt
+- public/export/8784603487603018400727339241555940088.nt
 - public/export/8928822333465579550735295671911007018.nt
 - public/export/91738681585473368364099375987469585611.nt
 - public/export/921.nt
@@ -1148,6 +1180,7 @@ files:
 - public/uploads/import/0afe18f0c16490245499c7242bee2971.nt
 - public/uploads/import/0be3bda2834a2c9a2a1c023f193f1557.nt
 - public/uploads/import/0beea5d524b2747d1e9cdda1d120376b.nt
+- public/uploads/import/0c65980ba25416fbc4d503426e1a8f25.nt
 - public/uploads/import/0c8a99fab2d94f26d91a4c6cd5fb22c3.nt
 - public/uploads/import/0e54d0a36679052c75be6c94760f2bd4.nt
 - public/uploads/import/0ff4f386b0ce742ae2393676fa283c03.nt
@@ -1165,6 +1198,7 @@ files:
 - public/uploads/import/137983f32ae2cfcd197ca07f54bd8836.nt
 - public/uploads/import/1382bb2374b945a19bd2b7387e03f721.nt
 - public/uploads/import/1397348a6f86aa6ed5331a84d3edcebc.nt
+- public/uploads/import/13b577babf078cb2daa4886acf527dab.nt
 - public/uploads/import/1492b9925771519b15ea7b5483a0605a.nt
 - public/uploads/import/15ba5b8b64ea75f1c2e2ef32fda893e6.nt
 - public/uploads/import/15f25175384c6d83d405d7be7c469c21.nt
@@ -1196,6 +1230,7 @@ files:
 - public/uploads/import/2420d2dc3190495edae156ea12c2e643.nt
 - public/uploads/import/24bd62a06efc3ad1ee105df06a8d74ff.nt
 - public/uploads/import/25deed29d38f0d216f20326ce0654142.nt
+- public/uploads/import/2630c1b010d4f6cd0bfc1a82b567c0f2.nt
 - public/uploads/import/2711fd4805d7d1fbfd920196a38e4bf9.nt
 - public/uploads/import/27cc545e7107e263f53a90cfa5c9f811.nt
 - public/uploads/import/28a591c94853a4ab9ac22b59fe13eb99.nt
@@ -1205,6 +1240,7 @@ files:
 - public/uploads/import/2a40b69c9f0c0d98c9a7e7de8c386f1d.nt
 - public/uploads/import/2a9a484ac02216cdca624b9dd00d4996.nt
 - public/uploads/import/2aef7428fe8406ee9c2c2b4778d78958.nt
+- public/uploads/import/2b4c8e8a0e717ec7482fbb0858a73ca9.nt
 - public/uploads/import/2b79db4bb7339fe5a572cf631f83c4b2.nt
 - public/uploads/import/2b8a98ffd564195eee949dc6c7417a0c.nt
 - public/uploads/import/2c514f4cfe8ae3b94e760a764d95c20d.nt
@@ -1232,6 +1268,7 @@ files:
 - public/uploads/import/3986f1bfeb7747a510d04dbb2229463d.nt
 - public/uploads/import/39ef9696a70b6a4f428eb6c60aa9a271.nt
 - public/uploads/import/3a1d917725f09b076f16e7ca96afd740.nt
+- public/uploads/import/3b10e21d4d4ae99504757daea91e37ea.nt
 - public/uploads/import/3b4f9b71a37ec9b3d636305f6f6ad519.nt
 - public/uploads/import/3bdeb517e30c38d46ae651199b265832.nt
 - public/uploads/import/3c1a53dcde97dd7fdc99862147996717.nt
@@ -1240,6 +1277,7 @@ files:
 - public/uploads/import/3cc3ce2b87fefb02f8eb4bb3703aac7a.nt
 - public/uploads/import/3d2d5b415c6e29963dce64017a3f0b64.nt
 - public/uploads/import/3dafd1e300163c2f95c2f4790ef3acf3.nt
+- public/uploads/import/3e2c6beca4bc3d1845c608e85a653b6b.nt
 - public/uploads/import/3e7b846c89e9fda86148db18bfde007e.nt
 - public/uploads/import/40cc28508c2c98f8e810db6a78c0f753.nt
 - public/uploads/import/410b1af4b92ee575a5880a32e372ad4f.nt
@@ -1267,6 +1305,7 @@ files:
 - public/uploads/import/46dbb9d15154dac47e0e233b236826e4.nt
 - public/uploads/import/47fa9d0e431b00d5687399172ccbb17d.nt
 - public/uploads/import/482d59458cf412b4ba43603740ba4018.nt
+- public/uploads/import/484589b64bb31625095e2aa461c7c5f5.nt
 - public/uploads/import/48f9906f336b36807c8252b9937cc65c.nt
 - public/uploads/import/49873a34ecbb5545637323f43e3fb30d.nt
 - public/uploads/import/49b8d43a601b6fba9fd8d7255cd90e3a.nt
@@ -1297,6 +1336,7 @@ files:
 - public/uploads/import/52ef292bd121f1bfb8be32cdd9e8b6f1.nt
 - public/uploads/import/52f22184637c2c74ca2577564c708441.nt
 - public/uploads/import/53dfe4545844a297b3f12a1c6382a8fa.nt
+- public/uploads/import/549f0c78be0d5a4071366cd5668b4fb8.nt
 - public/uploads/import/54e0b71c44f69a52c417738481801f84.nt
 - public/uploads/import/555854f47dac3eb9cf211fd3becd8612.nt
 - public/uploads/import/562a64daf76491e0a287bb2bec3542ec.nt
@@ -1317,6 +1357,7 @@ files:
 - public/uploads/import/5ca3aff54967e963dc78b14cd5ad87bf.nt
 - public/uploads/import/5cddf0500fba319bffcd50a7d0d45730.nt
 - public/uploads/import/5d16f4a8d09afaadb60c4a895c8221c6.nt
+- public/uploads/import/5d66b58c29807cd92be65cd536c4b237.nt
 - public/uploads/import/5dcdff16d0cc1c7728ab6d4fd38a81bc.nt
 - public/uploads/import/5de0c8bf799d418f1d7e3aa165caa28a.nt
 - public/uploads/import/60203f59f5337207643bae365891f817.nt
@@ -1350,6 +1391,7 @@ files:
 - public/uploads/import/6bcf78ccdcb97d1db5b355e419acf5e0.nt
 - public/uploads/import/6c52215c1e5fa9a01fc557c6b959ee88.nt
 - public/uploads/import/6c7e3c354d3f39b434efa0562d2143e3.nt
+- public/uploads/import/6c96310921be5d247e00badec43170ff.nt
 - public/uploads/import/6cecd2a4b748a5320ac379c92012b93e.nt
 - public/uploads/import/6d444bcd4abb765e611dce0bd4ecb7cc.nt
 - public/uploads/import/6d836c4e8b9f9b5c21ceea20eafac8f5.nt
@@ -1371,6 +1413,7 @@ files:
 - public/uploads/import/7500be0de2d7d5a134d1196b45d44162.nt
 - public/uploads/import/76071a3efeb2c6ac5a8226224d127a88.nt
 - public/uploads/import/761f68a7d6bec58f847d1496484afe5c.nt
+- public/uploads/import/76e98edd3edd803faa12c82047ebf7fc.nt
 - public/uploads/import/7746b8be6292014985483ae00df54296.nt
 - public/uploads/import/779e0b14763164c16251919096704de5.nt
 - public/uploads/import/77b7585f51129c8e741af3e7c5f4fd62.nt
@@ -1383,6 +1426,7 @@ files:
 - public/uploads/import/7959a9252544e96b4ee358fd5e5e50f9.nt
 - public/uploads/import/795fe8419d071576cc8a4c08af2e2b1f.nt
 - public/uploads/import/79a79a81642d875b3fb4463a38ad7de0.nt
+- public/uploads/import/7a8c8a3531229829bf7b16380550cb8c.nt
 - public/uploads/import/7b1dbbcc41d5153aff6da43964108e7d.nt
 - public/uploads/import/7b9c355872346d23ed2f1e70e2d67724.nt
 - public/uploads/import/7c5e3295b32cd3267d1a644e29d0ab03.nt
@@ -1408,9 +1452,11 @@ files:
 - public/uploads/import/8578a311f3c1de45bc18341ff187bf32.nt
 - public/uploads/import/859e0763655994d7808addd3607797b9.nt
 - public/uploads/import/8761c0c4546be2dee28b0878478aaf76.nt
+- public/uploads/import/876b3334d3fd4143d573e4e1c213a637.nt
 - public/uploads/import/88a9ec52d60760c84b7150a13f91bb7a.nt
 - public/uploads/import/88cd4af65af2d8be85b187993ff8b284.nt
 - public/uploads/import/899656cc9e6591d0a815b841552191d5.nt
+- public/uploads/import/8a39cdbeb92dcabb370bcc9a586a3d2e.nt
 - public/uploads/import/8b092d652c87c475e6897178becdcafc.nt
 - public/uploads/import/8b33bbe3f412a44f6edd75d9acad634e.nt
 - public/uploads/import/8b4b89ea4a2f47f628102335f73eebdd.nt
@@ -1436,9 +1482,11 @@ files:
 - public/uploads/import/93b6fe7114aa16708e46bfd22434e643.nt
 - public/uploads/import/93d710915123535827d989ed18c7f2b7.nt
 - public/uploads/import/940cc28717ef27f0c73b56455d6eeb4c.nt
+- public/uploads/import/94a3ea41583c51b9c36ffe5ea2d0535c.nt
 - public/uploads/import/94ca7c1f816107d85b6e9c3999dc94f4.nt
 - public/uploads/import/9537fe87eddca756d0b9eba9962d4655.nt
 - public/uploads/import/95a6d972b6925455b45450eb339de68c.nt
+- public/uploads/import/95d86f95ae7ef0a4c45f498587b51700.nt
 - public/uploads/import/95ddb529a517c7dc8d6da9eec5a33cee.nt
 - public/uploads/import/95dee6ba13c9dbbda9ffbec5ef98a513.nt
 - public/uploads/import/970eda95c403ceb162943d694a83bc90.nt
@@ -1485,6 +1533,7 @@ files:
 - public/uploads/import/a733fee9304bad1c68cde1bc5baf89e4.nt
 - public/uploads/import/a79c1ea75d7222fef7c390d78d30388e.nt
 - public/uploads/import/a7a39d9e22b6fe63fc6b0c2b1e44489f.nt
+- public/uploads/import/a8398ee85fdd1f866c2051f1074638b1.nt
 - public/uploads/import/a97112822b17fe1d9c2ad70772cdd9d8.nt
 - public/uploads/import/a9c9b349be0cf98fdb01770cf9ed862c.nt
 - public/uploads/import/a9dd7be7b97f938ff3e7918cb4af3982.nt
@@ -1497,8 +1546,10 @@ files:
 - public/uploads/import/ac1fd17981183189167996eebe6a9948.nt
 - public/uploads/import/ad550942482cac5dcf93ce43b622999e.nt
 - public/uploads/import/add313ca261aab61e1e0459de2a015a0.nt
+- public/uploads/import/addcaf555e2cfcb8baf358fb469f8a0a.nt
 - public/uploads/import/ade1b9fb83a3027bb40ac7d62a6d9ef9.nt
 - public/uploads/import/ae30adc4574aeecf683d61ce37abdb90.nt
+- public/uploads/import/ae54ee7fda3362df0f6de4da0459106d.nt
 - public/uploads/import/aea99360eca9d73d0e050d8bb9fc5f11.nt
 - public/uploads/import/aecb993260e733d626dfb32025e92caa.nt
 - public/uploads/import/af04fc05df612d22fb8090134cb7059b.nt
@@ -1506,6 +1557,7 @@ files:
 - public/uploads/import/af6a9b869c6c4880e3989860ddeb98cb.nt
 - public/uploads/import/b142f5096ce10e66b112bad881905768.nt
 - public/uploads/import/b172b4fa35c8953111710bebf58bcbd4.nt
+- public/uploads/import/b220fb27294d324cc34a4f32dcb15613.nt
 - public/uploads/import/b2df88bcbc9bfb8bedd93abff523ff86.nt
 - public/uploads/import/b30672a01792d8d5d1962cab3381cb17.nt
 - public/uploads/import/b49531b0ad2d00472d2bc17b3aa0d221.nt
@@ -1531,6 +1583,7 @@ files:
 - public/uploads/import/bc1a621735e1281bfc471306001eff66.nt
 - public/uploads/import/bc3460cddade18bbcd4d98cab147ea17.nt
 - public/uploads/import/bc75f528910deffc64df46537d3e4bb0.nt
+- public/uploads/import/bc8a3cd089026ff128732c047e7b911f.nt
 - public/uploads/import/bdbdbd0daab224e45ec48a4448869988.nt
 - public/uploads/import/be829d88516a9bced467f49326b5e1f1.nt
 - public/uploads/import/be96362caa02f6902bf85e2bc42a6c4b.nt
@@ -1565,6 +1618,7 @@ files:
 - public/uploads/import/c9522fe0bf5dd2a14910adebf0da8f42.nt
 - public/uploads/import/c99ba72a7425eba3fadb2c1b0a460cd9.nt
 - public/uploads/import/c9f2c5612d808d7562fbd28325b42c0f.nt
+- public/uploads/import/ca4a8b0c64170bc9e93d32be13b30136.nt
 - public/uploads/import/cad426d14050eecaa088fb9bf665c484.nt
 - public/uploads/import/cadcca7d94d54bd352932950c371667e.nt
 - public/uploads/import/cb0bf48f5f7c464e4faaee4e140f1fb8.nt
@@ -1636,8 +1690,10 @@ files:
 - public/uploads/import/f1d271371d1669bfab7802d7ebe9126e.nt
 - public/uploads/import/f20c069e95627b40f9b9ad158d51a4db.nt
 - public/uploads/import/f250168cc364a3f1598d57f9435502b8.nt
+- public/uploads/import/f2620905a23bbc9e0e49f186b10ac51a.nt
 - public/uploads/import/f3288033bf127cb1adbf74a545a3b79e.nt
 - public/uploads/import/f33c811c7105c9e7da9bb1a9fd90da36.nt
+- public/uploads/import/f3572e0f9e4ec2ef482789e048a11af8.nt
 - public/uploads/import/f3ef83476290ab485e350cdae8473244.nt
 - public/uploads/import/f5ecff98370466cafe19a5c8de986888.nt
 - public/uploads/import/f5f50c1753efa157354993d34de2b678.nt
@@ -1653,6 +1709,7 @@ files:
 - public/uploads/import/fa1654920daeae2e2d40215a747423e9.nt
 - public/uploads/import/fa3abeb13b65e3502bbd5c245df49fb6.nt
 - public/uploads/import/fad426da6bfaaa0653baef182d188b02.nt
+- public/uploads/import/fad73d1341ee30e4888cd1698f502ab5.nt
 - public/uploads/import/fca2fa2dd02e29c8d68b1c80846cb548.nt
 - public/uploads/import/fcdb5f1f04c1018ca519945ce5a60ca9.nt
 - public/uploads/import/fd2fe1d5fd251c9178979fade62db927.nt
@@ -2155,6 +2212,31 @@ files:
 - public/uploads/tmp/1463068182-37316-2356/hobbies.nt
 - public/uploads/tmp/1463126928-5331-8975/hobbies.nt
 - public/uploads/tmp/1463127124-5664-1168/hobbies.nt
+- public/uploads/tmp/1463649041-61474-2323/hobbies.nt
+- public/uploads/tmp/1463664346-5686-2298/hobbies.nt
+- public/uploads/tmp/1463665390-6932-0270/hobbies.nt
+- public/uploads/tmp/1463668304-9630-3251/hobbies.nt
+- public/uploads/tmp/1463669489-10839-0938/hobbies.nt
+- public/uploads/tmp/1466609043-45060-5576/hobbies.nt
+- public/uploads/tmp/1467099160-32022-0649/hobbies.nt
+- public/uploads/tmp/1467099195-32141-0911/hobbies.nt
+- public/uploads/tmp/1467104923-38750-3228/hobbies.nt
+- public/uploads/tmp/1467195067-15511-1862/hobbies.nt
+- public/uploads/tmp/1477904194-9559-9102/hobbies.nt
+- public/uploads/tmp/1478096083-30132-9555/hobbies.nt
+- public/uploads/tmp/1479132609-14928-7976/hobbies.nt
+- public/uploads/tmp/1479133367-19225-4523/hobbies.nt
+- public/uploads/tmp/1479139859-34556-4051/hobbies.nt
+- public/uploads/tmp/1479201601-72814-6787/hobbies.nt
+- public/uploads/tmp/1479208599-84188-0489/hobbies.nt
+- public/uploads/tmp/1479210883-89869-0006/hobbies.nt
+- public/uploads/tmp/1479219219-14488-9873/hobbies.nt
+- public/uploads/tmp/1479220116-16009-2099/hobbies.nt
+- public/uploads/tmp/1479221749-20446-1586/hobbies.nt
+- public/uploads/tmp/1479221819-21274-6192/hobbies.nt
+- public/uploads/tmp/1479292258-60665-3926/hobbies.nt
+- public/uploads/tmp/1479903704-8347-9444/hobbies.nt
+- public/uploads/tmp/1479905096-13975-7245/hobbies.nt
 - test/authentication.rb
 - test/controllers/concepts_movement_controller_test.rb
 - test/controllers/hierarchy_test.rb
@@ -2167,6 +2249,7 @@ files:
 - test/integration/client_edit_concept_test.rb
 - test/integration/collection_circularity_test.rb
 - test/integration/concept_browsing_test.rb
+- test/integration/concept_collection_assignment_test.rb
 - test/integration/concept_scheme_browsing_test.rb
 - test/integration/create_concept_test.rb
 - test/integration/edit_collections_test.rb
@@ -2816,6 +2899,7 @@ test_files:
 - test/integration/client_edit_concept_test.rb
 - test/integration/collection_circularity_test.rb
 - test/integration/concept_browsing_test.rb
+- test/integration/concept_collection_assignment_test.rb
 - test/integration/concept_scheme_browsing_test.rb
 - test/integration/create_concept_test.rb
 - test/integration/edit_collections_test.rb